Commit 41141127 authored by Alexandre Belloni's avatar Alexandre Belloni Committed by Nicolas Ferre
Browse files

ARM: at91: switch to multiplatform 



Switch AT91 to multiplatform as all SoCs are properly handled.

Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
parent 88c5544a

arch/arm/Kconfig

+0 −13
Original line number Diff line number Diff line
@@ -356,19 +356,6 @@ config ARCH_VERSATILE 
	help

	  This enables support for ARM Ltd Versatile board.



config ARCH_AT91

	bool "Atmel AT91"

	select ARCH_REQUIRE_GPIOLIB

	select CLKDEV_LOOKUP

	select IRQ_DOMAIN

	select PINCTRL

	select PINCTRL_AT91

	select SOC_BUS

	select USE_OF

	help

	  This enables support for systems based on Atmel

	  AT91RM9200, AT91SAM9 and SAMA5 processors.



config ARCH_CLPS711X

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

	select ARCH_REQUIRE_GPIOLIB

arch/arm/mach-at91/Kconfig

+52 −69
Original line number Diff line number Diff line 
if ARCH_AT91



config HAVE_AT91_UTMI

	bool



config HAVE_AT91_USB_CLK

	bool



config COMMON_CLK_AT91

	bool

	select COMMON_CLK



config HAVE_AT91_SMD

	bool



config HAVE_AT91_H32MX

	bool



config SOC_SAMA5

	bool

	select ATMEL_AIC5_IRQ

menuconfig ARCH_AT91

	bool "Atmel SoCs"

	select ARCH_REQUIRE_GPIOLIB

	select COMMON_CLK_AT91

	select CPU_V7

	select GENERIC_CLOCKEVENTS

	select MEMORY

	select ATMEL_SDRAMC

	select SRAM if PM



menu "Atmel AT91 System-on-Chip"



choice



	prompt "Core type"



config SOC_SAM_V4_V5

	bool "ARM9 AT91SAM9/AT91RM9200"

	help

	  Select this if you are using one of Atmel's AT91SAM9 or

	  AT91RM9200 SoC.



config SOC_SAM_V7

	bool "Cortex A5"

	help

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



endchoice



comment "Atmel AT91 Processor"

	select PINCTRL

	select PINCTRL_AT91

	select SOC_BUS



if SOC_SAM_V7

if ARCH_AT91

config SOC_SAMA5D3

	bool "SAMA5D3 family"

	bool "SAMA5D3 family" if ARCH_MULTI_V7

	select SOC_SAMA5

	select HAVE_FB_ATMEL

	select HAVE_AT91_UTMI
@@ -60,9 +19,8 @@ config SOC_SAMA5D3 
	  This support covers SAMA5D31, SAMA5D33, SAMA5D34, SAMA5D35, SAMA5D36.



config SOC_SAMA5D4

	bool "SAMA5D4 family"

	bool "SAMA5D4 family" if ARCH_MULTI_V7

	select SOC_SAMA5

	select CLKSRC_MMIO

	select CACHE_L2X0

	select HAVE_FB_ATMEL

	select HAVE_AT91_UTMI
@@ -71,32 +29,30 @@ config SOC_SAMA5D4 
	select HAVE_AT91_H32MX

	help

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

endif



if SOC_SAM_V4_V5

config SOC_AT91RM9200

	bool "AT91RM9200"

	bool "AT91RM9200" if ARCH_MULTI_V4T

	select ATMEL_AIC_IRQ

	select ATMEL_ST

	select COMMON_CLK_AT91

	select CPU_ARM920T

	select GENERIC_CLOCKEVENTS

	select HAVE_AT91_USB_CLK

	select MIGHT_HAVE_PCI

	select SOC_SAM_V4_V5

	select SRAM if PM

	help

	  Select this if you are using Atmel's AT91RM9200 SoC.



config SOC_AT91SAM9

	bool "AT91SAM9"

	bool "AT91SAM9" if ARCH_MULTI_V5

	select ATMEL_AIC_IRQ

	select ATMEL_SDRAMC

	select COMMON_CLK_AT91

	select CPU_ARM926T

	select GENERIC_CLOCKEVENTS

	select HAVE_AT91_SMD

	select HAVE_AT91_USB_CLK

	select HAVE_AT91_UTMI

	select HAVE_FB_ATMEL

	select MEMORY

	select SOC_SAM_V4_V5

	select SRAM if PM

	help

	  Select this if you are using one of those Atmel SoC:
@@ -116,9 +72,38 @@ config SOC_AT91SAM9 
	    AT91SAM9X25

	    AT91SAM9X35

	    AT91SAM9XE

endif # SOC_SAM_V4_V5



comment "AT91 Feature Selections"

config HAVE_AT91_UTMI

	bool



config HAVE_AT91_USB_CLK

	bool



config COMMON_CLK_AT91

	bool

	select COMMON_CLK



config HAVE_AT91_SMD

	bool



config HAVE_AT91_H32MX

	bool



config SOC_SAM_V4_V5

	bool



config SOC_SAM_V7

	bool



config SOC_SAMA5

	bool

	select ATMEL_AIC5_IRQ

	select ATMEL_SDRAMC

	select MEMORY

	select SOC_SAM_V7

	select SRAM if PM



comment "Atmel SoCs Feature Selections"



config AT91_TIMER_HZ

	int "Kernel HZ (jiffies per second)"
@@ -136,6 +121,4 @@ config AT91_TIMER_HZ 
	  system clock (of at least several MHz), rounding is less of a

	  problem so it can be safer to use a decimal values like 100.



endmenu



endif

arch/arm/mach-at91/Makefile

+2 −0
Original line number Diff line number Diff line 
#

# Makefile for the linux kernel.

#

ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include

asflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include



obj-y		:= soc.o