Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull ARM SoC fixes from Olof Johansson:
 "A few fixes for fallout that we didn't catch in time in -next, or
  smaller warning fixes that have been discovered since"

* tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  soc: qcom/spm: shut up uninitialized variable warning
  ARM: realview: fix device tree build
  ARM: debug-ll: fix BCM63xx entry for multiplatform
  ARM: dts: armadillo800eva Correct extal1 frequency to 24 MHz

diff --combined arch/arm/Kconfig.debug
index 5c0e5cc8ed1026373b0f34a97c95bbfc49e4f5c5,baee86602b04b0d8d9858ffcada72396a8a67f00..c6b6175d020329ac74eeefb0eebf1a6c353d6ea8
--- 1/arch/arm/Kconfig.debug
--- 2/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@@ -15,6 -15,20 +15,6 @@@ config ARM_PTDUM
          kernel.
          If in doubt, say "N"
  
 -config STRICT_DEVMEM
 -      bool "Filter access to /dev/mem"
 -      depends on MMU
 -      ---help---
 -        If this option is disabled, you allow userspace (root) access to all
 -        of memory, including kernel and userspace memory. Accidental
 -        access to this is obviously disastrous, but specific access can
 -        be used by people debugging the kernel.
 -
 -        If this option is switched on, the /dev/mem file only allows
 -        userspace access to memory mapped peripherals.
 -
 -          If in doubt, say Y.
 -
  # RMK wants arm kernels compiled with frame pointers or stack unwinding.
  # If you know what you are doing and are willing to live without stack
  # traces, you can get a slightly smaller kernel by setting this option to
@@@ -129,12 -143,7 +129,12 @@@ choic
  
        config DEBUG_BCM2835
                bool "Kernel low-level debugging on BCM2835 PL011 UART"
 -              depends on ARCH_BCM2835
 +              depends on ARCH_BCM2835 && ARCH_MULTI_V6
 +              select DEBUG_UART_PL01X
 +
 +      config DEBUG_BCM2836
 +              bool "Kernel low-level debugging on BCM2836 PL011 UART"
 +              depends on ARCH_BCM2835 && ARCH_MULTI_V7
                select DEBUG_UART_PL01X
  
        config DEBUG_BCM_5301X
@@@ -153,10 -162,9 +153,9 @@@
                  mobile SoCs in the Kona family of chips (e.g. bcm28155,
                  bcm11351, etc...)
  
-       config DEBUG_BCM63XX
+       config DEBUG_BCM63XX_UART
                bool "Kernel low-level debugging on BCM63XX UART"
                depends on ARCH_BCM_63XX
-               select DEBUG_UART_BCM63XX
  
        config DEBUG_BERLIN_UART
                bool "Marvell Berlin SoC Debug UART"
@@@ -1414,7 -1422,7 +1413,7 @@@ config DEBUG_LL_INCLUD
        default "debug/vf.S" if DEBUG_VF_UART
        default "debug/vt8500.S" if DEBUG_VT8500_UART0
        default "debug/zynq.S" if DEBUG_ZYNQ_UART0 || DEBUG_ZYNQ_UART1
-       default "debug/bcm63xx.S" if DEBUG_UART_BCM63XX
+       default "debug/bcm63xx.S" if DEBUG_BCM63XX_UART
        default "debug/digicolor.S" if DEBUG_DIGICOLOR_UA0
        default "mach/debug-macro.S"
  
@@@ -1428,10 -1436,6 +1427,6 @@@ config DEBUG_UART_825
                ARCH_IOP13XX || ARCH_IOP32X || ARCH_IOP33X || ARCH_IXP4XX || \
                ARCH_RPC
  
- # Compatibility options for BCM63xx
- config DEBUG_UART_BCM63XX
-       def_bool ARCH_BCM_63XX
- 
  config DEBUG_UART_PHYS
        hex "Physical base address of debug UART"
        default 0x00100a00 if DEBUG_NETX_UART
@@@ -1466,7 -1470,6 +1461,7 @@@
        default 0x20064000 if DEBUG_RK29_UART1 || DEBUG_RK3X_UART2
        default 0x20068000 if DEBUG_RK29_UART2 || DEBUG_RK3X_UART3
        default 0x20201000 if DEBUG_BCM2835
 +      default 0x3f201000 if DEBUG_BCM2836
        default 0x3e000000 if DEBUG_BCM_KONA_UART
        default 0x4000e400 if DEBUG_LL_UART_EFM32
        default 0x40081000 if DEBUG_LPC18XX_UART0
@@@ -1529,7 -1532,7 +1524,7 @@@
        default 0xfffb0000 if DEBUG_OMAP1UART1 || DEBUG_OMAP7XXUART1
        default 0xfffb0800 if DEBUG_OMAP1UART2 || DEBUG_OMAP7XXUART2
        default 0xfffb9800 if DEBUG_OMAP1UART3 || DEBUG_OMAP7XXUART3
-       default 0xfffe8600 if DEBUG_UART_BCM63XX
+       default 0xfffe8600 if DEBUG_BCM63XX_UART
        default 0xfffff700 if ARCH_IOP33X
        depends on ARCH_EP93XX || \
                DEBUG_LL_UART_8250 || DEBUG_LL_UART_PL01X || \
@@@ -1542,7 -1545,7 +1537,7 @@@
                DEBUG_RMOBILE_SCIFA0 || DEBUG_RMOBILE_SCIFA1 || \
                DEBUG_RMOBILE_SCIFA4 || DEBUG_S3C24XX_UART || \
                DEBUG_S3C64XX_UART || \
