Commit 68a3ead5 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'sunxi-h3-h5-for-5.2' of... 

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

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: default avatarOlof Johansson <olof@lixom.net>
parents b76cabc9 7aaee3d1

arch/arm/boot/dts/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -1094,6 +1094,7 @@ dtb-$(CONFIG_MACH_SUN8I) += \ 
	sun8i-h3-orangepi-plus.dtb \

	sun8i-h3-orangepi-plus2e.dtb \

	sun8i-h3-orangepi-zero-plus2.dtb \

	sun8i-h3-rervision-dvk.dtb \

	sun8i-r16-bananapi-m2m.dtb \

	sun8i-r16-nintendo-nes-classic.dtb \

	sun8i-r16-nintendo-super-nes-classic.dtb \

arch/arm/boot/dts/sun8i-h2-plus-bananapi-m2-zero.dts

+16 −4
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ 


	leds {

		compatible = "gpio-leds";

		pinctrl-names = "default";



		pwr_led {

			label = "bananapi-m2-zero:red:pwr";
@@ -39,7 +38,6 @@ 


	gpio_keys {

		compatible = "gpio-keys";

		pinctrl-names = "default";



		sw4 {

			label = "power";
@@ -67,8 +65,9 @@ 


	wifi_pwrseq: wifi_pwrseq {

		compatible = "mmc-pwrseq-simple";

		pinctrl-names = "default";

		reset-gpios = <&r_pio 0 7 GPIO_ACTIVE_LOW>; /* PL7 */

		clocks = <&rtc 1>;

		clock-names = "ext_clock";

	};

};
@@ -115,14 +114,27 @@ 


&uart0 {

	pinctrl-names = "default";

	pinctrl-0 = <&uart0_pins_a>;

	pinctrl-0 = <&uart0_pa_pins>;

	status = "okay";

};



&uart1 {

	pinctrl-names = "default";

	pinctrl-0 = <&uart1_pins>, <&uart1_rts_cts_pins>;

	uart-has-rtscts;

	status = "okay";



	bluetooth {

		compatible = "brcm,bcm43438-bt";

		clocks = <&rtc 1>;

		clock-names = "lpo";

		vbat-supply = <&reg_vcc3v3>;

		vddio-supply = <&reg_vcc3v3>;

		device-wakeup-gpios = <&pio 6 13 GPIO_ACTIVE_HIGH>; /* PG13 */

		host-wakeup-gpios = <&pio 6 11 GPIO_ACTIVE_HIGH>; /* PG11 */

		shutdown-gpios = <&pio 6 12 GPIO_ACTIVE_HIGH>; /* PG12 */

	};



};



&usb_otg {

arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts

+1 −1
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ 


&uart0 {

	pinctrl-names = "default";

	pinctrl-0 = <&uart0_pins_a>;

	pinctrl-0 = <&uart0_pa_pins>;

	status = "okay";

};

arch/arm/boot/dts/sun8i-h3-beelink-x2.dts

+3 −3
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ 


&ir {

	pinctrl-names = "default";

	pinctrl-0 = <&ir_pins_a>;

	pinctrl-0 = <&r_ir_rx_pin>;

	status = "okay";

};
@@ -193,13 +193,13 @@ 


&spdif {

	pinctrl-names = "default";

	pinctrl-0 = <&spdif_tx_pins_a>;

	pinctrl-0 = <&spdif_tx_pin>;

	status = "okay";

};



&uart0 {

	pinctrl-names = "default";

	pinctrl-0 = <&uart0_pins_a>;

	pinctrl-0 = <&uart0_pa_pins>;

	status = "okay";

};

arch/arm/boot/dts/sun8i-h3-mapleboard-mp130.dts

+3 −4
Original line number Diff line number Diff line
@@ -84,15 +84,14 @@ 


&ir {

	pinctrl-names = "default";

	pinctrl-0 = <&ir_pins_a>;

	pinctrl-0 = <&r_ir_rx_pin>;

	status = "okay";

};



&mmc0 {

	vmmc-supply = <&reg_vcc3v3>;

	bus-width = <4>;

	cd-gpios = <&pio 5 6 GPIO_ACTIVE_HIGH>; /* PF6 */

	cd-inverted;

	cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; /* PF6 */

	status = "okay";

};
@@ -120,7 +119,7 @@ 


&uart0 {

	pinctrl-names = "default";

	pinctrl-0 = <&uart0_pins_a>;

	pinctrl-0 = <&uart0_pa_pins>;

	status = "okay";

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE