diff options
| author | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2012-11-13 22:13:17 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-11-16 15:33:11 +0100 |
| commit | ffd78d22c186c1e84f26a6764b8c44f7e475e271 (patch) | |
| tree | d0e5330ad327c5cb8181530eb34a0776339468e1 /arch | |
| parent | 7fd15d219f6de3194f177bf72b77bd7fb69d3435 (diff) | |
| download | barebox-ffd78d22c186c1e84f26a6764b8c44f7e475e271.tar.gz barebox-ffd78d22c186c1e84f26a6764b8c44f7e475e271.tar.xz | |
usb-a9g20: add mmc spi support
on the 9g20 low power version we have a mmc spi as microSD
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boards/usb-a926x/init.c | 37 | ||||
| -rw-r--r-- | arch/arm/configs/usb_a9g20_128mib_defconfig | 10 | ||||
| -rw-r--r-- | arch/arm/configs/usb_a9g20_defconfig | 10 |
3 files changed, 49 insertions, 8 deletions
diff --git a/arch/arm/boards/usb-a926x/init.c b/arch/arm/boards/usb-a926x/init.c index 9708aaa277..e0df0264a7 100644 --- a/arch/arm/boards/usb-a926x/init.c +++ b/arch/arm/boards/usb-a926x/init.c @@ -31,6 +31,7 @@ #include <linux/clk.h> #include <mach/board.h> #include <mach/at91sam9_smc.h> +#include <mach/at91sam9_sdramc.h> #include <mach/sam9_smc.h> #include <gpio.h> #include <led.h> @@ -158,14 +159,38 @@ static const struct spi_board_info usb_a9263_spi_devices[] = { } }; +static const struct spi_board_info usb_a9g20_spi_devices[] = { + { + .name = "spi_mci", + .chip_select = 0, + .max_speed_hz = 25 * 1000 * 1000, + .bus_num = 1, + } +}; + +static unsigned spi0_standard_cs_a9263[] = { AT91_PIN_PA5 }; +static struct at91_spi_platform_data spi_a9263_pdata = { + .chipselect = spi0_standard_cs_a9263, + .num_chipselect = ARRAY_SIZE(spi0_standard_cs_a9263), +}; + +static unsigned spi0_standard_cs_a9g20[] = { AT91_PIN_PB3 }; +static struct at91_spi_platform_data spi_a9g20_pdata = { + .chipselect = spi0_standard_cs_a9g20, + .num_chipselect = ARRAY_SIZE(spi0_standard_cs_a9g20), +}; + static void usb_a9260_add_spi(void) { - if (!machine_is_usb_a9263()) - return; - - spi_register_board_info(usb_a9263_spi_devices, - ARRAY_SIZE(usb_a9263_spi_devices)); - at91_add_device_spi(0, NULL); + if (machine_is_usb_a9263()) { + spi_register_board_info(usb_a9263_spi_devices, + ARRAY_SIZE(usb_a9263_spi_devices)); + at91_add_device_spi(0, &spi_a9263_pdata); + } else if (machine_is_usb_a9g20() && at91_is_low_power_sdram()) { + spi_register_board_info(usb_a9g20_spi_devices, + ARRAY_SIZE(usb_a9g20_spi_devices)); + at91_add_device_spi(1, &spi_a9g20_pdata); + } } #if defined(CONFIG_MCI_ATMEL) diff --git a/arch/arm/configs/usb_a9g20_128mib_defconfig b/arch/arm/configs/usb_a9g20_128mib_defconfig index 4a6c9335b4..f4d412c988 100644 --- a/arch/arm/configs/usb_a9g20_128mib_defconfig +++ b/arch/arm/configs/usb_a9g20_128mib_defconfig @@ -53,6 +53,7 @@ CONFIG_CMD_OFTREE=y CONFIG_CMD_TIMEOUT=y CONFIG_CMD_PARTITION=y CONFIG_CMD_GPIO=y +CONFIG_CMD_SPI=y CONFIG_CMD_LED=y CONFIG_CMD_LED_TRIGGER=y CONFIG_NET=y @@ -64,7 +65,7 @@ CONFIG_FS_TFTP=y CONFIG_NET_NETCONSOLE=y CONFIG_NET_RESOLV=y CONFIG_DRIVER_NET_MACB=y -# CONFIG_SPI is not set +CONFIG_DRIVER_SPI_ATMEL=y CONFIG_MTD=y # CONFIG_MTD_OOB_DEVICE is not set CONFIG_NAND=y @@ -76,6 +77,13 @@ CONFIG_UBI=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DFU=y CONFIG_USB_GADGET_SERIAL=y +CONFIG_MCI=y +CONFIG_MCI_STARTUP=y +CONFIG_MCI_SPI=y +CONFIG_MMC_SPI_CRC_ON=y CONFIG_LED=y CONFIG_LED_GPIO=y CONFIG_LED_TRIGGERS=y +CONFIG_FS_FAT=y +CONFIG_FS_FAT_WRITE=y +CONFIG_FS_FAT_LFN=y diff --git a/arch/arm/configs/usb_a9g20_defconfig b/arch/arm/configs/usb_a9g20_defconfig index e851b9c438..3062fb4bff 100644 --- a/arch/arm/configs/usb_a9g20_defconfig +++ b/arch/arm/configs/usb_a9g20_defconfig @@ -52,6 +52,7 @@ CONFIG_CMD_OFTREE=y CONFIG_CMD_TIMEOUT=y CONFIG_CMD_PARTITION=y CONFIG_CMD_GPIO=y +CONFIG_CMD_SPI=y CONFIG_CMD_LED=y CONFIG_CMD_LED_TRIGGER=y CONFIG_NET=y @@ -63,7 +64,7 @@ CONFIG_FS_TFTP=y CONFIG_NET_NETCONSOLE=y CONFIG_NET_RESOLV=y CONFIG_DRIVER_NET_MACB=y -# CONFIG_SPI is not set +CONFIG_DRIVER_SPI_ATMEL=y CONFIG_MTD=y # CONFIG_MTD_OOB_DEVICE is not set CONFIG_NAND=y @@ -75,6 +76,13 @@ CONFIG_UBI=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DFU=y CONFIG_USB_GADGET_SERIAL=y +CONFIG_MCI=y +CONFIG_MCI_STARTUP=y +CONFIG_MCI_SPI=y +CONFIG_MMC_SPI_CRC_ON=y CONFIG_LED=y CONFIG_LED_GPIO=y CONFIG_LED_TRIGGERS=y +CONFIG_FS_FAT=y +CONFIG_FS_FAT_WRITE=y +CONFIG_FS_FAT_LFN=y |