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

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: Olof Johansson <olof@lixom.net>

diff --combined arch/arm/Kconfig.debug
index 74a873ad493f0a61de23df093e1593b0ed71e46c,575db67a61d68f1442f8b22dd3a7d625ab036439..453ae2feaeeec69b1dd87a9fd50def7c471c3327
--- 1/arch/arm/Kconfig.debug
--- 2/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@@ -117,17 -117,20 +117,20 @@@ choic
        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"
@@@ -275,14 -278,6 +278,14 @@@
                  Say Y here if you want the debug print routines to direct
                  their output to the UART on Highbank based devices.
  
 +      config DEBUG_HIP01_UART
 +              bool "Hisilicon Hip01 Debug UART"
 +              depends on ARCH_HIP01
 +              select DEBUG_UART_8250
 +              help
 +                Say Y here if you want kernel low-level debugging support
 +                on HIP01 UART.
 +
        config DEBUG_HIP04_UART
                bool "Hisilicon HiP04 Debug UART"
                depends on ARCH_HIP04
@@@ -438,7 -433,7 +441,7 @@@
                  Say Y here if you want the debug print routines to direct
                  their output to the serial port on MSM devices.
  
 -                ARCH                DEBUG_UART_PHYS   DEBUG_UART_BASE   #
 +                ARCH                DEBUG_UART_PHYS   DEBUG_UART_VIRT   #
                  MSM7X00A, QSD8X50   0xa9a00000        0xe1000000        UART1
                  MSM7X00A, QSD8X50   0xa9b00000        0xe1000000        UART2
                  MSM7X00A, QSD8X50   0xa9c00000        0xe1000000        UART3
@@@ -457,8 -452,7 +460,8 @@@
                  Say Y here if you want the debug print routines to direct
                  their output to the serial port on Qualcomm devices.
  
 -                ARCH      DEBUG_UART_PHYS   DEBUG_UART_BASE
 +                ARCH      DEBUG_UART_PHYS   DEBUG_UART_VIRT
 +                APQ8064   0x16640000        0xf0040000
                  APQ8084   0xf995e000        0xfa75e000
                  MSM8X60   0x19c40000        0xf0040000
                  MSM8960   0x16440000        0xf0040000
@@@ -467,13 -461,13 +470,13 @@@
                  Please adjust DEBUG_UART_PHYS and DEBUG_UART_BASE configuration
                  options based on your needs.
  
 -      config DEBUG_MVEBU_UART
 -              bool "Kernel low-level debugging messages via MVEBU UART (old bootloaders)"
 +      config DEBUG_MVEBU_UART0
 +              bool "Kernel low-level debugging messages via MVEBU UART0 (old bootloaders)"
                depends on ARCH_MVEBU
                select DEBUG_UART_8250
                help
                  Say Y here if you want kernel low-level debugging support
 -                on MVEBU based platforms.
 +                on MVEBU based platforms on UART0.
  
                  This option should be used with the old bootloaders
                  that left the internal registers mapped at
@@@ -486,28 -480,13 +489,28 @@@
                  when u-boot hands over to the kernel, the system
                  silently crashes, with no serial output at all.
  
 -      config DEBUG_MVEBU_UART_ALTERNATE
 -              bool "Kernel low-level debugging messages via MVEBU UART (new bootloaders)"
 +      config DEBUG_MVEBU_UART0_ALTERNATE
 +              bool "Kernel low-level debugging messages via MVEBU UART0 (new bootloaders)"
                depends on ARCH_MVEBU
                select DEBUG_UART_8250
                help
                  Say Y here if you want kernel low-level debugging support
 -                on MVEBU based platforms.
 +                on MVEBU based platforms on UART0.
 +
 +                This option should be used with the new bootloaders
 +                that remap the internal registers at 0xf1000000.
 +
 +                If the wrong DEBUG_MVEBU_UART* option is selected,
 +                when u-boot hands over to the kernel, the system
 +                silently crashes, with no serial output at all.
 +
 +      config DEBUG_MVEBU_UART1_ALTERNATE
 +              bool "Kernel low-level debugging messages via MVEBU UART1 (new bootloaders)"
 +              depends on ARCH_MVEBU
 +              select DEBUG_UART_8250
 +              help
 +                Say Y here if you want kernel low-level debugging support
 +                on MVEBU based platforms on UART1.
  
                  This option should be used with the new bootloaders
                  that remap the internal registers at 0xf1000000.
