sunxi: add support for kernel 4.9

[openwrt/openwrt.git] / package / boot / uboot-sunxi / patches / 011-dt-sync-dts-files-with-kernel.patch

diff --git a/package/boot/uboot-sunxi/patches/011-dt-sync-dts-files-with-kernel.patch b/package/boot/uboot-sunxi/patches/011-dt-sync-dts-files-with-kernel.patch
index 1b7a059311c1410939628ffab37970fce1dc202c..e36f9e3c5a7ef6b540461e1957af1cccca6ca7e4 100644 (file)
--- a/package/boot/uboot-sunxi/patches/011-dt-sync-dts-files-with-kernel.patch
+++ b/package/boot/uboot-sunxi/patches/011-dt-sync-dts-files-with-kernel.patch
@@ -93,8 +93,6 @@ Acked-by: Ian Campbell <ijc@hellion.org.uk>
  create mode 100644 arch/arm/dts/sun8i-a83t-cubietruck-plus.dts
  create mode 100644 arch/arm/dts/sunxi-itead-core-common.dtsi
 
-diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
-index 578038b..0cea4b4 100644
 --- a/arch/arm/dts/Makefile
 +++ b/arch/arm/dts/Makefile
 @@ -126,6 +126,7 @@ dtb-$(CONFIG_MACH_SUN4I) += \
@@ -105,8 +103,8 @@ index 578038b..0cea4b4 100644
        sun4i-a10-pov-protab2-ips9.dtb
  dtb-$(CONFIG_MACH_SUN5I) += \
        sun5i-a10s-auxtek-t003.dtb \
-@@ -154,7 +155,9 @@ dtb-$(CONFIG_MACH_SUN6I) += \
-       sun6i-a31-mixtile-loftq.dtb \
+@@ -155,7 +156,9 @@ dtb-$(CONFIG_MACH_SUN6I) += \
+       sun6i-a31-pangolin.dtb \
        sun6i-a31s-cs908.dtb \
        sun6i-a31s-primo81.dtb \
 -      sun6i-a31s-sinovoip-bpi-m2.dtb
@@ -116,7 +114,7 @@ index 578038b..0cea4b4 100644
  dtb-$(CONFIG_MACH_SUN7I) += \
        sun7i-a20-ainol-aw1.dtb \
        sun7i-a20-bananapi.dtb \
-@@ -163,6 +166,8 @@ dtb-$(CONFIG_MACH_SUN7I) += \
+@@ -164,6 +167,8 @@ dtb-$(CONFIG_MACH_SUN7I) += \
        sun7i-a20-cubietruck.dtb \
        sun7i-a20-hummingbird.dtb \
        sun7i-a20-i12-tvbox.dtb \
@@ -125,7 +123,7 @@ index 578038b..0cea4b4 100644
        sun7i-a20-lamobo-r1.dtb \
        sun7i-a20-m3.dtb \
        sun7i-a20-m5.dtb \
-@@ -189,6 +194,7 @@ dtb-$(CONFIG_MACH_SUN8I_A33) += \
+@@ -190,6 +195,7 @@ dtb-$(CONFIG_MACH_SUN8I_A33) += \
        sun8i-a33-sinlinx-sina33.dtb
  dtb-$(CONFIG_MACH_SUN8I_A83T) += \
        sun8i-a83t-allwinner-h8homlet-v2.dtb \
@@ -133,9 +131,6 @@ index 578038b..0cea4b4 100644
        sun8i-a83t-sinovoip-bpi-m3.dtb
  dtb-$(CONFIG_MACH_SUN8I_H3) += \
        sun8i-h3-orangepi-pc.dtb \
-diff --git a/arch/arm/dts/axp22x.dtsi b/arch/arm/dts/axp22x.dtsi
-new file mode 100644
-index 0000000..0cfec50
 --- /dev/null
 +++ b/arch/arm/dts/axp22x.dtsi
 @@ -0,0 +1,145 @@
@@ -284,8 +279,6 @@ index 0000000..0cfec50
 +              };
 +      };
 +};
-diff --git a/arch/arm/dts/sun4i-a10-a1000.dts b/arch/arm/dts/sun4i-a10-a1000.dts
-index 2630d78..97570cb 100644
 --- a/arch/arm/dts/sun4i-a10-a1000.dts
 +++ b/arch/arm/dts/sun4i-a10-a1000.dts
 @@ -93,6 +93,10 @@
@@ -299,8 +292,6 @@ index 2630d78..97570cb 100644
  &ehci0 {
        status = "okay";
  };
-diff --git a/arch/arm/dts/sun4i-a10-chuwi-v7-cw0825.dts b/arch/arm/dts/sun4i-a10-chuwi-v7-cw0825.dts
-index 1430568..023b03e 100644
 --- a/arch/arm/dts/sun4i-a10-chuwi-v7-cw0825.dts
 +++ b/arch/arm/dts/sun4i-a10-chuwi-v7-cw0825.dts
 @@ -45,6 +45,7 @@
