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

Commit 4b3d4d3d authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'at91/cleanup' into next/drivers 



This resolves some of the obvious conflicts between the at91 cleanup and
drivers branches.

Conflicts:
	arch/arm/mach-at91/at91sam9g45.c
	arch/arm/mach-at91/at91sam9rl.c
	drivers/rtc/Kconfig

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents b9e0e5a9 bcf8c7e7

arch/arm/configs/at91sam9g45_defconfig

deleted100644 → 0
+0 −175
Original line number Original line Diff line number Diff line 
# CONFIG_LOCALVERSION_AUTO is not set

# CONFIG_SWAP is not set

CONFIG_SYSVIPC=y

CONFIG_LOG_BUF_SHIFT=14

CONFIG_SYSFS_DEPRECATED=y

CONFIG_SYSFS_DEPRECATED_V2=y

CONFIG_BLK_DEV_INITRD=y

CONFIG_CC_OPTIMIZE_FOR_SIZE=y

CONFIG_EMBEDDED=y

CONFIG_SLAB=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

# CONFIG_LBDAF is not set

# CONFIG_BLK_DEV_BSG is not set

# CONFIG_IOSCHED_DEADLINE is not set

# CONFIG_IOSCHED_CFQ is not set

CONFIG_ARCH_AT91=y

CONFIG_ARCH_AT91SAM9G45=y

CONFIG_MACH_AT91SAM9M10G45EK=y

CONFIG_MACH_AT91SAM9_DT=y

CONFIG_AT91_SLOW_CLOCK=y

CONFIG_AEABI=y

CONFIG_UACCESS_WITH_MEMCPY=y

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_CMDLINE="mem=128M console=ttyS0,115200 initrd=0x71100000,25165824 root=/dev/ram0 rw"

CONFIG_AUTO_ZRELADDR=y

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y

CONFIG_INET=y

CONFIG_IP_MULTICAST=y

CONFIG_IP_PNP=y

CONFIG_IP_PNP_DHCP=y

CONFIG_IP_PNP_BOOTP=y

# CONFIG_INET_XFRM_MODE_TRANSPORT is not set

# CONFIG_INET_XFRM_MODE_TUNNEL is not set

# CONFIG_INET_XFRM_MODE_BEET is not set

# CONFIG_INET_DIAG is not set

CONFIG_IPV6=y

# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set

# CONFIG_INET6_XFRM_MODE_TUNNEL is not set

# CONFIG_INET6_XFRM_MODE_BEET is not set

CONFIG_IPV6_SIT_6RD=y

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y

# CONFIG_STANDALONE is not set

# CONFIG_PREVENT_FIRMWARE_BUILD is not set

CONFIG_MTD=y

CONFIG_MTD_CMDLINE_PARTS=y

CONFIG_MTD_BLOCK=y

CONFIG_MTD_DATAFLASH=y

CONFIG_MTD_NAND=y

CONFIG_MTD_NAND_ATMEL=y

CONFIG_MTD_UBI=y

CONFIG_MTD_UBI_GLUEBI=y

CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_RAM_COUNT=4

CONFIG_BLK_DEV_RAM_SIZE=8192

CONFIG_ATMEL_TCLIB=y

CONFIG_ATMEL_SSC=y

CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y

# CONFIG_SCSI_LOWLEVEL is not set

CONFIG_NETDEVICES=y

CONFIG_MACB=y

CONFIG_DAVICOM_PHY=y

# CONFIG_INPUT_MOUSEDEV is not set

CONFIG_INPUT_JOYDEV=y

CONFIG_INPUT_EVDEV=y

# CONFIG_KEYBOARD_ATKBD is not set

CONFIG_KEYBOARD_QT1070=y

CONFIG_KEYBOARD_QT2160=y

CONFIG_KEYBOARD_GPIO=y

# CONFIG_INPUT_MOUSE is not set

CONFIG_INPUT_TOUCHSCREEN=y

