diff options
Diffstat (limited to 'arch/arm/mach-pxa/imote2.c')
-rw-r--r-- | arch/arm/mach-pxa/imote2.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/arch/arm/mach-pxa/imote2.c b/arch/arm/mach-pxa/imote2.c index 2a4945db31c5..5161dca8ccc0 100644 --- a/arch/arm/mach-pxa/imote2.c +++ b/arch/arm/mach-pxa/imote2.c | |||
@@ -64,7 +64,6 @@ static unsigned long imote2_pin_config[] __initdata = { | |||
64 | GPIO116_GPIO, /* CC_CCA */ | 64 | GPIO116_GPIO, /* CC_CCA */ |
65 | GPIO0_GPIO, /* CC_FIFOP */ | 65 | GPIO0_GPIO, /* CC_FIFOP */ |
66 | GPIO16_GPIO, /* CCSFD */ | 66 | GPIO16_GPIO, /* CCSFD */ |
67 | GPIO39_GPIO, /* CSn */ | ||
68 | GPIO115_GPIO, /* Power enable */ | 67 | GPIO115_GPIO, /* Power enable */ |
69 | 68 | ||
70 | /* I2C */ | 69 | /* I2C */ |
@@ -72,7 +71,7 @@ static unsigned long imote2_pin_config[] __initdata = { | |||
72 | GPIO118_I2C_SDA, | 71 | GPIO118_I2C_SDA, |
73 | 72 | ||
74 | /* SSP 3 - 802.15.4 radio */ | 73 | /* SSP 3 - 802.15.4 radio */ |
75 | GPIO39_GPIO, /* Chip Select */ | 74 | GPIO39_GPIO, /* Chip Select */ |
76 | GPIO34_SSP3_SCLK, | 75 | GPIO34_SSP3_SCLK, |
77 | GPIO35_SSP3_TXD, | 76 | GPIO35_SSP3_TXD, |
78 | GPIO41_SSP3_RXD, | 77 | GPIO41_SSP3_RXD, |
@@ -554,11 +553,11 @@ static struct i2c_pxa_platform_data i2c_pdata = { | |||
554 | 553 | ||
555 | static void __init imote2_init(void) | 554 | static void __init imote2_init(void) |
556 | { | 555 | { |
557 | |||
558 | pxa2xx_mfp_config(ARRAY_AND_SIZE(imote2_pin_config)); | 556 | pxa2xx_mfp_config(ARRAY_AND_SIZE(imote2_pin_config)); |
559 | /* SPI chip select directions - all other directions should | 557 | |
560 | * be handled by drivers.*/ | 558 | pxa_set_ffuart_info(NULL); |
561 | gpio_direction_output(37, 0); | 559 | pxa_set_btuart_info(NULL); |
560 | pxa_set_stuart_info(NULL); | ||
562 | 561 | ||
563 | platform_add_devices(imote2_devices, ARRAY_SIZE(imote2_devices)); | 562 | platform_add_devices(imote2_devices, ARRAY_SIZE(imote2_devices)); |
564 | 563 | ||