mirror of
https://github.com/torvalds/linux.git
synced 2024-11-18 01:51:53 +00:00
8e73e367f7
This branch contains code cleanups, moves and removals for 3.12. There's a large number of various cleanups, and a nice net removal of 13500 lines of code. Highlights worth mentioning are: - A series of patches from Stephen Boyd removing the ARM local timer API. - Move of Qualcomm MSM IOMMU code to drivers/iommu. - Samsung PWM driver cleanups from Tomasz Figa, removing legacy PWM driver and switching over to the drivers/pwm one. - Removal of some unusued auto-generated headers for OMAP2+ (PRM/CM). There's also a move of a header file out of include/linux/i2c/ to platform_data, where it really belongs. It touches mostly ARM platform code for include changes so we took it through our tree. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABAgAGBQJSKg/NAAoJEIwa5zzehBx3vxIP/19ouV4WrzOeEMz2Id8bYT5/ Tu9HRm+PJJ2O+4P+DYlycRAEHsbuDbwgdcqToH3quca1YnIcoJgY0FA6D0ihQ5uE EvTgFIpkNMLnR43GYDOE3a/rR3hYPg5oQabKFn7ZGLG2ND3D3d2N05WT8XNbTYDk nvCXvyRRT1ynCEzbxRBiE8x62ao4bqa5dZ1zrHHIEoakqciXEng8IU0nxx7SUarv 61GBJHVoGFpwOWXdgt2uxyXFbn6nMrhf33ynB+RRAZhqlrC8FROj8Iz+3EoKSAHc fMJSw6jgdjMCfTDvi0j/eemoNC4fm0eP17Dz9WcwxtIrJPNFVrxZq+biDnpb49nM IHsbNrILosw9AbHr3C0kTU9tp+Jie2cE1RWHqTIN3S3zb4qN+fIJiU6o6LMhsNP5 +ZxL4M5IYmvZYbU3a+A00TPwVRqBbsZB+et9RtYZsdpepovDiN4XcixEoT7ffqrt VLjJyoX7Aqmds46lMdsdD3bpPkREmMdf8aMm5fvdIqwbJi1pFMMGMdTgN2WLG5aM r0bj/DizxL7Brs8RHwOScUgXteZs3gg87v5Ns/3zAyJZvE4norPAiT+EJeXylpRO LDqqaypFs75nU+mWLNo8Fzck4Xue55SBqx5Bo3aD/Smk8B6r4KMqnMKVsV5RFHAU XfWb49HulUwHHdn5DAPx =1vE4 -----END PGP SIGNATURE----- Merge tag 'cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc Pull ARM SoC cleanups from Olof Johansson: "This branch contains code cleanups, moves and removals for 3.12. There's a large number of various cleanups, and a nice net removal of 13500 lines of code. Highlights worth mentioning are: - A series of patches from Stephen Boyd removing the ARM local timer API. - Move of Qualcomm MSM IOMMU code to drivers/iommu. - Samsung PWM driver cleanups from Tomasz Figa, removing legacy PWM driver and switching over to the drivers/pwm one. - Removal of some unusued auto-generated headers for OMAP2+ (PRM/CM). There's also a move of a header file out of include/linux/i2c/ to platform_data, where it really belongs. It touches mostly ARM platform code for include changes so we took it through our tree" * tag 'cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (83 commits) ARM: OMAP2+: Add back the define for AM33XX_RST_GLOBAL_WARM_SW_MASK gpio: (gpio-pca953x) move header to linux/platform_data/ arm: zynq: hotplug: Remove unreachable code ARM: SAMSUNG: Remove unnecessary exynos4_default_sdhci*() tegra: simplify use of devm_ioremap_resource ARM: SAMSUNG: Remove plat/regs-timer.h header ARM: SAMSUNG: Remove remaining uses of plat/regs-timer.h header ARM: SAMSUNG: Remove pwm-clock infrastructure ARM: SAMSUNG: Remove old PWM timer platform devices pwm: Remove superseded pwm-samsung-legacy driver ARM: SAMSUNG: Modify board files to use new PWM platform device ARM: SAMSUNG: Rework private data handling in dev-backlight pwm: Add new pwm-samsung driver ARM: mach-mvebu: remove redundant DT parsing and validation ARM: msm: Only compile io.c on platforms that use it iommu/msm: Move mach includes to iommu directory ARM: msm: Remove devices-iommu.c ARM: msm: Move mach/board.h contents to common.h ARM: msm: Migrate msm_timer to CLOCKSOURCE_OF_DECLARE ARM: msm: Remove TMR and TMR0 static mappings ...
380 lines
9.5 KiB
C
380 lines
9.5 KiB
C
/*
|
|
* linux/arch/arm/mach-omap2/board-am3517evm.c
|
|
*
|
|
* Copyright (C) 2009 Texas Instruments Incorporated
|
|
* Author: Ranjith Lohithakshan <ranjithl@ti.com>
|
|
*
|
|
* Based on mach-omap2/board-omap3evm.c
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify it
|
|
* under the terms of the GNU General Public License as published by the
|
|
* Free Software Foundation version 2.
|
|
*
|
|
* This program is distributed "as is" WITHOUT ANY WARRANTY of any kind,
|
|
* whether express or implied; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* General Public License for more details.
|
|
*/
|
|
|
|
#include <linux/kernel.h>
|
|
#include <linux/init.h>
|
|
#include <linux/clk.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/gpio.h>
|
|
#include <linux/platform_data/pca953x.h>
|
|
#include <linux/can/platform/ti_hecc.h>
|
|
#include <linux/davinci_emac.h>
|
|
#include <linux/mmc/host.h>
|
|
#include <linux/usb/musb.h>
|
|
#include <linux/platform_data/gpio-omap.h>
|
|
|
|
#include "am35xx.h"
|
|
#include <asm/mach-types.h>
|
|
#include <asm/mach/arch.h>
|
|
#include <asm/mach/map.h>
|
|
|
|
#include "common.h"
|
|
#include <video/omapdss.h>
|
|
#include <video/omap-panel-data.h>
|
|
|
|
#include "am35xx-emac.h"
|
|
#include "mux.h"
|
|
#include "control.h"
|
|
#include "hsmmc.h"
|
|
|
|
#define LCD_PANEL_PWR 176
|
|
#define LCD_PANEL_BKLIGHT_PWR 182
|
|
#define LCD_PANEL_PWM 181
|
|
|
|
static struct i2c_board_info __initdata am3517evm_i2c1_boardinfo[] = {
|
|
{
|
|
I2C_BOARD_INFO("s35390a", 0x30),
|
|
},
|
|
};
|
|
|
|
/*
|
|
* RTC - S35390A
|
|
*/
|
|
#define GPIO_RTCS35390A_IRQ 55
|
|
|
|
static void __init am3517_evm_rtc_init(void)
|
|
{
|
|
int r;
|
|
|
|
omap_mux_init_gpio(GPIO_RTCS35390A_IRQ, OMAP_PIN_INPUT_PULLUP);
|
|
|
|
r = gpio_request_one(GPIO_RTCS35390A_IRQ, GPIOF_IN, "rtcs35390a-irq");
|
|
if (r < 0) {
|
|
printk(KERN_WARNING "failed to request GPIO#%d\n",
|
|
GPIO_RTCS35390A_IRQ);
|
|
return;
|
|
}
|
|
|
|
am3517evm_i2c1_boardinfo[0].irq = gpio_to_irq(GPIO_RTCS35390A_IRQ);
|
|
}
|
|
|
|
/*
|
|
* I2C GPIO Expander - TCA6416
|
|
*/
|
|
|
|
/* Mounted on Base-Board */
|
|
static struct pca953x_platform_data am3517evm_gpio_expander_info_0 = {
|
|
.gpio_base = OMAP_MAX_GPIO_LINES,
|
|
};
|
|
static struct i2c_board_info __initdata am3517evm_i2c2_boardinfo[] = {
|
|
{
|
|
I2C_BOARD_INFO("tlv320aic23", 0x1A),
|
|
},
|
|
{
|
|
I2C_BOARD_INFO("tca6416", 0x21),
|
|
.platform_data = &am3517evm_gpio_expander_info_0,
|
|
},
|
|
};
|
|
|
|
/* Mounted on UI Card */
|
|
static struct pca953x_platform_data am3517evm_ui_gpio_expander_info_1 = {
|
|
.gpio_base = OMAP_MAX_GPIO_LINES + 16,
|
|
};
|
|
static struct pca953x_platform_data am3517evm_ui_gpio_expander_info_2 = {
|
|
.gpio_base = OMAP_MAX_GPIO_LINES + 32,
|
|
};
|
|
static struct i2c_board_info __initdata am3517evm_i2c3_boardinfo[] = {
|
|
{
|
|
I2C_BOARD_INFO("tca6416", 0x20),
|
|
.platform_data = &am3517evm_ui_gpio_expander_info_1,
|
|
},
|
|
{
|
|
I2C_BOARD_INFO("tca6416", 0x21),
|
|
.platform_data = &am3517evm_ui_gpio_expander_info_2,
|
|
},
|
|
};
|
|
|
|
static int __init am3517_evm_i2c_init(void)
|
|
{
|
|
omap_register_i2c_bus(1, 400, NULL, 0);
|
|
omap_register_i2c_bus(2, 400, am3517evm_i2c2_boardinfo,
|
|
ARRAY_SIZE(am3517evm_i2c2_boardinfo));
|
|
omap_register_i2c_bus(3, 400, am3517evm_i2c3_boardinfo,
|
|
ARRAY_SIZE(am3517evm_i2c3_boardinfo));
|
|
|
|
return 0;
|
|
}
|
|
|
|
static const struct display_timing am3517_evm_lcd_videomode = {
|
|
.pixelclock = { 0, 9000000, 0 },
|
|
|
|
.hactive = { 0, 480, 0 },
|
|
.hfront_porch = { 0, 3, 0 },
|
|
.hback_porch = { 0, 2, 0 },
|
|
.hsync_len = { 0, 42, 0 },
|
|
|
|
.vactive = { 0, 272, 0 },
|
|
.vfront_porch = { 0, 3, 0 },
|
|
.vback_porch = { 0, 2, 0 },
|
|
.vsync_len = { 0, 11, 0 },
|
|
|
|
.flags = DISPLAY_FLAGS_HSYNC_LOW | DISPLAY_FLAGS_VSYNC_LOW |
|
|
DISPLAY_FLAGS_DE_LOW | DISPLAY_FLAGS_PIXDATA_POSEDGE,
|
|
};
|
|
|
|
static struct panel_dpi_platform_data am3517_evm_lcd_pdata = {
|
|
.name = "lcd",
|
|
.source = "dpi.0",
|
|
|
|
.data_lines = 16,
|
|
|
|
.display_timing = &am3517_evm_lcd_videomode,
|
|
|
|
.enable_gpio = LCD_PANEL_PWR,
|
|
.backlight_gpio = LCD_PANEL_BKLIGHT_PWR,
|
|
};
|
|
|
|
static struct platform_device am3517_evm_lcd_device = {
|
|
.name = "panel-dpi",
|
|
.id = 0,
|
|
.dev.platform_data = &am3517_evm_lcd_pdata,
|
|
};
|
|
|
|
static struct connector_dvi_platform_data am3517_evm_dvi_connector_pdata = {
|
|
.name = "dvi",
|
|
.source = "tfp410.0",
|
|
.i2c_bus_num = -1,
|
|
};
|
|
|
|
static struct platform_device am3517_evm_dvi_connector_device = {
|
|
.name = "connector-dvi",
|
|
.id = 0,
|
|
.dev.platform_data = &am3517_evm_dvi_connector_pdata,
|
|
};
|
|
|
|
static struct encoder_tfp410_platform_data am3517_evm_tfp410_pdata = {
|
|
.name = "tfp410.0",
|
|
.source = "dpi.0",
|
|
.data_lines = 24,
|
|
.power_down_gpio = -1,
|
|
};
|
|
|
|
static struct platform_device am3517_evm_tfp410_device = {
|
|
.name = "tfp410",
|
|
.id = 0,
|
|
.dev.platform_data = &am3517_evm_tfp410_pdata,
|
|
};
|
|
|
|
static struct connector_atv_platform_data am3517_evm_tv_pdata = {
|
|
.name = "tv",
|
|
.source = "venc.0",
|
|
.connector_type = OMAP_DSS_VENC_TYPE_SVIDEO,
|
|
.invert_polarity = false,
|
|
};
|
|
|
|
static struct platform_device am3517_evm_tv_connector_device = {
|
|
.name = "connector-analog-tv",
|
|
.id = 0,
|
|
.dev.platform_data = &am3517_evm_tv_pdata,
|
|
};
|
|
|
|
static struct omap_dss_board_info am3517_evm_dss_data = {
|
|
.default_display_name = "lcd",
|
|
};
|
|
|
|
static void __init am3517_evm_display_init(void)
|
|
{
|
|
gpio_request_one(LCD_PANEL_PWM, GPIOF_OUT_INIT_HIGH, "lcd panel pwm");
|
|
|
|
omap_display_init(&am3517_evm_dss_data);
|
|
|
|
platform_device_register(&am3517_evm_tfp410_device);
|
|
platform_device_register(&am3517_evm_dvi_connector_device);
|
|
platform_device_register(&am3517_evm_lcd_device);
|
|
platform_device_register(&am3517_evm_tv_connector_device);
|
|
}
|
|
|
|
/*
|
|
* Board initialization
|
|
*/
|
|
|
|
static struct omap_musb_board_data musb_board_data = {
|
|
.interface_type = MUSB_INTERFACE_ULPI,
|
|
.mode = MUSB_OTG,
|
|
.power = 500,
|
|
.set_phy_power = am35x_musb_phy_power,
|
|
.clear_irq = am35x_musb_clear_irq,
|
|
.set_mode = am35x_set_mode,
|
|
.reset = am35x_musb_reset,
|
|
};
|
|
|
|
static __init void am3517_evm_musb_init(void)
|
|
{
|
|
u32 devconf2;
|
|
|
|
/*
|
|
* Set up USB clock/mode in the DEVCONF2 register.
|
|
*/
|
|
devconf2 = omap_ctrl_readl(AM35XX_CONTROL_DEVCONF2);
|
|
|
|
/* USB2.0 PHY reference clock is 13 MHz */
|
|
devconf2 &= ~(CONF2_REFFREQ | CONF2_OTGMODE | CONF2_PHY_GPIOMODE);
|
|
devconf2 |= CONF2_REFFREQ_13MHZ | CONF2_SESENDEN | CONF2_VBDTCTEN
|
|
| CONF2_DATPOL;
|
|
|
|
omap_ctrl_writel(devconf2, AM35XX_CONTROL_DEVCONF2);
|
|
|
|
usb_musb_init(&musb_board_data);
|
|
}
|
|
|
|
static __init void am3517_evm_mcbsp1_init(void)
|
|
{
|
|
u32 devconf0;
|
|
|
|
/* McBSP1 CLKR/FSR signal to be connected to CLKX/FSX pin */
|
|
devconf0 = omap_ctrl_readl(OMAP2_CONTROL_DEVCONF0);
|
|
devconf0 |= OMAP2_MCBSP1_CLKR_MASK | OMAP2_MCBSP1_FSR_MASK;
|
|
omap_ctrl_writel(devconf0, OMAP2_CONTROL_DEVCONF0);
|
|
}
|
|
|
|
static struct usbhs_phy_data phy_data[] __initdata = {
|
|
{
|
|
.port = 1,
|
|
.reset_gpio = 57,
|
|
.vcc_gpio = -EINVAL,
|
|
},
|
|
};
|
|
|
|
static struct usbhs_omap_platform_data usbhs_bdata __initdata = {
|
|
.port_mode[0] = OMAP_EHCI_PORT_MODE_PHY,
|
|
#if defined(CONFIG_PANEL_SHARP_LQ043T1DG01) || \
|
|
defined(CONFIG_PANEL_SHARP_LQ043T1DG01_MODULE)
|
|
.port_mode[1] = OMAP_USBHS_PORT_MODE_UNUSED,
|
|
#else
|
|
.port_mode[1] = OMAP_EHCI_PORT_MODE_PHY,
|
|
#endif
|
|
};
|
|
|
|
#ifdef CONFIG_OMAP_MUX
|
|
static struct omap_board_mux board_mux[] __initdata = {
|
|
/* USB OTG DRVVBUS offset = 0x212 */
|
|
OMAP3_MUX(SAD2D_MCAD23, OMAP_MUX_MODE0 | OMAP_PIN_INPUT_PULLDOWN),
|
|
{ .reg_offset = OMAP_MUX_TERMINATOR },
|
|
};
|
|
#endif
|
|
|
|
|
|
static struct resource am3517_hecc_resources[] = {
|
|
{
|
|
.start = AM35XX_IPSS_HECC_BASE,
|
|
.end = AM35XX_IPSS_HECC_BASE + 0x3FFF,
|
|
.flags = IORESOURCE_MEM,
|
|
},
|
|
{
|
|
.start = 24 + OMAP_INTC_START,
|
|
.flags = IORESOURCE_IRQ,
|
|
},
|
|
};
|
|
|
|
static struct platform_device am3517_hecc_device = {
|
|
.name = "ti_hecc",
|
|
.id = -1,
|
|
.num_resources = ARRAY_SIZE(am3517_hecc_resources),
|
|
.resource = am3517_hecc_resources,
|
|
};
|
|
|
|
static struct ti_hecc_platform_data am3517_evm_hecc_pdata = {
|
|
.scc_hecc_offset = AM35XX_HECC_SCC_HECC_OFFSET,
|
|
.scc_ram_offset = AM35XX_HECC_SCC_RAM_OFFSET,
|
|
.hecc_ram_offset = AM35XX_HECC_RAM_OFFSET,
|
|
.mbx_offset = AM35XX_HECC_MBOX_OFFSET,
|
|
.int_line = AM35XX_HECC_INT_LINE,
|
|
.version = AM35XX_HECC_VERSION,
|
|
};
|
|
|
|
static void am3517_evm_hecc_init(struct ti_hecc_platform_data *pdata)
|
|
{
|
|
am3517_hecc_device.dev.platform_data = pdata;
|
|
platform_device_register(&am3517_hecc_device);
|
|
}
|
|
|
|
static struct omap2_hsmmc_info mmc[] = {
|
|
{
|
|
.mmc = 1,
|
|
.caps = MMC_CAP_4_BIT_DATA,
|
|
.gpio_cd = 127,
|
|
.gpio_wp = 126,
|
|
},
|
|
{
|
|
.mmc = 2,
|
|
.caps = MMC_CAP_4_BIT_DATA,
|
|
.gpio_cd = 128,
|
|
.gpio_wp = 129,
|
|
},
|
|
{} /* Terminator */
|
|
};
|
|
|
|
static void __init am3517_evm_init(void)
|
|
{
|
|
omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);
|
|
|
|
am3517_evm_i2c_init();
|
|
|
|
am3517_evm_display_init();
|
|
|
|
omap_serial_init();
|
|
omap_sdrc_init(NULL, NULL);
|
|
|
|
/* Configure GPIO for EHCI port */
|
|
omap_mux_init_gpio(57, OMAP_PIN_OUTPUT);
|
|
|
|
usbhs_init_phys(phy_data, ARRAY_SIZE(phy_data));
|
|
usbhs_init(&usbhs_bdata);
|
|
am3517_evm_hecc_init(&am3517_evm_hecc_pdata);
|
|
|
|
/* RTC - S35390A */
|
|
am3517_evm_rtc_init();
|
|
|
|
i2c_register_board_info(1, am3517evm_i2c1_boardinfo,
|
|
ARRAY_SIZE(am3517evm_i2c1_boardinfo));
|
|
/*Ethernet*/
|
|
am35xx_emac_init(AM35XX_DEFAULT_MDIO_FREQUENCY, 1);
|
|
|
|
/* MUSB */
|
|
am3517_evm_musb_init();
|
|
|
|
/* McBSP1 */
|
|
am3517_evm_mcbsp1_init();
|
|
|
|
/* MMC init function */
|
|
omap_hsmmc_init(mmc);
|
|
}
|
|
|
|
MACHINE_START(OMAP3517EVM, "OMAP3517/AM3517 EVM")
|
|
.atag_offset = 0x100,
|
|
.reserve = omap_reserve,
|
|
.map_io = omap3_map_io,
|
|
.init_early = am35xx_init_early,
|
|
.init_irq = omap3_init_irq,
|
|
.handle_irq = omap3_intc_handle_irq,
|
|
.init_machine = am3517_evm_init,
|
|
.init_late = am35xx_init_late,
|
|
.init_time = omap3_sync32k_timer_init,
|
|
.restart = omap3xxx_restart,
|
|
MACHINE_END
|