@@ -339,8 +330,6 @@ index 1430568..023b03e 100644
  &lradc {
        vref-supply = <&reg_vcc3v0>;
        status = "okay";
-diff --git a/arch/arm/dts/sun4i-a10-cubieboard.dts b/arch/arm/dts/sun4i-a10-cubieboard.dts
-index 046a84d..710e2ef 100644
 --- a/arch/arm/dts/sun4i-a10-cubieboard.dts
 +++ b/arch/arm/dts/sun4i-a10-cubieboard.dts
 @@ -83,6 +83,10 @@
@@ -354,8 +343,6 @@ index 046a84d..710e2ef 100644
  &cpu0 {
        cpu-supply = <&reg_dcdc2>;
  };
-diff --git a/arch/arm/dts/sun4i-a10-gemei-g9.dts b/arch/arm/dts/sun4i-a10-gemei-g9.dts
-index 570754d..ac64781 100644
 --- a/arch/arm/dts/sun4i-a10-gemei-g9.dts
 +++ b/arch/arm/dts/sun4i-a10-gemei-g9.dts
 @@ -47,6 +47,7 @@
@@ -470,8 +457,6 @@ index 570754d..ac64781 100644
  &reg_usb1_vbus {
        status = "okay";
  };
-diff --git a/arch/arm/dts/sun4i-a10-inet1.dts b/arch/arm/dts/sun4i-a10-inet1.dts
-index 487ce63..e09053b 100644
 --- a/arch/arm/dts/sun4i-a10-inet1.dts
 +++ b/arch/arm/dts/sun4i-a10-inet1.dts
 @@ -47,6 +47,7 @@
@@ -562,8 +547,6 @@ index 487ce63..e09053b 100644
  &reg_dcdc2 {
        regulator-always-on;
        regulator-min-microvolt = <1000000>;
-diff --git a/arch/arm/dts/sun4i-a10-inet97fv2.dts b/arch/arm/dts/sun4i-a10-inet97fv2.dts
-index 6c927a8..04b0d2d 100644
 --- a/arch/arm/dts/sun4i-a10-inet97fv2.dts
 +++ b/arch/arm/dts/sun4i-a10-inet97fv2.dts
 @@ -47,6 +47,8 @@
@@ -737,8 +720,6 @@ index 6c927a8..04b0d2d 100644
        usb2_vbus-supply = <&reg_usb2_vbus>;
        status = "okay";
  };
-diff --git a/arch/arm/dts/sun4i-a10-inet9f-rev03.dts b/arch/arm/dts/sun4i-a10-inet9f-rev03.dts
-index 8446465..bba4f9c 100644
 --- a/arch/arm/dts/sun4i-a10-inet9f-rev03.dts
 +++ b/arch/arm/dts/sun4i-a10-inet9f-rev03.dts
 @@ -59,6 +59,159 @@
@@ -949,8 +930,6 @@ index 8446465..bba4f9c 100644
        usb0_id_detect_pin: usb0_id_detect_pin@0 {
                allwinner,pins = "PH4";
                allwinner,function = "gpio_in";
-diff --git a/arch/arm/dts/sun4i-a10-itead-iteaduino-plus.dts b/arch/arm/dts/sun4i-a10-itead-iteaduino-plus.dts
-index 985e155..4e798f0 100644
 --- a/arch/arm/dts/sun4i-a10-itead-iteaduino-plus.dts
 +++ b/arch/arm/dts/sun4i-a10-itead-iteaduino-plus.dts
 @@ -1,5 +1,6 @@
@@ -1085,8 +1064,6 @@ index 985e155..4e798f0 100644
 -      usb2_vbus-supply = <&reg_usb2_vbus>;
 -      status = "okay";
 -};
-diff --git a/arch/arm/dts/sun4i-a10-jesurun-q5.dts b/arch/arm/dts/sun4i-a10-jesurun-q5.dts
-index dc2f2ae..7afc7a6 100644
 --- a/arch/arm/dts/sun4i-a10-jesurun-q5.dts
 +++ b/arch/arm/dts/sun4i-a10-jesurun-q5.dts
 @@ -156,6 +156,10 @@
@@ -1126,8 +1103,6 @@ index dc2f2ae..7afc7a6 100644
        usb1_vbus-supply = <&reg_usb1_vbus>;
        usb2_vbus-supply = <&reg_usb2_vbus>;
        status = "okay";
-diff --git a/arch/arm/dts/sun4i-a10-marsboard.dts b/arch/arm/dts/sun4i-a10-marsboard.dts
-index 02158bc..8e50723 100644
 --- a/arch/arm/dts/sun4i-a10-marsboard.dts
 +++ b/arch/arm/dts/sun4i-a10-marsboard.dts
 @@ -91,6 +91,10 @@
@@ -1182,8 +1157,6 @@ index 02158bc..8e50723 100644
        usb1_vbus-supply = <&reg_usb1_vbus>;
        usb2_vbus-supply = <&reg_usb2_vbus>;
        status = "okay";
-diff --git a/arch/arm/dts/sun4i-a10-mk802.dts b/arch/arm/dts/sun4i-a10-mk802.dts
-index 3c7eebe..ee46ea8 100644
 --- a/arch/arm/dts/sun4i-a10-mk802.dts
 +++ b/arch/arm/dts/sun4i-a10-mk802.dts
 @@ -44,6 +44,7 @@
@@ -1260,8 +1233,6 @@ index 3c7eebe..ee46ea8 100644
        usb1_vbus-supply = <&reg_usb1_vbus>;
        usb2_vbus-supply = <&reg_usb2_vbus>;
        status = "okay";
-diff --git a/arch/arm/dts/sun4i-a10-olinuxino-lime.dts b/arch/arm/dts/sun4i-a10-olinuxino-lime.dts
-index 28e32ad..b350448 100644
 --- a/arch/arm/dts/sun4i-a10-olinuxino-lime.dts
 +++ b/arch/arm/dts/sun4i-a10-olinuxino-lime.dts
 @@ -124,6 +124,18 @@
@@ -1283,8 +1254,6 @@ index 28e32ad..b350448 100644
  &mdio {
        status = "okay";
  
-diff --git a/arch/arm/dts/sun4i-a10-pcduino.dts b/arch/arm/dts/sun4i-a10-pcduino.dts
-index 4e3e1b9..39034aa 100644
 --- a/arch/arm/dts/sun4i-a10-pcduino.dts
 +++ b/arch/arm/dts/sun4i-a10-pcduino.dts
 @@ -104,6 +104,10 @@
@@ -1386,9 +1355,6 @@ index 4e3e1b9..39034aa 100644
 +      usb2_vbus-supply = <&reg_vcc5v0>; /* USB2 VBUS is always on */
        status = "okay";
  };
-diff --git a/arch/arm/dts/sun4i-a10-pcduino2.dts b/arch/arm/dts/sun4i-a10-pcduino2.dts
-new file mode 100644
-index 0000000..de483a1
 --- /dev/null
 +++ b/arch/arm/dts/sun4i-a10-pcduino2.dts
 @@ -0,0 +1,78 @@
@@ -1470,8 +1436,6 @@ index 0000000..de483a1
 +      usb2_vbus-supply = <&reg_usb2_vbus>;
 +      status = "okay";
 +};