@@@ -943,28 -922,16 +946,28 @@@
        config DEBUG_SIRFPRIMA2_UART1
                bool "Kernel low-level debugging messages via SiRFprimaII UART1"
                depends on ARCH_PRIMA2
 +              select DEBUG_SIRFSOC_UART
                help
                  Say Y here if you want the debug print routines to direct
                  their output to the uart1 port on SiRFprimaII devices.
  
 -      config DEBUG_SIRFMARCO_UART1
 -              bool "Kernel low-level debugging messages via SiRFmarco UART1"
 -              depends on ARCH_MARCO
 +      config DEBUG_SIRFATLAS7_UART0
 +              bool "Kernel low-level debugging messages via SiRFatlas7 UART0"
 +              depends on ARCH_ATLAS7
 +              select DEBUG_SIRFSOC_UART
                help
                  Say Y here if you want the debug print routines to direct
 -                their output to the uart1 port on SiRFmarco devices.
 +                their output to the uart0 port on SiRFATLAS7 devices.The uart0
 +                is used on SiRFATLAS7 as a extra debug port.sometimes an extra
 +                debug port can be very useful.
 +
 +      config DEBUG_SIRFATLAS7_UART1
 +              bool "Kernel low-level debugging messages via SiRFatlas7 UART1"
 +              depends on ARCH_ATLAS7
 +              select DEBUG_SIRFSOC_UART
 +              help
 +                Say Y here if you want the debug print routines to direct
 +                their output to the uart1 port on SiRFATLAS7 devices.
  
        config STIH41X_DEBUG_ASC2
                bool "Use StiH415/416 ASC2 UART for low-level debug"
@@@ -1012,7 -979,7 +1015,7 @@@
                  for Mediatek mt6589 based platforms on UART0.
  
        config DEBUG_MT8127_UART0
 -              bool "Mediatek mt8127 UART0"
 +              bool "Mediatek mt8127/mt6592 UART0"
                depends on ARCH_MEDIATEK
                select DEBUG_UART_8250
                help
@@@ -1148,6 -1115,10 +1151,10 @@@
  
  endchoice
  
+ config DEBUG_AT91_UART
+       bool
+       depends on ARCH_AT91
+ 
  config DEBUG_EXYNOS_UART
        bool
  
@@@ -1200,16 -1171,11 +1207,15 @@@ config DEBUG_STI_UAR
        bool
        depends on ARCH_STI
  
 +config DEBUG_SIRFSOC_UART
 +      bool
 +      depends on ARCH_SIRF
 +
  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
@@@ -1240,7 -1206,7 +1246,7 @@@
        default "debug/renesas-scif.S" if DEBUG_RMOBILE_SCIFA4
        default "debug/s3c24xx.S" if DEBUG_S3C24XX_UART
        default "debug/s5pv210.S" if DEBUG_S5PV210_UART
 -      default "debug/sirf.S" if DEBUG_SIRFPRIMA2_UART1 || DEBUG_SIRFMARCO_UART1
 +      default "debug/sirf.S" if DEBUG_SIRFSOC_UART
        default "debug/sti.S" if DEBUG_STI_UART
        default "debug/tegra.S" if DEBUG_TEGRA_UART
        default "debug/ux500.S" if DEBUG_UX500_UART
@@@ -1296,10 -1262,7 +1302,10 @@@ config DEBUG_UART_PHY
        default 0x11009000 if DEBUG_MT8135_UART3
        default 0x16000000 if ARCH_INTEGRATOR
        default 0x18000300 if DEBUG_BCM_5301X
 +      default 0x18010000 if DEBUG_SIRFATLAS7_UART0
 +      default 0x18020000 if DEBUG_SIRFATLAS7_UART1
        default 0x1c090000 if DEBUG_VEXPRESS_UART0_RS1
 +      default 0x20001000 if DEBUG_HIP01_UART
        default 0x20060000 if DEBUG_RK29_UART0
        default 0x20064000 if DEBUG_RK29_UART1 || DEBUG_RK3X_UART2
        default 0x20068000 if DEBUG_RK29_UART2 || DEBUG_RK3X_UART3
