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

[oweals/u-boot.git] / arch / arm / dts / sun8i-a33-olinuxino.dts

diff --git a/arch/arm/dts/sun8i-a33-olinuxino.dts b/arch/arm/dts/sun8i-a33-olinuxino.dts
index 9ea637e82b2d8c780ec2a848ab3d99f3fbff7964..a1a1eb64caeb9ecde85baa051782e7def4a819e7 100644 (file)
--- a/arch/arm/dts/sun8i-a33-olinuxino.dts
+++ b/arch/arm/dts/sun8i-a33-olinuxino.dts
@@ -43,7 +43,6 @@
 
 /dts-v1/;
 #include "sun8i-a33.dtsi"
-#include "sunxi-common-regulators.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
@@ -62,8 +61,6 @@
 
        leds {
                compatible = "gpio-leds";
-               pinctrl-names = "default";
-               pinctrl-0 = <&led_pin_olinuxino>;
 
                green {
                        label = "a33-olinuxino:green:usr";
@@ -72,17 +69,24 @@
        };
 };
 
+&codec {
+       status = "okay";
+};
+
+&dai {
+       status = "okay";
+};
+
 &ehci0 {
        status = "okay";
 };
 
 &mmc0 {
        pinctrl-names = "default";
-       pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_olinuxino>;
+       pinctrl-0 = <&mmc0_pins_a>;
        vmmc-supply = <&reg_dcdc1>;
        bus-width = <4>;
-       cd-gpios = <&pio 1 4 GPIO_ACTIVE_HIGH>; /* PB4 */
-       cd-inverted;
+       cd-gpios = <&pio 1 4 GPIO_ACTIVE_LOW>; /* PB4 */
        status = "okay";
 };
 
@@ -90,29 +94,6 @@
        status = "okay";
 };
 
-&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>;
-       };
-
-       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>;
-       };
-
-       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>;
-       };
-};
-
 &r_rsb {
        status = "okay";
 
@@ -126,7 +107,15 @@
        };
 };
 
-#include "axp22x.dtsi"
+#include "axp223.dtsi"
+
+&ac_power_supply {
+       status = "okay";
+};
+
+&battery_power_supply {
+       status = "okay";
+};
 
 &reg_aldo1 {
        regulator-always-on;
@@ -201,6 +190,21 @@
        vcc-lcd-supply = <&reg_dc1sw>;
 };
 
+&sound {
+       /* Board level jack widgets */
+       simple-audio-card,widgets = "Microphone", "Microphone Jack",
+                                   "Headphone", "Headphone Jack";
+       /* Board level routing. First 2 routes copied from SoC level */
+       simple-audio-card,routing =
+               "Left DAC", "AIF1 Slot 0 Left",
+               "Right DAC", "AIF1 Slot 0 Right",
+               "HP", "HPCOM",
+               "Headphone Jack", "HP",
+               "MIC1", "Microphone Jack",
+               "Microphone Jack", "MBIAS";
+       status = "okay";
+};
+
 &uart0 {
        pinctrl-names = "default";
        pinctrl-0 = <&uart0_pins_b>;
@@ -217,8 +221,6 @@
 };
 
 &usbphy {
-       pinctrl-names = "default";
-       pinctrl-0 = <&usb0_id_detect_pin>;
        usb0_id_det-gpios = <&pio 1 3 GPIO_ACTIVE_HIGH>; /* PB3 */
        usb0_vbus_power-supply = <&usb_power_supply>;
        usb0_vbus-supply = <&reg_drivevbus>;