Merge tag 'keystone-dts-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ssant...

Merge "Keystone DTS fixes for 3.15" from Santosh Shilimkar:

- Few fixes found during NAND ubifs testing
- Fix to build all dtbs together with dtbs
- Last patch is follow up comment from previous pull request

* tag 'keystone-dts-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone:
  ARM: dts: keystone: use common "ti,keystone" compatible instead of -evm
  ARM: dts: k2hk-evm: set ubifs partition size for 512M NAND
  ARM: dts: Build all keystone dt blobs
  ARM: dts: keystone: Fix control register range for clktsip
  ARM: dts: keystone: Fix domain register range for clkfftc1

Conflicts:
	arch/arm/boot/dts/Makefile

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --git a/Documentation/devicetree/bindings/arm/keystone/keystone.txt b/Documentation/devicetree/bindings/arm/keystone/keystone.txt
index ad16e7a588937bfca2da201374fadf13135d5add..59d7a46f85eb59ae0e33f217c98c0277fd7182b9 100644 (file)
--- 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/Makefile b/arch/arm/boot/dts/Makefile
index 4780ca1c8885f98cbb78c46b587f071d3c65f767..4bf43375eb901cb3f7062271d814937a748fdc42 100644 (file)
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -78,6 +78,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
 kirkwood := \
        kirkwood-b3.dtb \
        kirkwood-cloudbox.dtb \

diff --git a/arch/arm/boot/dts/k2e-evm.dts b/arch/arm/boot/dts/k2e-evm.dts
index bb8faeb1a2f89359ce77834e8b19843518b06fdc..74b3b63e94cf8cae0b6bf86817573551c99adfb5 100644 (file)
--- 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-clocks.dtsi b/arch/arm/boot/dts/k2hk-clocks.dtsi
index a71aa2996321656e9053226e8911c11e8a467f00..96e65365afe302c10b63ef08157e9cee590645ba 100644 (file)
--- 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>;
        };
@@ -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>;
        };

diff --git a/arch/arm/boot/dts/k2hk-evm.dts b/arch/arm/boot/dts/k2hk-evm.dts
index 1a1335b4a0b1d25fc0e2cbfcacaca3a7b3c9c330..c93d06f9f2a8db17e9d05b65766136c803247cff 100644 (file)
--- 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 {
@@ -133,7 +133,7 @@
 
                        partition@180000 {
                                label = "ubifs";
-                               reg = <0x180000 0x7E80000>;
+                               reg = <0x180000 0x1fe80000>;
                        };
                };
        };

diff --git a/arch/arm/boot/dts/k2l-evm.dts b/arch/arm/boot/dts/k2l-evm.dts
index ebf316a1bf6b5e7376016a6894795b21cf9b45b1..50a70132ac9e45ec00a8d9d985c702277006205e 100644 (file)
--- 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 aa0d2121449fab1fe74ff04f88bd93f098865c2f..e0b9e1b9cf303f9f91c8ff4bcff10cd0ab6d0f3c 100644 (file)
--- 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,
 };