13 files changed, 42 insertions, 39 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>;
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index d7896580f3bb..2328fe752e9c 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -479,4 +479,4 @@ CONFIG_DEBUG_FS=y
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_LOCKUP_DETECTOR=y
 CONFIG_CRYPTO_DEV_TEGRA_AES=y
-CONFIG_GENERIC_CPUFREQ_CPU0=y
+CONFIG_CPUFREQ_DT=y
diff --git a/arch/arm/configs/omap2plus_defconfig b/arch/arm/configs/omap2plus_defconfig
index 3e09286f7ff1..c2c3a852af9f 100644
--- a/arch/arm/configs/omap2plus_defconfig
+++ b/arch/arm/configs/omap2plus_defconfig
@@ -127,6 +127,8 @@ CONFIG_SRAM=y
 CONFIG_SCSI=y
 CONFIG_BLK_DEV_SD=y
 CONFIG_SCSI_SCAN_ASYNC=y
+CONFIG_ATA=y
+CONFIG_SATA_AHCI_PLATFORM=y
 CONFIG_MD=y
 CONFIG_NETDEVICES=y
 # CONFIG_NET_VENDOR_ARC is not set
diff --git a/arch/arm/configs/shmobile_defconfig b/arch/arm/configs/shmobile_defconfig
index 63fb5316ff02..df2c0f514b0a 100644
--- a/arch/arm/configs/shmobile_defconfig
+++ b/arch/arm/configs/shmobile_defconfig
@@ -146,7 +146,6 @@ CONFIG_RTC_CLASS=y
 CONFIG_RTC_DRV_S35390A=y
 CONFIG_DMADEVICES=y
 CONFIG_SH_DMAE=y
-CONFIG_RCAR_AUDMAC_PP=y
 CONFIG_RCAR_DMAC=y
 # CONFIG_IOMMU_SUPPORT is not set
 CONFIG_PWM=y
@@ -178,5 +177,5 @@ CONFIG_CPU_FREQ_GOV_USERSPACE=y
 CONFIG_CPU_FREQ_GOV_ONDEMAND=y
 CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
 CONFIG_CPU_THERMAL=y
-CONFIG_GENERIC_CPUFREQ_CPU0=y
+CONFIG_CPUFREQ_DT=y
 CONFIG_REGULATOR_DA9210=y
diff --git a/arch/arm/mach-omap2/clock.h b/arch/arm/mach-omap2/clock.h
index 641337c6cde9..a4282e79143e 100644
--- a/arch/arm/mach-omap2/clock.h
+++ b/arch/arm/mach-omap2/clock.h
@@ -270,8 +270,6 @@ extern const struct clksel_rate div31_1to31_rates[];
 
 extern void __iomem *clk_memmaps[];
 
-extern int am33xx_clk_init(void);
-
 extern int omap2_clkops_enable_clkdm(struct clk_hw *hw);
 extern void omap2_clkops_disable_clkdm(struct clk_hw *hw);
 
diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c
index 53841dea80ea..c25feba05818 100644
--- a/arch/arm/mach-omap2/id.c
+++ b/arch/arm/mach-omap2/id.c
@@ -471,11 +471,15 @@ void __init omap3xxx_check_revision(void)
                         cpu_rev = "1.0";
                         break;
                 case 1:
-                /* FALLTHROUGH */
-                default:
                         omap_revision = AM437X_REV_ES1_1;
                         cpu_rev = "1.1";
                         break;
+                case 2:
+                /* FALLTHROUGH */
+                default:
+                        omap_revision = AM437X_REV_ES1_2;
+                        cpu_rev = "1.2";
+                        break;
                 }
                 break;
         case 0xb8f2:
diff --git a/arch/arm/mach-omap2/soc.h b/arch/arm/mach-omap2/soc.h
index 4376f59626d1..c1a3b4416311 100644
--- a/arch/arm/mach-omap2/soc.h
+++ b/arch/arm/mach-omap2/soc.h
@@ -446,6 +446,7 @@ IS_OMAP_TYPE(3430, 0x3430)
 #define AM437X_CLASS            0x43700000
 #define AM437X_REV_ES1_0        (AM437X_CLASS | (0x10 << 8))
 #define AM437X_REV_ES1_1        (AM437X_CLASS | (0x11 << 8))
+#define AM437X_REV_ES1_2        (AM437X_CLASS | (0x12 << 8))
 
 #define OMAP443X_CLASS          0x44300044
 #define OMAP4430_REV_ES1_0      (OMAP443X_CLASS | (0x10 << 8))
diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig
index 30f0e61341c5..2fbe3b1dc92d 100644
--- a/drivers/iommu/Kconfig
+++ b/drivers/iommu/Kconfig
@@ -187,7 +187,7 @@ config TEGRA_IOMMU_SMMU
 
 config EXYNOS_IOMMU
         bool "Exynos IOMMU Support"
-        depends on ARCH_EXYNOS
+        depends on ARCH_EXYNOS && ARM
         select IOMMU_API
         select ARM_DMA_USE_IOMMU
         help