diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-03-27 01:54:39 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-03-27 01:54:39 +0100 |
| commit | 4de6732f88552e4f8fc504070ca4b840e7fe75f4 (patch) | |
| tree | d399f5e78a6cb53e55239447218008b9a4d7e24e /Documentation/devicetree | |
| parent | 95552f5afca21dddc2023000d6575a2013b85bb1 (diff) | |
| parent | 3babe30608dcfec811d64268bd9dc30b7c638e69 (diff) | |
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>
Diffstat (limited to 'Documentation/devicetree')
| -rw-r--r-- | Documentation/devicetree/bindings/arm/keystone/keystone.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/devicetree/bindings/arm/keystone/keystone.txt b/Documentation/devicetree/bindings/arm/keystone/keystone.txt index ad16e7a5889..59d7a46f85e 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" |