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

Pull ARM SoC fixes from Arnd Bergmann:
 "Most of the changes this time are for incorrect device nodes in
  various ways, on on imx, berlin, exynos, ux500, uniphier, omap and
  meson.

  Chen-Yu Tsai now co-maintains mach-sunxi (Allwinner).

  Other bug fixes include
   - a partial revert of a broken tegra gpio patch
   - irq affinity for arm ccn
   - suspend on one Armada 385 machine
   - enable ZONE_DMA to avoid an OMAP crash for over 2GB RAM
   - turning on a regulator on beagleboard-x15 for HDMI
   - making the omap gpmc debug code visible
   - setup of orion network switch
   - a rare build regression for pxa"

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (22 commits)
  ARM: OMAP2+: Fix imprecise external abort caused by bogus SRAM init
  thermal: exynos: Fix register read in TMU
  ARM: OMAP2+: Fix oops with LPAE and more than 2GB of memory
  ARM: tegra: Comment out gpio-ranges properties
  ARM: dts: uniphier: fix IRQ number for devices on PH1-LD6b ref board
  drivers/perf: arm_pmu: avoid CPU device_node reference leak
  bus: arm-ccn: Fix irq affinity setting on CPU migration
  bus: arm-ccn: Handle correctly no-more-cpus case
  ARM: mvebu: correct a385-db-ap compatible string
  ARM: meson6: DTS: Fix wrong reg mapping and IRQ numbers
  MAINTAINERS: Update Allwinner entry and add new maintainer
  ARM: ux500: modify initial levelshifter status
  ARM: pxa: fix pxa3xx DFI lockup hack
  Documentation: ARM: List new omap MMC requirements
  memory: omap-gpmc: dump "before" state before first modification
  memory: omap-gpmc: Fix unselectable debug option for GPMC
  ARM: dts: am57xx-beagle-x15: set VDD_SD to always-on
  ARM: dts: Fix audio card detection on Peach boards
  ARM: EXYNOS: Fix double of_node_put() when parsing child power domains
  ARM: orion: Fix DSA platform device after mvmdio conversion
  ...

28 files changed, 103 insertions, 44 deletions

diff --git a/Documentation/arm/OMAP/README b/Documentation/arm/OMAP/README
new file mode 100644
index 000000000000..75645c45d14a
--- /dev/null
+++ b/Documentation/arm/OMAP/README
@@ -0,0 +1,7 @@
+This file contains documentation for running mainline
+kernel on omaps.
+
+KERNEL          NEW DEPENDENCIES
+v4.3+           Update is needed for custom .config files to make sure
+                CONFIG_REGULATOR_PBIAS is enabled for MMC1 to work
+                properly.
diff --git a/MAINTAINERS b/MAINTAINERS
index fb7d2e4af200..ddc88c089c48 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -894,11 +894,12 @@ M:	Lennert Buytenhek <kernel@wantstofly.org>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:      Maintained
 
-ARM/Allwinner A1X SoC support
+ARM/Allwinner sunXi SoC support
 M:      Maxime Ripard <maxime.ripard@free-electrons.com>
+M:      Chen-Yu Tsai <wens@csie.org>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:      Maintained
-N:      sun[x4567]i
+N:      sun[x456789]i
 
 ARM/Allwinner SoC Clock Support
 M:      Emilio López <emilio@elopez.com.ar>
