diff options
author | Fabio Estevam <fabio.estevam@freescale.com> | 2011-03-01 14:59:44 -0500 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-03-07 13:29:22 -0500 |
commit | 352cd9a0b849494a44a46c60219b8b6ea99f1d70 (patch) | |
tree | a6265986bf0c0062d2b551d00fb1c2d4d6bd1468 /arch/arm/mach-mx3 | |
parent | a5e2051b720fb5bcb35f0edfc80c108448acb713 (diff) |
ARM: mx35_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-mx3')
-rw-r--r-- | arch/arm/mach-mx3/Kconfig | 1 | ||||
-rw-r--r-- | arch/arm/mach-mx3/mach-mx35_3ds.c | 8 |
2 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm/mach-mx3/Kconfig b/arch/arm/mach-mx3/Kconfig index 4f57f13c028c..8b4b097bea3e 100644 --- a/arch/arm/mach-mx3/Kconfig +++ b/arch/arm/mach-mx3/Kconfig | |||
@@ -183,6 +183,7 @@ config MACH_MX35_3DS | |||
183 | select MXC_DEBUG_BOARD | 183 | select MXC_DEBUG_BOARD |
184 | select IMX_HAVE_PLATFORM_FSL_USB2_UDC | 184 | select IMX_HAVE_PLATFORM_FSL_USB2_UDC |
185 | select IMX_HAVE_PLATFORM_IMX2_WDT | 185 | select IMX_HAVE_PLATFORM_IMX2_WDT |
186 | select IMX_HAVE_PLATFORM_IMX_I2C | ||
186 | select IMX_HAVE_PLATFORM_IMX_UART | 187 | select IMX_HAVE_PLATFORM_IMX_UART |
187 | select IMX_HAVE_PLATFORM_MXC_EHCI | 188 | select IMX_HAVE_PLATFORM_MXC_EHCI |
188 | select IMX_HAVE_PLATFORM_MXC_NAND | 189 | select IMX_HAVE_PLATFORM_MXC_NAND |
diff --git a/arch/arm/mach-mx3/mach-mx35_3ds.c b/arch/arm/mach-mx3/mach-mx35_3ds.c index be12ac1d1954..5f35d5c88f19 100644 --- a/arch/arm/mach-mx3/mach-mx35_3ds.c +++ b/arch/arm/mach-mx3/mach-mx35_3ds.c | |||
@@ -118,6 +118,9 @@ static iomux_v3_cfg_t mx35pdk_pads[] = { | |||
118 | MX35_PAD_SD1_DATA1__ESDHC1_DAT1, | 118 | MX35_PAD_SD1_DATA1__ESDHC1_DAT1, |
119 | MX35_PAD_SD1_DATA2__ESDHC1_DAT2, | 119 | MX35_PAD_SD1_DATA2__ESDHC1_DAT2, |
120 | MX35_PAD_SD1_DATA3__ESDHC1_DAT3, | 120 | MX35_PAD_SD1_DATA3__ESDHC1_DAT3, |
121 | /* I2C1 */ | ||
122 | MX35_PAD_I2C1_CLK__I2C1_SCL, | ||
123 | MX35_PAD_I2C1_DAT__I2C1_SDA, | ||
121 | }; | 124 | }; |
122 | 125 | ||
123 | static int mx35_3ds_otg_init(struct platform_device *pdev) | 126 | static int mx35_3ds_otg_init(struct platform_device *pdev) |
@@ -163,6 +166,10 @@ static int __init mx35_3ds_otg_mode(char *options) | |||
163 | } | 166 | } |
164 | __setup("otg_mode=", mx35_3ds_otg_mode); | 167 | __setup("otg_mode=", mx35_3ds_otg_mode); |
165 | 168 | ||
169 | static const struct imxi2c_platform_data mx35_3ds_i2c0_data __initconst = { | ||
170 | .bitrate = 100000, | ||
171 | }; | ||
172 | |||
166 | /* | 173 | /* |
167 | * Board specific initialization. | 174 | * Board specific initialization. |
168 | */ | 175 | */ |
@@ -190,6 +197,7 @@ static void __init mx35_3ds_init(void) | |||
190 | if (mxc_expio_init(MX35_CS5_BASE_ADDR, EXPIO_PARENT_INT)) | 197 | if (mxc_expio_init(MX35_CS5_BASE_ADDR, EXPIO_PARENT_INT)) |
191 | pr_warn("Init of the debugboard failed, all " | 198 | pr_warn("Init of the debugboard failed, all " |
192 | "devices on the debugboard are unusable.\n"); | 199 | "devices on the debugboard are unusable.\n"); |
200 | imx35_add_imx_i2c0(&mx35_3ds_i2c0_data); | ||
193 | } | 201 | } |
194 | 202 | ||
195 | static void __init mx35pdk_timer_init(void) | 203 | static void __init mx35pdk_timer_init(void) |