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:
 "Here are the first arm-soc bug fixes.  Most of these are OMAP related
  fixes for regressions or minor bugs.  Aside from that, there are a few
  defconfig changes for various platforms"

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  iommu/exynos: Fix arm64 allmodconfig build
  ARM: defconfigs: use CONFIG_CPUFREQ_DT
  ARM: omap2plus_defconfig: Enable AHCI_PLATFORM driver
  ARM: dts: am437x-sk-evm.dts: fix LCD timings
  ARM: dts: dra7-evm: Update SMPS7 (VDD_CORE) max voltage to match DM
  ARM: dts: dra7-evm: Fix typo in SMPS6 (VDD_GPU) max voltage
  ARM: OMAP2+: AM43x: Add ID for ES1.2
  ARM: dts: am437x-sk: fix lcd enable pin mux data
  ARM: dts: Fix gpmc regression for omap 2430sdp smc91x
  Revert "ARM: shmobile: multiplatform: add Audo DMAC peri peri support on defconfig"
  ARM: dts: dra7: fix DSS PLL clock mux registers
  ARM: dts: DRA7: wdt: Fix compatible property for watchdog node
  ARM: OMAP2+: clock: remove unused function prototype

6 files changed, 30 insertions, 31 deletions

diff --git a/arch/arm/boot/dts/am437x-sk-evm.dts b/arch/arm/boot/dts/am437x-sk-evm.dts
index 87aa4f3b8b3d..53bbfc90b26a 100644
--- a/arch/arm/boot/dts/am437x-sk-evm.dts
+++ b/arch/arm/boot/dts/am437x-sk-evm.dts
@@ -100,7 +100,7 @@
         };
 
         lcd0: display {
-                compatible = "osddisplays,osd057T0559-34ts", "panel-dpi";
+                compatible = "newhaven,nhd-4.3-480272ef-atxl", "panel-dpi";
                 label = "lcd";
 
                 pinctrl-names = "default";
@@ -112,11 +112,11 @@
                         clock-frequency = <9000000>;
                         hactive = <480>;
                         vactive = <272>;
-                        hfront-porch = <8>;
-                        hback-porch = <43>;
-                        hsync-len = <4>;
-                        vback-porch = <12>;
-                        vfront-porch = <4>;
+                        hfront-porch = <2>;
+                        hback-porch = <2>;
+                        hsync-len = <41>;
+                        vfront-porch = <2>;
+                        vback-porch = <2>;
                         vsync-len = <10>;
                         hsync-active = <0>;
                         vsync-active = <0>;
@@ -320,8 +320,7 @@
 
         lcd_pins: lcd_pins {
                 pinctrl-single,pins = <
-                        /* GPIO 5_8 to select LCD / HDMI */
-                        0x238 (PIN_OUTPUT_PULLUP | MUX_MODE7)
+                        0x1c (PIN_OUTPUT_PULLDOWN | MUX_MODE7) /* gpcm_ad7.gpio1_7 */
                 >;
         };
 };
diff --git a/arch/arm/boot/dts/dra7-evm.dts b/arch/arm/boot/dts/dra7-evm.dts
index 736092b1a535..10b725c7bfc0 100644
--- a/arch/arm/boot/dts/dra7-evm.dts
+++ b/arch/arm/boot/dts/dra7-evm.dts
@@ -304,7 +304,7 @@
                                         /* VDD_GPU - over VDD_SMPS6 */
                                         regulator-name = "smps6";
                                         regulator-min-microvolt = <850000>;
-                                        regulator-max-microvolt = <12500000>;
+                                        regulator-max-microvolt = <1250000>;
                                         regulator-always-on;
                                         regulator-boot-on;
                                 };
@@ -313,7 +313,7 @@
                                         /* CORE_VDD */
                                         regulator-name = "smps7";
                                         regulator-min-microvolt = <850000>;
-                                        regulator-max-microvolt = <1030000>;
+                                        regulator-max-microvolt = <1060000>;
                                         regulator-always-on;
                                         regulator-boot-on;
                                 };
diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi
index 63bf99be1762..22771bc1643a 100644
--- a/arch/arm/boot/dts/dra7.dtsi
+++ b/arch/arm/boot/dts/dra7.dtsi
@@ -742,7 +742,7 @@
                 };
 
                 wdt2: wdt@4ae14000 {
-                        compatible = "ti,omap4-wdt";
+                        compatible = "ti,omap3-wdt";
                         reg = <0x4ae14000 0x80>;
                         interrupts = <GIC_SPI 75 IRQ_TYPE_LEVEL_HIGH>;
                         ti,hwmods = "wd_timer2";
diff --git a/arch/arm/boot/dts/dra72-evm.dts b/arch/arm/boot/dts/dra72-evm.dts
index afc74fd4bb5e..89085d066c65 100644
--- a/arch/arm/boot/dts/dra72-evm.dts
+++ b/arch/arm/boot/dts/dra72-evm.dts
@@ -160,7 +160,7 @@
                                         /* VDD_CORE */
                                         regulator-name = "smps2";
                                         regulator-min-microvolt = <850000>;
-                                        regulator-max-microvolt = <1030000>;
+                                        regulator-max-microvolt = <1060000>;
                                         regulator-boot-on;
                                         regulator-always-on;
                                 };
diff --git a/arch/arm/boot/dts/dra7xx-clocks.dtsi b/arch/arm/boot/dts/dra7xx-clocks.dtsi
index 2c05b3f017fa..4bdcbd61ce47 100644
--- a/arch/arm/boot/dts/dra7xx-clocks.dtsi
+++ b/arch/arm/boot/dts/dra7xx-clocks.dtsi
@@ -1042,7 +1042,7 @@
                 #clock-cells = <0>;
                 compatible = "ti,mux-clock";
                 clocks = <&sys_clkin1>, <&sys_clkin2>;
-                reg = <0x01a4>;
+                reg = <0x0164>;
         };
 
         mlb_clk: mlb_clk {
@@ -1084,14 +1084,14 @@
                 #clock-cells = <0>;
                 compatible = "ti,mux-clock";
                 clocks = <&sys_clkin1>, <&sys_clkin2>;
-                reg = <0x01d0>;
+                reg = <0x0168>;
         };
 
         video2_dpll_clk_mux: video2_dpll_clk_mux {
                 #clock-cells = <0>;
                 compatible = "ti,mux-clock";
                 clocks = <&sys_clkin1>, <&sys_clkin2>;
-                reg = <0x01d4>;
+                reg = <0x016c>;
         };
 
         wkupaon_iclk_mux: wkupaon_iclk_mux {
diff --git a/arch/arm/boot/dts/omap2430-sdp.dts b/arch/arm/boot/dts/omap2430-sdp.dts
index 05eca2e4430f..6b36ede58488 100644
--- a/arch/arm/boot/dts/omap2430-sdp.dts
+++ b/arch/arm/boot/dts/omap2430-sdp.dts
@@ -48,22 +48,22 @@
                 gpmc,device-width = <1>;
                 gpmc,cycle2cycle-samecsen = <1>;
                 gpmc,cycle2cycle-diffcsen = <1>;
-                gpmc,cs-on-ns = <7>;
-                gpmc,cs-rd-off-ns = <233>;
-                gpmc,cs-wr-off-ns = <233>;
-                gpmc,adv-on-ns = <22>;
-                gpmc,adv-rd-off-ns = <60>;
-                gpmc,adv-wr-off-ns = <60>;
-                gpmc,oe-on-ns = <67>;
-                gpmc,oe-off-ns = <210>;
-                gpmc,we-on-ns = <67>;
-                gpmc,we-off-ns = <210>;
-                gpmc,rd-cycle-ns = <233>;
-                gpmc,wr-cycle-ns = <233>;
-                gpmc,access-ns = <233>;
-                gpmc,page-burst-access-ns = <30>;
-                gpmc,bus-turnaround-ns = <30>;
-                gpmc,cycle2cycle-delay-ns = <30>;
+                gpmc,cs-on-ns = <6>;
+                gpmc,cs-rd-off-ns = <187>;
+                gpmc,cs-wr-off-ns = <187>;
+                gpmc,adv-on-ns = <18>;
+                gpmc,adv-rd-off-ns = <48>;
+                gpmc,adv-wr-off-ns = <48>;
+                gpmc,oe-on-ns = <60>;
+                gpmc,oe-off-ns = <169>;
+                gpmc,we-on-ns = <66>;
+                gpmc,we-off-ns = <169>;
+                gpmc,rd-cycle-ns = <187>;
+                gpmc,wr-cycle-ns = <187>;
+                gpmc,access-ns = <187>;
+                gpmc,page-burst-access-ns = <24>;
+                gpmc,bus-turnaround-ns = <24>;
+                gpmc,cycle2cycle-delay-ns = <24>;
                 gpmc,wait-monitoring-ns = <0>;
                 gpmc,clk-activation-ns = <0>;
                 gpmc,wr-data-mux-bus-ns = <0>;