6 files changed, 8 insertions, 18 deletions

diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
index 7d7ca054c557..e58fab8aec5d 100644
--- a/arch/arm/boot/dts/am33xx.dtsi
+++ b/arch/arm/boot/dts/am33xx.dtsi
@@ -36,6 +36,8 @@
                 phy1 = &usb1_phy;
                 ethernet0 = &cpsw_emac0;
                 ethernet1 = &cpsw_emac1;
+                spi0 = &spi0;
+                spi1 = &spi1;
         };
 
         cpus {
diff --git a/arch/arm/boot/dts/am43x-epos-evm.dts b/arch/arm/boot/dts/am43x-epos-evm.dts
index 9d276af7c539..081fa68b6f98 100644
--- a/arch/arm/boot/dts/am43x-epos-evm.dts
+++ b/arch/arm/boot/dts/am43x-epos-evm.dts
@@ -388,6 +388,7 @@
         pinctrl-0 = <&cpsw_default>;
         pinctrl-1 = <&cpsw_sleep>;
         status = "okay";
+        slaves = <1>;
 };
 
 &davinci_mdio {
@@ -402,11 +403,6 @@
         phy-mode = "rmii";
 };
 
-&cpsw_emac1 {
-        phy_id = <&davinci_mdio>, <1>;
-        phy-mode = "rmii";
-};
-
 &phy_sel {
         rmii-clock-ext;
 };
diff --git a/arch/arm/boot/dts/dra7xx-clocks.dtsi b/arch/arm/boot/dts/dra7xx-clocks.dtsi
index cf229dfabf61..e62b62875cba 100644
--- a/arch/arm/boot/dts/dra7xx-clocks.dtsi
+++ b/arch/arm/boot/dts/dra7xx-clocks.dtsi
@@ -1817,6 +1817,8 @@
                 clocks = <&abe_24m_fclk>, <&abe_sys_clk_div>, <&func_24m_clk>, <&atl_clkin3_ck>, <&atl_clkin2_ck>, <&atl_clkin1_ck>, <&atl_clkin0_ck>, <&sys_clkin2>, <&ref_clkin0_ck>, <&ref_clkin1_ck>, <&ref_clkin2_ck>, <&ref_clkin3_ck>, <&mlb_clk>, <&mlbp_clk>;
                 ti,bit-shift = <24>;
                 reg = <0x1868>;
+                assigned-clocks = <&mcasp3_ahclkx_mux>;
+                assigned-clock-parents = <&abe_24m_fclk>;
         };
 
         mcasp3_aux_gfclk_mux: mcasp3_aux_gfclk_mux@1868 {
diff --git a/arch/arm/boot/dts/omap3-n900.dts b/arch/arm/boot/dts/omap3-n900.dts
index 26c20e1167b9..4acd32a1c4ef 100644
--- a/arch/arm/boot/dts/omap3-n900.dts
+++ b/arch/arm/boot/dts/omap3-n900.dts
@@ -144,15 +144,6 @@
                 io-channel-names = "temp", "bsi", "vbat";
         };
 
-        rear_camera: camera@0 {
-                compatible = "linux,camera";
-
-                module {
-                        model = "TCM8341MD";
-                        sensor = <&cam1>;
-                };
-        };
-
         pwm9: dmtimer-pwm {
                 compatible = "ti,omap-dmtimer-pwm";
                 #pwm-cells = <3>;
@@ -189,10 +180,8 @@
                                 clock-lanes = <1>;
                                 data-lanes = <0>;
                                 lane-polarity = <0 0>;
-                                clock-inv = <0>;
                                 /* Select strobe = <1> for back camera, <0> for front camera */
                                 strobe = <1>;
-                                crc = <0>;
                         };
                 };
         };
diff --git a/arch/arm/mach-omap2/hsmmc.c b/arch/arm/mach-omap2/hsmmc.c
index 5b614388d72f..6d28aa20a7d3 100644
--- a/arch/arm/mach-omap2/hsmmc.c
+++ b/arch/arm/mach-omap2/hsmmc.c
@@ -58,10 +58,10 @@ void omap_hsmmc_late_init(struct omap2_hsmmc_info *c)
         struct platform_device *pdev;
         int res;
 
-        if (omap_hsmmc_done != 1)
+        if (omap_hsmmc_done)
                 return;
 
-        omap_hsmmc_done++;
+        omap_hsmmc_done = 1;
 
         for (; c->mmc; c++) {
                 pdev = c->pdev;
diff --git a/arch/arm/mach-omap2/omap_hwmod_7xx_data.c b/arch/arm/mach-omap2/omap_hwmod_7xx_data.c
index f040244c57e7..2f4f7002f38d 100644
--- a/arch/arm/mach-omap2/omap_hwmod_7xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_7xx_data.c
@@ -839,6 +839,7 @@ static struct omap_hwmod dra7xx_gpio1_hwmod = {
         .name           = "gpio1",
         .class          = &dra7xx_gpio_hwmod_class,
         .clkdm_name     = "wkupaon_clkdm",
+        .flags          = HWMOD_CONTROL_OPT_CLKS_IN_RESET,
         .main_clk       = "wkupaon_iclk_mux",
         .prcm = {
                 .omap4 = {