Merge tag 'devprop-4.21-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafae...

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / sun6i-a31-hummingbird.dts

diff --git a/arch/arm/boot/dts/sun6i-a31-hummingbird.dts b/arch/arm/boot/dts/sun6i-a31-hummingbird.dts
index ce4f9e9834bf1de946984532494e466a79fbd045..e17a65b3561e73629ad59a9a9fb4301104876e01 100644 (file)
--- a/arch/arm/boot/dts/sun6i-a31-hummingbird.dts
+++ b/arch/arm/boot/dts/sun6i-a31-hummingbird.dts
@@ -160,7 +160,7 @@
 
 &gmac {
        pinctrl-names = "default";
-       pinctrl-0 = <&gmac_pins_rgmii_a>, <&gmac_phy_reset_pin_hummingbird>;
+       pinctrl-0 = <&gmac_rgmii_pins>;
        phy = <&phy1>;
        phy-mode = "rgmii";
        snps,reset-gpio = <&pio 0 21 GPIO_ACTIVE_HIGH>;
@@ -184,21 +184,15 @@
 };
 
 &i2c0 {
-       pinctrl-names = "default";
-       pinctrl-0 = <&i2c0_pins_a>;
        /* pull-ups and devices require AXP221 DLDO3 */
        status = "failed";
 };
 
 &i2c1 {
-       pinctrl-names = "default";
-       pinctrl-0 = <&i2c1_pins_a>;
        status = "okay";
 };
 
 &i2c2 {
-       pinctrl-names = "default";
-       pinctrl-0 = <&i2c2_pins_a>;
        status = "okay";
 
        pcf8563: rtc@51 {
@@ -209,27 +203,18 @@
 
 &ir {
        pinctrl-names = "default";
-       pinctrl-0 = <&ir_pins_a>;
+       pinctrl-0 = <&s_ir_rx_pin>;
        status = "okay";
 };
 
 &mmc0 {
-       pinctrl-names = "default";
-       pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_hummingbird>;
        vmmc-supply = <&reg_dcdc1>;
        bus-width = <4>;
        cd-gpios = <&pio 0 8 GPIO_ACTIVE_LOW>; /* PA8 */
        status = "okay";
 };
 
-&mmc0_pins_a {
-       /* external pull-ups missing for some pins */
-       bias-pull-up;
-};
-
 &mmc1 {
-       pinctrl-names = "default";
-       pinctrl-0 = <&mmc1_pins_a>, <&wifi_reset_pin_hummingbird>;
        vmmc-supply = <&reg_aldo1>;
        mmc-pwrseq = <&wifi_pwrseq>;
        bus-width = <4>;
@@ -241,24 +226,6 @@
        status = "okay";
 };
 
-&pio {
-       gmac_phy_reset_pin_hummingbird: gmac_phy_reset_pin@0 {
-               pins = "PA21";
-               function = "gpio_out";
-       };
-
-       mmc0_cd_pin_hummingbird: mmc0_cd_pin@0 {
-               pins = "PA8";
-               function = "gpio_in";
-               bias-pull-up;
-       };
-
-       wifi_reset_pin_hummingbird: wifi_reset_pin@0 {
-               pins = "PG10";
-               function = "gpio_out";
-       };
-};
-
 &p2wi {
        status = "okay";
 
@@ -354,7 +321,7 @@
 
 &uart0 {
        pinctrl-names = "default";
-       pinctrl-0 = <&uart0_pins_a>;
+       pinctrl-0 = <&uart0_ph_pins>;
        status = "okay";
 };