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

Commit 2f64a8d7 authored by Olof Johansson's avatar Olof Johansson
Browse files

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

Merge branch 'v3.8-samsung-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes

From Kukjin Kim:
Most of them are EXYNOS5440 fixes which are for changing uart console,
cpu id (typo)  and silent complaining gpio error in kernel boot.

* 'v3.8-samsung-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  ARM: EXYNOS: skip the clock initialization for exynos5440
  ARM: EXYNOS: enable PINCTRL for EXYNOS5440
  ARM: dts: use uart port1 for console on exynos4210-smdkv310
  ARM: dts: use uart port0 for console on exynos5440-ssdk5440
  ARM: SAMSUNG: fix the cpu id for EXYNOS5440
  ARM: EXYNOS: Revise HDMI resource size
parents 5595e755 61bcbc2a

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

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
	};



	chosen {

		bootargs = "root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M console=ttySAC2,115200 init=/linuxrc";

		bootargs = "root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M console=ttySAC1,115200 init=/linuxrc";

	};



	sdhci@12530000 {

arch/arm/boot/dts/exynos5250.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -574,7 +574,7 @@ 


	hdmi {

		compatible = "samsung,exynos5-hdmi";

		reg = <0x14530000 0x100000>;

		reg = <0x14530000 0x70000>;

		interrupts = <0 95 0>;

	};

arch/arm/boot/dts/exynos5440-ssdk5440.dts

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
	};



	chosen {

		bootargs = "root=/dev/ram0 rw ramdisk=8192 initrd=0x81000000,8M console=ttySAC2,115200 init=/linuxrc";

		bootargs = "root=/dev/ram0 rw ramdisk=8192 initrd=0x81000000,8M console=ttySAC0,115200 init=/linuxrc";

	};



	spi {

arch/arm/mach-exynos/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -74,6 +74,8 @@ config SOC_EXYNOS5440 
	depends on ARCH_EXYNOS5

	select ARM_ARCH_TIMER

	select AUTO_ZRELADDR

	select PINCTRL

	select PINCTRL_EXYNOS5440

	help

	  Enable EXYNOS5440 SoC support

arch/arm/mach-exynos/common.c

+7 −0
Original line number Diff line number Diff line
@@ -424,11 +424,18 @@ static void __init exynos5_init_clocks(int xtal) 
{

	printk(KERN_DEBUG "%s: initializing clocks\n", __func__);



	/* EXYNOS5440 can support only common clock framework */



	if (soc_is_exynos5440())

		return;



#ifdef CONFIG_SOC_EXYNOS5250

	s3c24xx_register_baseclocks(xtal);

	s5p_register_clocks(xtal);



	exynos5_register_clocks();

	exynos5_setup_clocks();

#endif

}



#define COMBINER_ENABLE_SET	0x0