소스 검색

ARM: dts: keystone: use common "ti,keystone" compatible instead of -evm

As suggested by Olof Johansson at
http://www.spinics.net/lists/arm-kernel/msg314009.html.
It be better just keeping a "ti,keystone" top-level compatible and
just using that to probe. If so we don't have to touch the file
for new boards in the future.

So use common "ti,keystone" compatible in keystone.c for all boards.

Cc: Santosh Shilimkar <santosh.shilimkar@ti.com>
Cc: Olof Johansson <olof@lixom.net>

Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com>
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Ivan Khoronzhuk 11 년 전
부모
커밋
3babe30608

+ 3 - 3
Documentation/devicetree/bindings/arm/keystone/keystone.txt

@@ -11,10 +11,10 @@ Required properties:
 
 
 Boards:
 Boards:
 -  Keystone 2 Hawking/Kepler EVM
 -  Keystone 2 Hawking/Kepler EVM
-   compatible = "ti,k2hk-evm"
+   compatible = "ti,k2hk-evm","ti,keystone"
 
 
 -  Keystone 2 Lamarr EVM
 -  Keystone 2 Lamarr EVM
-   compatible = "ti,k2l-evm"
+   compatible = "ti,k2l-evm","ti,keystone"
 
 
 -  Keystone 2 Edison EVM
 -  Keystone 2 Edison EVM
-   compatible = "ti,k2e-evm"
+   compatible = "ti,k2e-evm","ti,keystone"

+ 1 - 1
arch/arm/boot/dts/k2e-evm.dts

@@ -13,7 +13,7 @@
 #include "k2e.dtsi"
 #include "k2e.dtsi"
 
 
 / {
 / {
-	compatible =  "ti,k2e-evm";
+	compatible =  "ti,k2e-evm","ti,keystone";
 	model = "Texas Instruments Keystone 2 Edison EVM";
 	model = "Texas Instruments Keystone 2 Edison EVM";
 
 
 	soc {
 	soc {

+ 1 - 1
arch/arm/boot/dts/k2hk-evm.dts

@@ -13,7 +13,7 @@
 #include "k2hk.dtsi"
 #include "k2hk.dtsi"
 
 
 / {
 / {
-	compatible =  "ti,k2hk-evm";
+	compatible =  "ti,k2hk-evm","ti,keystone";
 	model = "Texas Instruments Keystone 2 Kepler/Hawking EVM";
 	model = "Texas Instruments Keystone 2 Kepler/Hawking EVM";
 
 
 	soc {
 	soc {

+ 1 - 1
arch/arm/boot/dts/k2l-evm.dts

@@ -13,7 +13,7 @@
 #include "k2l.dtsi"
 #include "k2l.dtsi"
 
 
 / {
 / {
-	compatible =  "ti,k2l-evm";
+	compatible =  "ti,k2l-evm","ti,keystone";
 	model = "Texas Instruments Keystone 2 Lamarr EVM";
 	model = "Texas Instruments Keystone 2 Lamarr EVM";
 
 
 	soc {
 	soc {

+ 1 - 4
arch/arm/mach-keystone/keystone.c

@@ -46,10 +46,7 @@ static void __init keystone_init(void)
 }
 }
 
 
 static const char *keystone_match[] __initconst = {
 static const char *keystone_match[] __initconst = {
-	"ti,keystone-evm",
-	"ti,k2hk-evm",
-	"ti,k2l-evm",
-	"ti,k2e-evm",
+	"ti,keystone",
 	NULL,
 	NULL,
 };
 };