Commit 02685cd2 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'at91-cleanup3' of... 

Merge tag 'at91-cleanup3' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91 into next/soc

Merge "at91: cleanup/soc for 3.20 #3 (bis) from Nicolas Ferre:

Third batch of cleanup/soc for 3.20:
- several fixes and adjustments following the last cleanup batch
- removal of some unused Kconfig options
- slight PM and pm_idle rework to ease future rework
- removal of unneeded mach/system_rev.h

* tag 'at91-cleanup3' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91

:
  ARM: at91: pm: remove warning to remove SOC_AT91SAM9263 usage
  ARM: at91: remove unused mach/system_rev.h
  ARM: at91: stop using HAVE_AT91_DBGUx
  ARM: at91: fix ordering of SRAM and PM initialization
  ARM: at91: sam9: set arm_pm_idle from sam9_dt_device_init
  ARM: at91: fix sam9n12 and sam9x5 arm_pm_idle
  ARM: at91: mark const init data with __initconst instead of __initdata
  ARM: at91: fix PM initialization for newer SoCs
  ARM: at91: fix Kconfig.debug by adding DEBUG_AT91_UART option

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 9b865d9b 9726b689

arch/arm/Kconfig.debug

+11 −5
Original line number Diff line number Diff line
@@ -117,17 +117,20 @@ choice 
	config AT91_DEBUG_LL_DBGU0

		bool "Kernel low-level debugging on rm9200, 9260/9g20, 9261/9g10, 9rl, 9x5, 9n12"

		select DEBUG_AT91_UART

		depends on HAVE_AT91_DBGU0

		depends on ARCH_AT91

		depends on SOC_AT91RM9200 || SOC_AT91SAM9



	config AT91_DEBUG_LL_DBGU1

		bool "Kernel low-level debugging on 9263, 9g45 and sama5d3"

		select DEBUG_AT91_UART

		depends on HAVE_AT91_DBGU1

		depends on ARCH_AT91

		depends on SOC_AT91SAM9 || SOC_SAMA5



	config AT91_DEBUG_LL_DBGU2

		bool "Kernel low-level debugging on sama5d4"

		select DEBUG_AT91_UART

		depends on HAVE_AT91_DBGU2

		depends on ARCH_AT91

		depends on SOC_SAMA5



	config DEBUG_BCM2835

		bool "Kernel low-level debugging on BCM2835 PL011 UART"
@@ -1148,6 +1151,10 @@ choice 


endchoice



config DEBUG_AT91_UART

	bool

	depends on ARCH_AT91



config DEBUG_EXYNOS_UART

	bool
@@ -1208,8 +1215,7 @@ config DEBUG_LL_INCLUDE 
	string

	default "debug/sa1100.S" if DEBUG_SA1100

	default "debug/8250.S" if DEBUG_LL_UART_8250 || DEBUG_UART_8250

	default "debug/at91.S" if AT91_DEBUG_LL_DBGU0 || AT91_DEBUG_LL_DBGU1 || \

				AT91_DEBUG_LL_DBGU2

	default "debug/at91.S" if DEBUG_AT91_UART

	default "debug/asm9260.S" if DEBUG_ASM9260_UART

	default "debug/clps711x.S" if DEBUG_CLPS711X_UART1 || DEBUG_CLPS711X_UART2

	default "debug/meson.S" if DEBUG_MESON_UARTAO

arch/arm/mach-at91/Kconfig

+0 −19
Original line number Diff line number Diff line
@@ -6,15 +6,6 @@ config HAVE_AT91_UTMI 
config HAVE_AT91_USB_CLK

	bool



config HAVE_AT91_DBGU0

	bool



config HAVE_AT91_DBGU1

	bool



config HAVE_AT91_DBGU2

	bool



config COMMON_CLK_AT91

	bool

	select COMMON_CLK
@@ -70,7 +61,6 @@ config SOC_SAMA5D3 
	bool "SAMA5D3 family"

	select SOC_SAMA5

	select HAVE_FB_ATMEL

	select HAVE_AT91_DBGU1

	select HAVE_AT91_UTMI

	select HAVE_AT91_SMD

	select HAVE_AT91_USB_CLK
