tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge branch 'for-v5.20/aspeed-dts-cleanup' into for-v5.20/dts-cleanup

Krzysztof Kozlowski 2f7a7f94 3120910a

+3 -2
+1 -1
arch/arm/boot/dts/aspeed-ast2500-evb.dts
··· 5 5 6 6 / { 7 7 model = "AST2500 EVB"; 8 - compatible = "aspeed,ast2500"; 8 + compatible = "aspeed,ast2500-evb", "aspeed,ast2500"; 9 9 10 10 aliases { 11 11 serial4 = &uart5;
+1
arch/arm/boot/dts/aspeed-ast2600-evb-a1.dts
··· 5 5 6 6 / { 7 7 model = "AST2600 A1 EVB"; 8 + compatible = "aspeed,ast2600-evb-a1", "aspeed,ast2600"; 8 9 9 10 /delete-node/regulator-vcc-sdhci0; 10 11 /delete-node/regulator-vcc-sdhci1;
+1 -1
arch/arm/boot/dts/aspeed-ast2600-evb.dts
··· 8 8 9 9 / { 10 10 model = "AST2600 EVB"; 11 - compatible = "aspeed,ast2600"; 11 + compatible = "aspeed,ast2600-evb-a1", "aspeed,ast2600"; 12 12 13 13 aliases { 14 14 serial4 = &uart5;