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

Commit 389a84d2 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'v3.7-samsung-fixes-2' of... 

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: default avatarArnd Bergmann <arnd@arndb.de>
parents ef3f9441 61ef3c0b

arch/arm/boot/dts/exynos4210-trats.dts

+4 −2
Original line number Diff line number Diff line
@@ -20,8 +20,10 @@ 
	compatible = "samsung,trats", "samsung,exynos4210";



	memory {

		reg =  <0x40000000 0x20000000

			0x60000000 0x20000000>;

		reg =  <0x40000000 0x10000000

			0x50000000 0x10000000

			0x60000000 0x10000000

			0x70000000 0x10000000>;

	};



	chosen {

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-exynos/mach-exynos4-dt.c

+1 −0
Original line number Diff line number Diff line
@@ -99,6 +99,7 @@ static char const *exynos4_dt_compat[] __initdata = { 


DT_MACHINE_START(EXYNOS4210_DT, "Samsung Exynos4 (Flattened Device Tree)")

	/* Maintainer: Thomas Abraham <thomas.abraham@linaro.org> */

	.smp		= smp_ops(exynos_smp_ops),

	.init_irq	= exynos4_init_irq,

	.map_io		= exynos4_dt_map_io,

	.handle_irq	= gic_handle_irq,

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));

}