Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 308b3afb authored by Heiko Stuebner's avatar Heiko Stuebner Committed by Kukjin Kim
Browse files

ARM: SAMSUNG: Add naming of s3c64xx-spi devices 



Commit a5238e36 (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: default avatarHeiko Stuebner <heiko@sntech.de>
Cc: Stable <stable@vger.kernel.org>
Reviewed-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
[s.nawrocki@samsung.com: tested on mach-exynos]
Tested-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent ddffeb8c

arch/arm/mach-exynos/common.c

+5 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ 
#include <plat/fimc-core.h>

#include <plat/iic-core.h>

#include <plat/tv-core.h>

#include <plat/spi-core.h>

#include <plat/regs-serial.h>



#include "common.h"
@@ -346,6 +347,8 @@ static void __init exynos4_map_io(void) 


	s5p_fb_setname(0, "exynos4-fb");

	s5p_hdmi_setname("exynos4-hdmi");



	s3c64xx_spi_setname("exynos4210-spi");

}



static void __init exynos5_map_io(void)
@@ -366,6 +369,8 @@ static void __init exynos5_map_io(void) 
	s3c_i2c0_setname("s3c2440-i2c");

	s3c_i2c1_setname("s3c2440-i2c");

	s3c_i2c2_setname("s3c2440-i2c");



	s3c64xx_spi_setname("exynos4210-spi");

}



static void __init exynos4_init_clocks(int xtal)

arch/arm/mach-s3c24xx/s3c2416.c

+2 −0
Original line number Diff line number Diff line
@@ -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));

}

arch/arm/mach-s3c24xx/s3c2443.c

+4 −0
Original line number Diff line number Diff line
@@ -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));

}

arch/arm/mach-s5p64x0/common.c

+3 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ 
#include <plat/sdhci.h>

#include <plat/adc-core.h>

#include <plat/fb-core.h>

#include <plat/spi-core.h>

#include <plat/gpio-cfg.h>

#include <plat/regs-irqtype.h>

#include <plat/regs-serial.h>
@@ -179,6 +180,7 @@ void __init s5p6440_map_io(void) 
	/* initialize any device information early */

	s3c_adc_setname("s3c64xx-adc");

	s3c_fb_setname("s5p64x0-fb");

	s3c64xx_spi_setname("s5p64x0-spi");



	s5p64x0_default_sdhci0();

	s5p64x0_default_sdhci1();
@@ -193,6 +195,7 @@ void __init s5p6450_map_io(void) 
	/* initialize any device information early */

	s3c_adc_setname("s3c64xx-adc");

	s3c_fb_setname("s5p64x0-fb");

	s3c64xx_spi_setname("s5p64x0-spi");



	s5p64x0_default_sdhci0();

	s5p64x0_default_sdhci1();

arch/arm/mach-s5pc100/common.c

+3 −0
Original line number Diff line number Diff line
@@ -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)