aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx
diff options
context:
space:
mode:
authorFabio Estevam <fabio.estevam@freescale.com>2011-03-01 14:59:46 -0500
committerSascha Hauer <s.hauer@pengutronix.de>2011-03-07 13:29:24 -0500
commit5885f0362b3fbe476b7ef0af0beac7a114a0a8dd (patch)
treea27e4ded547117d3502d6bab50e5205885d39c00 /arch/arm/mach-imx
parent3d94302442cce1124a0adc0402bf609d9d8d808c (diff)
ARM: mx27_3ds: Add I2C support
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-imx')
-rw-r--r--arch/arm/mach-imx/Kconfig1
-rw-r--r--arch/arm/mach-imx/mach-mx27_3ds.c7
2 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index 17e2c6dce987..3f88df6e66cc 100644
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -238,6 +238,7 @@ config MACH_MX27_3DS
238 select SOC_IMX27 238 select SOC_IMX27
239 select IMX_HAVE_PLATFORM_FSL_USB2_UDC 239 select IMX_HAVE_PLATFORM_FSL_USB2_UDC
240 select IMX_HAVE_PLATFORM_IMX2_WDT 240 select IMX_HAVE_PLATFORM_IMX2_WDT
241 select IMX_HAVE_PLATFORM_IMX_I2C
241 select IMX_HAVE_PLATFORM_IMX_KEYPAD 242 select IMX_HAVE_PLATFORM_IMX_KEYPAD
242 select IMX_HAVE_PLATFORM_IMX_UART 243 select IMX_HAVE_PLATFORM_IMX_UART
243 select IMX_HAVE_PLATFORM_MXC_EHCI 244 select IMX_HAVE_PLATFORM_MXC_EHCI
diff --git a/arch/arm/mach-imx/mach-mx27_3ds.c b/arch/arm/mach-imx/mach-mx27_3ds.c
index ba88417345ab..f4f2725b6945 100644
--- a/arch/arm/mach-imx/mach-mx27_3ds.c
+++ b/arch/arm/mach-imx/mach-mx27_3ds.c
@@ -98,6 +98,9 @@ static const int mx27pdk_pins[] __initconst = {
98 PD22_PF_CSPI2_SCLK, 98 PD22_PF_CSPI2_SCLK,
99 PD23_PF_CSPI2_MISO, 99 PD23_PF_CSPI2_MISO,
100 PD24_PF_CSPI2_MOSI, 100 PD24_PF_CSPI2_MOSI,
101 /* I2C1 */
102 PD17_PF_I2C_DATA,
103 PD18_PF_I2C_CLK,
101}; 104};
102 105
103static const struct imxuart_platform_data uart_pdata __initconst = { 106static const struct imxuart_platform_data uart_pdata __initconst = {
@@ -257,6 +260,9 @@ static struct spi_board_info mx27_3ds_spi_devs[] __initdata = {
257 }, 260 },
258}; 261};
259 262
263static const struct imxi2c_platform_data mx27_3ds_i2c0_data __initconst = {
264 .bitrate = 100000,
265};
260 266
261static void __init mx27pdk_init(void) 267static void __init mx27pdk_init(void)
262{ 268{
@@ -286,6 +292,7 @@ static void __init mx27pdk_init(void)
286 292
287 if (mxc_expio_init(MX27_CS5_BASE_ADDR, EXPIO_PARENT_INT)) 293 if (mxc_expio_init(MX27_CS5_BASE_ADDR, EXPIO_PARENT_INT))
288 pr_warn("Init of the debugboard failed, all devices on the debugboard are unusable.\n"); 294 pr_warn("Init of the debugboard failed, all devices on the debugboard are unusable.\n");
295 imx27_add_imx_i2c(0, &mx27_3ds_i2c0_data);
289} 296}
290 297
291static void __init mx27pdk_timer_init(void) 298static void __init mx27pdk_timer_init(void)