-               DEBUG_UART_BCM63XX || DEBUG_ASM9260_UART || \
+               DEBUG_BCM63XX_UART || DEBUG_ASM9260_UART || \
                DEBUG_SIRFSOC_UART || DEBUG_DIGICOLOR_UA0 || \
                DEBUG_AT91_UART
  
@@@ -1553,7 -1556,7 +1548,7 @@@ config DEBUG_UART_VIR
        default 0xf0000be0 if ARCH_EBSA110
        default 0xf0010000 if DEBUG_ASM9260_UART
        default 0xf01fb000 if DEBUG_NOMADIK_UART
 -      default 0xf0201000 if DEBUG_BCM2835
 +      default 0xf0201000 if DEBUG_BCM2835 || DEBUG_BCM2836
        default 0xf1000300 if DEBUG_BCM_5301X
        default 0xf1002000 if DEBUG_MT8127_UART0
        default 0xf1006000 if DEBUG_MT6589_UART0
@@@ -1588,7 -1591,7 +1583,7 @@@
        default 0xfb10c000 if DEBUG_REALVIEW_PB1176_PORT
        default 0xfc40ab00 if DEBUG_BRCMSTB_UART
        default 0xfc705000 if DEBUG_ZTE_ZX
-       default 0xfcfe8600 if DEBUG_UART_BCM63XX
+       default 0xfcfe8600 if DEBUG_BCM63XX_UART
        default 0xfd000000 if DEBUG_SPEAR3XX || DEBUG_SPEAR13XX
        default 0xfd012000 if DEBUG_MVEBU_UART0_ALTERNATE && ARCH_MV78XX0
        default 0xfd883000 if DEBUG_ALPINE_UART0
@@@ -1638,7 -1641,7 +1633,7 @@@
                DEBUG_NETX_UART || \
                DEBUG_QCOM_UARTDM || DEBUG_S3C24XX_UART || \
                DEBUG_S3C64XX_UART || \
-               DEBUG_UART_BCM63XX || DEBUG_ASM9260_UART || \
+               DEBUG_BCM63XX_UART || DEBUG_ASM9260_UART || \
                DEBUG_SIRFSOC_UART || DEBUG_DIGICOLOR_UA0
  
  config DEBUG_UART_8250_SHIFT

diff --combined arch/arm/boot/dts/r8a7740-armadillo800eva.dts
index 78a21f2828dff6d1cbafa9139b12791d4840936d,5c76dcc89df52de61e4995e1e03848b66cd0bab8..c548cabb102f5ae1eb063a43117adedecf52b0b0
--- 1/arch/arm/boot/dts/r8a7740-armadillo800eva.dts
--- 2/arch/arm/boot/dts/r8a7740-armadillo800eva.dts
+++ b/arch/arm/boot/dts/r8a7740-armadillo800eva.dts
@@@ -85,7 -85,7 +85,7 @@@
                        gpios = <&pfc 99 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_POWER>;
                        label = "SW3";
 -                      gpio-key,wakeup;
 +                      wakeup-source;
                };
  
                back-key {
@@@ -180,7 -180,7 +180,7 @@@
  };
  
  &extal1_clk {
-       clock-frequency = <25000000>;
+       clock-frequency = <24000000>;
  };
  &extal2_clk {
        clock-frequency = <48000000>;

diff --combined drivers/soc/qcom/spm.c
index 0ad66fa9bb1aa47c97a7a5c1cae80f7bbc945473,65bce1eecaf868ddd60cca8324920f5d5fa57802..5548a31e1a39a100142b45841cbe38e1aa007e38
--- 1/drivers/soc/qcom/spm.c
--- 2/drivers/soc/qcom/spm.c
+++ b/drivers/soc/qcom/spm.c
@@@ -116,7 -116,7 +116,7 @@@ static const struct spm_reg_data spm_re
  
  static DEFINE_PER_CPU(struct spm_driver_data *, cpu_spm_drv);
  
 -typedef int (*idle_fn)(int);
 +typedef int (*idle_fn)(void);
  static DEFINE_PER_CPU(idle_fn*, qcom_idle_ops);
  
  static inline void spm_register_write(struct spm_driver_data *drv,
@@@ -179,10 -179,10 +179,10 @@@ static int qcom_pm_collapse(unsigned lo
        return -1;
  }
  
 -static int qcom_cpu_spc(int cpu)
 +static int qcom_cpu_spc(void)
  {
        int ret;
 -      struct spm_driver_data *drv = per_cpu(cpu_spm_drv, cpu);
 +      struct spm_driver_data *drv = __this_cpu_read(cpu_spm_drv);
  
        spm_set_low_power_mode(drv, PM_SLEEP_MODE_SPC);
        ret = cpu_suspend(0, qcom_pm_collapse);
@@@ -197,9 -197,9 +197,9 @@@
        return ret;
  }
  
 -static int qcom_idle_enter(int cpu, unsigned long index)
 +static int qcom_idle_enter(unsigned long index)
  {
 -      return per_cpu(qcom_idle_ops, cpu)[index](cpu);
 +      return __this_cpu_read(qcom_idle_ops)[index]();
  }
  
  static const struct of_device_id qcom_idle_state_match[] __initconst = {
@@@ -288,7 -288,7 +288,7 @@@ static struct spm_driver_data *spm_get_
        struct spm_driver_data *drv = NULL;
        struct device_node *cpu_node, *saw_node;
        int cpu;
-       bool found;
+       bool found = 0;
  
        for_each_possible_cpu(cpu) {
                cpu_node = of_cpu_device_node_get(cpu);