summaryrefslogtreecommitdiff
path: root/arch/arm/mach-s5pc100/common.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-10-26 14:45:06 +0200
committerArnd Bergmann <arnd@arndb.de>2012-10-26 14:45:06 +0200
commit389a84d2c1c62f0232b5239017c81ee88b2613ae (patch)
treea03ca8c6bb5c772b2da5214717a3adf0fad05835 /arch/arm/mach-s5pc100/common.c
parentef3f94412a4d7e107392e7c7cfc3e2d0668aa1aa (diff)
parent61ef3c0bd3ccc9552ea4e54f5003a21ba45ceb44 (diff)
downloadlwn-389a84d2c1c62f0232b5239017c81ee88b2613ae.tar.gz
lwn-389a84d2c1c62f0232b5239017c81ee88b2613ae.zip
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/mach-s5pc100/common.c')
-rw-r--r--arch/arm/mach-s5pc100/common.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-s5pc100/common.c b/arch/arm/mach-s5pc100/common.c
index 621908658861..cc6e561c9958 100644
--- a/arch/arm/mach-s5pc100/common.c
+++ b/arch/arm/mach-s5pc100/common.c
@@ -45,6 +45,7 @@
#include <plat/fb-core.h>
#include <plat/iic-core.h>
#include <plat/onenand-core.h>
+#include <plat/spi-core.h>
#include <plat/regs-serial.h>
#include <plat/watchdog-reset.h>
@@ -165,6 +166,8 @@ void __init s5pc100_map_io(void)
s3c_onenand_setname("s5pc100-onenand");
s3c_fb_setname("s5pc100-fb");
s3c_cfcon_setname("s5pc100-pata");
+
+ s3c64xx_spi_setname("s5pc100-spi");
}
void __init s5pc100_init_clocks(int xtal)