From 754f67cdfe708b4bacefb869e89bf3fc50a4f49e Mon Sep 17 00:00:00 2001 From: Ivan Khoronzhuk Date: Tue, 18 Mar 2014 15:58:45 -0400 Subject: [PATCH 1/5] ARM: dts: keystone: Fix domain register range for clkfftc1 The domain register range for clkfftc1 has to be 0x0235004c instead of 0x023504c0. Signed-off-by: Ivan Khoronzhuk Signed-off-by: Santosh Shilimkar --- arch/arm/boot/dts/k2hk-clocks.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/k2hk-clocks.dtsi b/arch/arm/boot/dts/k2hk-clocks.dtsi index a71aa2996321..f8e5729bd858 100644 --- a/arch/arm/boot/dts/k2hk-clocks.dtsi +++ b/arch/arm/boot/dts/k2hk-clocks.dtsi @@ -209,7 +209,7 @@ clocks { compatible = "ti,keystone,psc-clock"; clocks = <&chipclk13>; clock-output-names = "fftc-1"; - reg = <0x02350074 0xb00>, <0x023504c0 0x400>; + reg = <0x02350074 0xb00>, <0x0235004c 0x400>; reg-names = "control", "domain"; domain-id = <19>; }; From 1f9f5201a3983ce12fd8b4b8838586606ef13dd2 Mon Sep 17 00:00:00 2001 From: Ivan Khoronzhuk Date: Tue, 18 Mar 2014 15:59:26 -0400 Subject: [PATCH 2/5] ARM: dts: keystone: Fix control register range for clktsip The control register range for clktsio interferes with clkaemifspi clock. And it causes issues for NAND/AEMIF. So fix it. Signed-off-by: Ivan Khoronzhuk Signed-off-by: Santosh Shilimkar --- arch/arm/boot/dts/k2hk-clocks.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/k2hk-clocks.dtsi b/arch/arm/boot/dts/k2hk-clocks.dtsi index f8e5729bd858..96e65365afe3 100644 --- a/arch/arm/boot/dts/k2hk-clocks.dtsi +++ b/arch/arm/boot/dts/k2hk-clocks.dtsi @@ -59,7 +59,7 @@ clocks { compatible = "ti,keystone,psc-clock"; clocks = <&chipclk16>; clock-output-names = "tsip"; - reg = <0x0235000c 0xb00>, <0x02350000 0x400>; + reg = <0x02350000 0xb00>, <0x02350000 0x400>; reg-names = "control", "domain"; domain-id = <0>; }; From 400550ae7e778302a45d2952ac75907903e2610c Mon Sep 17 00:00:00 2001 From: Santosh Shilimkar Date: Tue, 18 Mar 2014 16:02:34 -0400 Subject: [PATCH 3/5] ARM: dts: Build all keystone dt blobs Now we have additional two SOC/boards supported, so add make file rule so that all device tree blobs can be build for keystone with 'make dtbs'. Signed-off-by: Santosh Shilimkar --- arch/arm/boot/dts/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index b9d6a8b485e0..49ff796dc02e 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -81,6 +81,9 @@ dtb-$(CONFIG_ARCH_HIGHBANK) += highbank.dtb \ ecx-2000.dtb dtb-$(CONFIG_ARCH_INTEGRATOR) += integratorap.dtb \ integratorcp.dtb +dtb-$(CONFIG_ARCH_KEYSTONE) += k2hk-evm.dtb \ + k2l-evm.dtb \ + k2e-evm.dtb dtb-$(CONFIG_ARCH_LPC32XX) += ea3250.dtb phy3250.dtb dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-cloudbox.dtb \ kirkwood-db-88f6281.dtb \ From 7eb7e8bc6806aadc3a18a0be661d82d7c5b7dc01 Mon Sep 17 00:00:00 2001 From: Murali Karicheri Date: Thu, 20 Mar 2014 16:39:21 -0400 Subject: [PATCH 4/5] ARM: dts: k2hk-evm: set ubifs partition size for 512M NAND The UBIFS partition size was incorrectly defined as for 128M NAND, but on k2hk-evm installed NAND flash size is 512M. Hence, correct it. Signed-off-by: Murali Karicheri Signed-off-by: Ivan Khoronzhuk Signed-off-by: Santosh Shilimkar --- arch/arm/boot/dts/k2hk-evm.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/k2hk-evm.dts b/arch/arm/boot/dts/k2hk-evm.dts index 1a1335b4a0b1..949ef7d34975 100644 --- a/arch/arm/boot/dts/k2hk-evm.dts +++ b/arch/arm/boot/dts/k2hk-evm.dts @@ -133,7 +133,7 @@ partition@180000 { label = "ubifs"; - reg = <0x180000 0x7E80000>; + reg = <0x180000 0x1fe80000>; }; }; }; From 3babe30608dcfec811d64268bd9dc30b7c638e69 Mon Sep 17 00:00:00 2001 From: Ivan Khoronzhuk Date: Thu, 20 Mar 2014 17:00:27 -0400 Subject: [PATCH 5/5] 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, };