diff options
-rw-r--r-- | arch/arm/configs/carmeva_defconfig | 2 | ||||
-rw-r--r-- | arch/arm/mach-at91rm9200/board-carmeva.c | 30 |
2 files changed, 28 insertions, 4 deletions
diff --git a/arch/arm/configs/carmeva_defconfig b/arch/arm/configs/carmeva_defconfig index d24ae8777c35..d392833b31fb 100644 --- a/arch/arm/configs/carmeva_defconfig +++ b/arch/arm/configs/carmeva_defconfig | |||
@@ -474,7 +474,7 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
474 | # CONFIG_WATCHDOG is not set | 474 | # CONFIG_WATCHDOG is not set |
475 | # CONFIG_NVRAM is not set | 475 | # CONFIG_NVRAM is not set |
476 | # CONFIG_RTC is not set | 476 | # CONFIG_RTC is not set |
477 | # CONFIG_AT91_RTC is not set | 477 | # CONFIG_AT91RM9200_RTC is not set |
478 | # CONFIG_DTLK is not set | 478 | # CONFIG_DTLK is not set |
479 | # CONFIG_R3964 is not set | 479 | # CONFIG_R3964 is not set |
480 | 480 | ||
diff --git a/arch/arm/mach-at91rm9200/board-carmeva.c b/arch/arm/mach-at91rm9200/board-carmeva.c index 98208740e7c5..5cd68e6001ef 100644 --- a/arch/arm/mach-at91rm9200/board-carmeva.c +++ b/arch/arm/mach-at91rm9200/board-carmeva.c | |||
@@ -65,7 +65,6 @@ static void __init carmeva_init_irq(void) | |||
65 | at91rm9200_init_interrupts(NULL); | 65 | at91rm9200_init_interrupts(NULL); |
66 | } | 66 | } |
67 | 67 | ||
68 | |||
69 | static struct at91_eth_data __initdata carmeva_eth_data = { | 68 | static struct at91_eth_data __initdata carmeva_eth_data = { |
70 | .phy_irq_pin = AT91_PIN_PC4, | 69 | .phy_irq_pin = AT91_PIN_PC4, |
71 | .is_rmii = 1, | 70 | .is_rmii = 1, |
@@ -91,6 +90,31 @@ static struct at91_udc_data __initdata carmeva_udc_data = { | |||
91 | static struct at91_mmc_data __initdata carmeva_mmc_data = { | 90 | static struct at91_mmc_data __initdata carmeva_mmc_data = { |
92 | .is_b = 0, | 91 | .is_b = 0, |
93 | .wire4 = 1, | 92 | .wire4 = 1, |
93 | .det_pin = AT91_PIN_PB10, | ||
94 | .wp_pin = AT91_PIN_PC14, | ||
95 | }; | ||
96 | |||
97 | static struct spi_board_info carmeva_spi_devices[] = { | ||
98 | { /* DataFlash chip */ | ||
99 | .modalias = "mtd_dataflash", | ||
100 | .chip_select = 0, | ||
101 | .max_speed_hz = 10 * 1000 * 1000, | ||
102 | }, | ||
103 | { /* User accessable spi - cs1 (250KHz) */ | ||
104 | .modalias = "spi-cs1", | ||
105 | .chip_select = 1, | ||
106 | .max_speed_hz = 250 * 1000, | ||
107 | }, | ||
108 | { /* User accessable spi - cs2 (1MHz) */ | ||
109 | .modalias = "spi-cs2", | ||
110 | .chip_select = 2, | ||
111 | .max_speed_hz = 1 * 1000 * 1000, | ||
112 | }, | ||
113 | { /* User accessable spi - cs3 (10MHz) */ | ||
114 | .modalias = "spi-cs3", | ||
115 | .chip_select = 3, | ||
116 | .max_speed_hz = 10 * 1000 * 1000, | ||
117 | }, | ||
94 | }; | 118 | }; |
95 | 119 | ||
96 | static void __init carmeva_board_init(void) | 120 | static void __init carmeva_board_init(void) |
@@ -105,10 +129,10 @@ static void __init carmeva_board_init(void) | |||
105 | at91_add_device_udc(&carmeva_udc_data); | 129 | at91_add_device_udc(&carmeva_udc_data); |
106 | /* I2C */ | 130 | /* I2C */ |
107 | at91_add_device_i2c(); | 131 | at91_add_device_i2c(); |
132 | /* SPI */ | ||
133 | at91_add_device_spi(carmeva_spi_devices, ARRAY_SIZE(carmeva_spi_devices)); | ||
108 | /* Compact Flash */ | 134 | /* Compact Flash */ |
109 | // at91_add_device_cf(&carmeva_cf_data); | 135 | // at91_add_device_cf(&carmeva_cf_data); |
110 | /* SPI */ | ||
111 | // at91_add_device_spi(NULL, 0); | ||
112 | /* MMC */ | 136 | /* MMC */ |
113 | at91_add_device_mmc(&carmeva_mmc_data); | 137 | at91_add_device_mmc(&carmeva_mmc_data); |
114 | } | 138 | } |