ARM: dts: rmobile: Add soc label to Gen3

[oweals/u-boot.git] / arch / arm / dts / sun4i-a10-inet9f-rev03.dts

diff --git a/arch/arm/dts/sun4i-a10-inet9f-rev03.dts b/arch/arm/dts/sun4i-a10-inet9f-rev03.dts
index bba4f9cf9bf5d6c2f51faa05ea0ac90deb48bacc..221acd10f6c8418ccacbdd996e9aa579de4ccf7f 100644 (file)
--- a/arch/arm/dts/sun4i-a10-inet9f-rev03.dts
+++ b/arch/arm/dts/sun4i-a10-inet9f-rev03.dts
@@ -46,7 +46,6 @@
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
 #include <dt-bindings/interrupt-controller/irq.h>
-#include <dt-bindings/pinctrl/sun4i-a10.h>
 
 / {
        model = "iNet-9F Rev 03";
@@ -60,7 +59,7 @@
                stdout-path = "serial0:115200n8";
        };
 
-       gpio_keys {
+       gpio-keys {
                compatible = "gpio-keys-polled";
                pinctrl-names = "default";
                pinctrl-0 = <&key_pins_inet9f>;
@@ -68,7 +67,7 @@
                #size-cells = <0>;
                poll-interval = <20>;
 
-               button@0 {
+               left-joystick-left {
                        label = "Left Joystick Left";
                        linux,code = <ABS_X>;
                        linux,input-type = <EV_ABS>;
@@ -76,7 +75,7 @@
                        gpios = <&pio 0 6 GPIO_ACTIVE_LOW>; /* PA6 */
                };
 
-               button@1 {
+               left-joystick-right {
                        label = "Left Joystick Right";
                        linux,code = <ABS_X>;
                        linux,input-type = <EV_ABS>;
@@ -84,7 +83,7 @@
                        gpios = <&pio 0 5 GPIO_ACTIVE_LOW>; /* PA5 */
                };
 
-               button@2 {
+               left-joystick-up {
                        label = "Left Joystick Up";
                        linux,code = <ABS_Y>;
                        linux,input-type = <EV_ABS>;
@@ -92,7 +91,7 @@
                        gpios = <&pio 0 8 GPIO_ACTIVE_LOW>; /* PA8 */
                };
 
-               button@3 {
+               left-joystick-down {
                        label = "Left Joystick Down";
                        linux,code = <ABS_Y>;
                        linux,input-type = <EV_ABS>;
@@ -100,7 +99,7 @@
                        gpios = <&pio 0 9 GPIO_ACTIVE_LOW>; /* PA9 */
                };
 
-               button@4 {
+               right-joystick-left {
                        label = "Right Joystick Left";
                        linux,code = <ABS_Z>;
                        linux,input-type = <EV_ABS>;
@@ -108,7 +107,7 @@
                        gpios = <&pio 0 1 GPIO_ACTIVE_LOW>; /* PA1 */
                };
 
-               button@5 {
+               right-joystick-right {
                        label = "Right Joystick Right";
                        linux,code = <ABS_Z>;
                        linux,input-type = <EV_ABS>;
@@ -116,7 +115,7 @@
                        gpios = <&pio 0 0 GPIO_ACTIVE_LOW>; /* PA0 */
                };
 
-               button@6 {
+               right-joystick-up {
                        label = "Right Joystick Up";
                        linux,code = <ABS_RZ>;
                        linux,input-type = <EV_ABS>;
@@ -124,7 +123,7 @@
                        gpios = <&pio 0 3 GPIO_ACTIVE_LOW>; /* PA3 */
                };
 
-               button@7 {
+               right-joystick-down {
                        label = "Right Joystick Down";
                        linux,code = <ABS_RZ>;
                        linux,input-type = <EV_ABS>;
@@ -132,7 +131,7 @@
                        gpios = <&pio 0 4 GPIO_ACTIVE_LOW>; /* PA4 */
                };
 
-               button@8 {
+               dpad-left {
                        label = "DPad Left";
                        linux,code = <ABS_HAT0X>;
                        linux,input-type = <EV_ABS>;
@@ -140,7 +139,7 @@
                        gpios = <&pio 7 23 GPIO_ACTIVE_LOW>; /* PH23 */
                };
 
-               button@9 {
+               dpad-right {
                        label = "DPad Right";
                        linux,code = <ABS_HAT0X>;
                        linux,input-type = <EV_ABS>;
@@ -148,7 +147,7 @@
                        gpios = <&pio 7 24 GPIO_ACTIVE_LOW>; /* PH24 */
                };
 
-               button@10 {
+               dpad-up {
                        label = "DPad Up";
                        linux,code = <ABS_HAT0Y>;
                        linux,input-type = <EV_ABS>;
@@ -156,7 +155,7 @@
                        gpios = <&pio 7 25 GPIO_ACTIVE_LOW>; /* PH25 */
                };
 
-               button@11 {
+               dpad-down {
                        label = "DPad Down";
                        linux,code = <ABS_HAT0Y>;
                        linux,input-type = <EV_ABS>;
@@ -164,49 +163,49 @@
                        gpios = <&pio 7 26 GPIO_ACTIVE_LOW>; /* PH26 */
                };
 
-               button@12 {
+               x {
                        label = "Button X";
                        linux,code = <BTN_X>;
                        gpios = <&pio 0 16 GPIO_ACTIVE_LOW>; /* PA16 */
                };
 
-               button@13 {
+               y {
                        label = "Button Y";
                        linux,code = <BTN_Y>;
                        gpios = <&pio 0 14 GPIO_ACTIVE_LOW>; /* PA14 */
                };
 
-               button@14 {
+               a {
                        label = "Button A";
                        linux,code = <BTN_A>;
                        gpios = <&pio 0 17 GPIO_ACTIVE_LOW>; /* PA17 */
                };
 
-               button@15 {
+               b {
                        label = "Button B";
                        linux,code = <BTN_B>;
                        gpios = <&pio 0 15 GPIO_ACTIVE_LOW>; /* PA15 */
                };
 
-               button@16 {
+               select {
                        label = "Select Button";
                        linux,code = <BTN_SELECT>;
                        gpios = <&pio 0 11 GPIO_ACTIVE_LOW>; /* PA11 */
                };
 
-               button@17 {
+               start {
                        label = "Start Button";
                        linux,code = <BTN_START>;
                        gpios = <&pio 0 12 GPIO_ACTIVE_LOW>; /* PA12 */
                };
 
-               button@18 {
+               top-left {
                        label = "Top Left Button";
                        linux,code = <BTN_TL>;
                        gpios = <&pio 7 22 GPIO_ACTIVE_LOW>; /* PH22 */
                };
 
-               button@19 {
+               top-right {
                        label = "Top Right Button";
                        linux,code = <BTN_TR>;
                        gpios = <&pio 0 13 GPIO_ACTIVE_LOW>; /* PA13 */
@@ -223,8 +222,6 @@
 };
 
 &i2c0 {
-       pinctrl-names = "default";
-       pinctrl-0 = <&i2c0_pins_a>;
        status = "okay";
 
        axp209: pmic@34 {
@@ -236,8 +233,6 @@
 #include "axp209.dtsi"
 
 &i2c1 {
-       pinctrl-names = "default";
-       pinctrl-0 = <&i2c1_pins_a>;
        status = "okay";
 
        /* Accelerometer */
@@ -250,8 +245,6 @@
 };
 
 &i2c2 {
-       pinctrl-names = "default";
-       pinctrl-0 = <&i2c2_pins_a>;
        status = "okay";
 
        ft5406ee8: touchscreen@38 {
@@ -268,35 +261,35 @@
        vref-supply = <&reg_ldo2>;
        status = "okay";
 
-       button@200 {
+       button-200 {
                label = "Menu";
                linux,code = <KEY_MENU>;
                channel = <0>;
                voltage = <200000>;
        };
 
-       button@600 {
+       button-600 {
                label = "Volume Up";
                linux,code = <KEY_VOLUMEUP>;
                channel = <0>;
                voltage = <600000>;
        };
 
-       button@800 {
+       button-800 {
                label = "Volume Down";
                linux,code = <KEY_VOLUMEDOWN>;
                channel = <0>;
                voltage = <800000>;
        };
 
-       button@1000 {
+       button-1000 {
                label = "Home";
                linux,code = <KEY_HOMEPAGE>;
                channel = <0>;
                voltage = <1000000>;
        };
 
-       button@1200 {
+       button-1200 {
                label = "Esc";
                linux,code = <KEY_ESC>;
                channel = <0>;
@@ -305,12 +298,9 @@
 };
 
 &mmc0 {
-       pinctrl-names = "default";
-       pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_reference_design>;
        vmmc-supply = <&reg_vcc3v3>;
        bus-width = <4>;
-       cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */
-       cd-inverted;
+       cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
        status = "okay";
 };
 
@@ -319,29 +309,26 @@
 };
 
 &pio {
-       key_pins_inet9f: key_pins@0 {
-               allwinner,pins = "PA0", "PA1", "PA3", "PA4",
-                                "PA5", "PA6", "PA8", "PA9",
-                                "PA11", "PA12", "PA13",
-                                "PA14", "PA15", "PA16", "PA17",
-                                "PH22", "PH23", "PH24", "PH25", "PH26";
-               allwinner,function = "gpio_in";
-               allwinner,drive = <SUN4I_PINCTRL_10_MA>;
-               allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
+       key_pins_inet9f: key-pins {
+               pins = "PA0", "PA1", "PA3", "PA4",
+                      "PA5", "PA6", "PA8", "PA9",
+                      "PA11", "PA12", "PA13",
+                      "PA14", "PA15", "PA16", "PA17",
+                      "PH22", "PH23", "PH24", "PH25", "PH26";
+               function = "gpio_in";
+               bias-pull-up;
        };
 
-       usb0_id_detect_pin: usb0_id_detect_pin@0 {
-               allwinner,pins = "PH4";
-               allwinner,function = "gpio_in";
-               allwinner,drive = <SUN4I_PINCTRL_10_MA>;
-               allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
+       usb0_id_detect_pin: usb0-id-detect-pin {
+               pins = "PH4";
+               function = "gpio_in";
+               bias-pull-up;
        };
 
-       usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 {
-               allwinner,pins = "PH5";
-               allwinner,function = "gpio_in";
-               allwinner,drive = <SUN4I_PINCTRL_10_MA>;
-               allwinner,pull = <SUN4I_PINCTRL_PULL_DOWN>;
+       usb0_vbus_detect_pin: usb0-vbus-detect-pin {
+               pins = "PH5";
+               function = "gpio_in";
+               bias-pull-down;
        };
 };
 
@@ -380,7 +367,7 @@
 
 &uart0 {
        pinctrl-names = "default";
-       pinctrl-0 = <&uart0_pins_a>;
+       pinctrl-0 = <&uart0_pb_pins>;
        status = "okay";
 };