@@@ -1325,13 -1288,12 +1331,13 @@@
        default 0x808c0000 if ARCH_EP93XX
        default 0x90020000 if DEBUG_NSPIRE_CLASSIC_UART || DEBUG_NSPIRE_CX_UART
        default 0xa9a00000 if DEBUG_MSM_UART
 +      default 0xb0060000 if DEBUG_SIRFPRIMA2_UART1
        default 0xb0090000 if DEBUG_VEXPRESS_UART0_CRX
        default 0xc0013000 if DEBUG_U300_UART
        default 0xc8000000 if ARCH_IXP4XX && !CPU_BIG_ENDIAN
        default 0xc8000003 if ARCH_IXP4XX && CPU_BIG_ENDIAN
        default 0xd0000000 if ARCH_SPEAR3XX || ARCH_SPEAR6XX
 -      default 0xd0012000 if DEBUG_MVEBU_UART
 +      default 0xd0012000 if DEBUG_MVEBU_UART0
        default 0xc81004c0 if DEBUG_MESON_UARTAO
        default 0xd4017000 if DEBUG_MMP_UART2
        default 0xd4018000 if DEBUG_MMP_UART3
@@@ -1345,8 -1307,7 +1351,8 @@@
        default 0xe8008000 if DEBUG_R7S72100_SCIF2
        default 0xf0000be0 if ARCH_EBSA110
        default 0xf040ab00 if DEBUG_BRCMSTB_UART
 -      default 0xf1012000 if DEBUG_MVEBU_UART_ALTERNATE
 +      default 0xf1012000 if DEBUG_MVEBU_UART0_ALTERNATE
 +      default 0xf1012100 if DEBUG_MVEBU_UART1_ALTERNATE
        default 0xf1012000 if ARCH_DOVE || ARCH_MV78XX0 || \
                                ARCH_ORION5X
        default 0xf7fc9000 if DEBUG_BERLIN_UART
@@@ -1370,8 -1331,7 +1376,8 @@@
                DEBUG_RCAR_GEN2_SCIF0 || DEBUG_RCAR_GEN2_SCIF2 || \
                DEBUG_RMOBILE_SCIFA0 || DEBUG_RMOBILE_SCIFA1 || \
                DEBUG_RMOBILE_SCIFA4 || DEBUG_S3C24XX_UART || \
 -              DEBUG_UART_BCM63XX || DEBUG_ASM9260_UART
 +              DEBUG_UART_BCM63XX || DEBUG_ASM9260_UART || \
 +              DEBUG_SIRFSOC_UART
  
  config DEBUG_UART_VIRT
        hex "Virtual base address of debug UART"
@@@ -1428,12 -1388,8 +1434,12 @@@
        default 0xfeb30c00 if DEBUG_KEYSTONE_UART0
        default 0xfeb31000 if DEBUG_KEYSTONE_UART1
        default 0xfec02000 if DEBUG_SOCFPGA_UART
 -      default 0xfec12000 if DEBUG_MVEBU_UART || DEBUG_MVEBU_UART_ALTERNATE
 +      default 0xfec12000 if DEBUG_MVEBU_UART0 || DEBUG_MVEBU_UART0_ALTERNATE
 +      default 0xfec12100 if DEBUG_MVEBU_UART1_ALTERNATE
 +      default 0xfec10000 if DEBUG_SIRFATLAS7_UART0
        default 0xfec20000 if DEBUG_DAVINCI_DMx_UART0
 +      default 0xfec20000 if DEBUG_SIRFATLAS7_UART1
 +      default 0xfec60000 if DEBUG_SIRFPRIMA2_UART1
        default 0xfec90000 if DEBUG_RK32_UART2
        default 0xfed0c000 if DEBUG_DAVINCI_DA8XX_UART1
        default 0xfed0d000 if DEBUG_DAVINCI_DA8XX_UART2
@@@ -1449,12 -1405,11 +1455,12 @@@
        default 0xfef36000 if DEBUG_HIGHBANK_UART
        default 0xfefff700 if ARCH_IOP33X
        default 0xff003000 if DEBUG_U300_UART
 +      default 0xffd01000 if DEBUG_HIP01_UART
        default DEBUG_UART_PHYS if !MMU
        depends on DEBUG_LL_UART_8250 || DEBUG_LL_UART_PL01X || \
                DEBUG_UART_8250 || DEBUG_UART_PL01X || DEBUG_MESON_UARTAO || \
                DEBUG_MSM_UART || DEBUG_QCOM_UARTDM || DEBUG_S3C24XX_UART || \
 -              DEBUG_UART_BCM63XX || DEBUG_ASM9260_UART
 +              DEBUG_UART_BCM63XX || DEBUG_ASM9260_UART || DEBUG_SIRFSOC_UART
  
  config DEBUG_UART_8250_SHIFT
        int "Register offset shift for the 8250 debug UART"