Merge tag 'at91-cleanup4' of...

	select IRQ_DOMAIN

	select NEED_MACH_IO_H if PCCARD

	select PINCTRL

	select PINCTRL_AT91 if USE_OF

	select PINCTRL_AT91

	select USE_OF

	help

	  This enables support for systems based on Atmel

	  AT91RM9200 and AT91SAM9* processors.

	  AT91RM9200, AT91SAM9 and SAMA5 processors.

config ARCH_CLPS711X

	bool "Cirrus Logic CLPS711x/EP721x/EP731x-based"

# CONFIG_LOCALVERSION_AUTO is not set

# CONFIG_SWAP is not set

CONFIG_SYSVIPC=y

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_LOG_BUF_SHIFT=14

CONFIG_USER_NS=y

CONFIG_BLK_DEV_INITRD=y

CONFIG_MODULES=y

CONFIG_MODULE_FORCE_LOAD=y

CONFIG_MODULE_UNLOAD=y

CONFIG_MODVERSIONS=y

CONFIG_MODULE_SRCVERSION_ALL=y

# CONFIG_BLK_DEV_BSG is not set

# CONFIG_IOSCHED_CFQ is not set

CONFIG_ARCH_AT91=y

CONFIG_ARCH_AT91RM9200=y

CONFIG_MACH_ONEARM=y

CONFIG_MACH_AT91RM9200EK=y

CONFIG_MACH_CSB337=y

CONFIG_MACH_CSB637=y

CONFIG_MACH_CARMEVA=y

CONFIG_MACH_ATEB9200=y

CONFIG_MACH_KB9200=y

CONFIG_MACH_PICOTUX2XX=y

CONFIG_MACH_KAFA=y

CONFIG_MACH_ECBAT91=y

CONFIG_MACH_YL9200=y

CONFIG_MACH_CPUAT91=y

CONFIG_MACH_ECO920=y

CONFIG_MTD_AT91_DATAFLASH_CARD=y

CONFIG_AT91_TIMER_HZ=100

# CONFIG_ARM_THUMB is not set

CONFIG_PCCARD=y

CONFIG_AT91_CF=y

CONFIG_AEABI=y

# CONFIG_COMPACTION is not set

CONFIG_ZBOOT_ROM_TEXT=0x10000000

CONFIG_ZBOOT_ROM_BSS=0x20040000

CONFIG_KEXEC=y

CONFIG_AUTO_ZRELADDR=y

CONFIG_FPE_NWFPE=y

CONFIG_BINFMT_MISC=y

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_IPV6_PRIVACY=y

CONFIG_IPV6_ROUTER_PREF=y

CONFIG_IPV6_ROUTE_INFO=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_CHAR=y

CONFIG_MTD_BLOCK=y

CONFIG_MTD_CFI=y

CONFIG_MTD_JEDECPROBE=y

CONFIG_MTD_CFI_INTELEXT=y

CONFIG_MTD_CFI_AMDSTD=y

CONFIG_MTD_COMPLEX_MAPPINGS=y

CONFIG_MTD_PHYSMAP=y

CONFIG_MTD_PLATRAM=y

CONFIG_MTD_DATAFLASH=y

CONFIG_MTD_NAND=y

CONFIG_MTD_NAND_ATMEL=y

CONFIG_MTD_NAND_PLATFORM=y

CONFIG_MTD_UBI=y

CONFIG_MTD_UBI_GLUEBI=y

CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_RAM_SIZE=8192

CONFIG_NETDEVICES=y

CONFIG_MII=y

CONFIG_ARM_AT91_ETHER=y

CONFIG_DAVICOM_PHY=y

CONFIG_SMSC_PHY=y

CONFIG_MICREL_PHY=y

# CONFIG_WLAN is not set

# CONFIG_INPUT_MOUSEDEV is not set

CONFIG_INPUT_EVDEV=y

CONFIG_KEYBOARD_GPIO=y

# CONFIG_INPUT_MOUSE is not set

CONFIG_INPUT_TOUCHSCREEN=y

# 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_GPIO_SYSFS=y

# CONFIG_HWMON is not set

CONFIG_WATCHDOG=y

CONFIG_WATCHDOG_NOWAYOUT=y

CONFIG_AT91RM9200_WATCHDOG=y

CONFIG_FB=y

CONFIG_FB_MODE_HELPERS=y

CONFIG_FB_TILEBLITTING=y

CONFIG_FB_S1D13XXX=y

CONFIG_BACKLIGHT_LCD_SUPPORT=y