CONFIG_TOUCHSCREEN_ATMEL_MXT=m

# CONFIG_SERIO is not set

# CONFIG_LEGACY_PTYS is not set

CONFIG_SERIAL_ATMEL=y

CONFIG_SERIAL_ATMEL_CONSOLE=y

CONFIG_HW_RANDOM=y

CONFIG_I2C=y

CONFIG_I2C_CHARDEV=y

CONFIG_I2C_GPIO=y

CONFIG_SPI=y

CONFIG_SPI_ATMEL=y

CONFIG_POWER_SUPPLY=y

CONFIG_POWER_RESET=y

# CONFIG_HWMON is not set

CONFIG_WATCHDOG=y

CONFIG_WATCHDOG_NOWAYOUT=y

CONFIG_AT91SAM9X_WATCHDOG=y

CONFIG_FB=y

CONFIG_FB_ATMEL=y

CONFIG_BACKLIGHT_LCD_SUPPORT=y

CONFIG_LCD_CLASS_DEVICE=y

CONFIG_BACKLIGHT_CLASS_DEVICE=y

CONFIG_BACKLIGHT_ATMEL_LCDC=y

# CONFIG_BACKLIGHT_GENERIC is not set

CONFIG_BACKLIGHT_PWM=y

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y

CONFIG_LOGO=y

CONFIG_SOUND=y

CONFIG_SND=y

CONFIG_SND_SEQUENCER=y

CONFIG_SND_MIXER_OSS=y

CONFIG_SND_PCM_OSS=y

# CONFIG_SND_SUPPORT_OLD_API is not set

# CONFIG_SND_VERBOSE_PROCFS is not set

# CONFIG_SND_DRIVERS is not set

# CONFIG_SND_ARM is not set

CONFIG_SND_ATMEL_AC97C=y

# CONFIG_SND_SPI is not set

# CONFIG_SND_USB is not set

# CONFIG_USB_HID is not set

CONFIG_USB=y

CONFIG_USB_ANNOUNCE_NEW_DEVICES=y

CONFIG_USB_EHCI_HCD=y

CONFIG_USB_OHCI_HCD=y

CONFIG_USB_ACM=y

CONFIG_USB_STORAGE=y

CONFIG_USB_GADGET=y

CONFIG_USB_ATMEL_USBA=y

CONFIG_USB_G_MULTI=y

CONFIG_USB_G_MULTI_CDC=y

CONFIG_MMC=y

# CONFIG_MMC_BLOCK_BOUNCE is not set

CONFIG_MMC_ATMELMCI=y

CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y

CONFIG_LEDS_GPIO=y

CONFIG_LEDS_PWM=y

CONFIG_LEDS_TRIGGERS=y

CONFIG_LEDS_TRIGGER_TIMER=y

CONFIG_LEDS_TRIGGER_HEARTBEAT=y

CONFIG_LEDS_TRIGGER_GPIO=y

CONFIG_RTC_CLASS=y

CONFIG_RTC_DRV_AT91RM9200=y

CONFIG_DMADEVICES=y

CONFIG_AT_HDMAC=y

CONFIG_DMATEST=m

# CONFIG_IOMMU_SUPPORT is not set

CONFIG_IIO=y

CONFIG_AT91_ADC=y

CONFIG_PWM=y

CONFIG_PWM_ATMEL=y

CONFIG_EXT4_FS=y

CONFIG_FANOTIFY=y

CONFIG_VFAT_FS=y

CONFIG_TMPFS=y

CONFIG_UBIFS_FS=y

CONFIG_UBIFS_FS_ADVANCED_COMPR=y

CONFIG_NFS_FS=y

CONFIG_ROOT_NFS=y

CONFIG_NLS_CODEPAGE_437=y

CONFIG_NLS_CODEPAGE_850=y

CONFIG_NLS_ISO8859_1=y

CONFIG_STRIP_ASM_SYMS=y

CONFIG_DEBUG_MEMORY_INIT=y

