Commit 9440d8ac authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'v5.8-rockchip-dts32-1' of... 

Merge tag 'v5.8-rockchip-dts32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into arm/dt

RGA node for rk322x, wifi node for rk3229-xms6 and some cleanups.

* tag 'v5.8-rockchip-dts32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  ARM: dts: rockchip: add rga node for rk322x
  ARM: dts: remove disable-wp from rk3229-xms6 emmc
  ARM: dts: enable WLAN for Mecer Xtreme Mini S6
  ARM: dts: rockchip: remove identical #include from rk3288.dtsi
  ARM: dts: rockchip: rename and label gpio-led subnodes

Link: https://lore.kernel.org/r/3735080.6Cexqc3t0Y@phil


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents f0c59fd9 54b1a4e0

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

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
	leds: gpio-leds {

		compatible = "gpio-leds";



		work {

		work_led: led-0 {

			gpios = <&gpio2 RK_PD6 GPIO_ACTIVE_HIGH>;

			label = "kylin:red:led";

			pinctrl-names = "default";

arch/arm/boot/dts/rk3066a-mk808.dts

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
	gpio-leds {

		compatible = "gpio-leds";



		blue {

		blue_led: led-0 {

			label = "mk808:blue:power";

			gpios = <&gpio0 RK_PA3 GPIO_ACTIVE_HIGH>;

			default-state = "off";

arch/arm/boot/dts/rk3188-radxarock.dts

+3 −3
Original line number Diff line number Diff line
@@ -33,19 +33,19 @@ 
	gpio-leds {

		compatible = "gpio-leds";



		green {

		green_led: led-0 {

			label = "rock:green:user1";

			gpios = <&gpio0 RK_PB4 GPIO_ACTIVE_LOW>;

			default-state = "off";

		};



		blue {

		blue_led: led-1 {

			label = "rock:blue:user2";

			gpios = <&gpio0 RK_PB6 GPIO_ACTIVE_LOW>;

			default-state = "off";

		};



		sleep {

		sleep_led: led-2 {

			label = "rock:red:power";

			gpios = <&gpio0 RK_PB7 GPIO_ACTIVE_HIGH>;

			default-state = "off";

arch/arm/boot/dts/rk3229-xms6.dts

+17 −2
Original line number Diff line number Diff line
@@ -33,12 +33,18 @@ 
	power-led {

		compatible = "gpio-leds";



		blue {

		blue_led: led-0 {

			gpios = <&gpio3 21 GPIO_ACTIVE_HIGH>;

			default-state = "on";

		};

	};



	sdio_pwrseq: sdio-pwrseq {

		compatible = "mmc-pwrseq-simple";

		reset-gpios = <&gpio2 26 GPIO_ACTIVE_LOW>,

		              <&gpio2 29 GPIO_ACTIVE_LOW>;

	};



	vcc_host: vcc-host-regulator {

		compatible = "regulator-fixed";

		enable-active-high;
@@ -131,7 +137,6 @@ 


&emmc {

	cap-mmc-highspeed;

	disable-wp;

	non-removable;

	status = "okay";

};
@@ -202,6 +207,16 @@ 
	status = "okay";

};



&sdio {

	bus-width = <4>;

	cap-sd-highspeed;

	cap-sdio-irq;

	mmc-pwrseq = <&sdio_pwrseq>;

	non-removable;

	vqmmc-supply = <&vccio_1v8>;

	status = "okay";

};



&sdmmc {

	cap-mmc-highspeed;

	disable-wp;

arch/arm/boot/dts/rk322x.dtsi

+10 −0
Original line number Diff line number Diff line
@@ -615,6 +615,16 @@ 
		status = "disabled";

	};



	rga: rga@20060000 {

		compatible = "rockchip,rk3228-rga", "rockchip,rk3288-rga";

		reg = <0x20060000 0x1000>;

		interrupts = <GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&cru ACLK_RGA>, <&cru HCLK_RGA>, <&cru SCLK_RGA>;

		clock-names = "aclk", "hclk", "sclk";

		resets = <&cru SRST_RGA>, <&cru SRST_RGA_A>, <&cru SRST_RGA_H>;

		reset-names = "core", "axi", "ahb";

	};



	iep_mmu: iommu@20070800 {

		compatible = "rockchip,iommu";

		reg = <0x20070800 0x100>;