diff options
author | Gwenhael Goavec-Merou <gwenhael.goavec-merou@armadeus.com> | 2011-10-08 11:19:49 -0400 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-01-03 03:47:13 -0500 |
commit | 7a9948183d0c5ed69cf6d374c2049a0d927a14bd (patch) | |
tree | aa05908c03a5c14fd008940e6df551fe480260af /arch | |
parent | 384703b8e6cd4c8ef08512e596024e028c91c339 (diff) |
MX1:apf9328: Add i2c support
Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@armadeus.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-imx/Kconfig | 1 | ||||
-rw-r--r-- | arch/arm/mach-imx/mach-apf9328.c | 10 |
2 files changed, 11 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index c44aa974e79c..d0a27303edb8 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig | |||
@@ -98,6 +98,7 @@ config MACH_SCB9328 | |||
98 | config MACH_APF9328 | 98 | config MACH_APF9328 |
99 | bool "APF9328" | 99 | bool "APF9328" |
100 | select SOC_IMX1 | 100 | select SOC_IMX1 |
101 | select IMX_HAVE_PLATFORM_IMX_I2C | ||
101 | select IMX_HAVE_PLATFORM_IMX_UART | 102 | select IMX_HAVE_PLATFORM_IMX_UART |
102 | help | 103 | help |
103 | Say Yes here if you are using the Armadeus APF9328 development board | 104 | Say Yes here if you are using the Armadeus APF9328 development board |
diff --git a/arch/arm/mach-imx/mach-apf9328.c b/arch/arm/mach-imx/mach-apf9328.c index 1e486e67dabb..c71dbcc37b11 100644 --- a/arch/arm/mach-imx/mach-apf9328.c +++ b/arch/arm/mach-imx/mach-apf9328.c | |||
@@ -18,6 +18,7 @@ | |||
18 | #include <linux/platform_device.h> | 18 | #include <linux/platform_device.h> |
19 | #include <linux/mtd/physmap.h> | 19 | #include <linux/mtd/physmap.h> |
20 | #include <linux/dm9000.h> | 20 | #include <linux/dm9000.h> |
21 | #include <linux/i2c.h> | ||
21 | 22 | ||
22 | #include <asm/mach-types.h> | 23 | #include <asm/mach-types.h> |
23 | #include <asm/mach/arch.h> | 24 | #include <asm/mach/arch.h> |
@@ -41,6 +42,9 @@ static const int apf9328_pins[] __initconst = { | |||
41 | PB29_PF_UART2_RTS, | 42 | PB29_PF_UART2_RTS, |
42 | PB30_PF_UART2_TXD, | 43 | PB30_PF_UART2_TXD, |
43 | PB31_PF_UART2_RXD, | 44 | PB31_PF_UART2_RXD, |
45 | /* I2C */ | ||
46 | PA15_PF_I2C_SDA, | ||
47 | PA16_PF_I2C_SCL, | ||
44 | }; | 48 | }; |
45 | 49 | ||
46 | /* | 50 | /* |
@@ -103,6 +107,10 @@ static const struct imxuart_platform_data uart1_pdata __initconst = { | |||
103 | .flags = IMXUART_HAVE_RTSCTS, | 107 | .flags = IMXUART_HAVE_RTSCTS, |
104 | }; | 108 | }; |
105 | 109 | ||
110 | static const struct imxi2c_platform_data apf9328_i2c_data __initconst = { | ||
111 | .bitrate = 100000, | ||
112 | }; | ||
113 | |||
106 | static struct platform_device *devices[] __initdata = { | 114 | static struct platform_device *devices[] __initdata = { |
107 | &apf9328_flash_device, | 115 | &apf9328_flash_device, |
108 | &dm9000x_device, | 116 | &dm9000x_device, |
@@ -119,6 +127,8 @@ static void __init apf9328_init(void) | |||
119 | imx1_add_imx_uart0(NULL); | 127 | imx1_add_imx_uart0(NULL); |
120 | imx1_add_imx_uart1(&uart1_pdata); | 128 | imx1_add_imx_uart1(&uart1_pdata); |
121 | 129 | ||
130 | imx1_add_imx_i2c(&apf9328_i2c_data); | ||
131 | |||
122 | platform_add_devices(devices, ARRAY_SIZE(devices)); | 132 | platform_add_devices(devices, ARRAY_SIZE(devices)); |
123 | } | 133 | } |
124 | 134 | ||