Merge tag 'keystone-dts-fixes' of...

Merge tag 'keystone-dts-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone into next/dt

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>

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"

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 \

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 {

arch/arm/boot/dts/k2hk-clocks.dtsi

@@ -59,7 +59,7 @@ clktsip: clktsip {
 		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 @@ clkfftc1: clkfftc1 {
 		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>;
 	};

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@100000 {
 
 			partition@180000 {
 				label = "ubifs";
-				reg = <0x180000 0x7E80000>;
+				reg = <0x180000 0x1fe80000>;
 			};
 		};
 	};

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 {

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,
 };