Commit 91f059a0 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'v5.13-rockchip-dts32' of... 

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

MMC aliases fixups and some property/compatible cleanups.

* tag 'v5.13-rockchip-dts32' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  ARM: dts: rockchip: move rv1108 mmcx aliases to board dts files
  ARM: dts: rockchip: move rk322x mmcx aliases to board dts files
  ARM: dts: rockchip: remove clock-names property from watchdog node in rv1108.dtsi
  ARM: dts: rockchip: add new watchdog compatible to rk322x.dtsi
  ARM: dts: rockchip: add new watchdog compatible to rv1108.dtsi

Link: https://lore.kernel.org/r/4638723.31r3eYUQgx@phil


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents e4379d64 e89db2b4

arch/arm/boot/dts/rk3228-evb.dts

+4 −0
Original line number Diff line number Diff line
@@ -8,6 +8,10 @@ 
	model = "Rockchip RK3228 Evaluation board";

	compatible = "rockchip,rk3228-evb", "rockchip,rk3228";



	aliases {

		mmc0 = &emmc;

	};



	memory@60000000 {

		device_type = "memory";

		reg = <0x60000000 0x40000000>;

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

+4 −0
Original line number Diff line number Diff line
@@ -9,6 +9,10 @@ 
	model = "Rockchip RK3229 Evaluation board";

	compatible = "rockchip,rk3229-evb", "rockchip,rk3229";



	aliases {

		mmc0 = &emmc;

	};



	memory@60000000 {

		device_type = "memory";

		reg = <0x60000000 0x40000000>;

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

+6 −0
Original line number Diff line number Diff line
@@ -9,6 +9,12 @@ 
	model = "Mecer Xtreme Mini S6";

	compatible = "mecer,xms6", "rockchip,rk3229";



	aliases {

		mmc0 = &sdmmc;

		mmc1 = &sdio;

		mmc2 = &emmc;

	};



	memory@60000000 {

		device_type = "memory";

		reg = <0x60000000 0x40000000>;

arch/arm/boot/dts/rk322x.dtsi

+1 −4
Original line number Diff line number Diff line
@@ -14,9 +14,6 @@ 
	interrupt-parent = <&gic>;



	aliases {

		mmc0 = &sdmmc;

		mmc1 = &sdio;

		mmc2 = &emmc;

		serial0 = &uart0;

		serial1 = &uart1;

		serial2 = &uart2;
@@ -370,7 +367,7 @@ 
	};



	wdt: watchdog@110a0000 {

		compatible = "snps,dw-wdt";

		compatible = "rockchip,rk3228-wdt", "snps,dw-wdt";

		reg = <0x110a0000 0x100>;

		interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&cru PCLK_CPU>;

arch/arm/boot/dts/rv1108-elgin-r1.dts

+4 −0
Original line number Diff line number Diff line
@@ -12,6 +12,10 @@ 
	model = "Elgin RV1108 R1 board";

	compatible = "elgin,rv1108-r1", "rockchip,rv1108";



	aliases {

		mmc0 = &emmc;

	};



	memory@60000000 {

		device_type = "memory";

		reg = <0x60000000 0x08000000>;