-diff --git a/arch/arm/dts/sun4i-a10-pov-protab2-ips9.dts b/arch/arm/dts/sun4i-a10-pov-protab2-ips9.dts
-index 223515e..ea90634 100644
 --- a/arch/arm/dts/sun4i-a10-pov-protab2-ips9.dts
 +++ b/arch/arm/dts/sun4i-a10-pov-protab2-ips9.dts
 @@ -47,6 +47,7 @@
@@ -1589,8 +1553,6 @@ index 223515e..ea90634 100644
  &reg_dcdc2 {
        regulator-always-on;
        regulator-min-microvolt = <1000000>;
-diff --git a/arch/arm/dts/sun4i-a10.dtsi b/arch/arm/dts/sun4i-a10.dtsi
-index 463bacd..2c8f5e6 100644
 --- a/arch/arm/dts/sun4i-a10.dtsi
 +++ b/arch/arm/dts/sun4i-a10.dtsi
 @@ -45,6 +45,7 @@
@@ -1840,8 +1802,6 @@ index 463bacd..2c8f5e6 100644
                sid: eeprom@01c23800 {
                        compatible = "allwinner,sun4i-a10-sid";
                        reg = <0x01c23800 0x10>;
-diff --git a/arch/arm/dts/sun5i-a10s-auxtek-t004.dts b/arch/arm/dts/sun5i-a10s-auxtek-t004.dts
-index 2b3511e..a790ec8 100644
 --- a/arch/arm/dts/sun5i-a10s-auxtek-t004.dts
 +++ b/arch/arm/dts/sun5i-a10s-auxtek-t004.dts
 @@ -86,6 +86,20 @@
@@ -1865,8 +1825,6 @@ index 2b3511e..a790ec8 100644
  &mmc0 {
        pinctrl-names = "default";
        pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_t004>;
-diff --git a/arch/arm/dts/sun5i-a10s-olinuxino-micro.dts b/arch/arm/dts/sun5i-a10s-olinuxino-micro.dts
-index 5a422c1..86d046a 100644
 --- a/arch/arm/dts/sun5i-a10s-olinuxino-micro.dts
 +++ b/arch/arm/dts/sun5i-a10s-olinuxino-micro.dts
 @@ -111,7 +111,7 @@
@@ -1878,8 +1836,6 @@ index 5a422c1..86d046a 100644
                pagesize = <16>;
                reg = <0x50>;
                read-only;
-diff --git a/arch/arm/dts/sun5i-a13-empire-electronix-d709.dts b/arch/arm/dts/sun5i-a13-empire-electronix-d709.dts
-index 7fbb0b0..6efbba6 100644
 --- a/arch/arm/dts/sun5i-a13-empire-electronix-d709.dts
 +++ b/arch/arm/dts/sun5i-a13-empire-electronix-d709.dts
 @@ -123,7 +123,7 @@
@@ -1920,8 +1876,6 @@ index 7fbb0b0..6efbba6 100644
                allwinner,pins = "PG0";
                allwinner,function = "gpio_in";
                allwinner,drive = <SUN4I_PINCTRL_10_MA>;
-diff --git a/arch/arm/dts/sun5i-a13-inet-98v-rev2.dts b/arch/arm/dts/sun5i-a13-inet-98v-rev2.dts
-index 6d466a2..1b11ec9 100644
 --- a/arch/arm/dts/sun5i-a13-inet-98v-rev2.dts
 +++ b/arch/arm/dts/sun5i-a13-inet-98v-rev2.dts
 @@ -123,21 +123,6 @@
@@ -1976,8 +1930,6 @@ index 6d466a2..1b11ec9 100644
 +      usb1_vbus-supply = <&reg_ldo3>;
        status = "okay";
  };
-diff --git a/arch/arm/dts/sun5i-a13-utoo-p66.dts b/arch/arm/dts/sun5i-a13-utoo-p66.dts
-index eb793d5..fa9ddfd 100644
 --- a/arch/arm/dts/sun5i-a13-utoo-p66.dts
 +++ b/arch/arm/dts/sun5i-a13-utoo-p66.dts
 @@ -47,11 +47,21 @@
@@ -2043,8 +1995,6 @@ index eb793d5..fa9ddfd 100644
  &reg_dcdc2 {
        regulator-always-on;
        regulator-min-microvolt = <1000000>;
-diff --git a/arch/arm/dts/sun5i-q8-common.dtsi b/arch/arm/dts/sun5i-q8-common.dtsi
-index 0641d68..a78e189 100644
 --- a/arch/arm/dts/sun5i-q8-common.dtsi
 +++ b/arch/arm/dts/sun5i-q8-common.dtsi
 @@ -41,11 +41,21 @@
@@ -2069,8 +2019,6 @@ index 0641d68..a78e189 100644
        chosen {
                stdout-path = "serial0:115200n8";
        };
-diff --git a/arch/arm/dts/sun5i-r8-chip.dts b/arch/arm/dts/sun5i-r8-chip.dts
-index abf3ccb..6ad19e2 100644
 --- a/arch/arm/dts/sun5i-r8-chip.dts
 +++ b/arch/arm/dts/sun5i-r8-chip.dts
 @@ -64,6 +64,26 @@
@@ -2151,8 +2099,6 @@ index abf3ccb..6ad19e2 100644
  &reg_ldo5 {
        regulator-min-microvolt = <1800000>;
        regulator-max-microvolt = <1800000>;
-diff --git a/arch/arm/dts/sun5i.dtsi b/arch/arm/dts/sun5i.dtsi
-index 9ffee9b..59a9426 100644
 --- a/arch/arm/dts/sun5i.dtsi
 +++ b/arch/arm/dts/sun5i.dtsi
 @@ -44,6 +44,7 @@
@@ -2214,8 +2160,6 @@ index 9ffee9b..59a9426 100644
                sid: eeprom@01c23800 {
                        compatible = "allwinner,sun4i-a10-sid";
                        reg = <0x01c23800 0x10>;
-diff --git a/arch/arm/dts/sun6i-a31-colombus.dts b/arch/arm/dts/sun6i-a31-colombus.dts
-index 0d0b6f2..f9cf368 100644
 --- a/arch/arm/dts/sun6i-a31-colombus.dts
 +++ b/arch/arm/dts/sun6i-a31-colombus.dts
 @@ -60,6 +60,16 @@
@@ -2263,8 +2207,6 @@ index 0d0b6f2..f9cf368 100644
  };
  
  &reg_usb2_vbus {
-diff --git a/arch/arm/dts/sun6i-a31-hummingbird.dts b/arch/arm/dts/sun6i-a31-hummingbird.dts
-index d0cfada..9a74637 100644
 --- a/arch/arm/dts/sun6i-a31-hummingbird.dts
 +++ b/arch/arm/dts/sun6i-a31-hummingbird.dts
 @@ -54,6 +54,8 @@
@@ -2454,8 +2396,6 @@ index d0cfada..9a74637 100644
  &reg_usb1_vbus {
        gpio = <&pio 7 24 GPIO_ACTIVE_HIGH>; /* PH24 */
        status = "okay";
-diff --git a/arch/arm/dts/sun6i-a31.dtsi b/arch/arm/dts/sun6i-a31.dtsi
-index 44f889f..1867af2 100644
 --- a/arch/arm/dts/sun6i-a31.dtsi
 +++ b/arch/arm/dts/sun6i-a31.dtsi
 @@ -61,7 +61,7 @@
@@ -2543,7 +2483,7 @@ index 44f889f..1867af2 100644
                        clock-output-names = "usb_phy0", "usb_phy1", "usb_phy2",
                                             "usb_ohci0", "usb_ohci1",
                                             "usb_ohci2";
-@@ -677,6 +709,16 @@
+@@ -684,6 +716,16 @@
                                allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
  
@@ -2560,7 +2500,7 @@ index 44f889f..1867af2 100644
                        gmac_pins_mii_a: gmac_mii@0 {
                                allwinner,pins = "PA0", "PA1", "PA2", "PA3",
                                                "PA8", "PA9", "PA11",
-@@ -754,6 +796,13 @@
+@@ -761,6 +803,13 @@
                        reg = <0x01c20ca0 0x20>;
                };
  
@@ -2574,7 +2514,7 @@ index 44f889f..1867af2 100644
                rtp: rtp@01c25000 {
                        compatible = "allwinner,sun6i-a31-ts";
                        reg = <0x01c25000 0x100>;
-@@ -900,6 +949,16 @@
+@@ -907,6 +956,16 @@
                        #size-cells = <0>;
                };
  
@@ -2591,7 +2531,7 @@ index 44f889f..1867af2 100644
                timer@01c60000 {
                        compatible = "allwinner,sun6i-a31-hstimer",
                                     "allwinner,sun7i-a20-hstimer";
-@@ -1061,7 +1120,7 @@
+@@ -1068,7 +1127,7 @@
                        resets = <&apb0_rst 0>;
                        gpio-controller;
                        interrupt-controller;
@@ -2600,8 +2540,6 @@ index 44f889f..1867af2 100644
                        #size-cells = <0>;
                        #gpio-cells = <3>;
  
-diff --git a/arch/arm/dts/sun6i-a31s-primo81.dts b/arch/arm/dts/sun6i-a31s-primo81.dts
-index cfdc03e..379746a 100644
 --- a/arch/arm/dts/sun6i-a31s-primo81.dts
 +++ b/arch/arm/dts/sun6i-a31s-primo81.dts
 @@ -1,16 +1,57 @@
@@ -2871,9 +2809,6 @@ index cfdc03e..379746a 100644
 +      usb1_vbus-supply = <&reg_dldo1>;
        status = "okay";
  };
-diff --git a/arch/arm/dts/sun6i-a31s-sina31s-core.dtsi b/arch/arm/dts/sun6i-a31s-sina31s-core.dtsi
-new file mode 100644
-index 0000000..4ec0c86
 --- /dev/null
 +++ b/arch/arm/dts/sun6i-a31s-sina31s-core.dtsi
 @@ -0,0 +1,142 @@
@@ -3019,9 +2954,6 @@ index 0000000..4ec0c86
 +      status = "okay";
 +};
 +
-diff --git a/arch/arm/dts/sun6i-a31s-sina31s.dts b/arch/arm/dts/sun6i-a31s-sina31s.dts
-new file mode 100644
-index 0000000..6ead2f5
 --- /dev/null
 +++ b/arch/arm/dts/sun6i-a31s-sina31s.dts
 @@ -0,0 +1,153 @@
@@ -3178,9 +3110,6 @@ index 0000000..6ead2f5
 +&usbphy {
 +      status = "okay";
 +};
-diff --git a/arch/arm/dts/sun6i-a31s-yones-toptech-bs1078-v2.dts b/arch/arm/dts/sun6i-a31s-yones-toptech-bs1078-v2.dts
-new file mode 100644
-index 0000000..360adfb
 --- /dev/null
 +++ b/arch/arm/dts/sun6i-a31s-yones-toptech-bs1078-v2.dts
 @@ -0,0 +1,205 @@
@@ -3389,8 +3318,6 @@ index 0000000..360adfb
 +      usb2_vbus-supply = <&reg_dc1sw>;
 +      status = "okay";
 +};
-diff --git a/arch/arm/dts/sun7i-a20-bananapi.dts b/arch/arm/dts/sun7i-a20-bananapi.dts
-index 9f7b472..67c8a76 100644
 --- a/arch/arm/dts/sun7i-a20-bananapi.dts
 +++ b/arch/arm/dts/sun7i-a20-bananapi.dts
 @@ -92,6 +92,24 @@
@@ -3511,8 +3438,6 @@ index 9f7b472..67c8a76 100644
        usb1_vbus-supply = <&reg_usb1_vbus>;
        usb2_vbus-supply = <&reg_usb2_vbus>;
        status = "okay";
-diff --git a/arch/arm/dts/sun7i-a20-cubieboard2.dts b/arch/arm/dts/sun7i-a20-cubieboard2.dts
-index 39a51d5..1fa832d 100644
 --- a/arch/arm/dts/sun7i-a20-cubieboard2.dts
 +++ b/arch/arm/dts/sun7i-a20-cubieboard2.dts
 @@ -84,6 +84,10 @@
@@ -3572,8 +3497,6 @@ index 39a51d5..1fa832d 100644
        usb1_vbus-supply = <&reg_usb1_vbus>;
        usb2_vbus-supply = <&reg_usb2_vbus>;
        status = "okay";
-diff --git a/arch/arm/dts/sun7i-a20-cubietruck.dts b/arch/arm/dts/sun7i-a20-cubietruck.dts
-index e6b0192..8da939a 100644
 --- a/arch/arm/dts/sun7i-a20-cubietruck.dts
 +++ b/arch/arm/dts/sun7i-a20-cubietruck.dts
 @@ -101,6 +101,10 @@
@@ -3587,9 +3510,6 @@ index e6b0192..8da939a 100644
  &cpu0 {
        cpu-supply = <&reg_dcdc2>;
  };
-diff --git a/arch/arm/dts/sun7i-a20-icnova-swac.dts b/arch/arm/dts/sun7i-a20-icnova-swac.dts
-new file mode 100644
-index 0000000..f5b5325
 --- /dev/null
 +++ b/arch/arm/dts/sun7i-a20-icnova-swac.dts
 @@ -0,0 +1,169 @@
@@ -3762,9 +3682,6 @@ index 0000000..f5b5325
 +      usb2_vbus-supply = <&reg_usb2_vbus>;
 +      status = "okay";
 +};
-diff --git a/arch/arm/dts/sun7i-a20-itead-ibox.dts b/arch/arm/dts/sun7i-a20-itead-ibox.dts
-new file mode 100644
-index 0000000..661c21d
 --- /dev/null
 +++ b/arch/arm/dts/sun7i-a20-itead-ibox.dts
 @@ -0,0 +1,125 @@
@@ -3893,8 +3810,6 @@ index 0000000..661c21d
 +&reg_ahci_5v {
 +      status = "okay";
 +};
-diff --git a/arch/arm/dts/sun7i-a20-lamobo-r1.dts b/arch/arm/dts/sun7i-a20-lamobo-r1.dts
-index 975b0b2..5ee43d8 100644
 --- a/arch/arm/dts/sun7i-a20-lamobo-r1.dts
 +++ b/arch/arm/dts/sun7i-a20-lamobo-r1.dts
 @@ -97,16 +97,6 @@
@@ -3914,8 +3829,6 @@ index 975b0b2..5ee43d8 100644
  };
  
  &ehci0 {
-diff --git a/arch/arm/dts/sun7i-a20-mk808c.dts b/arch/arm/dts/sun7i-a20-mk808c.dts
-index 4f432f8..90ff4a2 100644
 --- a/arch/arm/dts/sun7i-a20-mk808c.dts
 +++ b/arch/arm/dts/sun7i-a20-mk808c.dts
 @@ -53,6 +53,7 @@
@@ -3986,8 +3899,6 @@ index 4f432f8..90ff4a2 100644
        usb1_vbus-supply = <&reg_usb1_vbus>;
        usb2_vbus-supply = <&reg_usb2_vbus>;
        status = "okay";
-diff --git a/arch/arm/dts/sun7i-a20-olimex-som-evb.dts b/arch/arm/dts/sun7i-a20-olimex-som-evb.dts
-index 6904dbd..23aacce 100644
 --- a/arch/arm/dts/sun7i-a20-olimex-som-evb.dts
 +++ b/arch/arm/dts/sun7i-a20-olimex-som-evb.dts
 @@ -1,5 +1,6 @@
@@ -4155,8 +4066,6 @@ index 6904dbd..23aacce 100644
        usb0_vbus-supply = <&reg_usb0_vbus>;
        usb1_vbus-supply = <&reg_usb1_vbus>;
        usb2_vbus-supply = <&reg_usb2_vbus>;
-diff --git a/arch/arm/dts/sun7i-a20-olinuxino-lime.dts b/arch/arm/dts/sun7i-a20-olinuxino-lime.dts
-index 0423708..35ad700 100644
 --- a/arch/arm/dts/sun7i-a20-olinuxino-lime.dts
 +++ b/arch/arm/dts/sun7i-a20-olinuxino-lime.dts
 @@ -117,6 +117,18 @@
@@ -4178,8 +4087,6 @@ index 0423708..35ad700 100644
  &mmc0 {
        pinctrl-names = "default";
        pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_reference_design>;
-diff --git a/arch/arm/dts/sun7i-a20-olinuxino-lime2.dts b/arch/arm/dts/sun7i-a20-olinuxino-lime2.dts
-index 8acff78..d5c796c 100644
 --- a/arch/arm/dts/sun7i-a20-olinuxino-lime2.dts
 +++ b/arch/arm/dts/sun7i-a20-olinuxino-lime2.dts
 @@ -170,6 +170,12 @@
@@ -4265,8 +4172,6 @@ index 8acff78..d5c796c 100644
        usb1_vbus-supply = <&reg_usb1_vbus>;
        usb2_vbus-supply = <&reg_usb2_vbus>;
        status = "okay";
-diff --git a/arch/arm/dts/sun7i-a20-olinuxino-micro.dts b/arch/arm/dts/sun7i-a20-olinuxino-micro.dts
-index c5d70ca..7e3006f 100644
 --- a/arch/arm/dts/sun7i-a20-olinuxino-micro.dts
 +++ b/arch/arm/dts/sun7i-a20-olinuxino-micro.dts
 @@ -125,6 +125,12 @@
@@ -4282,8 +4187,6 @@ index c5d70ca..7e3006f 100644
  };
  
  &i2c2 {
-diff --git a/arch/arm/dts/sun7i-a20-orangepi-mini.dts b/arch/arm/dts/sun7i-a20-orangepi-mini.dts
-index 73cd81e..2be04c4 100644
 --- a/arch/arm/dts/sun7i-a20-orangepi-mini.dts
 +++ b/arch/arm/dts/sun7i-a20-orangepi-mini.dts
 @@ -95,6 +95,10 @@
@@ -4349,8 +4252,6 @@ index 73cd81e..2be04c4 100644
        usb1_vbus-supply = <&reg_usb1_vbus>;
        usb2_vbus-supply = <&reg_usb2_vbus>;
        status = "okay";
-diff --git a/arch/arm/dts/sun7i-a20-orangepi.dts b/arch/arm/dts/sun7i-a20-orangepi.dts
-index 55a06ce..71125bf 100644
 --- a/arch/arm/dts/sun7i-a20-orangepi.dts
 +++ b/arch/arm/dts/sun7i-a20-orangepi.dts
 @@ -141,7 +141,18 @@
@@ -4405,8 +4306,6 @@ index 55a06ce..71125bf 100644
        usb1_vbus-supply = <&reg_usb1_vbus>;
        usb2_vbus-supply = <&reg_usb2_vbus>;
        status = "okay";
-diff --git a/arch/arm/dts/sun7i-a20-pcduino3-nano.dts b/arch/arm/dts/sun7i-a20-pcduino3-nano.dts
-index 5361fce..ddac732 100644
 --- a/arch/arm/dts/sun7i-a20-pcduino3-nano.dts
 +++ b/arch/arm/dts/sun7i-a20-pcduino3-nano.dts
 @@ -82,6 +82,14 @@
@@ -4527,8 +4426,6 @@ index 5361fce..ddac732 100644
 +      usb2_vbus-supply = <&reg_usb1_vbus>;
        status = "okay";
  };
-diff --git a/arch/arm/dts/sun7i-a20-pcduino3.dts b/arch/arm/dts/sun7i-a20-pcduino3.dts
-index afc9ece..1a8b39b 100644
 --- a/arch/arm/dts/sun7i-a20-pcduino3.dts
 +++ b/arch/arm/dts/sun7i-a20-pcduino3.dts
 @@ -111,6 +111,14 @@
@@ -4638,8 +4535,6 @@ index afc9ece..1a8b39b 100644
        usb1_vbus-supply = <&reg_usb1_vbus>;
        usb2_vbus-supply = <&reg_usb2_vbus>;
        status = "okay";
-diff --git a/arch/arm/dts/sun7i-a20-wexler-tab7200.dts b/arch/arm/dts/sun7i-a20-wexler-tab7200.dts
-index 83c6d3f..2f6b21a 100644
 --- a/arch/arm/dts/sun7i-a20-wexler-tab7200.dts
 +++ b/arch/arm/dts/sun7i-a20-wexler-tab7200.dts
 @@ -48,6 +48,7 @@
@@ -4787,8 +4682,6 @@ index 83c6d3f..2f6b21a 100644
        usb1_vbus-supply = <&reg_usb1_vbus>;
        usb2_vbus-supply = <&reg_usb2_vbus>;
        status = "okay";
-diff --git a/arch/arm/dts/sun7i-a20-wits-pro-a20-dkt.dts b/arch/arm/dts/sun7i-a20-wits-pro-a20-dkt.dts
-index e7d84fe..dc31d47 100644
 --- a/arch/arm/dts/sun7i-a20-wits-pro-a20-dkt.dts
 +++ b/arch/arm/dts/sun7i-a20-wits-pro-a20-dkt.dts
 @@ -1,13 +1,52 @@
@@ -5012,8 +4905,6 @@ index e7d84fe..dc31d47 100644
 +      usb2_vbus-supply = <&reg_usb2_vbus>;
 +      status = "okay";
 +};
-diff --git a/arch/arm/dts/sun7i-a20.dtsi b/arch/arm/dts/sun7i-a20.dtsi
-index 71ab6b8..0940a78 100644
 --- a/arch/arm/dts/sun7i-a20.dtsi
 +++ b/arch/arm/dts/sun7i-a20.dtsi
 @@ -47,6 +47,7 @@
@@ -5220,8 +5111,6 @@ index 71ab6b8..0940a78 100644
                sid: eeprom@01c23800 {
                        compatible = "allwinner,sun7i-a20-sid";
                        reg = <0x01c23800 0x200>;
-diff --git a/arch/arm/dts/sun8i-a23-a33.dtsi b/arch/arm/dts/sun8i-a23-a33.dtsi
-index 9c4a55c..7e05e09 100644
 --- a/arch/arm/dts/sun8i-a23-a33.dtsi
 +++ b/arch/arm/dts/sun8i-a23-a33.dtsi
 @@ -56,7 +56,7 @@
@@ -5364,8 +5253,6 @@ index 9c4a55c..7e05e09 100644
 +              };
        };
  };
