mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

MMC aliases fixups and some property/compatible cleanups. 

-----BEGIN PGP SIGNATURE-----
 
 iQFEBAABCAAuFiEE7v+35S2Q1vLNA3Lx86Z5yZzRHYEFAmByvY0QHGhlaWtvQHNu
 dGVjaC5kZQAKCRDzpnnJnNEdgSjAB/0ca5PFybfoqLk49gTxkRuKfHw3s1WNUJrO
 x9GFk5ow8egchU2s3p5wk11+g9XoJA6OS05nwZPiDgNoK4pfsxydF3fHL54u8l0a
 8QhK5+AmmSu+LS1K/MU9O4riz8O4SY/XGp8Yn0Y0SL0a8BPIGyA1OInkCLlogMOw
 5pybiYNKERyh6oEWlttEWdusBtLDMuKlDttdgE1goAB2lXR1TokawT6WaRfnAUlL
 7Yp7JqksYKY/lhxC9CoO8GxtaqLZctPxDwPEIIn3Mx5R5M/KSdDNYgqGPEZY/CMK
 pJnAEeFDdE5ehQhmjcbmi/+IYilqndsYm6p4M4LGeDnNEFXk7aD1
 =8tCw
 -----END PGP SIGNATURE-----

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: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2021-04-13 10:54:16 +02:00
parent e4379d649e e89db2b4c7
commit 91f059a0fc
7 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/boot/dts/rk3228-evb.dts
View File

@ -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>;

4
arch/arm/boot/dts/rk3229-evb.dts
View File

@ -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>;

6
arch/arm/boot/dts/rk3229-xms6.dts
View File

@ -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>;

5
arch/arm/boot/dts/rk322x.dtsi
View File

@ -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>;

4
arch/arm/boot/dts/rv1108-elgin-r1.dts
View File

@ -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>;

4
arch/arm/boot/dts/rv1108-evb.dts
View File

@ -8,6 +8,10 @@
model = "Rockchip RV1108 Evaluation board";
compatible = "rockchip,rv1108-evb", "rockchip,rv1108";
aliases {
mmc0 = &sdmmc;
};
memory@60000000 {
device_type = "memory";
reg = <0x60000000 0x08000000>;

6
arch/arm/boot/dts/rv1108.dtsi
View File

@ -19,9 +19,6 @@
i2c1 = &i2c1;
i2c2 = &i2c2;
i2c3 = &i2c3;
mmc0 = &emmc;
mmc1 = &sdio;
mmc2 = &sdmmc;
serial0 = &uart0;
serial1 = &uart1;
serial2 = &uart2;
@ -303,11 +300,10 @@
};
watchdog: watchdog@10360000 {
compatible = "snps,dw-wdt";
compatible = "rockchip,rv1108-wdt", "snps,dw-wdt";
reg = <0x10360000 0x100>;
interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cru PCLK_WDT>;
clock-names = "pclk_wdt";
status = "disabled";
};