@@ -81,7 +71,6 @@ config SOC_SAMA5D3 
config SOC_SAMA5D4

	bool "SAMA5D4 family"

	select SOC_SAMA5

	select HAVE_AT91_DBGU2

	select CLKSRC_MMIO

	select CACHE_L2X0

	select CACHE_PL310
@@ -101,12 +90,10 @@ config SOC_AT91RM9200 
	select COMMON_CLK_AT91

	select CPU_ARM920T

	select GENERIC_CLOCKEVENTS

	select HAVE_AT91_DBGU0

	select HAVE_AT91_USB_CLK



config SOC_AT91SAM9260

	bool "AT91SAM9260, AT91SAM9XE or AT91SAM9G20"

	select HAVE_AT91_DBGU0

	select SOC_AT91SAM9

	select HAVE_AT91_USB_CLK

	help
@@ -115,7 +102,6 @@ config SOC_AT91SAM9260 


config SOC_AT91SAM9261

	bool "AT91SAM9261 or AT91SAM9G10"

	select HAVE_AT91_DBGU0

	select HAVE_FB_ATMEL

	select SOC_AT91SAM9

	select HAVE_AT91_USB_CLK
@@ -124,21 +110,18 @@ config SOC_AT91SAM9261 


config SOC_AT91SAM9263

	bool "AT91SAM9263"

	select HAVE_AT91_DBGU1

	select HAVE_FB_ATMEL

	select SOC_AT91SAM9

	select HAVE_AT91_USB_CLK



config SOC_AT91SAM9RL

	bool "AT91SAM9RL"

	select HAVE_AT91_DBGU0

	select HAVE_FB_ATMEL

	select SOC_AT91SAM9

	select HAVE_AT91_UTMI



config SOC_AT91SAM9G45

	bool "AT91SAM9G45 or AT91SAM9M10 families"

	select HAVE_AT91_DBGU1

	select HAVE_FB_ATMEL

	select SOC_AT91SAM9

	select HAVE_AT91_UTMI
@@ -149,7 +132,6 @@ config SOC_AT91SAM9G45 


config SOC_AT91SAM9X5

	bool "AT91SAM9x5 family"

	select HAVE_AT91_DBGU0

	select HAVE_FB_ATMEL

	select SOC_AT91SAM9

	select HAVE_AT91_UTMI
@@ -164,7 +146,6 @@ config SOC_AT91SAM9X5 


config SOC_AT91SAM9N12

	bool "AT91SAM9N12 family"

	select HAVE_AT91_DBGU0

	select HAVE_FB_ATMEL

	select SOC_AT91SAM9

	select HAVE_AT91_USB_CLK

arch/arm/mach-at91/at91sam9260.c

+0 −6
Original line number Diff line number Diff line
@@ -22,11 +22,5 @@ 
 *  AT91SAM9260 processor initialization

 * -------------------------------------------------------------------- */



static void __init at91sam9260_initialize(void)

{

	arm_pm_idle = at91sam9_idle;

}



AT91_SOC_START(at91sam9260)

	.init = at91sam9260_initialize,

AT91_SOC_END

arch/arm/mach-at91/at91sam9261.c

+0 −6
Original line number Diff line number Diff line
@@ -21,11 +21,5 @@ 
 *  AT91SAM9261 processor initialization

 * -------------------------------------------------------------------- */



static void __init at91sam9261_initialize(void)

{

	arm_pm_idle = at91sam9_idle;

}



AT91_SOC_START(at91sam9261)

	.init = at91sam9261_initialize,

AT91_SOC_END

arch/arm/mach-at91/at91sam9263.c

+0 −6
Original line number Diff line number Diff line
@@ -20,11 +20,5 @@ 
 *  AT91SAM9263 processor initialization

 * -------------------------------------------------------------------- */



static void __init at91sam9263_initialize(void)

{

	arm_pm_idle = at91sam9_idle;

}



AT91_SOC_START(at91sam9263)

	.init = at91sam9263_initialize,

AT91_SOC_END

CRA Git | Maintained and supported by SUSTech CRA and CCSE