# CONFIG_SCHED_DEBUG is not set

# CONFIG_FTRACE is not set

CONFIG_DEBUG_USER=y

CONFIG_DEBUG_LL=y

CONFIG_EARLY_PRINTK=y

CONFIG_CRYPTO_ECB=y

# CONFIG_CRYPTO_ANSI_CPRNG is not set

CONFIG_CRYPTO_USER_API_HASH=m

CONFIG_CRYPTO_USER_API_SKCIPHER=m

# CONFIG_CRYPTO_HW is not set

CONFIG_FONTS=y

arch/arm/configs/at91sam9rl_defconfig

deleted100644 → 0
+0 −92
Original line number Original line Diff line number Diff line 
# CONFIG_LOCALVERSION_AUTO is not set

# CONFIG_SWAP is not set

CONFIG_SYSVIPC=y

CONFIG_LOG_BUF_SHIFT=14

CONFIG_BLK_DEV_INITRD=y

CONFIG_EMBEDDED=y

CONFIG_SLAB=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

# CONFIG_BLK_DEV_BSG is not set

# CONFIG_IOSCHED_DEADLINE is not set

# CONFIG_IOSCHED_CFQ is not set

CONFIG_ARCH_AT91=y

CONFIG_ARCH_AT91SAM9RL=y

CONFIG_MACH_AT91SAM9RLEK=y

# CONFIG_ARM_THUMB is not set

CONFIG_AEABI=y

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_CMDLINE="mem=64M console=ttyS0,115200 initrd=0x21100000,17105363 root=/dev/ram0 rw"

CONFIG_AUTO_ZRELADDR=y

CONFIG_NET=y

CONFIG_UNIX=y

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y

CONFIG_MTD=y

CONFIG_MTD_CMDLINE_PARTS=y

CONFIG_MTD_BLOCK=y

CONFIG_MTD_DATAFLASH=y

CONFIG_MTD_NAND=y

CONFIG_MTD_NAND_ATMEL=y

CONFIG_MTD_UBI=y

CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_RAM_COUNT=4

CONFIG_BLK_DEV_RAM_SIZE=24576

CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y

# CONFIG_INPUT_MOUSEDEV_PSAUX is not set

CONFIG_INPUT_MOUSEDEV_SCREEN_X=320

CONFIG_INPUT_MOUSEDEV_SCREEN_Y=240

CONFIG_INPUT_EVDEV=y

# CONFIG_INPUT_KEYBOARD is not set

# CONFIG_INPUT_MOUSE is not set

CONFIG_INPUT_TOUCHSCREEN=y

# CONFIG_SERIO is not set

CONFIG_SERIAL_ATMEL=y

CONFIG_SERIAL_ATMEL_CONSOLE=y

# CONFIG_HW_RANDOM is not set

CONFIG_I2C=y

CONFIG_I2C_CHARDEV=y

CONFIG_I2C_GPIO=y

CONFIG_SPI=y

CONFIG_SPI_ATMEL=y

CONFIG_POWER_SUPPLY=y

CONFIG_POWER_RESET=y

# CONFIG_HWMON is not set

CONFIG_WATCHDOG=y

CONFIG_WATCHDOG_NOWAYOUT=y

CONFIG_AT91SAM9X_WATCHDOG=y

CONFIG_FB=y

CONFIG_FB_ATMEL=y

CONFIG_USB_GADGET=y

CONFIG_USB_ATMEL_USBA=y

CONFIG_MMC=y

CONFIG_MMC_ATMELMCI=m

CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y

CONFIG_LEDS_GPIO=y

CONFIG_LEDS_PWM=y

CONFIG_LEDS_TRIGGERS=y

CONFIG_LEDS_TRIGGER_HEARTBEAT=y

CONFIG_RTC_CLASS=y

CONFIG_RTC_DRV_AT91SAM9=y

CONFIG_IIO=y

CONFIG_AT91_ADC=y

CONFIG_PWM=y

