diff options
| author | Heiko Stuebner <heiko@sntech.de> | 2012-10-17 09:47:11 +0200 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2012-10-17 09:47:32 +0200 |
| commit | 308b3afb97dc342e9c4f958d8b4c459ae0e22bd7 (patch) | |
| tree | e369cf2f77f8b5bdbe8085e71459cfb4943e6916 /arch/arm/mach-s3c24xx/s3c2443.c | |
| parent | Linux 3.7-rc1 (diff) | |
| download | linux-308b3afb97dc342e9c4f958d8b4c459ae0e22bd7.tar.xz 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/s3c2443.c')
| -rw-r--r-- | arch/arm/mach-s3c24xx/s3c2443.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c24xx/s3c2443.c b/arch/arm/mach-s3c24xx/s3c2443.c index ab648ad8fa50..165b6a6b3daa 100644 --- a/arch/arm/mach-s3c24xx/s3c2443.c +++ b/arch/arm/mach-s3c24xx/s3c2443.c @@ -43,6 +43,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 s3c2443_iodesc[] __initdata = { IODESC_ENT(WATCHDOG), @@ -100,6 +101,9 @@ void __init s3c2443_map_io(void) s3c24xx_gpiocfg_default.set_pull = s3c2443_gpio_setpull; s3c24xx_gpiocfg_default.get_pull = s3c2443_gpio_getpull; + /* initialize device information early */ + s3c64xx_spi_setname("s3c2443-spi"); + iotable_init(s3c2443_iodesc, ARRAY_SIZE(s3c2443_iodesc)); } |