5 files changed, 11 insertions, 6 deletions

diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi b/arch/arm/boot/dts/am335x-bone-common.dtsi
index f9e8667f5886..73b514dddf65 100644
--- a/arch/arm/boot/dts/am335x-bone-common.dtsi
+++ b/arch/arm/boot/dts/am335x-bone-common.dtsi
@@ -168,7 +168,6 @@
                         AM33XX_IOPAD(0x8f0, PIN_INPUT_PULLUP | MUX_MODE0)       /* mmc0_dat3.mmc0_dat3 */
                         AM33XX_IOPAD(0x904, PIN_INPUT_PULLUP | MUX_MODE0)       /* mmc0_cmd.mmc0_cmd */
                         AM33XX_IOPAD(0x900, PIN_INPUT_PULLUP | MUX_MODE0)       /* mmc0_clk.mmc0_clk */
-                        AM33XX_IOPAD(0x9a0, PIN_INPUT | MUX_MODE4)              /* mcasp0_aclkr.mmc0_sdwp */
                 >;
         };
 
diff --git a/arch/arm/boot/dts/am3517.dtsi b/arch/arm/boot/dts/am3517.dtsi
index ca294914bbb1..4b6062b631b1 100644
--- a/arch/arm/boot/dts/am3517.dtsi
+++ b/arch/arm/boot/dts/am3517.dtsi
@@ -39,6 +39,8 @@
                         ti,davinci-ctrl-ram-size = <0x2000>;
                         ti,davinci-rmii-en = /bits/ 8 <1>;
                         local-mac-address = [ 00 00 00 00 00 00 ];
+                        clocks = <&emac_ick>;
+                        clock-names = "ick";
                 };
 
                 davinci_mdio: ethernet@5c030000 {
@@ -49,6 +51,8 @@
                         bus_freq = <1000000>;
                         #address-cells = <1>;
                         #size-cells = <0>;
+                        clocks = <&emac_fck>;
+                        clock-names = "fck";
                 };
 
                 uart4: serial@4809e000 {
diff --git a/arch/arm/boot/dts/am437x-sk-evm.dts b/arch/arm/boot/dts/am437x-sk-evm.dts
index 440351ad0b80..d4be3fd0b6f4 100644
--- a/arch/arm/boot/dts/am437x-sk-evm.dts
+++ b/arch/arm/boot/dts/am437x-sk-evm.dts
@@ -610,6 +610,8 @@
 
                 touchscreen-size-x = <480>;
                 touchscreen-size-y = <272>;
+
+                wakeup-source;
         };
 
         tlv320aic3106: tlv320aic3106@1b {
diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi
index 9dcd14edc202..e03495a799ce 100644
--- a/arch/arm/boot/dts/dra7.dtsi
+++ b/arch/arm/boot/dts/dra7.dtsi
@@ -1580,7 +1580,6 @@
                                 dr_mode = "otg";
                                 snps,dis_u3_susphy_quirk;
                                 snps,dis_u2_susphy_quirk;
-                                snps,dis_metastability_quirk;
                         };
                 };
 
@@ -1608,6 +1607,7 @@
                                 dr_mode = "otg";
                                 snps,dis_u3_susphy_quirk;
                                 snps,dis_u2_susphy_quirk;
+                                snps,dis_metastability_quirk;
                         };
                 };
 
diff --git a/drivers/bus/ti-sysc.c b/drivers/bus/ti-sysc.c
index 1cc29629d238..80d60f43db56 100644
--- a/drivers/bus/ti-sysc.c
+++ b/drivers/bus/ti-sysc.c
@@ -169,9 +169,9 @@ static int sysc_get_clocks(struct sysc *ddata)
         const char *name;
         int nr_fck = 0, nr_ick = 0, i, error = 0;
 
-        ddata->clock_roles = devm_kzalloc(ddata->dev,
-                                          sizeof(*ddata->clock_roles) *
+        ddata->clock_roles = devm_kcalloc(ddata->dev,
                                           SYSC_MAX_CLOCKS,
+                                          sizeof(*ddata->clock_roles),
                                           GFP_KERNEL);
         if (!ddata->clock_roles)
                 return -ENOMEM;
@@ -200,8 +200,8 @@ static int sysc_get_clocks(struct sysc *ddata)
                 return -EINVAL;
         }
 
-        ddata->clocks = devm_kzalloc(ddata->dev,
-                                     sizeof(*ddata->clocks) * ddata->nr_clocks,
+        ddata->clocks = devm_kcalloc(ddata->dev,
+                                     ddata->nr_clocks, sizeof(*ddata->clocks),
                                      GFP_KERNEL);
         if (!ddata->clocks)
                 return -ENOMEM;