From 3babe30608dcfec811d64268bd9dc30b7c638e69 Mon Sep 17 00:00:00 2001 From: Ivan Khoronzhuk Date: Thu, 20 Mar 2014 17:00:27 -0400 Subject: [PATCH] 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 Cc: Olof Johansson Signed-off-by: Ivan Khoronzhuk Signed-off-by: Santosh Shilimkar --- 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(-) diff --git a/Documentation/devicetree/bindings/arm/keystone/keystone.txt b/Documentation/devicetree/bindings/arm/keystone/keystone.txt index ad16e7a58893..59d7a46f85eb 100644 --- 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 bb8faeb1a2f8..74b3b63e94cf 100644 --- 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 949ef7d34975..c93d06f9f2a8 100644 --- 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 ebf316a1bf6b..50a70132ac9e 100644 --- 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 aa0d2121449f..e0b9e1b9cf30 100644 --- 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, }; -- 2.20.1