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 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: | |||
11 | 11 | ||
12 | Boards: | 12 | Boards: |
13 | - Keystone 2 Hawking/Kepler EVM | 13 | - Keystone 2 Hawking/Kepler EVM |
14 | compatible = "ti,k2hk-evm" | 14 | compatible = "ti,k2hk-evm","ti,keystone" |
15 | 15 | ||
16 | - Keystone 2 Lamarr EVM | 16 | - Keystone 2 Lamarr EVM |
17 | compatible = "ti,k2l-evm" | 17 | compatible = "ti,k2l-evm","ti,keystone" |
18 | 18 | ||
19 | - Keystone 2 Edison EVM | 19 | - Keystone 2 Edison EVM |
20 | compatible = "ti,k2e-evm" | 20 | 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 @@ | |||
13 | #include "k2e.dtsi" | 13 | #include "k2e.dtsi" |
14 | 14 | ||
15 | / { | 15 | / { |
16 | compatible = "ti,k2e-evm"; | 16 | compatible = "ti,k2e-evm","ti,keystone"; |
17 | model = "Texas Instruments Keystone 2 Edison EVM"; | 17 | model = "Texas Instruments Keystone 2 Edison EVM"; |
18 | 18 | ||
19 | soc { | 19 | 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 @@ | |||
13 | #include "k2hk.dtsi" | 13 | #include "k2hk.dtsi" |
14 | 14 | ||
15 | / { | 15 | / { |
16 | compatible = "ti,k2hk-evm"; | 16 | compatible = "ti,k2hk-evm","ti,keystone"; |
17 | model = "Texas Instruments Keystone 2 Kepler/Hawking EVM"; | 17 | model = "Texas Instruments Keystone 2 Kepler/Hawking EVM"; |
18 | 18 | ||
19 | soc { | 19 | 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 @@ | |||
13 | #include "k2l.dtsi" | 13 | #include "k2l.dtsi" |
14 | 14 | ||
15 | / { | 15 | / { |
16 | compatible = "ti,k2l-evm"; | 16 | compatible = "ti,k2l-evm","ti,keystone"; |
17 | model = "Texas Instruments Keystone 2 Lamarr EVM"; | 17 | model = "Texas Instruments Keystone 2 Lamarr EVM"; |
18 | 18 | ||
19 | soc { | 19 | 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) | |||
46 | } | 46 | } |
47 | 47 | ||
48 | static const char *keystone_match[] __initconst = { | 48 | static const char *keystone_match[] __initconst = { |
49 | "ti,keystone-evm", | 49 | "ti,keystone", |
50 | "ti,k2hk-evm", | ||
51 | "ti,k2l-evm", | ||
52 | "ti,k2e-evm", | ||
53 | NULL, | 50 | NULL, |
54 | }; | 51 | }; |
55 | 52 | ||