Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e05dd97c authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'at91-for-next-soc' of git://github.com/at91linux/linux-at91 into at91/mci 

AT91 SoC related code modifications: a cleanup in defconfigs and
a one liner in a board file.
The most important is the move to atmel-mci driver in AT91 SoC & boards.
The old at91_mci (marked as deprecated) will be removed in 3.7. So all
platform data for this old driver are erased and replace by information
needed by atmel-mci driver.

* tag 'at91-for-next-soc' of git://github.com/at91linux/linux-at91

:
  ARM: at91: add atmel-mci support for chips and boards which can use it
  ARM: at91/defconfig: change the MCI driver to use in defconfigs
  ARM: at91: set i2c_board_info.type to "ds1339" directly
  ARM: at91/defconfig: Remove unaffected config option

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 19e4ab54 4cf3326a

arch/arm/configs/afeb9260_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ CONFIG_MTD_BLOCK=y 
CONFIG_MTD_DATAFLASH=y

CONFIG_MTD_NAND=y

CONFIG_MTD_NAND_ATMEL=y

CONFIG_MTD_NAND_ATMEL_ECC_SOFT=y

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_RAM_SIZE=8192

CONFIG_ATMEL_SSC=y

arch/arm/configs/at91rm9200_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -232,7 +232,7 @@ CONFIG_USB_GADGET=y 
CONFIG_USB_ETH=m

CONFIG_USB_MASS_STORAGE=m

CONFIG_MMC=y

CONFIG_MMC_AT91=y

CONFIG_MMC_ATMELMCI=y

CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y

CONFIG_LEDS_GPIO=y

arch/arm/configs/at91sam9261_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ CONFIG_USB_GADGETFS=m 
CONFIG_USB_FILE_STORAGE=m

CONFIG_USB_G_SERIAL=m

CONFIG_MMC=y

CONFIG_MMC_AT91=m

CONFIG_MMC_ATMELMCI=m

CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y

CONFIG_LEDS_GPIO=y

arch/arm/configs/at91sam9263_defconfig

+1 −2
Original line number Diff line number Diff line
@@ -61,7 +61,6 @@ CONFIG_MTD_DATAFLASH=y 
CONFIG_MTD_BLOCK2MTD=y

CONFIG_MTD_NAND=y

CONFIG_MTD_NAND_ATMEL=y

CONFIG_MTD_NAND_ATMEL_ECC_SOFT=y

CONFIG_MTD_UBI=y

CONFIG_MTD_UBI_GLUEBI=y

CONFIG_BLK_DEV_LOOP=y
@@ -138,7 +137,7 @@ CONFIG_USB_FILE_STORAGE=m 
CONFIG_USB_G_SERIAL=m

CONFIG_MMC=y

CONFIG_SDIO_UART=m

CONFIG_MMC_AT91=m

CONFIG_MMC_ATMELMCI=m

CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y

CONFIG_LEDS_ATMEL_PWM=y

arch/arm/configs/at91sam9g20_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ CONFIG_USB_GADGETFS=m 
CONFIG_USB_FILE_STORAGE=m

CONFIG_USB_G_SERIAL=m

CONFIG_MMC=y

CONFIG_MMC_AT91=m

CONFIG_MMC_ATMELMCI=m

CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y

CONFIG_LEDS_GPIO=y