CONFIG_PWM_ATMEL=y

CONFIG_EXT4_FS=y

CONFIG_VFAT_FS=y

CONFIG_TMPFS=y

CONFIG_UBIFS_FS=y

CONFIG_CRAMFS=y

CONFIG_NLS_CODEPAGE_437=y

CONFIG_NLS_CODEPAGE_850=y

CONFIG_NLS_ISO8859_1=y

CONFIG_NLS_ISO8859_15=y

CONFIG_NLS_UTF8=y

CONFIG_DEBUG_INFO=y

CONFIG_DEBUG_USER=y

CONFIG_DEBUG_LL=y

arch/arm/configs/at91x40_defconfig

deleted100644 → 0
+0 −48
Original line number Original line Diff line number Diff line 
CONFIG_EXPERIMENTAL=y

CONFIG_LOG_BUF_SHIFT=14

CONFIG_EMBEDDED=y

# CONFIG_HOTPLUG is not set

# CONFIG_ELF_CORE is not set

# CONFIG_FUTEX is not set

# CONFIG_TIMERFD is not set

# CONFIG_VM_EVENT_COUNTERS is not set

# CONFIG_COMPAT_BRK is not set

CONFIG_SLAB=y

# CONFIG_LBDAF is not set

# CONFIG_BLK_DEV_BSG is not set

# CONFIG_IOSCHED_DEADLINE is not set

# CONFIG_IOSCHED_CFQ is not set

# CONFIG_MMU is not set

CONFIG_ARCH_AT91=y

CONFIG_ARCH_AT91X40=y

CONFIG_MACH_AT91EB01=y

CONFIG_AT91_EARLY_USART0=y

CONFIG_CPU_ARM7TDMI=y

CONFIG_SET_MEM_PARAM=y

CONFIG_DRAM_BASE=0x01000000

CONFIG_DRAM_SIZE=0x00400000

CONFIG_FLASH_MEM_BASE=0x01400000

CONFIG_PROCESSOR_ID=0x14000040

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_BINFMT_FLAT=y

# CONFIG_SUSPEND is not set

# CONFIG_FW_LOADER is not set

CONFIG_MTD=y

CONFIG_MTD_PARTITIONS=y

CONFIG_MTD_CHAR=y

CONFIG_MTD_BLOCK=y

CONFIG_MTD_RAM=y

CONFIG_MTD_ROM=y

CONFIG_BLK_DEV_RAM=y

# CONFIG_INPUT is not set

# CONFIG_SERIO is not set

# CONFIG_VT is not set

# CONFIG_DEVKMEM is not set

# CONFIG_HW_RANDOM is not set

# CONFIG_HWMON is not set

# CONFIG_USB_SUPPORT is not set

CONFIG_EXT2_FS=y

# CONFIG_DNOTIFY is not set

CONFIG_ROMFS_FS=y

# CONFIG_ENABLE_MUST_CHECK is not set

arch/arm/mach-at91/Kconfig

+3 −17
Original line number Original line Diff line number Diff line
@@ -18,18 +18,14 @@ config HAVE_AT91_DBGU2 
config AT91_USE_OLD_CLK

config AT91_USE_OLD_CLK

	bool

	bool





config AT91_PMC_UNIT

	bool

	default !ARCH_AT91X40



config COMMON_CLK_AT91

config COMMON_CLK_AT91

	bool

	bool

	default AT91_PMC_UNIT && USE_OF && !AT91_USE_OLD_CLK

	default USE_OF && !AT91_USE_OLD_CLK

	select COMMON_CLK

	select COMMON_CLK





config OLD_CLK_AT91

config OLD_CLK_AT91

	bool

	bool

	default AT91_PMC_UNIT && AT91_USE_OLD_CLK

	default AT91_USE_OLD_CLK





config OLD_IRQ_AT91

config OLD_IRQ_AT91

	bool

	bool
@@ -65,16 +61,6 @@ choice 




	prompt "Core type"

	prompt "Core type"