-diff --git a/arch/arm/dts/sun8i-a23-gt90h-v4.dts b/arch/arm/dts/sun8i-a23-gt90h-v4.dts
-index 1aeb06c..b2ce284 100644
 --- a/arch/arm/dts/sun8i-a23-gt90h-v4.dts
 +++ b/arch/arm/dts/sun8i-a23-gt90h-v4.dts
 @@ -47,15 +47,26 @@
@@ -5535,8 +5422,6 @@ index 1aeb06c..b2ce284 100644
 +      usb1_vbus-supply = <&reg_dldo1>;
        status = "okay";
  };
-diff --git a/arch/arm/dts/sun8i-a23.dtsi b/arch/arm/dts/sun8i-a23.dtsi
-index 2cc27c7..92e6616 100644
 --- a/arch/arm/dts/sun8i-a23.dtsi
 +++ b/arch/arm/dts/sun8i-a23.dtsi
 @@ -50,6 +50,31 @@
@@ -5571,8 +5456,6 @@ index 2cc27c7..92e6616 100644
                mbus_clk: clk@01c2015c {
                        #clock-cells = <0>;
                        compatible = "allwinner,sun8i-a23-mbus-clk";
-diff --git a/arch/arm/dts/sun8i-a33-sinlinx-sina33.dts b/arch/arm/dts/sun8i-a33-sinlinx-sina33.dts
-index 1d5390d..fef6abc 100644
 --- a/arch/arm/dts/sun8i-a33-sinlinx-sina33.dts
 +++ b/arch/arm/dts/sun8i-a33-sinlinx-sina33.dts
 @@ -68,7 +68,7 @@
@@ -5692,8 +5575,6 @@ index 1d5390d..fef6abc 100644
  &uart0 {
        pinctrl-names = "default";
        pinctrl-0 = <&uart0_pins_b>;
-diff --git a/arch/arm/dts/sun8i-a33.dtsi b/arch/arm/dts/sun8i-a33.dtsi
-index faa7d3c..001d840 100644
 --- a/arch/arm/dts/sun8i-a33.dtsi
 +++ b/arch/arm/dts/sun8i-a33.dtsi
 @@ -72,6 +72,41 @@
@@ -5755,9 +5636,6 @@ index faa7d3c..001d840 100644
                usb_otg: usb@01c19000 {
                        compatible = "allwinner,sun8i-a33-musb";
                        reg = <0x01c19000 0x0400>;
-diff --git a/arch/arm/dts/sun8i-a83t-cubietruck-plus.dts b/arch/arm/dts/sun8i-a83t-cubietruck-plus.dts
-new file mode 100644
-index 0000000..88b1e09
 --- /dev/null
 +++ b/arch/arm/dts/sun8i-a83t-cubietruck-plus.dts
 @@ -0,0 +1,65 @@
@@ -5826,8 +5704,6 @@ index 0000000..88b1e09
 +      pinctrl-0 = <&uart0_pins_b>;
 +      status = "okay";
 +};
-diff --git a/arch/arm/dts/sun8i-a83t.dtsi b/arch/arm/dts/sun8i-a83t.dtsi
-index 245b819..d3473f8 100644
 --- a/arch/arm/dts/sun8i-a83t.dtsi
 +++ b/arch/arm/dts/sun8i-a83t.dtsi
 @@ -52,12 +52,6 @@
@@ -6039,8 +5915,6 @@ index 245b819..d3473f8 100644
 +              };
        };
  };
