ARM: dts: sun5i: Update A10s/A13/gr8/r8 dts(i) files from Linux-v4.18-rc3

[oweals/u-boot.git] / arch / arm / dts / sun5i-a10s-auxtek-t004.dts

diff --git a/arch/arm/dts/sun5i-a10s-auxtek-t004.dts b/arch/arm/dts/sun5i-a10s-auxtek-t004.dts
index a790ec8adb75263c1a20e70d6737c184a51a6736..8d4fb9331212dc22d2e1d30de352b9a93b68197f 100644 (file)
--- a/arch/arm/dts/sun5i-a10s-auxtek-t004.dts
+++ b/arch/arm/dts/sun5i-a10s-auxtek-t004.dts
@@ -44,7 +44,6 @@
 #include "sun5i-a10s.dtsi"
 #include "sunxi-common-regulators.dtsi"
 #include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/pinctrl/sun4i-a10.h>
 
 / {
        model = "Auxtek t004 A10s hdmi tv-stick";
@@ -105,8 +104,7 @@
        pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_t004>;
        vmmc-supply = <&reg_vcc3v3>;
        bus-width = <4>;
-       cd-gpios = <&pio 6 1 GPIO_ACTIVE_HIGH>; /* PG1 */
-       cd-inverted;
+       cd-gpios = <&pio 6 1 GPIO_ACTIVE_LOW>; /* PG1 */
        status = "okay";
 };
 
@@ -124,26 +122,32 @@
        status = "okay";
 };
 
+&otg_sram {
+       status = "okay";
+};
+
 &pio {
+       usb0_id_detect_pin: usb0_id_detect_pin@0 {
+               pins = "PG12";
+               function = "gpio_in";
+               bias-pull-up;
+       };
+
        mmc0_cd_pin_t004: mmc0_cd_pin@0 {
-               allwinner,pins = "PG1";
-               allwinner,function = "gpio_in";
-               allwinner,drive = <SUN4I_PINCTRL_10_MA>;
-               allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
+               pins = "PG1";
+               function = "gpio_in";
+               bias-pull-up;
        };
 
        mmc1_vcc_en_pin_t004: mmc1_vcc_en_pin@0 {
-               allwinner,pins = "PB18";
-               allwinner,function = "gpio_out";
-               allwinner,drive = <SUN4I_PINCTRL_10_MA>;
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
+               pins = "PB18";
+               function = "gpio_out";
        };
 
        led_pins_t004: led_pins@0 {
-               allwinner,pins = "PB2";
-               allwinner,function = "gpio_out";
-               allwinner,drive = <SUN4I_PINCTRL_20_MA>;
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
+               pins = "PB2";
+               function = "gpio_out";
+               drive-strength = <20>;
        };
 };
 
@@ -158,11 +162,15 @@
        status = "okay";
 };
 
-&usb1_vbus_pin_a {
-       allwinner,pins = "PG13";
+&usb_otg {
+       dr_mode = "otg";
+       status = "okay";
 };
 
 &usbphy {
+       pinctrl-names = "default";
+       pinctrl-0 = <&usb0_id_detect_pin>;
+       usb0_id_det-gpio = <&pio 6 12 GPIO_ACTIVE_HIGH>; /* PG12 */
        usb1_vbus-supply = <&reg_usb1_vbus>;
        status = "okay";
 };