Merge tag 'v5.1-rockchip-dts32-1' of... (77ab2ebf) · Commits · 戴 / test

Merge tag 'v5.1-rockchip-dts32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into arm/dt New board the Elgin-R1 based on the rv1108 soc and a number of small improvements for rv1108 as well. RK3066 got support for the core display components and the Edison tablet got its touchscreen added. Apart from that a wider fix to drop display-wp usage from places where it shouldn't be used, a pin fix for Edison and a cleanup to prevent rk3036 board from defining sound-dai-cells for core components in each board separately. * tag 'v5.1-rockchip-dts32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip : ARM: dts: rockchip: clean up the abuse of disable-wp ARM: dts: rv1108: Add support for rv1108-elgin-r1 board dt-bindings: Add vendor prefix for elgin ARM: dts: rockchip: rv1108: Add spim0 and spim1 pinctrl groups ARM: dts: rockchip: Add missing dma-names SPI support for rv1108 ARM: dts: rockchip: add rk3066 vop display nodes ARM: dts: rockchip: add focaltech touchscreen to rk3188-bqedison2qc ARM: dts: rockchip: fix cif1_pdn pin on rk3188-bqedison2qc ARM: dts: rockchip: add HCLK_HDMI to rk3066 vio power-domain ARM: dts: rockchip: move rk3036 i2s sound-dail-cells into soc dtsi Signed-off-by:

Arnd Bergmann <arnd@arndb.de>

Documentation/devicetree/bindings/arm/rockchip.yaml

+5 −0

Original line number	Diff line number	Diff line
		@@ -60,6 +60,11 @@ properties:
		- const: chipspark,rayeager-px2
		- const: rockchip,rk3066a

		- description: Elgin RV1108 R1
		items:
		- const: elgin,rv1108-r1
		- const: rockchip,rv1108

		- description: Firefly Firefly-RK3288
		items:
		- enum:

Documentation/devicetree/bindings/vendor-prefixes.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -113,6 +113,7 @@ eckelmann Eckelmann AG
		edt Emerging Display Technologies
		eeti eGalax_eMPIA Technology Inc
		elan Elan Microelectronic Corp.
		elgin Elgin S/A.
		embest Shenzhen Embest Technology Co., Ltd.
		emlid Emlid, Ltd.
		emmicro EM Microelectronic

arch/arm/boot/dts/Makefile

+1 −0

Original line number	Diff line number	Diff line
		@@ -869,6 +869,7 @@ dtb-$(CONFIG_ARCH_RENESAS) += \
		r9a06g032-rzn1d400-db.dtb \
		sh73a0-kzm9g.dtb
		dtb-$(CONFIG_ARCH_ROCKCHIP) += \
		rv1108-elgin-r1.dtb \
		rv1108-evb.dtb \
		rk3036-evb.dtb \
		rk3036-kylin.dtb \

arch/arm/boot/dts/rk3036-kylin.dts

+0 −1

Original line number	Diff line number	Diff line
		@@ -310,7 +310,6 @@
		};

		&i2s {
		#sound-dai-cells = <0>;
		status = "okay";
		};

arch/arm/boot/dts/rk3036.dtsi

+1 −0

Original line number	Diff line number	Diff line
		@@ -289,6 +289,7 @@
		dma-names = "tx", "rx";
		pinctrl-names = "default";
		pinctrl-0 = <&i2s_bus>;
		#sound-dai-cells = <0>;
		status = "disabled";
		};

Admin message