diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-10-26 08:45:06 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-10-26 08:45:06 -0400 |
| commit | 389a84d2c1c62f0232b5239017c81ee88b2613ae (patch) | |
| tree | a03ca8c6bb5c772b2da5214717a3adf0fad05835 /arch/arm/boot/dts/exynos4210-trats.dts | |
| parent | ef3f94412a4d7e107392e7c7cfc3e2d0668aa1aa (diff) | |
| parent | 61ef3c0bd3ccc9552ea4e54f5003a21ba45ceb44 (diff) | |
Merge branch 'v3.7-samsung-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes
From Kukjin Kim <kgene.kim@samsung.com>:
One is spi stuff for fix the device names for the different subtypes of
the spi controller. And the other is adding missing .smp field for
exynos4-dt and fixing memory sections for exynos4210-trats board.
* 'v3.7-samsung-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: EXYNOS: Set .smp field of machine descriptor for exynos4-dt
ARM: dts: Split memory into 4 sections for exynos4210-trats
ARM: SAMSUNG: Add naming of s3c64xx-spi devices
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/boot/dts/exynos4210-trats.dts')
| -rw-r--r-- | arch/arm/boot/dts/exynos4210-trats.dts | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/exynos4210-trats.dts b/arch/arm/boot/dts/exynos4210-trats.dts index 73567b843e72..a21511c14071 100644 --- a/arch/arm/boot/dts/exynos4210-trats.dts +++ b/arch/arm/boot/dts/exynos4210-trats.dts | |||
| @@ -20,8 +20,10 @@ | |||
| 20 | compatible = "samsung,trats", "samsung,exynos4210"; | 20 | compatible = "samsung,trats", "samsung,exynos4210"; |
| 21 | 21 | ||
| 22 | memory { | 22 | memory { |
| 23 | reg = <0x40000000 0x20000000 | 23 | reg = <0x40000000 0x10000000 |
| 24 | 0x60000000 0x20000000>; | 24 | 0x50000000 0x10000000 |
| 25 | 0x60000000 0x10000000 | ||
| 26 | 0x70000000 0x10000000>; | ||
| 25 | }; | 27 | }; |
| 26 | 28 | ||
| 27 | chosen { | 29 | chosen { |