Merge tag 'sunxi-fixes-for-5.4-3' of https://git.kernel.org/pub/scm/linux/kernel...

One patch to add back the PMU node that was removed because the
interrupts were improper in a previous fixes PR.

* tag 'sunxi-fixes-for-5.4-3' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
  arm64: dts: allwinner: a64: Re-add PMU node
  ARM: sunxi: Fix CPU powerdown on A83T
  ARM: dts: sun8i-a83t-tbs-a711: Fix WiFi resume from suspend
  ARM: dts: sun7i: Drop the module clock from the device tree
  dt-bindings: media: sun4i-csi: Drop the module clock
  media: dt-bindings: Fix building error for dt_binding_check
  arm64: dts: allwinner: a64: sopine-baseboard: Add PHY regulator delay
  arm64: dts: allwinner: a64: Drop PMU node
  arm64: dts: allwinner: a64: pine64-plus: Add PHY regulator delay

Link: https://lore.kernel.org/r/45023fa6-b2bc-4934-b85c-3e7841dde0b1.lettre@localhost
Signed-off-by: Olof Johansson <olof@lixom.net>

diff --combined arch/arm/boot/dts/sun8i-a83t-tbs-a711.dts
index 19f520252dc515dbdf72a8f941b097485db22438,3bec3e0a81b2c6d4b4fededfb97db8836470a091..2fd31a0a0b344e90c4c6efb53b90b85fa90da85f
--- 1/arch/arm/boot/dts/sun8i-a83t-tbs-a711.dts
--- 2/arch/arm/boot/dts/sun8i-a83t-tbs-a711.dts
+++ b/arch/arm/boot/dts/sun8i-a83t-tbs-a711.dts
@@@ -164,22 -164,6 +164,22 @@@
        status = "okay";
  };
  
 +&i2c0 {
 +      clock-frequency = <400000>;
 +      status = "okay";
 +
 +      touchscreen@38 {
 +              compatible = "edt,edt-ft5x06";
 +              reg = <0x38>;
 +              interrupt-parent = <&r_pio>;
 +              interrupts = <0 7 IRQ_TYPE_EDGE_FALLING>; /* PL7 */
 +              reset-gpios = <&pio 3 5 GPIO_ACTIVE_LOW>; /* PD5 */
 +              vcc-supply = <&reg_ldo_io0>;
 +              touchscreen-size-x = <1024>;
 +              touchscreen-size-y = <600>;
 +      };
 +};
 +
  &i2c1 {
        clock-frequency = <400000>;
        status = "okay";
@@@ -208,6 -192,7 +208,7 @@@
        vqmmc-supply = <&reg_dldo1>;
        non-removable;
        wakeup-source;
+       keep-power-in-suspend;
        status = "okay";
  
        brcmf: wifi@1 {

diff --combined arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts
index 0c484270edb2b70fe9d92725644f0127ed921887,25099202c52c99d37b06ca3127dcc9b9b8214b4b..920103ec0046160cb1351394757c90cc41dde940
--- 1/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts
--- 2/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts
@@@ -55,10 -55,6 +55,10 @@@
        aliases {
                ethernet0 = &emac;
                serial0 = &uart0;
 +              serial1 = &uart1;
 +              serial2 = &uart2;
 +              serial3 = &uart3;
 +              serial4 = &uart4;
        };
  
        chosen {
@@@ -163,6 -159,12 +163,12 @@@
  };
  
  &reg_dc1sw {
+       /*
+        * Ethernet PHY needs 30ms to properly power up and some more
+        * to initialize. 100ms should be plenty of time to finish
+        * whole process.
+        */
+       regulator-enable-ramp-delay = <100000>;
        regulator-name = "vcc-phy";
  };
  
@@@ -208,27 -210,6 +214,27 @@@
        status = "okay";
  };
  
 +/* On Pi-2 connector */
 +&uart2 {
 +      pinctrl-names = "default";
 +      pinctrl-0 = <&uart2_pins>;
 +      status = "disabled";
 +};
 +
 +/* On Euler connector */
 +&uart3 {
 +      pinctrl-names = "default";
 +      pinctrl-0 = <&uart3_pins>;
 +      status = "disabled";
 +};
 +
 +/* On Euler connector, RTS/CTS optional */
 +&uart4 {
 +      pinctrl-names = "default";
 +      pinctrl-0 = <&uart4_pins>;
 +      status = "disabled";
 +};
 +
  &usb_otg {
        dr_mode = "host";
        status = "okay";

diff --combined arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
index 5daa398f9246814eacb3499d374e1c019ccb6005,b58976736898726616b0fdccfc0d734ab0b3915b..d89413b8778542fce501b7e44c15333f770461fc
--- 1/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
--- 2/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
@@@ -144,10 -144,10 +144,10 @@@
  
        pmu {
                compatible = "arm,cortex-a53-pmu";
-               interrupts = <GIC_SPI 152 IRQ_TYPE_LEVEL_HIGH>,
-                            <GIC_SPI 153 IRQ_TYPE_LEVEL_HIGH>,
-                            <GIC_SPI 154 IRQ_TYPE_LEVEL_HIGH>,
-                            <GIC_SPI 155 IRQ_TYPE_LEVEL_HIGH>;
+               interrupts = <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>,
+                            <GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>,
+                            <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>,
+                            <GIC_SPI 119 IRQ_TYPE_LEVEL_HIGH>;
                interrupt-affinity = <&cpu0>, <&cpu1>, <&cpu2>, <&cpu3>;
        };
  
@@@ -487,15 -487,6 +487,15 @@@
                        reg = <0x1c14000 0x400>;
                };
  
 +              crypto: crypto@1c15000 {
 +                      compatible = "allwinner,sun50i-a64-crypto";
 +                      reg = <0x01c15000 0x1000>;
 +                      interrupts = <GIC_SPI 94 IRQ_TYPE_LEVEL_HIGH>;
 +                      clocks = <&ccu CLK_BUS_CE>, <&ccu CLK_CE>;
 +                      clock-names = "bus", "mod";
 +                      resets = <&ccu RST_BUS_CE>;
 +              };
 +
                usb_otg: usb@1c19000 {
                        compatible = "allwinner,sun8i-a33-musb";
                        reg = <0x01c19000 0x0400>;