summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s3c24xx/s3c2416.c
diff options
context:
space:
mode:
authorHeiko Stuebner <heiko@sntech.de>2012-10-17 16:47:11 +0900
committerKukjin Kim <kgene.kim@samsung.com>2012-10-17 16:47:32 +0900
commit308b3afb97dc342e9c4f958d8b4c459ae0e22bd7 (patch)
treee369cf2f77f8b5bdbe8085e71459cfb4943e6916 /arch/arm/mach-s3c24xx/s3c2416.c
parentddffeb8c4d0331609ef2581d84de4d763607bd37 (diff)
downloadtalos-op-linux-308b3afb97dc342e9c4f958d8b4c459ae0e22bd7.tar.gz
talos-op-linux-308b3afb97dc342e9c4f958d8b4c459ae0e22bd7.zip
ARM: SAMSUNG: Add naming of s3c64xx-spi devices
Commit a5238e360b71 (spi: s3c64xx: move controller information into driver data) introduced separate device names for the different subtypes of the spi controller but forgot to set these in the relevant machines. To fix this introduce a s3c64xx_spi_setname function and populate all Samsung arches with the correct names. The function resides in a new header, as the s3c64xx-spi.h contains driver platform data and should therefore at some later point move out of the Samsung include dir. Tested on a s3c2416-based machine. Signed-off-by: Heiko Stuebner <heiko@sntech.de> Cc: Stable <stable@vger.kernel.org> Reviewed-by: Sylwester Nawrocki <s.nawrocki@samsung.com> [s.nawrocki@samsung.com: tested on mach-exynos] Tested-by: Sylwester Nawrocki <s.nawrocki@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch/arm/mach-s3c24xx/s3c2416.c')
-rw-r--r--arch/arm/mach-s3c24xx/s3c2416.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c24xx/s3c2416.c b/arch/arm/mach-s3c24xx/s3c2416.c
index ed5a95ece9eb..77ee0b732237 100644
--- a/arch/arm/mach-s3c24xx/s3c2416.c
+++ b/arch/arm/mach-s3c24xx/s3c2416.c
@@ -61,6 +61,7 @@
#include <plat/nand-core.h>
#include <plat/adc-core.h>
#include <plat/rtc-core.h>
+#include <plat/spi-core.h>
static struct map_desc s3c2416_iodesc[] __initdata = {
IODESC_ENT(WATCHDOG),
@@ -132,6 +133,7 @@ void __init s3c2416_map_io(void)
/* initialize device information early */
s3c2416_default_sdhci0();
s3c2416_default_sdhci1();
+ s3c64xx_spi_setname("s3c2443-spi");
iotable_init(s3c2416_iodesc, ARRAY_SIZE(s3c2416_iodesc));
}
OpenPOWER on IntegriCloud