diff options
| -rw-r--r-- | Documentation/devicetree/bindings/arm/keystone/keystone.txt | 6 | ||||
| -rw-r--r-- | arch/arm/boot/dts/k2e-evm.dts | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/k2hk-evm.dts | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/k2l-evm.dts | 2 | ||||
| -rw-r--r-- | 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 ad16e7a5889..59d7a46f85e 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 bb8faeb1a2f..74b3b63e94c 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 949ef7d3497..c93d06f9f2a 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 ebf316a1bf6..50a70132ac9 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 aa0d2121449..e0b9e1b9cf3 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, }; |