-diff --git a/arch/arm/dts/sun8i-h3-orangepi-pc.dts b/arch/arm/dts/sun8i-h3-orangepi-pc.dts
-index 4b25dcc..30ccca0 100644
 --- a/arch/arm/dts/sun8i-h3-orangepi-pc.dts
 +++ b/arch/arm/dts/sun8i-h3-orangepi-pc.dts
 @@ -45,6 +45,7 @@
@@ -6140,8 +6014,6 @@ index 4b25dcc..30ccca0 100644
  &uart0 {
        pinctrl-names = "default";
        pinctrl-0 = <&uart0_pins_a>;
-diff --git a/arch/arm/dts/sun8i-h3-orangepi-plus.dts b/arch/arm/dts/sun8i-h3-orangepi-plus.dts
-index 1cb6c66..900ec4f 100644
 --- a/arch/arm/dts/sun8i-h3-orangepi-plus.dts
 +++ b/arch/arm/dts/sun8i-h3-orangepi-plus.dts
 @@ -45,6 +45,7 @@
@@ -6221,8 +6093,6 @@ index 1cb6c66..900ec4f 100644
  };
  
  &ehci1 {
-diff --git a/arch/arm/dts/sun8i-h3.dtsi b/arch/arm/dts/sun8i-h3.dtsi
-index 0faa38a..c2f63c5 100644
 --- a/arch/arm/dts/sun8i-h3.dtsi
 +++ b/arch/arm/dts/sun8i-h3.dtsi
 @@ -83,12 +83,6 @@
@@ -6590,8 +6460,6 @@ index 0faa38a..c2f63c5 100644
 +              };
        };
  };
