Merge branch 'fixes' into for-next

* fixes:
  ARM: dts: fix gpio-keys wakeup-source property
  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: mvebu: correct a385-db-ap compatible string
  ARM: dts: Fix audio card detection on Peach boards
  ARM: EXYNOS: Fix double of_node_put() when parsing child power domains

diff --combined arch/arm/boot/dts/armada-385-db-ap.dts
index 4de813c236bf9d17eb50c8959a3003b3224a2c9a,4047621b137e6b107f875dc2f7c82292752bf448..acd5b1519edb2be2f4cd58246fba337a7059ffa1
--- 1/arch/arm/boot/dts/armada-385-db-ap.dts
--- 2/arch/arm/boot/dts/armada-385-db-ap.dts
+++ b/arch/arm/boot/dts/armada-385-db-ap.dts
@@@ -46,7 -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";
@@@ -59,9 -59,7 +59,9 @@@
  
        soc {
                ranges = <MBUS_ID(0xf0, 0x01) 0 0xf1000000 0x100000
 -                        MBUS_ID(0x01, 0x1d) 0 0xfff00000 0x100000>;
 +                        MBUS_ID(0x01, 0x1d) 0 0xfff00000 0x100000
 +                        MBUS_ID(0x09, 0x19) 0 0xf1100000 0x10000
 +                        MBUS_ID(0x09, 0x15) 0 0xf1110000 0x10000>;
  
                internal-regs {
                        spi1: spi@10680 {

diff --combined arch/arm/boot/dts/exynos5420-peach-pit.dts
index e722c22b2ba9e41bc36f4d584530b881e00da77b,1b95da79293c58a173ce833d2e72e995a7761cb0..72ba6f032ed72b0e664f42f6dba357dd3b2e9ffd
--- 1/arch/arm/boot/dts/exynos5420-peach-pit.dts
--- 2/arch/arm/boot/dts/exynos5420-peach-pit.dts
+++ b/arch/arm/boot/dts/exynos5420-peach-pit.dts
@@@ -94,7 -94,7 +94,7 @@@
                regulator-name = "P5.0V_USB3CON0";
                regulator-min-microvolt = <5000000>;
                regulator-max-microvolt = <5000000>;
 -              gpio = <&gph0 0 0>;
 +              gpio = <&gph0 0 GPIO_ACTIVE_HIGH>;
                pinctrl-names = "default";
                pinctrl-0 = <&usb300_vbus_en>;
                enable-active-high;
@@@ -105,7 -105,7 +105,7 @@@
                regulator-name = "P5.0V_USB3CON1";
                regulator-min-microvolt = <5000000>;
                regulator-max-microvolt = <5000000>;
 -              gpio = <&gph0 1 0>;
 +              gpio = <&gph0 1 GPIO_ACTIVE_HIGH>;
                pinctrl-names = "default";
                pinctrl-0 = <&usb301_vbus_en>;
                enable-active-high;
@@@ -153,7 -153,7 +153,7 @@@
        samsung,color-depth = <1>;
        samsung,link-rate = <0x06>;
        samsung,lane-count = <2>;
 -      samsung,hpd-gpio = <&gpx2 6 0>;
 +      samsung,hpd-gpio = <&gpx2 6 GPIO_ACTIVE_HIGH>;
  
        ports {
                port@0 {
@@@ -915,6 -915,11 +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>;
@@@ -925,7 -930,7 +930,7 @@@
        status = "okay";
        num-cs = <1>;
        samsung,spi-src-clk = <0>;
 -      cs-gpios = <&gpb1 2 0>;
 +      cs-gpios = <&gpb1 2 GPIO_ACTIVE_HIGH>;
  
        cros_ec: cros-ec@0 {
                compatible = "google,cros-ec-spi";
@@@ -935,7 -940,6 +940,7 @@@
                pinctrl-0 = <&ec_spi_cs &ec_irq>;
                reg = <0>;
                spi-max-frequency = <3125000>;
 +              google,has-vbc-nvram;
  
                controller-data {
                        samsung,spi-feedback-delay = <1>;

diff --combined arch/arm/boot/dts/exynos5800-peach-pi.dts
index 56275a6f9fca4c9e15e7b5173303972295f52d66,8f40c7e549bd5ef48d77c4ee5c9dacaaae65d820..49a4f43e5ac25c8ad16742cca0ccdebf9f9d194c
--- 1/arch/arm/boot/dts/exynos5800-peach-pi.dts
--- 2/arch/arm/boot/dts/exynos5800-peach-pi.dts
+++ b/arch/arm/boot/dts/exynos5800-peach-pi.dts
@@@ -94,7 -94,7 +94,7 @@@
                regulator-name = "P5.0V_USB3CON0";
                regulator-min-microvolt = <5000000>;
                regulator-max-microvolt = <5000000>;
 -              gpio = <&gph0 0 0>;
 +              gpio = <&gph0 0 GPIO_ACTIVE_HIGH>;
                pinctrl-names = "default";
                pinctrl-0 = <&usb300_vbus_en>;
                enable-active-high;
@@@ -105,7 -105,7 +105,7 @@@
                regulator-name = "P5.0V_USB3CON1";
                regulator-min-microvolt = <5000000>;
                regulator-max-microvolt = <5000000>;
 -              gpio = <&gph0 1 0>;
 +              gpio = <&gph0 1 GPIO_ACTIVE_HIGH>;
                pinctrl-names = "default";
                pinctrl-0 = <&usb301_vbus_en>;
                enable-active-high;
@@@ -147,7 -147,7 +147,7 @@@
        samsung,color-depth = <1>;
        samsung,link-rate = <0x0a>;
        samsung,lane-count = <2>;
 -      samsung,hpd-gpio = <&gpx2 6 0>;
 +      samsung,hpd-gpio = <&gpx2 6 GPIO_ACTIVE_HIGH>;
        panel = <&panel>;
  };
  
@@@ -878,6 -878,11 +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>;
@@@ -888,7 -893,7 +893,7 @@@
        status = "okay";
        num-cs = <1>;
        samsung,spi-src-clk = <0>;
 -      cs-gpios = <&gpb1 2 0>;
 +      cs-gpios = <&gpb1 2 GPIO_ACTIVE_HIGH>;
  
        cros_ec: cros-ec@0 {
                compatible = "google,cros-ec-spi";
@@@ -898,7 -903,6 +903,7 @@@
                pinctrl-0 = <&ec_spi_cs &ec_irq>;
                reg = <0>;
                spi-max-frequency = <3125000>;
 +              google,has-vbc-nvram;
  
                controller-data {
                        samsung,spi-feedback-delay = <1>;

diff --combined arch/arm64/boot/dts/arm/juno-motherboard.dtsi
index c7c99a42e2e997684449482535965a0570598044,3c386680357ebc2af6b0b734e26cdb1165194020..21c945480c9c7ccac888fc277e2633f996cb12ae
--- 1/arch/arm64/boot/dts/arm/juno-motherboard.dtsi
--- 2/arch/arm64/boot/dts/arm/juno-motherboard.dtsi
+++ b/arch/arm64/boot/dts/arm/juno-motherboard.dtsi
@@@ -61,56 -61,48 +61,56 @@@
  
                                button@1 {
                                        debounce_interval = <50>;
-                                       wakeup = <1>;
+                                       wakeup-source;
                                        linux,code = <116>;
                                        label = "POWER";
                                        gpios = <&iofpga_gpio0 0 0x4>;
                                };
                                button@2 {
                                        debounce_interval = <50>;
-                                       wakeup = <1>;
+                                       wakeup-source;
                                        linux,code = <102>;
                                        label = "HOME";
                                        gpios = <&iofpga_gpio0 1 0x4>;
                                };
                                button@3 {
                                        debounce_interval = <50>;
-                                       wakeup = <1>;
+                                       wakeup-source;
                                        linux,code = <152>;
                                        label = "RLOCK";
                                        gpios = <&iofpga_gpio0 2 0x4>;
                                };
                                button@4 {
                                        debounce_interval = <50>;
-                                       wakeup = <1>;
+                                       wakeup-source;
                                        linux,code = <115>;
                                        label = "VOL+";
                                        gpios = <&iofpga_gpio0 3 0x4>;
                                };
                                button@5 {
                                        debounce_interval = <50>;
-                                       wakeup = <1>;
+                                       wakeup-source;
                                        linux,code = <114>;
                                        label = "VOL-";
                                        gpios = <&iofpga_gpio0 4 0x4>;
                                };
                                button@6 {
                                        debounce_interval = <50>;
-                                       wakeup = <1>;
+                                       wakeup-source;
                                        linux,code = <99>;
                                        label = "NMI";
                                        gpios = <&iofpga_gpio0 5 0x4>;
                                };
                        };
  
 +                      flash@0,00000000 {
 +                              /* 2 * 32MiB NOR Flash memory mounted on CS0 */
 +                              compatible = "arm,vexpress-flash", "cfi-flash";
 +                              linux,part-probe = "afs";
 +                              reg = <0 0x00000000 0x04000000>;
 +                              bank-width = <4>;
 +                      };
 +
                        ethernet@2,00000000 {
                                compatible = "smsc,lan9118", "smsc,lan9115";
                                reg = <2 0x00000000 0x10000>;