11 files changed, 39 insertions, 24 deletions

diff --git a/arch/arm/boot/dts/da850.dtsi b/arch/arm/boot/dts/da850.dtsi
index f6f1597b03df..0f4f817a9e22 100644
--- a/arch/arm/boot/dts/da850.dtsi
+++ b/arch/arm/boot/dts/da850.dtsi
@@ -549,11 +549,7 @@
                         gpio-controller;
                         #gpio-cells = <2>;
                         reg = <0x226000 0x1000>;
-                        interrupts = <42 IRQ_TYPE_EDGE_BOTH
-                                43 IRQ_TYPE_EDGE_BOTH 44 IRQ_TYPE_EDGE_BOTH
-                                45 IRQ_TYPE_EDGE_BOTH 46 IRQ_TYPE_EDGE_BOTH
-                                47 IRQ_TYPE_EDGE_BOTH 48 IRQ_TYPE_EDGE_BOTH
-                                49 IRQ_TYPE_EDGE_BOTH 50 IRQ_TYPE_EDGE_BOTH>;
+                        interrupts = <42 43 44 45 46 47 48 49 50>;
                         ti,ngpio = <144>;
                         ti,davinci-gpio-unbanked = <0>;
                         status = "disabled";
diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c
index e22fb40e34bc..6d5beb11bd96 100644
--- a/arch/arm/mach-davinci/board-da850-evm.c
+++ b/arch/arm/mach-davinci/board-da850-evm.c
@@ -774,7 +774,7 @@ static struct gpiod_lookup_table mmc_gpios_table = {
                 GPIO_LOOKUP("davinci_gpio.0", DA850_MMCSD_CD_PIN, "cd",
                             GPIO_ACTIVE_LOW),
                 GPIO_LOOKUP("davinci_gpio.0", DA850_MMCSD_WP_PIN, "wp",
-                            GPIO_ACTIVE_LOW),
+                            GPIO_ACTIVE_HIGH),
         },
 };
 
