Merge remote-tracking branches 'regulator/fix/isl9305', 'regulator/fix/rk808' and...

[karo-tx-linux.git] / arch / arm / boot / dts / sun8i-a33-olinuxino.dts

diff --git a/arch/arm/boot/dts/sun8i-a33-olinuxino.dts b/arch/arm/boot/dts/sun8i-a33-olinuxino.dts
index 9ea637e82b2d8c780ec2a848ab3d99f3fbff7964..be9a6b8d7a1e405f79d91760287171f268b1cf4c 100644 (file)
--- a/arch/arm/boot/dts/sun8i-a33-olinuxino.dts
+++ b/arch/arm/boot/dts/sun8i-a33-olinuxino.dts
@@ -92,24 +92,18 @@
 
 &pio {
        led_pin_olinuxino: led_pins@0 {
-               allwinner,pins = "PB7";
-               allwinner,function = "gpio_out";
-               allwinner,drive = <SUN4I_PINCTRL_10_MA>;
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
+               pins = "PB7";
+               function = "gpio_out";
        };
 
        mmc0_cd_pin_olinuxino: mmc0_cd_pin@0 {
-               allwinner,pins = "PB4";
-               allwinner,function = "gpio_in";
-               allwinner,drive = <SUN4I_PINCTRL_10_MA>;
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
+               pins = "PB4";
+               function = "gpio_in";
        };
 
        usb0_id_detect_pin: usb0_id_detect_pin@0 {
-               allwinner,pins = "PB3";
-               allwinner,function = "gpio_in";
-               allwinner,drive = <SUN4I_PINCTRL_10_MA>;
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
+               pins = "PB3";
+               function = "gpio_in";
        };
 };
 
@@ -126,7 +120,7 @@
        };
 };
 
-#include "axp22x.dtsi"
+#include "axp223.dtsi"
 
 &reg_aldo1 {
        regulator-always-on;