Merge tag 'ktest-v4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...

[karo-tx-linux.git] / arch / arm / boot / dts / sun7i-a20.dtsi

diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi
index 8e970c40f236d167cee65deed64d4cf46f310200..2db97fc820dd678a6076f6bb78b052dd2af32ffe 100644 (file)
--- a/arch/arm/boot/dts/sun7i-a20.dtsi
+++ b/arch/arm/boot/dts/sun7i-a20.dtsi
@@ -871,6 +871,7 @@
                        status = "disabled";
                        #address-cells = <1>;
                        #size-cells = <0>;
+                       num-cs = <4>;
                };
 
                spi1: spi@01c06000 {
@@ -885,6 +886,7 @@
                        status = "disabled";
                        #address-cells = <1>;
                        #size-cells = <0>;
+                       num-cs = <1>;
                };
 
                emac: ethernet@01c0b000 {
@@ -1037,6 +1039,7 @@
                        status = "disabled";
                        #address-cells = <1>;
                        #size-cells = <0>;
+                       num-cs = <1>;
                };
 
                ahci: sata@01c18000 {
@@ -1079,6 +1082,7 @@
                        status = "disabled";
                        #address-cells = <1>;
                        #size-cells = <0>;
+                       num-cs = <1>;
                };
 
                pio: pinctrl@01c20800 {
@@ -1179,6 +1183,7 @@
                                       "PF3", "PF4", "PF5";
                                function = "mmc0";
                                drive-strength = <30>;
+                               bias-pull-up;
                        };
 
                        mmc0_cd_pin_reference_design: mmc0_cd_pin@0 {
@@ -1200,6 +1205,7 @@
                                       "PI7", "PI8", "PI9";
                                function = "mmc3";
                                drive-strength = <30>;
+                               bias-pull-up;
                        };
 
                        ps20_pins_a: ps20@0 {