diff --git a/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts b/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts
index 4b3331fbfe39..dff9b15eb3c0 100644
--- a/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts
@@ -66,9 +66,22 @@
 
 &ethmac {
         status = "okay";
-        phy-mode = "rgmii";
         pinctrl-0 = <&eth_rgmii_y_pins>;
         pinctrl-names = "default";
+        phy-handle = <&eth_phy0>;
+        phy-mode = "rgmii";
+
+        mdio {
+                compatible = "snps,dwmac-mdio";
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                eth_phy0: ethernet-phy@0 {
+                        /* Realtek RTL8211F (0x001cc916) */
+                        reg = <0>;
+                        eee-broken-1000t;
+                };
+        };
 };
 
 &uart_A {
diff --git a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
index fee87737a201..67d7115e4eff 100644
--- a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
@@ -132,7 +132,7 @@
 
                         sd_emmc_b: sd@5000 {
                                 compatible = "amlogic,meson-axg-mmc";
-                                reg = <0x0 0x5000 0x0 0x2000>;
+                                reg = <0x0 0x5000 0x0 0x800>;
                                 interrupts = <GIC_SPI 217 IRQ_TYPE_EDGE_RISING>;
                                 status = "disabled";
                                 clocks = <&clkc CLKID_SD_EMMC_B>,
@@ -144,7 +144,7 @@
 
                         sd_emmc_c: mmc@7000 {
                                 compatible = "amlogic,meson-axg-mmc";
-                                reg = <0x0 0x7000 0x0 0x2000>;
+                                reg = <0x0 0x7000 0x0 0x800>;
                                 interrupts = <GIC_SPI 218 IRQ_TYPE_EDGE_RISING>;
                                 status = "disabled";
                                 clocks = <&clkc CLKID_SD_EMMC_C>,
diff --git a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
index 3c31e21cbed7..b8dc4dbb391b 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
@@ -35,6 +35,12 @@
                         no-map;
                 };
 
+                /* Alternate 3 MiB reserved for ARM Trusted Firmware (BL31) */
+                secmon_reserved_alt: secmon@5000000 {
+                        reg = <0x0 0x05000000 0x0 0x300000>;
+                        no-map;
+                };
+
                 linux,cma {
                         compatible = "shared-dma-pool";
                         reusable;
@@ -457,21 +463,21 @@
 
                         sd_emmc_a: mmc@70000 {
                                 compatible = "amlogic,meson-gx-mmc", "amlogic,meson-gxbb-mmc";
-                                reg = <0x0 0x70000 0x0 0x2000>;
+                                reg = <0x0 0x70000 0x0 0x800>;
                                 interrupts = <GIC_SPI 216 IRQ_TYPE_EDGE_RISING>;
                                 status = "disabled";
                         };
 
                         sd_emmc_b: mmc@72000 {
                                 compatible = "amlogic,meson-gx-mmc", "amlogic,meson-gxbb-mmc";
-                                reg = <0x0 0x72000 0x0 0x2000>;
+                                reg = <0x0 0x72000 0x0 0x800>;
                                 interrupts = <GIC_SPI 217 IRQ_TYPE_EDGE_RISING>;
                                 status = "disabled";
                         };
 
                         sd_emmc_c: mmc@74000 {
                                 compatible = "amlogic,meson-gx-mmc", "amlogic,meson-gxbb-mmc";
-                                reg = <0x0 0x74000 0x0 0x2000>;
+                                reg = <0x0 0x74000 0x0 0x800>;
                                 interrupts = <GIC_SPI 218 IRQ_TYPE_EDGE_RISING>;
                                 status = "disabled";
                         };
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-mali.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxl-mali.dtsi
index eb327664a4d8..6aaafff674f9 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxl-mali.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gxl-mali.dtsi
@@ -6,7 +6,7 @@
 
 &apb {
         mali: gpu@c0000 {
-                compatible = "amlogic,meson-gxbb-mali", "arm,mali-450";
+                compatible = "amlogic,meson-gxl-mali", "arm,mali-450";
                 reg = <0x0 0xc0000 0x0 0x40000>;
                 interrupts = <GIC_SPI 160 IRQ_TYPE_LEVEL_HIGH>,
                              <GIC_SPI 161 IRQ_TYPE_LEVEL_HIGH>,
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts
index 3e3eb31748a3..f63bceb88caa 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts
@@ -234,9 +234,6 @@
 
         bus-width = <4>;
         cap-sd-highspeed;
-        sd-uhs-sdr12;
-        sd-uhs-sdr25;
-        sd-uhs-sdr50;
         max-frequency = <100000000>;
         disable-wp;
 
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi
index 0cfd701809de..a1b31013ab6e 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi
@@ -189,3 +189,10 @@
 &usb0 {
         status = "okay";
 };
+
+&usb2_phy0 {
+        /*
+         * HDMI_5V is also used as supply for the USB VBUS.
+         */
+        phy-supply = <&hdmi_5v>;
+};
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi
index 27538eea547b..c87a80e9bcc6 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi
@@ -13,14 +13,6 @@
 / {
         compatible = "amlogic,meson-gxl";
 
-        reserved-memory {
-                /* Alternate 3 MiB reserved for ARM Trusted Firmware (BL31) */
-                secmon_reserved_alt: secmon@5000000 {
-                        reg = <0x0 0x05000000 0x0 0x300000>;
-                        no-map;
-                };
-        };
-
         soc {
                 usb0: usb@c9000000 {
                         status = "disabled";
diff --git a/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts b/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts
index c6999624ed8a..68c5a6c819ae 100644
--- a/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts
+++ b/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts
@@ -585,6 +585,8 @@
         vmmc-supply = <&wlan_en>;
         ti,non-removable;
         non-removable;
+        cap-power-off-card;
+        keep-power-in-suspend;
         #address-cells = <0x1>;
         #size-cells = <0x0>;
         status = "ok";
diff --git a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
index edb4ee0b8896..7f12624f6c8e 100644
--- a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
+++ b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
@@ -322,6 +322,8 @@
                 dwmmc_2: dwmmc2@f723f000 {
                         bus-width = <0x4>;
                         non-removable;
+                        cap-power-off-card;
+                        keep-power-in-suspend;
                         vmmc-supply = <&reg_vdd_3v3>;
                         mmc-pwrseq = <&wl1835_pwrseq>;