6 files changed, 9 insertions, 13 deletions

diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
index 6d95d3df33c7..79087ccf64bc 100644
--- a/arch/arm/boot/dts/am33xx.dtsi
+++ b/arch/arm/boot/dts/am33xx.dtsi
@@ -448,7 +448,7 @@
                         ti,hwmods = "usb_otg_hs";
                         status = "disabled";
 
-                        usb_ctrl_mod: control@44e10000 {
+                        usb_ctrl_mod: control@44e10620 {
                                 compatible = "ti,am335x-usb-ctrl-module";
                                 reg = <0x44e10620 0x10
                                         0x44e10648 0x4>;
@@ -551,7 +551,7 @@
                                         "tx14", "tx15";
                         };
 
-                        cppi41dma: dma-controller@07402000 {
+                        cppi41dma: dma-controller@47402000 {
                                 compatible = "ti,am3359-cppi41";
                                 reg =  <0x47400000 0x1000
                                         0x47402000 0x1000
diff --git a/arch/arm/boot/dts/exynos5250-arndale.dts b/arch/arm/boot/dts/exynos5250-arndale.dts
index b42e658876e5..457112d659ea 100644
--- a/arch/arm/boot/dts/exynos5250-arndale.dts
+++ b/arch/arm/boot/dts/exynos5250-arndale.dts
@@ -287,6 +287,7 @@
                                         regulator-name = "vdd_g3d";
                                         regulator-min-microvolt = <1000000>;
                                         regulator-max-microvolt = <1000000>;
+                                        regulator-always-on;
                                         regulator-boot-on;
                                         op_mode = <1>;
                                 };
diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi
index d3f8a6e8ca20..69409f7e05dc 100644
--- a/arch/arm/boot/dts/omap4.dtsi
+++ b/arch/arm/boot/dts/omap4.dtsi
@@ -275,6 +275,8 @@
                         gpmc,num-waitpins = <4>;
                         ti,hwmods = "gpmc";
                         ti,no-idle-on-init;
+                        clocks = <&l3_div_ck>;
+                        clock-names = "fck";
                 };
 
                 uart1: serial@4806a000 {
diff --git a/arch/arm/boot/dts/omap5.dtsi b/arch/arm/boot/dts/omap5.dtsi
index a72813a9663e..7a16647c76f4 100644
--- a/arch/arm/boot/dts/omap5.dtsi
+++ b/arch/arm/boot/dts/omap5.dtsi
@@ -302,6 +302,8 @@
                         gpmc,num-cs = <8>;
                         gpmc,num-waitpins = <4>;
                         ti,hwmods = "gpmc";
+                        clocks = <&l3_iclk_div>;
+                        clock-names = "fck";
                 };
 
                 i2c1: i2c@48070000 {
diff --git a/arch/arm/boot/dts/tegra114-dalmore.dts b/arch/arm/boot/dts/tegra114-dalmore.dts
index 73aecfb57ccb..eb54353975bc 100644
--- a/arch/arm/boot/dts/tegra114-dalmore.dts
+++ b/arch/arm/boot/dts/tegra114-dalmore.dts
@@ -715,7 +715,6 @@
                                 nvidia,pins = "drive_sdio1";
                                 nvidia,high-speed-mode = <TEGRA_PIN_ENABLE>;
                                 nvidia,schmitt = <TEGRA_PIN_DISABLE>;
-                                nvidia,low-power-mode = <TEGRA_PIN_LP_DRIVE_DIV_1>;
                                 nvidia,pull-down-strength = <36>;
                                 nvidia,pull-up-strength = <20>;
                                 nvidia,slew-rate-rising = <TEGRA_PIN_SLEW_RATE_SLOW>;
@@ -725,7 +724,6 @@
                                 nvidia,pins = "drive_sdio3";
                                 nvidia,high-speed-mode = <TEGRA_PIN_ENABLE>;
                                 nvidia,schmitt = <TEGRA_PIN_DISABLE>;
-                                nvidia,low-power-mode = <TEGRA_PIN_LP_DRIVE_DIV_1>;
                                 nvidia,pull-down-strength = <22>;
                                 nvidia,pull-up-strength = <36>;
                                 nvidia,slew-rate-rising = <TEGRA_PIN_SLEW_RATE_FASTEST>;
diff --git a/arch/arm/boot/dts/tegra124-venice2.dts b/arch/arm/boot/dts/tegra124-venice2.dts
index c6dcef513e5d..0b54743c2621 100644
--- a/arch/arm/boot/dts/tegra124-venice2.dts
+++ b/arch/arm/boot/dts/tegra124-venice2.dts
@@ -138,14 +138,9 @@
                                 nvidia,enable-input = <TEGRA_PIN_ENABLE>;
                         };
                         sdmmc1_clk_pz0 {
-                                nvidia,pins = "sdmmc1_clk_pz0",
-                                              "sdmmc1_cmd_pz1",
-                                              "sdmmc1_dat0_py7",
-                                              "sdmmc1_dat1_py6",
-                                              "sdmmc1_dat2_py5",
-                                              "sdmmc1_dat3_py4";
+                                nvidia,pins = "sdmmc1_clk_pz0";
                                 nvidia,function = "sdmmc1";
-                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
                                 nvidia,pull = <TEGRA_PIN_PULL_NONE>;
                                 nvidia,tristate = <TEGRA_PIN_DISABLE>;
                         };
@@ -423,7 +418,6 @@
                                 nvidia,pins = "drive_sdio1";
                                 nvidia,high-speed-mode = <TEGRA_PIN_ENABLE>;
                                 nvidia,schmitt = <TEGRA_PIN_DISABLE>;
-                                nvidia,low-power-mode = <TEGRA_PIN_LP_DRIVE_DIV_1>;
                                 nvidia,pull-down-strength = <32>;
                                 nvidia,pull-up-strength = <42>;
                                 nvidia,slew-rate-rising = <TEGRA_PIN_SLEW_RATE_FASTEST>;
@@ -433,7 +427,6 @@
                                 nvidia,pins = "drive_sdio3";
                                 nvidia,high-speed-mode = <TEGRA_PIN_ENABLE>;
                                 nvidia,schmitt = <TEGRA_PIN_DISABLE>;
-                                nvidia,low-power-mode = <TEGRA_PIN_LP_DRIVE_DIV_1>;
                                 nvidia,pull-down-strength = <20>;
                                 nvidia,pull-up-strength = <36>;
                                 nvidia,slew-rate-rising = <TEGRA_PIN_SLEW_RATE_FASTEST>;