Merge branch 'next/fixes-non-critical' into next/cleanup

Merging in the few fixes we had also received, no need to keep those in
a separate branch.

* next/fixes-non-critical:
  drivers: CCI: Correct use of ! and &
  MAINTAINERS: Add sdhci-st file to ARCH/STI architecture
  ARM: EXYNOS: Fix build breakge with PM_SLEEP=n
  ARM: omap2+: gpmc-nand: Use dynamic platform_device_alloc()
  omap16xx: Removes fixme no longer needed in ocpi_enable()
  ARM: dts: OMAP5: Add device nodes for ABB
  ARM: omap2+: usb-tusb6010.c: Cleaning up variable is set more than once

Signed-off-by: Olof Johansson <olof@lixom.net>

diff --combined MAINTAINERS
index 0ea2036,a36b11c..f561562
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1097,13 -1097,14 +1097,13 @@@ L:   linux-arm-kernel@lists.infradead.or
  S:    Maintained
  F:    arch/arm/mach-berlin/
  
 -ARM/Marvell Dove/Kirkwood/MV78xx0/Orion SOC support
 +ARM/Marvell Dove/MV78xx0/Orion SOC support
  M:    Jason Cooper <jason@lakedaemon.net>
  M:    Andrew Lunn <andrew@lunn.ch>
  M:    Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm/mach-dove/
 -F:    arch/arm/mach-kirkwood/
  F:    arch/arm/mach-mv78xx0/
  F:    arch/arm/mach-orion5x/
  F:    arch/arm/plat-orion/
@@@ -1356,6 -1357,7 +1356,7 @@@ F:      drivers/pinctrl/pinctrl-st.
  F:    drivers/media/rc/st_rc.c
  F:    drivers/i2c/busses/i2c-st.c
  F:    drivers/tty/serial/st-asc.c
+ F:    drivers/mmc/host/sdhci-st.c
  
  ARM/TECHNOLOGIC SYSTEMS TS7250 MACHINE SUPPORT
  M:    Lennert Buytenhek <kernel@wantstofly.org>

diff --combined arch/arm/mach-exynos/platsmp.c
index 39ad38f,29500da..51e941a
--- 1/arch/arm/mach-exynos/platsmp.c
--- 2/arch/arm/mach-exynos/platsmp.c
+++ b/arch/arm/mach-exynos/platsmp.c
@@@ -1,4 -1,5 +1,4 @@@
 -/* linux/arch/arm/mach-exynos4/platsmp.c
 - *
 + /*
   * Copyright (c) 2010-2011 Samsung Electronics Co., Ltd.
   *            http://www.samsung.com
   *
@@@ -31,6 -32,72 +31,72 @@@
  
  extern void exynos4_secondary_startup(void);
  
+ /**
+  * exynos_core_power_down : power down the specified cpu
+  * @cpu : the cpu to power down
+  *
+  * Power down the specified cpu. The sequence must be finished by a
+  * call to cpu_do_idle()
+  *
+  */
+ void exynos_cpu_power_down(int cpu)
+ {
+       __raw_writel(0, EXYNOS_ARM_CORE_CONFIGURATION(cpu));
+ }
+ 
+ /**
+  * exynos_cpu_power_up : power up the specified cpu
+  * @cpu : the cpu to power up
+  *
+  * Power up the specified cpu
+  */
+ void exynos_cpu_power_up(int cpu)
+ {
+       __raw_writel(S5P_CORE_LOCAL_PWR_EN,
+                    EXYNOS_ARM_CORE_CONFIGURATION(cpu));
+ }
+ 
+ /**
+  * exynos_cpu_power_state : returns the power state of the cpu
+  * @cpu : the cpu to retrieve the power state from
+  *
+  */
+ int exynos_cpu_power_state(int cpu)
+ {
+       return (__raw_readl(EXYNOS_ARM_CORE_STATUS(cpu)) &
+                       S5P_CORE_LOCAL_PWR_EN);
+ }
+ 
+ /**
+  * exynos_cluster_power_down : power down the specified cluster
+  * @cluster : the cluster to power down
+  */
+ void exynos_cluster_power_down(int cluster)
+ {
+       __raw_writel(0, EXYNOS_COMMON_CONFIGURATION(cluster));
+ }
+ 
+ /**
+  * exynos_cluster_power_up : power up the specified cluster
+  * @cluster : the cluster to power up
+  */
+ void exynos_cluster_power_up(int cluster)
+ {
+       __raw_writel(S5P_CORE_LOCAL_PWR_EN,
+                    EXYNOS_COMMON_CONFIGURATION(cluster));
+ }
+ 
+ /**
+  * exynos_cluster_power_state : returns the power state of the cluster
+  * @cluster : the cluster to retrieve the power state from
+  *
+  */
+ int exynos_cluster_power_state(int cluster)
+ {
+       return (__raw_readl(EXYNOS_COMMON_STATUS(cluster)) &
+                       S5P_CORE_LOCAL_PWR_EN);
+ }
+ 
  static inline void __iomem *cpu_boot_reg_base(void)
  {
        if (soc_is_exynos4210() && samsung_rev() == EXYNOS4210_REV_1_1)

diff --combined arch/arm/mach-exynos/pm.c
index f127c0c,20a8e0e..3d06495
--- 1/arch/arm/mach-exynos/pm.c
--- 2/arch/arm/mach-exynos/pm.c
+++ b/arch/arm/mach-exynos/pm.c
@@@ -35,7 -35,6 +35,7 @@@
  
  #include "common.h"
  #include "regs-pmu.h"
 +#include "regs-sys.h"
  
  /**
   * struct exynos_wkup_irq - Exynos GIC to PMU IRQ mapping
@@@ -101,72 -100,6 +101,6 @@@ static int exynos_irq_set_wake(struct i
        return -ENOENT;
  }
  
- /**
-  * exynos_core_power_down : power down the specified cpu
-  * @cpu : the cpu to power down
-  *
-  * Power down the specified cpu. The sequence must be finished by a
-  * call to cpu_do_idle()
-  *
-  */
- void exynos_cpu_power_down(int cpu)
- {
-       __raw_writel(0, EXYNOS_ARM_CORE_CONFIGURATION(cpu));
- }
- 
- /**
-  * exynos_cpu_power_up : power up the specified cpu
-  * @cpu : the cpu to power up
-  *
-  * Power up the specified cpu
-  */
- void exynos_cpu_power_up(int cpu)
- {
-       __raw_writel(S5P_CORE_LOCAL_PWR_EN,
-                    EXYNOS_ARM_CORE_CONFIGURATION(cpu));
- }
- 
- /**
-  * exynos_cpu_power_state : returns the power state of the cpu
-  * @cpu : the cpu to retrieve the power state from
-  *
-  */
- int exynos_cpu_power_state(int cpu)
- {
-       return (__raw_readl(EXYNOS_ARM_CORE_STATUS(cpu)) &
-                       S5P_CORE_LOCAL_PWR_EN);
- }
- 
- /**
-  * exynos_cluster_power_down : power down the specified cluster
-  * @cluster : the cluster to power down
-  */
- void exynos_cluster_power_down(int cluster)
- {
-       __raw_writel(0, EXYNOS_COMMON_CONFIGURATION(cluster));
- }
- 
- /**
-  * exynos_cluster_power_up : power up the specified cluster
-  * @cluster : the cluster to power up
-  */
- void exynos_cluster_power_up(int cluster)
- {
-       __raw_writel(S5P_CORE_LOCAL_PWR_EN,
-                    EXYNOS_COMMON_CONFIGURATION(cluster));
- }
- 
- /**
-  * exynos_cluster_power_state : returns the power state of the cluster
-  * @cluster : the cluster to retrieve the power state from
-  *
-  */
- int exynos_cluster_power_state(int cluster)
- {
-       return (__raw_readl(EXYNOS_COMMON_STATUS(cluster)) &
-                       S5P_CORE_LOCAL_PWR_EN);
- }
- 
  #define EXYNOS_BOOT_VECTOR_ADDR       (samsung_rev() == EXYNOS4210_REV_1_1 ? \
                        S5P_INFORM7 : (samsung_rev() == EXYNOS4210_REV_1_0 ? \
                        (sysram_base_addr + 0x24) : S5P_INFORM0))