config ARCH_AT91X40

	bool "ARM7 AT91X40"

	depends on !MMU

	select CPU_ARM7TDMI

	select ARCH_USES_GETTIMEOFFSET

	select OLD_IRQ_AT91



	help

	  Select this if you are using one of Atmel's AT91X40 SoC.



config SOC_SAM_V4_V5

config SOC_SAM_V4_V5

	bool "ARM9 AT91SAM9/AT91RM9200"

	bool "ARM9 AT91SAM9/AT91RM9200"

	help

	help
@@ -199,7 +185,7 @@ config SOC_AT91SAM9N12 
endif # SOC_SAM_V4_V5

endif # SOC_SAM_V4_V5









if SOC_SAM_V4_V5 || ARCH_AT91X40

if SOC_SAM_V4_V5

source arch/arm/mach-at91/Kconfig.non_dt

source arch/arm/mach-at91/Kconfig.non_dt

endif

endif

arch/arm/mach-at91/Kconfig.non_dt

+0 −58
Original line number Original line Diff line number Diff line
@@ -5,7 +5,6 @@ config HAVE_AT91_DATAFLASH_CARD 




choice

choice

	prompt "Atmel AT91 Processor Devices for non DT boards"

	prompt "Atmel AT91 Processor Devices for non DT boards"

	depends on !ARCH_AT91X40





config ARCH_AT91_NONE

config ARCH_AT91_NONE

	bool "None"

	bool "None"
@@ -34,18 +33,6 @@ config ARCH_AT91SAM9263 
	select AT91_USE_OLD_CLK

	select AT91_USE_OLD_CLK

	select OLD_IRQ_AT91

	select OLD_IRQ_AT91





config ARCH_AT91SAM9RL

	bool "AT91SAM9RL"

	select SOC_AT91SAM9RL

	select AT91_USE_OLD_CLK

	select OLD_IRQ_AT91



config ARCH_AT91SAM9G45

	bool "AT91SAM9G45"

	select SOC_AT91SAM9G45

	select AT91_USE_OLD_CLK

	select OLD_IRQ_AT91



endchoice

endchoice





config ARCH_AT91SAM9G20

config ARCH_AT91SAM9G20
@@ -288,51 +275,6 @@ endif 




# ----------------------------------------------------------

# ----------------------------------------------------------





if ARCH_AT91SAM9RL



comment "AT91SAM9RL Board Type"



config MACH_AT91SAM9RLEK

	bool "Atmel AT91SAM9RL-EK Evaluation Kit"

	help

	  Select this if you are using Atmel's AT91SAM9RL-EK Evaluation Kit.



endif



# ----------------------------------------------------------



if ARCH_AT91SAM9G45



comment "AT91SAM9G45 Board Type"



config MACH_AT91SAM9M10G45EK

	bool "Atmel AT91SAM9M10G45-EK Evaluation Kits"

	help

	  Select this if you are using Atmel's AT91SAM9M10G45-EK Evaluation Kit.

	  Those boards can be populated with any SoC of AT91SAM9G45 or AT91SAM9M10

	  families: AT91SAM9G45, AT91SAM9G46, AT91SAM9M10 and AT91SAM9M11.

	  <http://www.atmel.com/tools/SAM9M10-G45-EK.aspx>



endif



# ----------------------------------------------------------



if ARCH_AT91X40



comment "AT91X40 Board Type"



config MACH_AT91EB01

	bool "Atmel AT91EB01 Evaluation Kit"

	help

	  Select this if you are using Atmel's AT91EB01 Evaluation Kit.

	  It is also a popular target for simulators such as GDB's

	  ARM simulator (commonly known as the ARMulator) and the

	  Skyeye simulator.



endif



# ----------------------------------------------------------



comment "AT91 Board Options"

comment "AT91 Board Options"





config MTD_AT91_DATAFLASH_CARD

config MTD_AT91_DATAFLASH_CARD