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

PATCH New Ivan Khoronzhuk 2 participants 2 messages Mar 18, 2014 – Mar 20, 2014

Subsystems (4)

Device tree bindings Arm (32-bit) Arm sub-architectures Arm/Texas instrument Keystone architecture

lore

Share & tools

lore

Ivan Khoronzhuk

author

2014-03-18 13:12 UTC #0 lore raw

PATCH 1/1 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 <[email protected]>

Cc Olof Johansson <[email protected]>

Signed-off-by Ivan Khoronzhuk <[email protected]>

---

Based on linux-next/master

 Documentation/devicetree/bindings/arm/keystone/keystone.txt | 6 +++---
 arch/arm/boot/dts/k2e-evm.dts                               | 2 +-
 arch/arm/boot/dts/k2hk-evm.dts                              | 2 +-
 arch/arm/boot/dts/k2l-evm.dts                               | 2 +-
 arch/arm/mach-keystone/keystone.c                           | 5 +----
 5 files changed, 7 insertions(+), 10 deletions(-)

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

index ad16e7a..59d7a46 100644
@@ -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"

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

index bb8faeb..74b3b63 100644
@@ -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 {

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

index 1a1335b..f2a6658 100644
@@ -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 {

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

index ebf316a..50a7013 100644
@@ -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 {

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

index aa0d212..e0b9e1b 100644
@@ -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,
 };

Signature · 1 line

1.8.3.2

Santosh Shilimkar

2014-03-20 20:58 UTC #1 lore raw

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

Quoted 8 lines · Ivan Khoronzhuk

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.

Quoted 8 lines

Cc Santosh Shilimkar <[email protected]>
Cc Olof Johansson <[email protected]>
Signed-off-by Ivan Khoronzhuk <[email protected]>
---
Based on linux-next/master

Applying it to for_3.15/fixes

Quoted 81 lines

 Documentation/devicetree/bindings/arm/keystone/keystone.txt | 6 +++---
 arch/arm/boot/dts/k2e-evm.dts                               | 2 +-
 arch/arm/boot/dts/k2hk-evm.dts                              | 2 +-
 arch/arm/boot/dts/k2l-evm.dts                               | 2 +-
 arch/arm/mach-keystone/keystone.c                           | 5 +----
 5 files changed, 7 insertions(+), 10 deletions(-)