CONFIG_LCD_CLASS_DEVICE=y

CONFIG_BACKLIGHT_CLASS_DEVICE=y

# CONFIG_BACKLIGHT_GENERIC is not set

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_FONTS=y

CONFIG_LOGO=y

CONFIG_USB=y

CONFIG_USB_OHCI_HCD=y

CONFIG_USB_GADGET=y

CONFIG_USB_AT91=y

CONFIG_USB_G_SERIAL=y

CONFIG_MMC=y

CONFIG_MMC_ATMELMCI=y

CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y

CONFIG_LEDS_GPIO=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_EXT4_FS=y

CONFIG_AUTOFS4_FS=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_NLS_UTF8=y

CONFIG_MAGIC_SYSRQ=y

CONFIG_DEBUG_FS=y

CONFIG_DEBUG_KERNEL=y

# CONFIG_FTRACE is not set

CONFIG_DEBUG_USER=y

CONFIG_DEBUG_LL=y

CONFIG_EARLY_PRINTK=y

CONFIG_CRYPTO_PCBC=y

CONFIG_CRYPTO_SHA1=y

CONFIG_XZ_DEC_ARMTHUMB=y

config HAVE_AT91_DBGU2

	bool

config AT91_USE_OLD_CLK

	bool

config COMMON_CLK_AT91

	bool

	default USE_OF && !AT91_USE_OLD_CLK

	select COMMON_CLK

config OLD_CLK_AT91

	bool

	default AT91_USE_OLD_CLK

config OLD_IRQ_AT91

	bool

	select MULTI_IRQ_HANDLER

	select SPARSE_IRQ

config HAVE_AT91_SMD

	bool

config SOC_AT91SAM9

	bool

	select ATMEL_AIC_IRQ if !OLD_IRQ_AT91

	select ATMEL_AIC_IRQ

	select COMMON_CLK_AT91

	select CPU_ARM926T

	select GENERIC_CLOCKEVENTS

	select MEMORY if USE_OF

	select ATMEL_SDRAMC if USE_OF

	select MEMORY

	select ATMEL_SDRAMC

config SOC_SAMA5

	bool

	select ATMEL_AIC5_IRQ

	select COMMON_CLK_AT91

	select CPU_V7

	select GENERIC_CLOCKEVENTS

	select USE_OF

	select MEMORY

	select ATMEL_SDRAMC

	select PHYLIB if NETDEVICES

if SOC_SAM_V4_V5

config SOC_AT91RM9200

	bool "AT91RM9200"

	select ATMEL_AIC_IRQ if !OLD_IRQ_AT91

	select ATMEL_AIC_IRQ

	select COMMON_CLK_AT91

	select CPU_ARM920T

	select GENERIC_CLOCKEVENTS

	select HAVE_AT91_DBGU0

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

endif # SOC_SAM_V4_V5

if SOC_SAM_V4_V5

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

endif

comment "Generic Board Type"

config MACH_AT91RM9200_DT

	bool "Atmel AT91RM9200 Evaluation Kits with device-tree support"

	depends on SOC_AT91RM9200

	select USE_OF

	help

	  Select this if you want to experiment device-tree with

	  an Atmel RM9200 Evaluation Kit.

config MACH_AT91SAM9_DT

	bool "Atmel AT91SAM Evaluation Kits with device-tree support"

	depends on SOC_AT91SAM9

	select USE_OF

	help

	  Select this if you want to experiment device-tree with

	  an Atmel Evaluation Kit.

       int "Kernel HZ (jiffies per second)"

       range 32 1024

       depends on ARCH_AT91

       default "128" if ARCH_AT91RM9200

       default "128" if SOC_AT91RM9200

       default "100"

       help

	  On AT91rm9200 chips where you're using a system clock derived

menu "Atmel Non-DT world"

config HAVE_AT91_DATAFLASH_CARD

	bool

choice

	prompt "Atmel AT91 Processor Devices for non DT boards"

config ARCH_AT91_NONE

	bool "None"

config ARCH_AT91RM9200

	bool "AT91RM9200"

	select SOC_AT91RM9200

	select AT91_USE_OLD_CLK

	select OLD_IRQ_AT91

endchoice

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

if ARCH_AT91RM9200

comment "AT91RM9200 Board Type"

config MACH_ONEARM

	bool "Ajeco 1ARM Single Board Computer"

	help

	  Select this if you are using Ajeco's 1ARM Single Board Computer.

	  <http://www.ajeco.fi/>

