Merge tag 'sunxi-h3-h5-for-5.2' of https://git.kernel.org/pub/scm/linux/kernel/git...

Allwinner H3/H5 changes for 5.2

Our usual bunch of changes shared between arm and arm64, the most notable
one being:
  - Fix of improper usage of DT bindings, thanks to the DT validation
  - Add the SID for the H3 and H5
  - New board: RerVision H3-DVK

* tag 'sunxi-h3-h5-for-5.2' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
  ARM: dts: sun8i: mapleboard: Remove cd-inverted
  ARM: dts: sunxi: h3/h5: Remove useless phy-names from EHCI and OHCI
  ARM: dts: sun8i: h3: bluetooth for Banana Pi M2 Zero board
  ARM: dts: sun8i: h3: Add default dr_mode
  ARM: dts: sun8i: h3: Refactor the pinctrl node names
  ARM: dts: sunxi: h3/h5: Remove stale pinctrl-names entry
  ARM: dts: sunxi: h3/h5: Add device node for SID
  ARM: dts: sun8i-h3: Add support for the RerVision H3-DVK board

Signed-off-by: Olof Johansson <olof@lixom.net>

diff --cc arch/arm/boot/dts/Makefile
Simple merge

diff --cc arch/arm/boot/dts/sun8i-h3-nanopi.dtsi
index ec2a05f,660bcf4..4df29a6
--- 1/arch/arm/boot/dts/sun8i-h3-nanopi.dtsi
--- 2/arch/arm/boot/dts/sun8i-h3-nanopi.dtsi
+++ b/arch/arm/boot/dts/sun8i-h3-nanopi.dtsi
@@@ -100,9 -104,28 +100,9 @@@
        status = "okay";
  };
  
 -&pio {
 -      leds_npi: led_pins {
 -              pins = "PA10";
 -              function = "gpio_out";
 -      };
 -};
 -
 -&r_pio {
 -      leds_r_npi: led_pins {
 -              pins = "PL10";
 -              function = "gpio_out";
 -      };
 -
 -      sw_r_npi: key_pins {
 -              pins = "PL3";
 -              function = "gpio_in";
 -      };
 -};
 -
  &uart0 {
        pinctrl-names = "default";
-       pinctrl-0 = <&uart0_pins_a>;
+       pinctrl-0 = <&uart0_pa_pins>;
        status = "okay";
  };
  

diff --cc arch/arm/boot/dts/sun8i-h3-orangepi-2.dts
Simple merge

diff --cc arch/arm/boot/dts/sun8i-h3-orangepi-lite.dts
index 34d8e5d,ceda02d..6f9c97a
--- 1/arch/arm/boot/dts/sun8i-h3-orangepi-lite.dts
--- 2/arch/arm/boot/dts/sun8i-h3-orangepi-lite.dts
+++ b/arch/arm/boot/dts/sun8i-h3-orangepi-lite.dts
@@@ -156,9 -160,28 +156,9 @@@
        status = "okay";
  };
  
 -&pio {
 -      leds_opc: led_pins {
 -              pins = "PA15";
 -              function = "gpio_out";
 -      };
 -};
 -
 -&r_pio {
 -      leds_r_opc: led_pins {
 -              pins = "PL10";
 -              function = "gpio_out";
 -      };
 -
 -      sw_r_opc: key_pins {
 -              pins = "PL3";
 -              function = "gpio_in";
 -      };
 -};
 -
  &uart0 {
        pinctrl-names = "default";
-       pinctrl-0 = <&uart0_pins_a>;
+       pinctrl-0 = <&uart0_pa_pins>;
        status = "okay";
  };
  

diff --cc arch/arm/boot/dts/sun8i-h3-orangepi-one.dts
Simple merge

diff --cc arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts
Simple merge