diff --git a/arch/arm/boot/dts/am57xx-beagle-x15.dts b/arch/arm/boot/dts/am57xx-beagle-x15.dts
index 568adf5efde0..d55e3ea89fda 100644
--- a/arch/arm/boot/dts/am57xx-beagle-x15.dts
+++ b/arch/arm/boot/dts/am57xx-beagle-x15.dts
@@ -402,11 +402,12 @@
                                 /* SMPS9 unused */
 
                                 ldo1_reg: ldo1 {
-                                        /* VDD_SD  */
+                                        /* VDD_SD / VDDSHV8  */
                                         regulator-name = "ldo1";
                                         regulator-min-microvolt = <1800000>;
                                         regulator-max-microvolt = <3300000>;
                                         regulator-boot-on;
+                                        regulator-always-on;
                                 };
 
                                 ldo2_reg: ldo2 {
diff --git a/arch/arm/boot/dts/armada-385-db-ap.dts b/arch/arm/boot/dts/armada-385-db-ap.dts
index 89f5a95954ed..4047621b137e 100644
--- a/arch/arm/boot/dts/armada-385-db-ap.dts
+++ b/arch/arm/boot/dts/armada-385-db-ap.dts
@@ -46,7 +46,7 @@
 
 / {
         model = "Marvell Armada 385 Access Point Development Board";
-        compatible = "marvell,a385-db-ap", "marvell,armada385", "marvell,armada38x";
+        compatible = "marvell,a385-db-ap", "marvell,armada385", "marvell,armada380";
 
         chosen {
                 stdout-path = "serial1:115200n8";
diff --git a/arch/arm/boot/dts/berlin2q.dtsi b/arch/arm/boot/dts/berlin2q.dtsi
index 63a48490e2f9..d4dbd28d348c 100644
--- a/arch/arm/boot/dts/berlin2q.dtsi
+++ b/arch/arm/boot/dts/berlin2q.dtsi
@@ -152,7 +152,7 @@
                 };
 
                 usb_phy2: phy@a2f400 {
-                        compatible = "marvell,berlin2-usb-phy";
+                        compatible = "marvell,berlin2cd-usb-phy";
                         reg = <0xa2f400 0x128>;
                         #phy-cells = <0>;
                         resets = <&chip_rst 0x104 14>;
@@ -170,7 +170,7 @@
                 };
 
                 usb_phy0: phy@b74000 {
-                        compatible = "marvell,berlin2-usb-phy";
+                        compatible = "marvell,berlin2cd-usb-phy";
                         reg = <0xb74000 0x128>;
                         #phy-cells = <0>;
                         resets = <&chip_rst 0x104 12>;
@@ -178,7 +178,7 @@
                 };
 
                 usb_phy1: phy@b78000 {
-                        compatible = "marvell,berlin2-usb-phy";
+                        compatible = "marvell,berlin2cd-usb-phy";
                         reg = <0xb78000 0x128>;
                         #phy-cells = <0>;
                         resets = <&chip_rst 0x104 13>;
diff --git a/arch/arm/boot/dts/exynos5420-peach-pit.dts b/arch/arm/boot/dts/exynos5420-peach-pit.dts
index 8f4d76c5e11c..1b95da79293c 100644
--- a/arch/arm/boot/dts/exynos5420-peach-pit.dts
+++ b/arch/arm/boot/dts/exynos5420-peach-pit.dts
@@ -915,6 +915,11 @@
         };
 };
 
+&pmu_system_controller {
+        assigned-clocks = <&pmu_system_controller 0>;
+        assigned-clock-parents = <&clock CLK_FIN_PLL>;
+};
+
 &rtc {
         status = "okay";
         clocks = <&clock CLK_RTC>, <&max77802 MAX77802_CLK_32K_AP>;
diff --git a/arch/arm/boot/dts/exynos5800-peach-pi.dts b/arch/arm/boot/dts/exynos5800-peach-pi.dts
index 7d5b386b5ae6..8f40c7e549bd 100644
--- a/arch/arm/boot/dts/exynos5800-peach-pi.dts
+++ b/arch/arm/boot/dts/exynos5800-peach-pi.dts
@@ -878,6 +878,11 @@
         };
 };
 
+&pmu_system_controller {
+        assigned-clocks = <&pmu_system_controller 0>;
+        assigned-clock-parents = <&clock CLK_FIN_PLL>;
+};
+
 &rtc {
         status = "okay";
         clocks = <&clock CLK_RTC>, <&max77802 MAX77802_CLK_32K_AP>;
diff --git a/arch/arm/boot/dts/imx7d.dtsi b/arch/arm/boot/dts/imx7d.dtsi
index b738ce0f9d9b..6e444bb873f9 100644
--- a/arch/arm/boot/dts/imx7d.dtsi
+++ b/arch/arm/boot/dts/imx7d.dtsi
@@ -588,10 +588,10 @@
                                 status = "disabled";
                         };
 