-diff --git a/arch/arm/dts/sun8i-q8-common.dtsi b/arch/arm/dts/sun8i-q8-common.dtsi
-index 07cd268..346a49d 100644
 --- a/arch/arm/dts/sun8i-q8-common.dtsi
 +++ b/arch/arm/dts/sun8i-q8-common.dtsi
 @@ -41,11 +41,23 @@
@@ -6718,8 +6586,6 @@ index 07cd268..346a49d 100644
 +&simplefb_lcd {
 +      vcc-lcd-supply = <&reg_dc1sw>;
 +};
-diff --git a/arch/arm/dts/sun9i-a80-cubieboard4.dts b/arch/arm/dts/sun9i-a80-cubieboard4.dts
-index 6484dcf..eb2ccd0 100644
 --- a/arch/arm/dts/sun9i-a80-cubieboard4.dts
 +++ b/arch/arm/dts/sun9i-a80-cubieboard4.dts
 @@ -62,9 +62,31 @@
@@ -6775,8 +6641,6 @@ index 6484dcf..eb2ccd0 100644
        status = "okay";
  };
  
-diff --git a/arch/arm/dts/sun9i-a80-optimus.dts b/arch/arm/dts/sun9i-a80-optimus.dts
-index 6ce4b5e..d7a20d9 100644
 --- a/arch/arm/dts/sun9i-a80-optimus.dts
 +++ b/arch/arm/dts/sun9i-a80-optimus.dts
 @@ -65,7 +65,7 @@
