ARM: dts: sun8i: Update A23/A33/r16 dts(i) files from Linux-v4.18-rc3

[oweals/u-boot.git] / arch / arm / dts / sun8i-r16-parrot.dts

diff --git a/arch/arm/dts/sun8i-r16-parrot.dts b/arch/arm/dts/sun8i-r16-parrot.dts
index 47553e522982b28e5f004d528f550af08f9232b3..472c03b7aeabec8f8966c342f72f67bb4123bbfd 100644 (file)
--- a/arch/arm/dts/sun8i-r16-parrot.dts
+++ b/arch/arm/dts/sun8i-r16-parrot.dts
@@ -84,6 +84,14 @@
 
 };
 
+&codec {
+       status = "okay";
+};
+
+&dai {
+       status = "okay";
+};
+
 &ehci0 {
        status = "okay";
 };
@@ -149,8 +157,8 @@
 };
 
 &mmc2_8bit_pins {
-       allwinner,drive = <SUN4I_PINCTRL_40_MA>;
-       allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
+       drive-strength = <40>;
+       bias-pull-up;
 };
 
 &ohci0 {
@@ -159,40 +167,32 @@
 
 &pio {
        mmc0_cd_pin_parrot: mmc0_cd_pin@0 {
-               allwinner,pins = "PD14";
-               allwinner,function = "gpio_in";
-               allwinner,drive = <SUN4I_PINCTRL_10_MA>;
-               allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
+               pins = "PD14";
+               function = "gpio_in";
+               bias-pull-up;
        };
 
        led_pins_parrot: led_pins@0 {
-               allwinner,pins = "PE16", "PE17";
-               allwinner,function = "gpio_out";
-               allwinner,drive = <SUN4I_PINCTRL_10_MA>;
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
+               pins = "PE16", "PE17";
+               function = "gpio_out";
        };
 
        usb0_id_det: usb0_id_detect_pin@0 {
-               allwinner,pins = "PD10";
-               allwinner,function = "gpio_in";
-               allwinner,drive = <SUN4I_PINCTRL_10_MA>;
-               allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
+               pins = "PD10";
+               function = "gpio_in";
+               bias-pull-up;
        };
 
        usb1_vbus_pin_parrot: usb1_vbus_pin@0 {
-               allwinner,pins = "PD12";
-               allwinner,function = "gpio_out";
-               allwinner,drive = <SUN4I_PINCTRL_10_MA>;
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
+               pins = "PD12";
+               function = "gpio_out";
        };
 };
 
 &r_pio {
        wifi_reset_pin_parrot: wifi_reset_pin@0 {
-               allwinner,pins = "PL6";
-               allwinner,function = "gpio_out";
-               allwinner,drive = <SUN4I_PINCTRL_10_MA>;
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
+               pins = "PL6";
+               function = "gpio_out";
        };
 };
 
@@ -209,7 +209,7 @@
        };
 };
 
-#include "axp22x.dtsi"
+#include "axp223.dtsi"
 
 &reg_aldo1 {
        regulator-always-on;
@@ -325,6 +325,10 @@
        status = "okay";
 };
 
+&sound {
+       status = "okay";
+};
+
 &uart0 {
        pinctrl-names = "default";
        pinctrl-0 = <&uart0_pins_b>;