-                        uart2: serial@30870000 {
+                        uart2: serial@30890000 {
                                 compatible = "fsl,imx7d-uart",
                                              "fsl,imx6q-uart";
-                                reg = <0x30870000 0x10000>;
+                                reg = <0x30890000 0x10000>;
                                 interrupts = <GIC_SPI 27 IRQ_TYPE_LEVEL_HIGH>;
                                 clocks = <&clks IMX7D_UART2_ROOT_CLK>,
                                         <&clks IMX7D_UART2_ROOT_CLK>;
diff --git a/arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts b/arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts
index 91146c318798..5b0430041ec6 100644
--- a/arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts
+++ b/arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts
@@ -12,7 +12,7 @@
 
 / {
         model = "LogicPD Zoom DM3730 Torpedo Development Kit";
-        compatible = "logicpd,dm3730-torpedo-devkit", "ti,omap36xx";
+        compatible = "logicpd,dm3730-torpedo-devkit", "ti,omap3630", "ti,omap3";
 
         gpio_keys {
                 compatible = "gpio-keys";
diff --git a/arch/arm/boot/dts/meson.dtsi b/arch/arm/boot/dts/meson.dtsi
index 548441384d2a..8c77c87660cd 100644
--- a/arch/arm/boot/dts/meson.dtsi
+++ b/arch/arm/boot/dts/meson.dtsi
@@ -67,7 +67,7 @@
 
         timer@c1109940 {
                 compatible = "amlogic,meson6-timer";
-                reg = <0xc1109940 0x14>;
+                reg = <0xc1109940 0x18>;
                 interrupts = <0 10 1>;
         };
 
@@ -80,36 +80,37 @@
                 wdt: watchdog@c1109900 {
                         compatible = "amlogic,meson6-wdt";
                         reg = <0xc1109900 0x8>;
+                        interrupts = <0 0 1>;
                 };
 
                 uart_AO: serial@c81004c0 {
                         compatible = "amlogic,meson-uart";
-                        reg = <0xc81004c0 0x14>;
+                        reg = <0xc81004c0 0x18>;
                         interrupts = <0 90 1>;
                         clocks = <&clk81>;
                         status = "disabled";
                 };
 
-                uart_A: serial@c81084c0 {
+                uart_A: serial@c11084c0 {
                         compatible = "amlogic,meson-uart";
-                        reg = <0xc81084c0 0x14>;
-                        interrupts = <0 90 1>;
+                        reg = <0xc11084c0 0x18>;
+                        interrupts = <0 26 1>;
                         clocks = <&clk81>;
                         status = "disabled";
                 };
 
-                uart_B: serial@c81084dc {
+                uart_B: serial@c11084dc {
                         compatible = "amlogic,meson-uart";
-                        reg = <0xc81084dc 0x14>;
-                        interrupts = <0 90 1>;
+                        reg = <0xc11084dc 0x18>;
+                        interrupts = <0 75 1>;
                         clocks = <&clk81>;
                         status = "disabled";
                 };
 
-                uart_C: serial@c8108700 {
+                uart_C: serial@c1108700 {
                         compatible = "amlogic,meson-uart";
-                        reg = <0xc8108700 0x14>;
-                        interrupts = <0 90 1>;
+                        reg = <0xc1108700 0x18>;
+                        interrupts = <0 93 1>;
                         clocks = <&clk81>;
                         status = "disabled";
                 };
diff --git a/arch/arm/boot/dts/omap3-evm-37xx.dts b/arch/arm/boot/dts/omap3-evm-37xx.dts
index 16e8ce350dda..bb339d1648e0 100644
--- a/arch/arm/boot/dts/omap3-evm-37xx.dts
+++ b/arch/arm/boot/dts/omap3-evm-37xx.dts
@@ -13,7 +13,7 @@
 
 / {
         model = "TI OMAP37XX EVM (TMDSEVM3730)";
-        compatible = "ti,omap3-evm-37xx", "ti,omap36xx";
+        compatible = "ti,omap3-evm-37xx", "ti,omap3630", "ti,omap3";
 
         memory {
                 device_type = "memory";
diff --git a/arch/arm/boot/dts/ste-hrefv60plus.dtsi b/arch/arm/boot/dts/ste-hrefv60plus.dtsi
index 810cda743b6d..9c2387b34d0c 100644
--- a/arch/arm/boot/dts/ste-hrefv60plus.dtsi
+++ b/arch/arm/boot/dts/ste-hrefv60plus.dtsi
@@ -56,7 +56,7 @@
                                         /* VMMCI level-shifter enable */
                                         default_hrefv60_cfg2 {
                                                 pins = "GPIO169_D22";
-                                                ste,config = <&gpio_out_lo>;
+                                                ste,config = <&gpio_out_hi>;
                                         };
                                         /* VMMCI level-shifter voltage select */
                                         default_hrefv60_cfg3 {
diff --git a/arch/arm/boot/dts/tegra114.dtsi b/arch/arm/boot/dts/tegra114.dtsi
index 9d4f86e9c50a..d845bd1448b5 100644
--- a/arch/arm/boot/dts/tegra114.dtsi
+++ b/arch/arm/boot/dts/tegra114.dtsi
@@ -234,7 +234,9 @@
                 gpio-controller;
                 #interrupt-cells = <2>;
                 interrupt-controller;
+                /*
                 gpio-ranges = <&pinmux 0 0 246>;
+                */
         };
 
         apbmisc@70000800 {
diff --git a/arch/arm/boot/dts/tegra124.dtsi b/arch/arm/boot/dts/tegra124.dtsi
index 1e204a6de12c..819e2ae2cabe 100644
--- a/arch/arm/boot/dts/tegra124.dtsi
+++ b/arch/arm/boot/dts/tegra124.dtsi
@@ -258,7 +258,9 @@
                 gpio-controller;
                 #interrupt-cells = <2>;
                 interrupt-controller;
+                /*
                 gpio-ranges = <&pinmux 0 0 251>;
+                */
         };
 
         apbdma: dma@0,60020000 {
diff --git a/arch/arm/boot/dts/tegra20.dtsi b/arch/arm/boot/dts/tegra20.dtsi
index e058709e6d98..969b828505ae 100644
--- a/arch/arm/boot/dts/tegra20.dtsi
+++ b/arch/arm/boot/dts/tegra20.dtsi
@@ -244,7 +244,9 @@
                 gpio-controller;
                 #interrupt-cells = <2>;
                 interrupt-controller;
+                /*
                 gpio-ranges = <&pinmux 0 0 224>;
+                */
         };
 
         apbmisc@70000800 {
diff --git a/arch/arm/boot/dts/tegra30.dtsi b/arch/arm/boot/dts/tegra30.dtsi
index fe04fb5e155f..c6938ad1b543 100644
--- a/arch/arm/boot/dts/tegra30.dtsi
+++ b/arch/arm/boot/dts/tegra30.dtsi
@@ -349,7 +349,9 @@
                 gpio-controller;
                 #interrupt-cells = <2>;
                 interrupt-controller;
+                /*
                 gpio-ranges = <&pinmux 0 0 248>;
+                */
         };
 
         apbmisc@70000800 {
diff --git a/arch/arm/boot/dts/uniphier-ph1-ld6b-ref.dts b/arch/arm/boot/dts/uniphier-ph1-ld6b-ref.dts
index 33963acd7e8f..f80f772d99fb 100644
--- a/arch/arm/boot/dts/uniphier-ph1-ld6b-ref.dts
+++ b/arch/arm/boot/dts/uniphier-ph1-ld6b-ref.dts
@@ -85,7 +85,7 @@
 };
 
 &ethsc {
-        interrupts = <0 50 4>;
+        interrupts = <0 52 4>;
 };
 
 &serial0 {
diff --git a/arch/arm/mach-exynos/pm_domains.c b/arch/arm/mach-exynos/pm_domains.c
index 4a87e86dec45..7c21760f590f 100644
--- a/arch/arm/mach-exynos/pm_domains.c
+++ b/arch/arm/mach-exynos/pm_domains.c
@@ -200,15 +200,15 @@ no_clk:
                 args.args_count = 0;
                 child_domain = of_genpd_get_from_provider(&args);
                 if (IS_ERR(child_domain))
-                        goto next_pd;
+                        continue;
 
                 if (of_parse_phandle_with_args(np, "power-domains",
                                          "#power-domain-cells", 0, &args) != 0)
-                        goto next_pd;
+                        continue;
 
                 parent_domain = of_genpd_get_from_provider(&args);
                 if (IS_ERR(parent_domain))
-                        goto next_pd;
+                        continue;
 
                 if (pm_genpd_add_subdomain(parent_domain, child_domain))
                         pr_warn("%s failed to add subdomain: %s\n",
@@ -216,8 +216,6 @@ no_clk:
                 else
                         pr_info("%s has as child subdomain: %s.\n",
                                 parent_domain->name, child_domain->name);
-next_pd:
-                of_node_put(np);
         }
 
         return 0;
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index b3a0dff67e3f..33d1460a5639 100644
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -49,6 +49,7 @@ config SOC_OMAP5
         select OMAP_INTERCONNECT
         select OMAP_INTERCONNECT_BARRIER
         select PM_OPP if PM
+        select ZONE_DMA if ARM_LPAE
 
 config SOC_AM33XX
         bool "TI AM33XX"
@@ -78,6 +79,7 @@ config SOC_DRA7XX
         select OMAP_INTERCONNECT
         select OMAP_INTERCONNECT_BARRIER
         select PM_OPP if PM
+        select ZONE_DMA if ARM_LPAE
 
 config ARCH_OMAP2PLUS
         bool
diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c
index 6133eaac685d..fb219a30c10c 100644
--- a/arch/arm/mach-omap2/board-generic.c
+++ b/arch/arm/mach-omap2/board-generic.c
@@ -106,6 +106,7 @@ DT_MACHINE_START(OMAP3_DT, "Generic OMAP3 (Flattened Device Tree)")
 MACHINE_END
 
 static const char *const omap36xx_boards_compat[] __initconst = {
+        "ti,omap3630",
         "ti,omap36xx",
         NULL,
 };
@@ -243,6 +244,9 @@ static const char *const omap5_boards_compat[] __initconst = {
 };
 
 DT_MACHINE_START(OMAP5_DT, "Generic OMAP5 (Flattened Device Tree)")
+#if defined(CONFIG_ZONE_DMA) && defined(CONFIG_ARM_LPAE)
+        .dma_zone_size  = SZ_2G,
+#endif
         .reserve        = omap_reserve,
         .smp            = smp_ops(omap4_smp_ops),
         .map_io         = omap5_map_io,
@@ -288,6 +292,9 @@ static const char *const dra74x_boards_compat[] __initconst = {
 };
 
 DT_MACHINE_START(DRA74X_DT, "Generic DRA74X (Flattened Device Tree)")
+#if defined(CONFIG_ZONE_DMA) && defined(CONFIG_ARM_LPAE)
+        .dma_zone_size  = SZ_2G,
+#endif
         .reserve        = omap_reserve,
         .smp            = smp_ops(omap4_smp_ops),
         .map_io         = dra7xx_map_io,
@@ -308,6 +315,9 @@ static const char *const dra72x_boards_compat[] __initconst = {
 };
 
 DT_MACHINE_START(DRA72X_DT, "Generic DRA72X (Flattened Device Tree)")
+#if defined(CONFIG_ZONE_DMA) && defined(CONFIG_ARM_LPAE)
+        .dma_zone_size  = SZ_2G,
+#endif
         .reserve        = omap_reserve,
         .map_io         = dra7xx_map_io,
         .init_early     = dra7xx_init_early,
diff --git a/arch/arm/mach-omap2/pdata-quirks.c b/arch/arm/mach-omap2/pdata-quirks.c
index ea56397599c2..1dfe34654c43 100644
--- a/arch/arm/mach-omap2/pdata-quirks.c
+++ b/arch/arm/mach-omap2/pdata-quirks.c
@@ -559,7 +559,14 @@ static void pdata_quirks_check(struct pdata_init *quirks)
 
 void __init pdata_quirks_init(const struct of_device_id *omap_dt_match_table)
 {
-        omap_sdrc_init(NULL, NULL);
+        /*
+         * We still need this for omap2420 and omap3 PM to work, others are
+         * using drivers/misc/sram.c already.
+         */
+        if (of_machine_is_compatible("ti,omap2420") ||
+            of_machine_is_compatible("ti,omap3"))
+                omap_sdrc_init(NULL, NULL);
+
         pdata_quirks_check(auxdata_quirks);
         of_platform_populate(NULL, omap_dt_match_table,
                              omap_auxdata_lookup, NULL);
diff --git a/arch/arm/mach-pxa/pxa3xx.c b/arch/arm/mach-pxa/pxa3xx.c
index 06005d3f2ba3..20ce2d386f17 100644
--- a/arch/arm/mach-pxa/pxa3xx.c
+++ b/arch/arm/mach-pxa/pxa3xx.c
@@ -42,10 +42,6 @@
 #define PECR_IS(n)      ((1 << ((n) * 2)) << 29)
 
 extern void __init pxa_dt_irq_init(int (*fn)(struct irq_data *, unsigned int));
-#ifdef CONFIG_PM
-
-#define ISRAM_START     0x5c000000
-#define ISRAM_SIZE      SZ_256K
 
 /*
  * NAND NFC: DFI bus arbitration subset
@@ -54,6 +50,11 @@ extern void __init pxa_dt_irq_init(int (*fn)(struct irq_data *, unsigned int));
 #define NDCR_ND_ARB_EN          (1 << 12)
 #define NDCR_ND_ARB_CNTL        (1 << 19)
 
+#ifdef CONFIG_PM
+
+#define ISRAM_START     0x5c000000
+#define ISRAM_SIZE      SZ_256K
+
 static void __iomem *sram;
 static unsigned long wakeup_src;
 
diff --git a/arch/arm/plat-orion/common.c b/arch/arm/plat-orion/common.c
index 2235081a04ee..8861c367d061 100644
--- a/arch/arm/plat-orion/common.c
+++ b/arch/arm/plat-orion/common.c
@@ -495,7 +495,7 @@ void __init orion_ge00_switch_init(struct dsa_platform_data *d, int irq)
 
         d->netdev = &orion_ge00.dev;
         for (i = 0; i < d->nr_chips; i++)
-                d->chip[i].host_dev = &orion_ge00_shared.dev;
+                d->chip[i].host_dev = &orion_ge_mvmdio.dev;
         orion_switch_device.dev.platform_data = d;
 
         platform_device_register(&orion_switch_device);
diff --git a/drivers/bus/arm-ccn.c b/drivers/bus/arm-ccn.c
index 7d9879e166cf..7082c7268845 100644
--- a/drivers/bus/arm-ccn.c
+++ b/drivers/bus/arm-ccn.c
@@ -1184,11 +1184,12 @@ static int arm_ccn_pmu_cpu_notifier(struct notifier_block *nb,
                 if (!cpumask_test_and_clear_cpu(cpu, &dt->cpu))
                         break;
                 target = cpumask_any_but(cpu_online_mask, cpu);
-                if (target < 0)
+                if (target >= nr_cpu_ids)
                         break;
                 perf_pmu_migrate_context(&dt->pmu, cpu, target);
                 cpumask_set_cpu(target, &dt->cpu);
-                WARN_ON(irq_set_affinity(ccn->irq, &dt->cpu) != 0);
+                if (ccn->irq)
+                        WARN_ON(irq_set_affinity(ccn->irq, &dt->cpu) != 0);
         default:
                 break;
         }
diff --git a/drivers/memory/Kconfig b/drivers/memory/Kconfig
index c6a644b22af4..6f3154613dc7 100644
--- a/drivers/memory/Kconfig
+++ b/drivers/memory/Kconfig
@@ -58,12 +58,18 @@ config OMAP_GPMC
           memory drives like NOR, NAND, OneNAND, SRAM.
 
 config OMAP_GPMC_DEBUG
-        bool
+        bool "Enable GPMC debug output and skip reset of GPMC during init"
         depends on OMAP_GPMC
         help
           Enables verbose debugging mostly to decode the bootloader provided
-          timings. Enable this during development to configure devices
-          connected to the GPMC bus.
+          timings. To preserve the bootloader provided timings, the reset
+          of GPMC is skipped during init. Enable this during development to
+          configure devices connected to the GPMC bus.
+
+          NOTE: In addition to matching the register setup with the bootloader
+          you also need to match the GPMC FCLK frequency used by the
+          bootloader or else the GPMC timings won't be identical with the
+          bootloader timings.
 
 config MVEBU_DEVBUS
         bool "Marvell EBU Device Bus Controller"
diff --git a/drivers/memory/omap-gpmc.c b/drivers/memory/omap-gpmc.c
index 32ac049f2bc4..6515dfc2b805 100644
--- a/drivers/memory/omap-gpmc.c
+++ b/drivers/memory/omap-gpmc.c
@@ -696,7 +696,6 @@ int gpmc_cs_set_timings(int cs, const struct gpmc_timings *t,
         int div;
         u32 l;
 
-        gpmc_cs_show_timings(cs, "before gpmc_cs_set_timings");
         div = gpmc_calc_divider(t->sync_clk);
         if (div < 0)
                 return div;
@@ -1988,6 +1987,7 @@ static int gpmc_probe_generic_child(struct platform_device *pdev,
         if (ret < 0)
                 goto err;
 
+        gpmc_cs_show_timings(cs, "before gpmc_cs_program_settings");
         ret = gpmc_cs_program_settings(cs, &gpmc_s);
         if (ret < 0)
                 goto err;
diff --git a/drivers/perf/arm_pmu.c b/drivers/perf/arm_pmu.c
index 2365a32a595e..be3755c973e9 100644
--- a/drivers/perf/arm_pmu.c
+++ b/drivers/perf/arm_pmu.c
@@ -823,9 +823,15 @@ static int of_pmu_irq_cfg(struct arm_pmu *pmu)
                 }
 
                 /* Now look up the logical CPU number */
-                for_each_possible_cpu(cpu)
-                        if (dn == of_cpu_device_node_get(cpu))
+                for_each_possible_cpu(cpu) {
+                        struct device_node *cpu_dn;
+
+                        cpu_dn = of_cpu_device_node_get(cpu);
+                        of_node_put(cpu_dn);
+
+                        if (dn == cpu_dn)
                                 break;
+                }
 
                 if (cpu >= nr_cpu_ids) {
                         pr_warn("Failed to find logical CPU for %s\n",
diff --git a/drivers/thermal/samsung/exynos_tmu.c b/drivers/thermal/samsung/exynos_tmu.c
index 0bae8cc6c23a..ca920b0ecf8f 100644
--- a/drivers/thermal/samsung/exynos_tmu.c
+++ b/drivers/thermal/samsung/exynos_tmu.c
@@ -932,7 +932,7 @@ static void exynos4412_tmu_set_emulation(struct exynos_tmu_data *data,
 
         if (data->soc == SOC_ARCH_EXYNOS5260)
                 emul_con = EXYNOS5260_EMUL_CON;
-        if (data->soc == SOC_ARCH_EXYNOS5433)
+        else if (data->soc == SOC_ARCH_EXYNOS5433)
                 emul_con = EXYNOS5433_TMU_EMUL_CON;
         else if (data->soc == SOC_ARCH_EXYNOS7)
                 emul_con = EXYNOS7_TMU_REG_EMUL_CON;