diff options
| -rw-r--r-- | arch/arm/dts/sun50i-a64.dtsi | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/arch/arm/dts/sun50i-a64.dtsi b/arch/arm/dts/sun50i-a64.dtsi index 4911d6a2d7..1271fb58ec 100644 --- a/arch/arm/dts/sun50i-a64.dtsi +++ b/arch/arm/dts/sun50i-a64.dtsi @@ -459,8 +459,8 @@ allwinner,pins = "PF0", "PF1", "PF2", "PF3", "PF4", "PF5"; allwinner,function = "mmc0"; - allwinner,drive = <SUN4I_PINCTRL_30_MA>; - allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; + drive-strength = < 30 >; + bias-pull-up; }; mmc0_default_cd_pin: mmc0-cd-pin { @@ -474,23 +474,19 @@ allwinner,pins = "PG0", "PG1", "PG2", "PG3", "PG4", "PG5"; allwinner,function = "mmc1"; - allwinner,drive = <SUN4I_PINCTRL_30_MA>; - allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; + drive-strength = < 30 >; + bias-pull-up; }; mmc2_pins: mmc2-pins { allwinner,pins = "PC1", "PC5", "PC6", "PC8", "PC9", "PC10"; allwinner,function = "mmc2"; -<<<<<<< HEAD - allwinner,drive = <SUN4I_PINCTRL_30_MA>; - allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; -======= drive-strength = < 30 >; bias-pull-up; }; - mmc2_8bit_pins: mmc2-8bit { + mmc2_8bit_pins: mmc2-8bit-pins { allwinner,pins = "PC5", "PC6", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", @@ -498,7 +494,6 @@ allwinner,function = "mmc2"; drive-strength = < 30 >; bias-pull-up; ->>>>>>> 20221b3... [f] dts warnings }; i2c0_pins: i2c0-pins { |