Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Ivan Khoronzhuk and committed by
Santosh Shilimkar
3babe306 7eb7e8bc

+7 -10
+3 -3
Documentation/devicetree/bindings/arm/keystone/keystone.txt
··· 11 11 12 12 Boards: 13 13 - Keystone 2 Hawking/Kepler EVM 14 - compatible = "ti,k2hk-evm" 14 + compatible = "ti,k2hk-evm","ti,keystone" 15 15 16 16 - Keystone 2 Lamarr EVM 17 - compatible = "ti,k2l-evm" 17 + compatible = "ti,k2l-evm","ti,keystone" 18 18 19 19 - Keystone 2 Edison EVM 20 - compatible = "ti,k2e-evm" 20 + compatible = "ti,k2e-evm","ti,keystone"
+1 -1
arch/arm/boot/dts/k2e-evm.dts
··· 13 13 #include "k2e.dtsi" 14 14 15 15 / { 16 - compatible = "ti,k2e-evm"; 16 + compatible = "ti,k2e-evm","ti,keystone"; 17 17 model = "Texas Instruments Keystone 2 Edison EVM"; 18 18 19 19 soc {
+1 -1
arch/arm/boot/dts/k2hk-evm.dts
··· 13 13 #include "k2hk.dtsi" 14 14 15 15 / { 16 - compatible = "ti,k2hk-evm"; 16 + compatible = "ti,k2hk-evm","ti,keystone"; 17 17 model = "Texas Instruments Keystone 2 Kepler/Hawking EVM"; 18 18 19 19 soc {
+1 -1
arch/arm/boot/dts/k2l-evm.dts
··· 13 13 #include "k2l.dtsi" 14 14 15 15 / { 16 - compatible = "ti,k2l-evm"; 16 + compatible = "ti,k2l-evm","ti,keystone"; 17 17 model = "Texas Instruments Keystone 2 Lamarr EVM"; 18 18 19 19 soc {
+1 -4
arch/arm/mach-keystone/keystone.c
··· 46 46 } 47 47 48 48 static const char *keystone_match[] __initconst = { 49 - "ti,keystone-evm", 50 - "ti,k2hk-evm", 51 - "ti,k2l-evm", 52 - "ti,k2e-evm", 49 + "ti,keystone", 53 50 NULL, 54 51 }; 55 52