diff options
author | Fabio Estevam <fabio.estevam@freescale.com> | 2011-03-01 14:59:47 -0500 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-03-07 13:29:26 -0500 |
commit | ff864521a93ca3932e281828d41f709e107dad70 (patch) | |
tree | f0a5d5af8ec98f6b875cf67f37edb19814b1a54d /arch/arm | |
parent | 5885f0362b3fbe476b7ef0af0beac7a114a0a8dd (diff) |
ARM: mx25_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')
-rw-r--r-- | arch/arm/mach-imx/Kconfig | 1 | ||||
-rw-r--r-- | arch/arm/mach-imx/mach-mx25_3ds.c | 9 |
2 files changed, 10 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index 3f88df6e66cc..5eec099e0c72 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig | |||
@@ -100,6 +100,7 @@ config MACH_MX25_3DS | |||
100 | select IMX_HAVE_PLATFORM_FSL_USB2_UDC | 100 | select IMX_HAVE_PLATFORM_FSL_USB2_UDC |
101 | select IMX_HAVE_PLATFORM_IMX2_WDT | 101 | select IMX_HAVE_PLATFORM_IMX2_WDT |
102 | select IMX_HAVE_PLATFORM_IMXDI_RTC | 102 | select IMX_HAVE_PLATFORM_IMXDI_RTC |
103 | select IMX_HAVE_PLATFORM_IMX_I2C | ||
103 | select IMX_HAVE_PLATFORM_IMX_FB | 104 | select IMX_HAVE_PLATFORM_IMX_FB |
104 | select IMX_HAVE_PLATFORM_IMX_KEYPAD | 105 | select IMX_HAVE_PLATFORM_IMX_KEYPAD |
105 | select IMX_HAVE_PLATFORM_IMX_UART | 106 | select IMX_HAVE_PLATFORM_IMX_UART |
diff --git a/arch/arm/mach-imx/mach-mx25_3ds.c b/arch/arm/mach-imx/mach-mx25_3ds.c index 66b6cdd5821e..06da438282aa 100644 --- a/arch/arm/mach-imx/mach-mx25_3ds.c +++ b/arch/arm/mach-imx/mach-mx25_3ds.c | |||
@@ -103,6 +103,10 @@ static iomux_v3_cfg_t mx25pdk_pads[] = { | |||
103 | MX25_PAD_SD1_DATA1__SD1_DATA1, | 103 | MX25_PAD_SD1_DATA1__SD1_DATA1, |
104 | MX25_PAD_SD1_DATA2__SD1_DATA2, | 104 | MX25_PAD_SD1_DATA2__SD1_DATA2, |
105 | MX25_PAD_SD1_DATA3__SD1_DATA3, | 105 | MX25_PAD_SD1_DATA3__SD1_DATA3, |
106 | |||
107 | /* I2C1 */ | ||
108 | MX25_PAD_I2C1_CLK__I2C1_CLK, | ||
109 | MX25_PAD_I2C1_DAT__I2C1_DAT, | ||
106 | }; | 110 | }; |
107 | 111 | ||
108 | static const struct fec_platform_data mx25_fec_pdata __initconst = { | 112 | static const struct fec_platform_data mx25_fec_pdata __initconst = { |
@@ -200,6 +204,10 @@ static const struct fsl_usb2_platform_data otg_device_pdata __initconst = { | |||
200 | .phy_mode = FSL_USB2_PHY_UTMI, | 204 | .phy_mode = FSL_USB2_PHY_UTMI, |
201 | }; | 205 | }; |
202 | 206 | ||
207 | static const struct imxi2c_platform_data mx25_3ds_i2c0_data __initconst = { | ||
208 | .bitrate = 100000, | ||
209 | }; | ||
210 | |||
203 | static void __init mx25pdk_init(void) | 211 | static void __init mx25pdk_init(void) |
204 | { | 212 | { |
205 | mxc_iomux_v3_setup_multiple_pads(mx25pdk_pads, | 213 | mxc_iomux_v3_setup_multiple_pads(mx25pdk_pads, |
@@ -218,6 +226,7 @@ static void __init mx25pdk_init(void) | |||
218 | imx25_add_imx_keypad(&mx25pdk_keymap_data); | 226 | imx25_add_imx_keypad(&mx25pdk_keymap_data); |
219 | 227 | ||
220 | imx25_add_sdhci_esdhc_imx(0, NULL); | 228 | imx25_add_sdhci_esdhc_imx(0, NULL); |
229 | imx25_add_imx_i2c0(&mx25_3ds_i2c0_data); | ||
221 | } | 230 | } |
222 | 231 | ||
223 | static void __init mx25pdk_timer_init(void) | 232 | static void __init mx25pdk_timer_init(void) |