Merge branch 'work.splice_read' of git://git.kernel.org/pub/scm/linux/kernel/git...

[cascardo/linux.git] / arch / arm64 / boot / dts / hisilicon / hi6220.dtsi

diff --git a/arch/arm64/boot/dts/hisilicon/hi6220.dtsi b/arch/arm64/boot/dts/hisilicon/hi6220.dtsi
index d0b887a..17839db 100644 (file)
--- a/arch/arm64/boot/dts/hisilicon/hi6220.dtsi
+++ b/arch/arm64/boot/dts/hisilicon/hi6220.dtsi
@@ -771,6 +771,7 @@
                        interrupts = <0x0 0x48 0x4>;
                        clocks = <&sys_ctrl 2>, <&sys_ctrl 1>;
                        clock-names = "ciu", "biu";
+                       resets = <&sys_ctrl PERIPH_RSTDIS0_MMC0>;
                        bus-width = <0x8>;
                        vmmc-supply = <&ldo19>;
                        pinctrl-names = "default";
@@ -784,12 +785,16 @@
                        card-detect-delay = <200>;
                        hisilicon,peripheral-syscon = <&ao_ctrl>;
                        cap-sd-highspeed;
+                       sd-uhs-sdr12;
+                       sd-uhs-sdr25;
+                       sd-uhs-sdr50;
                        reg = <0x0 0xf723e000 0x0 0x1000>;
                        interrupts = <0x0 0x49 0x4>;
                        #address-cells = <0x1>;
                        #size-cells = <0x0>;
                        clocks = <&sys_ctrl 4>, <&sys_ctrl 3>;
                        clock-names = "ciu", "biu";
+                       resets = <&sys_ctrl PERIPH_RSTDIS0_MMC1>;
                        vqmmc-supply = <&ldo7>;
                        vmmc-supply = <&ldo10>;
                        bus-width = <0x4>;
@@ -807,6 +812,7 @@
                        interrupts = <0x0 0x4a 0x4>;
                        clocks = <&sys_ctrl HI6220_MMC2_CIUCLK>, <&sys_ctrl HI6220_MMC2_CLK>;
                        clock-names = "ciu", "biu";
+                       resets = <&sys_ctrl PERIPH_RSTDIS0_MMC2>;
                        bus-width = <0x4>;
                        broken-cd;
                        pinctrl-names = "default", "idle";