Merge tag 'u-boot-rockchip-20200501' of https://gitlab.denx.de/u-boot/custodians...

[oweals/u-boot.git] / arch / arm / dts / sun8i-a23-polaroid-mid2407pxe03.dts

diff --git a/arch/arm/dts/sun8i-a23-polaroid-mid2407pxe03.dts b/arch/arm/dts/sun8i-a23-polaroid-mid2407pxe03.dts
index f23ca638284d60ac1bcc127d72e3400bc192e013..649e31339662832c4fa64bbfe18cd07bc1aef61b 100644 (file)
--- a/arch/arm/dts/sun8i-a23-polaroid-mid2407pxe03.dts
+++ b/arch/arm/dts/sun8i-a23-polaroid-mid2407pxe03.dts
@@ -62,14 +62,11 @@
        };
 };
 
-&gsl1680 {
-       vddio-supply = <&reg_ldo_io1>;
-       touchscreen-size-x = <960>;
-       touchscreen-size-y = <640>;
-       touchscreen-inverted-x;
-       touchscreen-inverted-y;
-       touchscreen-fw-name = "silead/gsl1680-polaroid-mid2407pxe03.fw";
-       status = "okay";
+&i2c1 {
+       mma7660: accelerometer@4c {
+               reg = <0x4c>;
+               compatible = "fsl,mma7660";
+       };
 };
 
 &mmc1 {
@@ -89,21 +86,24 @@
 };
 
 &mmc1_pins_a {
-       allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
+       bias-pull-up;
 };
 
 &r_pio {
        wifi_pwrseq_pin_mid2407: wifi_pwrseq_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";
        };
 };
 
-&reg_ldo_io1 {
-       regulator-min-microvolt = <3300000>;
-       regulator-max-microvolt = <3300000>;
-       regulator-name = "vcc-touchscreen";
+&touchscreen {
+       reg = <0x40>;
+       compatible = "silead,gsl1680";
+       firmware-name = "gsl1680-polaroid-mid2407pxe03.fw";
+       touchscreen-size-x = <960>;
+       touchscreen-size-y = <640>;
+       touchscreen-inverted-x;
+       touchscreen-inverted-y;
+       vddio-supply = <&reg_ldo_io1>;
        status = "okay";
 };