config MACH_AT91RM9200EK

	bool "Atmel AT91RM9200-EK Evaluation Kit"

	select HAVE_AT91_DATAFLASH_CARD

	help

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

	  <http://www.atmel.com/dyn/products/tools_card.asp?tool_id=3507>

config MACH_CSB337

	bool "Cogent CSB337"

	help

	  Select this if you are using Cogent's CSB337 board.

	  <http://www.cogcomp.com/csb_csb337.htm>

config MACH_CSB637

	bool "Cogent CSB637"

	help

	  Select this if you are using Cogent's CSB637 board.

	  <http://www.cogcomp.com/csb_csb637.htm>

config MACH_CARMEVA

	bool "Conitec ARM&EVA"

	help

	  Select this if you are using Conitec's AT91RM9200-MCU-Module.

	  <http://www.conitec.net/english/linuxboard.php>

config MACH_ATEB9200

	bool "Embest ATEB9200"

	help

	  Select this if you are using Embest's ATEB9200 board.

	  <http://www.embedinfo.com/english/product/ATEB9200.asp>

config MACH_KB9200

	bool "KwikByte KB920x"

	help

	  Select this if you are using KwikByte's KB920x board.

	  <http://www.kwikbyte.com/KB9202.html>

config MACH_PICOTUX2XX

	bool "picotux 200"

	help

	  Select this if you are using a picotux 200.

	  <http://www.picotux.com/>

config MACH_KAFA

	bool "Sperry-Sun KAFA board"

	help

	  Select this if you are using Sperry-Sun's KAFA board.

config MACH_ECBAT91

	bool "emQbit ECB_AT91 SBC"

	select HAVE_AT91_DATAFLASH_CARD

	help

	  Select this if you are using emQbit's ECB_AT91 board.

	  <http://wiki.emqbit.com/free-ecb-at91>

config MACH_YL9200

	bool "ucDragon YL-9200"

	help

	  Select this if you are using the ucDragon YL-9200 board.

config MACH_CPUAT91

	bool "Eukrea CPUAT91"

	help

	  Select this if you are using the Eukrea Electromatique's

	  CPUAT91 board <http://www.eukrea.com/>.

config MACH_ECO920

	bool "eco920"

	help

	  Select this if you are using the eco920 board

endif

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

comment "AT91 Board Options"

config MTD_AT91_DATAFLASH_CARD

	bool "Enable DataFlash Card support"

	depends on HAVE_AT91_DATAFLASH_CARD

	help

	  Enable support for the DataFlash card.

endmenu

obj-y		:= gpio.o setup.o sysirq_mask.o

obj-$(CONFIG_OLD_IRQ_AT91)	+= irq.o

obj-$(CONFIG_OLD_CLK_AT91)	+= clock.o

obj-$(CONFIG_SOC_AT91SAM9)	+= sam9_smc.o

# CPU-specific support

obj-$(CONFIG_SOC_SAMA5D3)	+= sama5d3.o

obj-$(CONFIG_SOC_SAMA5D4)	+= sama5d4.o

obj-$(CONFIG_ARCH_AT91RM9200)	+= at91rm9200_devices.o

# AT91RM9200 board-specific support

obj-$(CONFIG_MACH_ONEARM)	+= board-1arm.o

obj-$(CONFIG_MACH_AT91RM9200EK)	+= board-rm9200ek.o

obj-$(CONFIG_MACH_CSB337)	+= board-csb337.o

obj-$(CONFIG_MACH_CSB637)	+= board-csb637.o

obj-$(CONFIG_MACH_CARMEVA)	+= board-carmeva.o

obj-$(CONFIG_MACH_KB9200)	+= board-kb9202.o

obj-$(CONFIG_MACH_ATEB9200)	+= board-eb9200.o

obj-$(CONFIG_MACH_KAFA)		+= board-kafa.o

obj-$(CONFIG_MACH_PICOTUX2XX)	+= board-picotux200.o

obj-$(CONFIG_MACH_ECBAT91)	+= board-ecbat91.o

obj-$(CONFIG_MACH_YL9200)	+= board-yl-9200.o

obj-$(CONFIG_MACH_CPUAT91)	+= board-cpuat91.o

obj-$(CONFIG_MACH_ECO920)	+= board-eco920.o

# AT91SAM board with device-tree

obj-$(CONFIG_MACH_AT91RM9200_DT) += board-dt-rm9200.o

obj-$(CONFIG_MACH_AT91SAM9_DT) += board-dt-sam9.o