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>

diff --git a/Documentation/devicetree/bindings/arm/keystone/keystone.txt b/Documentation/devicetree/bindings/arm/keystone/keystone.txt
index ad16e7a588937bfca2da201374fadf13135d5add..59d7a46f85eb59ae0e33f217c98c0277fd7182b9 100644 (file)
--- a/Documentation/devicetree/bindings/arm/keystone/keystone.txt
+++ b/Documentation/devicetree/bindings/arm/keystone/keystone.txt
@@ -11,10 +11,10 @@ Required properties:
 
 Boards:
 -  Keystone 2 Hawking/Kepler EVM
-   compatible = "ti,k2hk-evm"
+   compatible = "ti,k2hk-evm","ti,keystone"
 
 -  Keystone 2 Lamarr EVM
-   compatible = "ti,k2l-evm"
+   compatible = "ti,k2l-evm","ti,keystone"
 
 -  Keystone 2 Edison EVM
-   compatible = "ti,k2e-evm"
+   compatible = "ti,k2e-evm","ti,keystone"

diff --git a/arch/arm/boot/dts/k2e-evm.dts b/arch/arm/boot/dts/k2e-evm.dts
index bb8faeb1a2f89359ce77834e8b19843518b06fdc..74b3b63e94cf8cae0b6bf86817573551c99adfb5 100644 (file)
--- a/arch/arm/boot/dts/k2e-evm.dts
+++ b/arch/arm/boot/dts/k2e-evm.dts
@@ -13,7 +13,7 @@
 #include "k2e.dtsi"
 
 / {
-       compatible =  "ti,k2e-evm";
+       compatible =  "ti,k2e-evm","ti,keystone";
        model = "Texas Instruments Keystone 2 Edison EVM";
 
        soc {

diff --git a/arch/arm/boot/dts/k2hk-evm.dts b/arch/arm/boot/dts/k2hk-evm.dts
index 949ef7d3497565771f2ccdf251829aab8854e9b1..c93d06f9f2a8db17e9d05b65766136c803247cff 100644 (file)
--- a/arch/arm/boot/dts/k2hk-evm.dts
+++ b/arch/arm/boot/dts/k2hk-evm.dts
@@ -13,7 +13,7 @@
 #include "k2hk.dtsi"
 
 / {
-       compatible =  "ti,k2hk-evm";
+       compatible =  "ti,k2hk-evm","ti,keystone";
        model = "Texas Instruments Keystone 2 Kepler/Hawking EVM";
 
        soc {

diff --git a/arch/arm/boot/dts/k2l-evm.dts b/arch/arm/boot/dts/k2l-evm.dts
index ebf316a1bf6b5e7376016a6894795b21cf9b45b1..50a70132ac9e45ec00a8d9d985c702277006205e 100644 (file)
--- a/arch/arm/boot/dts/k2l-evm.dts
+++ b/arch/arm/boot/dts/k2l-evm.dts
@@ -13,7 +13,7 @@
 #include "k2l.dtsi"
 
 / {
-       compatible =  "ti,k2l-evm";
+       compatible =  "ti,k2l-evm","ti,keystone";
        model = "Texas Instruments Keystone 2 Lamarr EVM";
 
        soc {

diff --git a/arch/arm/mach-keystone/keystone.c b/arch/arm/mach-keystone/keystone.c
index aa0d2121449fab1fe74ff04f88bd93f098865c2f..e0b9e1b9cf303f9f91c8ff4bcff10cd0ab6d0f3c 100644 (file)
--- a/arch/arm/mach-keystone/keystone.c
+++ b/arch/arm/mach-keystone/keystone.c
@@ -46,10 +46,7 @@ static void __init keystone_init(void)
 }
 
 static const char *keystone_match[] __initconst = {
-       "ti,keystone-evm",
-       "ti,k2hk-evm",
-       "ti,k2l-evm",
-       "ti,k2e-evm",
+       "ti,keystone",
        NULL,
 };