Merge tag 'sunxi-h3-h5-for-5.1' of... (51098f76) · Commits · 戴 / test

Merge tag 'sunxi-h3-h5-for-5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into arm/dt Allwinner H3 and H5 changes for 5.1 Our usual round of DT changes shared between arm and arm64. We have a bunch of changes for board, improving the eMMC support on the H5 variant of the All-H3-CC, enabling HDMI and reworking the CSI driver. * tag 'sunxi-h3-h5-for-5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux : arm64: dts: allwinner: h5: libretech-all-h3-cc: Mark eMMC HS-DDR 3.3V capable ARM: dts: sunxi: h3/h5: Drop A31 fallback compatible for CSI controller ARM: dts: sun8i-h3: nanopi-m1-plus: enable HDMI Signed-off-by:

Arnd Bergmann <arnd@arndb.de>

arch/arm/boot/dts/sun8i-h3-nanopi-m1-plus.dts

+25 −0

Original line number	Diff line number	Diff line
		@@ -67,6 +67,21 @@
		pinctrl-names = "default";
		reset-gpios = <&r_pio 0 7 GPIO_ACTIVE_LOW>; /* PL7 */
		};

		connector {
		compatible = "hdmi-connector";
		type = "a";

		port {
		hdmi_con_in: endpoint {
		remote-endpoint = <&hdmi_out_con>;
		};
		};
		};
		};

		&de {
		status = "okay";
		};

		&ehci1 {
		@@ -94,6 +109,16 @@
		};
		};

		&hdmi {
		status = "okay";
		};

		&hdmi_out {
		hdmi_out_con: endpoint {
		remote-endpoint = <&hdmi_con_in>;
		};
		};

		&ir {
		pinctrl-names = "default";
		pinctrl-0 = <&ir_pins_a>;

arch/arm/boot/dts/sunxi-h3-h5.dtsi

+1 −2

Original line number	Diff line number	Diff line
		@@ -740,8 +740,7 @@
		};

		csi: camera@1cb0000 {
		compatible = "allwinner,sun8i-h3-csi",
		"allwinner,sun6i-a31-csi";
		compatible = "allwinner,sun8i-h3-csi";
		reg = <0x01cb0000 0x1000>;
		interrupts = <GIC_SPI 84 IRQ_TYPE_LEVEL_HIGH>;
		clocks = <&ccu CLK_BUS_CSI>,

arch/arm64/boot/dts/allwinner/sun50i-h5-libretech-all-h3-cc.dts

+4 −0

Original line number	Diff line number	Diff line
		@@ -12,3 +12,7 @@
		model = "Libre Computer Board ALL-H3-CC H5";
		compatible = "libretech,all-h3-cc-h5", "allwinner,sun50i-h5";
		};

		&mmc2 {
		mmc-ddr-3_3v;
		};

Admin message