@@ -6870,8 +6734,6 @@ index 6ce4b5e..d7a20d9 100644
  };
  
  &usbphy1 {
-diff --git a/arch/arm/dts/sun9i-a80.dtsi b/arch/arm/dts/sun9i-a80.dtsi
-index a43ad77..f68b324 100644
 --- a/arch/arm/dts/sun9i-a80.dtsi
 +++ b/arch/arm/dts/sun9i-a80.dtsi
 @@ -128,6 +128,17 @@
@@ -7196,9 +7058,6 @@ index a43ad77..f68b324 100644
 +              };
        };
  };
-diff --git a/arch/arm/dts/sunxi-itead-core-common.dtsi b/arch/arm/dts/sunxi-itead-core-common.dtsi
-new file mode 100644
-index 0000000..2565d51
 --- /dev/null
 +++ b/arch/arm/dts/sunxi-itead-core-common.dtsi
 @@ -0,0 +1,136 @@
@@ -7338,8 +7197,6 @@ index 0000000..2565d51
 +      usb2_vbus-supply = <&reg_usb2_vbus>;
 +      status = "okay";
 +};
-diff --git a/arch/arm/dts/sunxi-q8-common.dtsi b/arch/arm/dts/sunxi-q8-common.dtsi
-index 17b26ff..b824146 100644
 --- a/arch/arm/dts/sunxi-q8-common.dtsi
 +++ b/arch/arm/dts/sunxi-q8-common.dtsi
 @@ -75,3 +75,9 @@