Merge tag 'zynq-dt-for-v5.0' of https://github.com/Xilinx/linux-xlnx into next/dt

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / sun5i-r8-chip.dts

diff --git a/arch/arm/boot/dts/sun5i-r8-chip.dts b/arch/arm/boot/dts/sun5i-r8-chip.dts
index 879a4b0f3bd5b3171e8f225e7099c6be59b1edf1..f4298facf9dc3a41baa8845b87aad1524079396f 100644 (file)
--- a/arch/arm/boot/dts/sun5i-r8-chip.dts
+++ b/arch/arm/boot/dts/sun5i-r8-chip.dts
@@ -79,8 +79,6 @@
 
        mmc0_pwrseq: mmc0_pwrseq {
                compatible = "mmc-pwrseq-simple";
-               pinctrl-names = "default";
-               pinctrl-0 = <&chip_wifi_reg_on_pin>;
                reset-gpios = <&pio 2 19 GPIO_ACTIVE_LOW>; /* PC19 */
        };
 
@@ -109,8 +107,6 @@
 };
 
 &i2c0 {
-       pinctrl-names = "default";
-       pinctrl-0 = <&i2c0_pins_a>;
        status = "okay";
 
        axp209: pmic@34 {
@@ -137,14 +133,10 @@
 };
 
 &i2c1 {
-       pinctrl-names = "default";
-       pinctrl-0 = <&i2c1_pins_a>;
        status = "disabled";
 };
 
 &i2c2 {
-       pinctrl-names = "default";
-       pinctrl-0 = <&i2c2_pins_a>;
        status = "okay";
 
        xio: gpio@38 {
@@ -161,13 +153,11 @@
        };
 };
 
-&mmc0_pins_a {
+&mmc0_pins {
        bias-pull-up;
 };
 
 &mmc0 {
-       pinctrl-names = "default";
-       pinctrl-0 = <&mmc0_pins_a>;
        vmmc-supply = <&reg_vcc3v3>;
        mmc-pwrseq = <&mmc0_pwrseq>;
        bus-width = <4>;
@@ -184,22 +174,7 @@
 };
 
 &pio {
-       chip_vbus_pin: chip_vbus_pin@0 {
-               pins = "PB10";
-               function = "gpio_out";
-       };
-
-       chip_wifi_reg_on_pin: chip_wifi_reg_on_pin@0 {
-               pins = "PC19";
-               function = "gpio_out";
-       };
-
-       chip_id_det_pin: chip_id_det_pin@0 {
-               pins = "PG2";
-               function = "gpio_in";
-       };
-
-       chip_w1_pin: chip_w1_pin@0 {
+       chip_w1_pin: chip-w1-pin {
                pins = "PD2";
                function = "gpio_in";
                bias-pull-up;
@@ -260,7 +235,6 @@
 };
 
 &reg_usb0_vbus {
-       pinctrl-0 = <&chip_vbus_pin>;
        vin-supply = <&reg_vcc5v0>;
        gpio = <&pio 1 10 GPIO_ACTIVE_HIGH>; /* PB10 */
        status = "okay";
@@ -268,7 +242,7 @@
 
 &spi2 {
        pinctrl-names = "default";
-       pinctrl-0 = <&spi2_pins_a>;
+       pinctrl-0 = <&spi2_pe_pins>;
        status = "disabled";
 };
 
@@ -282,14 +256,14 @@
 
 &uart1 {
        pinctrl-names = "default";
-       pinctrl-0 = <&uart1_pins_b>;
+       pinctrl-0 = <&uart1_pg_pins>;
        status = "okay";
 };
 
 &uart3 {
        pinctrl-names = "default";
-       pinctrl-0 = <&uart3_pins_a>,
-                   <&uart3_cts_rts_pins_a>;
+       pinctrl-0 = <&uart3_pg_pins>,
+                   <&uart3_cts_rts_pg_pins>;
        status = "okay";
 };
 
@@ -303,8 +277,6 @@
 };
 
 &usbphy {
-       pinctrl-names = "default";
-       pinctrl-0 = <&chip_id_det_pin>;
        status = "okay";
 
        usb0_id_det-gpio = <&pio 6 2 GPIO_ACTIVE_HIGH>; /* PG2 */