diff options
author | Arnd Bergmann <arnd@arndb.de> | 2014-03-27 04:54:39 +0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2014-03-27 04:54:39 +0400 |
commit | 4de6732f88552e4f8fc504070ca4b840e7fe75f4 (patch) | |
tree | d399f5e78a6cb53e55239447218008b9a4d7e24e /arch/arm/boot/dts/omap2430.dtsi | |
parent | 95552f5afca21dddc2023000d6575a2013b85bb1 (diff) | |
parent | 3babe30608dcfec811d64268bd9dc30b7c638e69 (diff) | |
download | linux-4de6732f88552e4f8fc504070ca4b840e7fe75f4.tar.xz |
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 'arch/arm/boot/dts/omap2430.dtsi')
0 files changed, 0 insertions, 0 deletions