diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-03-13 17:44:51 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-03-13 17:44:51 -0400 |
commit | 97fb44eb6bc01f4ffed4300e475aa15e44877375 (patch) | |
tree | 481ed6efd0babe7185cae04f2fd295426b36411d /arch/arm/mach-mx2/pcm038.c | |
parent | e4707dd3e9d0cb57597b6568a5e51fea5d6fca41 (diff) | |
parent | 148854c65ea8046b045672fd49f4333aefaa3ab5 (diff) |
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel
Conflicts:
arch/arm/mach-at91/gpio.c
Diffstat (limited to 'arch/arm/mach-mx2/pcm038.c')
-rw-r--r-- | arch/arm/mach-mx2/pcm038.c | 82 |
1 files changed, 68 insertions, 14 deletions
diff --git a/arch/arm/mach-mx2/pcm038.c b/arch/arm/mach-mx2/pcm038.c index dfd4156da7d5..aa4eaa61d1b5 100644 --- a/arch/arm/mach-mx2/pcm038.c +++ b/arch/arm/mach-mx2/pcm038.c | |||
@@ -20,11 +20,18 @@ | |||
20 | #include <linux/platform_device.h> | 20 | #include <linux/platform_device.h> |
21 | #include <linux/mtd/physmap.h> | 21 | #include <linux/mtd/physmap.h> |
22 | #include <linux/mtd/plat-ram.h> | 22 | #include <linux/mtd/plat-ram.h> |
23 | #include <linux/io.h> | ||
24 | #include <linux/i2c.h> | ||
25 | #include <linux/i2c/at24.h> | ||
26 | |||
23 | #include <asm/mach/arch.h> | 27 | #include <asm/mach/arch.h> |
24 | #include <asm/mach-types.h> | 28 | #include <asm/mach-types.h> |
25 | #include <mach/common.h> | 29 | #include <mach/common.h> |
26 | #include <mach/hardware.h> | 30 | #include <mach/hardware.h> |
27 | #include <mach/iomux-mx1-mx2.h> | 31 | #include <mach/iomux.h> |
32 | #ifdef CONFIG_I2C_IMX | ||
33 | #include <mach/i2c.h> | ||
34 | #endif | ||
28 | #include <asm/mach/time.h> | 35 | #include <asm/mach/time.h> |
29 | #include <mach/imx-uart.h> | 36 | #include <mach/imx-uart.h> |
30 | #include <mach/board-pcm038.h> | 37 | #include <mach/board-pcm038.h> |
@@ -121,10 +128,10 @@ static int uart_mxc_port1_exit(struct platform_device *pdev) | |||
121 | return 0; | 128 | return 0; |
122 | } | 129 | } |
123 | 130 | ||
124 | static int mxc_uart2_pins[] = { PE10_PF_UART3_CTS, | 131 | static int mxc_uart2_pins[] = { PE8_PF_UART3_TXD, |
125 | PE9_PF_UART3_RXD, | 132 | PE9_PF_UART3_RXD, |
126 | PE10_PF_UART3_CTS, | 133 | PE10_PF_UART3_CTS, |
127 | PE9_PF_UART3_RXD }; | 134 | PE11_PF_UART3_RTS }; |
128 | 135 | ||
129 | static int uart_mxc_port2_init(struct platform_device *pdev) | 136 | static int uart_mxc_port2_init(struct platform_device *pdev) |
130 | { | 137 | { |
@@ -170,7 +177,7 @@ static int mxc_fec_pins[] = { | |||
170 | PD11_AOUT_FEC_TX_CLK, | 177 | PD11_AOUT_FEC_TX_CLK, |
171 | PD12_AOUT_FEC_RXD0, | 178 | PD12_AOUT_FEC_RXD0, |
172 | PD13_AOUT_FEC_RX_DV, | 179 | PD13_AOUT_FEC_RX_DV, |
173 | PD14_AOUT_FEC_CLR, | 180 | PD14_AOUT_FEC_RX_CLK, |
174 | PD15_AOUT_FEC_COL, | 181 | PD15_AOUT_FEC_COL, |
175 | PD16_AIN_FEC_TX_ER, | 182 | PD16_AIN_FEC_TX_ER, |
176 | PF23_AIN_FEC_TX_EN | 183 | PF23_AIN_FEC_TX_EN |
@@ -182,12 +189,6 @@ static void gpio_fec_active(void) | |||
182 | ARRAY_SIZE(mxc_fec_pins), "FEC"); | 189 | ARRAY_SIZE(mxc_fec_pins), "FEC"); |
183 | } | 190 | } |
184 | 191 | ||
185 | static void gpio_fec_inactive(void) | ||
186 | { | ||
187 | mxc_gpio_release_multiple_pins(mxc_fec_pins, | ||
188 | ARRAY_SIZE(mxc_fec_pins)); | ||
189 | } | ||
190 | |||
191 | static struct mxc_nand_platform_data pcm038_nand_board_info = { | 192 | static struct mxc_nand_platform_data pcm038_nand_board_info = { |
192 | .width = 1, | 193 | .width = 1, |
193 | .hw_ecc = 1, | 194 | .hw_ecc = 1, |
@@ -196,6 +197,7 @@ static struct mxc_nand_platform_data pcm038_nand_board_info = { | |||
196 | static struct platform_device *platform_devices[] __initdata = { | 197 | static struct platform_device *platform_devices[] __initdata = { |
197 | &pcm038_nor_mtd_device, | 198 | &pcm038_nor_mtd_device, |
198 | &mxc_w1_master_device, | 199 | &mxc_w1_master_device, |
200 | &mxc_fec_device, | ||
199 | &pcm038_sram_mtd_device, | 201 | &pcm038_sram_mtd_device, |
200 | }; | 202 | }; |
201 | 203 | ||
@@ -208,6 +210,51 @@ static void __init pcm038_init_sram(void) | |||
208 | __raw_writel(0x22220a00, CSCR_A(1)); | 210 | __raw_writel(0x22220a00, CSCR_A(1)); |
209 | } | 211 | } |
210 | 212 | ||
213 | #ifdef CONFIG_I2C_IMX | ||
214 | static int mxc_i2c1_pins[] = { | ||
215 | PC5_PF_I2C2_SDA, | ||
216 | PC6_PF_I2C2_SCL | ||
217 | }; | ||
218 | |||
219 | static int pcm038_i2c_1_init(struct device *dev) | ||
220 | { | ||
221 | return mxc_gpio_setup_multiple_pins(mxc_i2c1_pins, ARRAY_SIZE(mxc_i2c1_pins), | ||
222 | "I2C1"); | ||
223 | } | ||
224 | |||
225 | static void pcm038_i2c_1_exit(struct device *dev) | ||
226 | { | ||
227 | mxc_gpio_release_multiple_pins(mxc_i2c1_pins, ARRAY_SIZE(mxc_i2c1_pins)); | ||
228 | } | ||
229 | |||
230 | static struct imxi2c_platform_data pcm038_i2c_1_data = { | ||
231 | .bitrate = 100000, | ||
232 | .init = pcm038_i2c_1_init, | ||
233 | .exit = pcm038_i2c_1_exit, | ||
234 | }; | ||
235 | |||
236 | static struct at24_platform_data board_eeprom = { | ||
237 | .byte_len = 4096, | ||
238 | .page_size = 32, | ||
239 | .flags = AT24_FLAG_ADDR16, | ||
240 | }; | ||
241 | |||
242 | static struct i2c_board_info pcm038_i2c_devices[] = { | ||
243 | [0] = { | ||
244 | I2C_BOARD_INFO("at24", 0x52), /* E0=0, E1=1, E2=0 */ | ||
245 | .platform_data = &board_eeprom, | ||
246 | }, | ||
247 | [1] = { | ||
248 | I2C_BOARD_INFO("rtc-pcf8563", 0x51), | ||
249 | .type = "pcf8563" | ||
250 | }, | ||
251 | [2] = { | ||
252 | I2C_BOARD_INFO("lm75", 0x4a), | ||
253 | .type = "lm75" | ||
254 | } | ||
255 | }; | ||
256 | #endif | ||
257 | |||
211 | static void __init pcm038_init(void) | 258 | static void __init pcm038_init(void) |
212 | { | 259 | { |
213 | gpio_fec_active(); | 260 | gpio_fec_active(); |
@@ -217,9 +264,17 @@ static void __init pcm038_init(void) | |||
217 | mxc_register_device(&mxc_uart_device1, &uart_pdata[1]); | 264 | mxc_register_device(&mxc_uart_device1, &uart_pdata[1]); |
218 | mxc_register_device(&mxc_uart_device2, &uart_pdata[2]); | 265 | mxc_register_device(&mxc_uart_device2, &uart_pdata[2]); |
219 | 266 | ||
220 | mxc_gpio_mode(PE16_AF_RTCK); /* OWIRE */ | 267 | mxc_gpio_mode(PE16_AF_OWIRE); |
221 | mxc_register_device(&mxc_nand_device, &pcm038_nand_board_info); | 268 | mxc_register_device(&mxc_nand_device, &pcm038_nand_board_info); |
222 | 269 | ||
270 | #ifdef CONFIG_I2C_IMX | ||
271 | /* only the i2c master 1 is used on this CPU card */ | ||
272 | i2c_register_board_info(1, pcm038_i2c_devices, | ||
273 | ARRAY_SIZE(pcm038_i2c_devices)); | ||
274 | |||
275 | mxc_register_device(&mxc_i2c_device1, &pcm038_i2c_1_data); | ||
276 | #endif | ||
277 | |||
223 | platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices)); | 278 | platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices)); |
224 | 279 | ||
225 | #ifdef CONFIG_MACH_PCM970_BASEBOARD | 280 | #ifdef CONFIG_MACH_PCM970_BASEBOARD |
@@ -229,11 +284,10 @@ static void __init pcm038_init(void) | |||
229 | 284 | ||
230 | static void __init pcm038_timer_init(void) | 285 | static void __init pcm038_timer_init(void) |
231 | { | 286 | { |
232 | mxc_clocks_init(26000000); | 287 | mx27_clocks_init(26000000); |
233 | mxc_timer_init("gpt_clk.0"); | ||
234 | } | 288 | } |
235 | 289 | ||
236 | struct sys_timer pcm038_timer = { | 290 | static struct sys_timer pcm038_timer = { |
237 | .init = pcm038_timer_init, | 291 | .init = pcm038_timer_init, |
238 | }; | 292 | }; |
239 | 293 | ||