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

Commit f2420ec2 authored by Olof Johansson's avatar Olof Johansson
Browse files

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

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

From Kukjin Kim:

Here is Samsung fixes-1 for v3.8-rc1.
Most of them are trivial fixes which are for NULL pointer dereference, MSHC
clocks instance names and exynos5440 stuff.

* 'v3.8-samsung-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung

:
  ARM: EXYNOS: Fix MSHC clocks instance names
  ARM: EXYNOS: Fix NULL pointer dereference bug in SMDKV310
  ARM: EXYNOS: Fix NULL pointer dereference bug in SMDK4X12
  ARM: EXYNOS: Fix NULL pointer dereference bug in Origen
  ARM: SAMSUNG: Add missing include guard to gpio-core.h
  pinctrl: exynos5440/samsung: Staticize pcfgs
  pinctrl: samsung: Fix a typo in pinctrl-samsung.h
  ARM: EXYNOS: fix skip scu_enable() for EXYNOS5440
  ARM: EXYNOS: fix GIC using for EXYNOS5440
  ARM: EXYNOS: fix build error when MFC is not selected

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents febd41d5 454696fd

arch/arm/mach-exynos/clock-exynos4.c

+2 −2
Original line number Diff line number Diff line
@@ -529,7 +529,7 @@ static struct clk exynos4_init_clocks_off[] = { 
		.enable		= exynos4_clk_ip_fsys_ctrl,

		.ctrlbit	= (1 << 8),

	}, {

		.name		= "dwmmc",

		.name		= "biu",

		.parent		= &exynos4_clk_aclk_133.clk,

		.enable		= exynos4_clk_ip_fsys_ctrl,

		.ctrlbit	= (1 << 9),
@@ -1134,7 +1134,7 @@ static struct clksrc_clk exynos4_clksrcs[] = { 
		.reg_div = { .reg = EXYNOS4_CLKDIV_MFC, .shift = 0, .size = 4 },

	}, {

		.clk	= {

			.name		= "sclk_dwmmc",

			.name		= "ciu",

			.parent		= &exynos4_clk_dout_mmc4.clk,

			.enable		= exynos4_clksrc_mask_fsys_ctrl,

			.ctrlbit	= (1 << 16),

arch/arm/mach-exynos/common.c

+2 −1
Original line number Diff line number Diff line
@@ -679,6 +679,7 @@ void __init exynos5_init_irq(void) 
	 * Theses parameters should be NULL and 0 because EXYNOS4

	 * uses GIC instead of VIC.

	 */

	if (!of_machine_is_compatible("samsung,exynos5440"))

		s5p_init_irq(NULL, 0);



	gic_arch_extn.irq_set_wake = s3c_irq_wake;

arch/arm/mach-exynos/mach-exynos5-dt.c

+2 −0
Original line number Diff line number Diff line
@@ -163,6 +163,7 @@ static char const *exynos5_dt_compat[] __initdata = { 


static void __init exynos5_reserve(void)

{

#ifdef CONFIG_S5P_DEV_MFC

	struct s5p_mfc_dt_meminfo mfc_mem;



	/* Reserve memory for MFC only if it's available */
@@ -170,6 +171,7 @@ static void __init exynos5_reserve(void) 
	if (of_scan_flat_dt(s5p_fdt_find_mfc_mem, &mfc_mem))

		s5p_mfc_reserve_mem(mfc_mem.roff, mfc_mem.rsize, mfc_mem.loff,

				mfc_mem.lsize);

#endif

}



DT_MACHINE_START(EXYNOS5_DT, "SAMSUNG EXYNOS5 (Flattened Device Tree)")

arch/arm/mach-exynos/mach-origen.c

+2 −2
Original line number Diff line number Diff line
@@ -621,7 +621,7 @@ static struct pwm_lookup origen_pwm_lookup[] = { 
	PWM_LOOKUP("s3c24xx-pwm.0", 0, "pwm-backlight.0", NULL),

};



#ifdef CONFIG_DRM_EXYNOS

#ifdef CONFIG_DRM_EXYNOS_FIMD

static struct exynos_drm_fimd_pdata drm_fimd_pdata = {

	.panel	= {

		.timing	= {
@@ -793,7 +793,7 @@ static void __init origen_machine_init(void) 
	s5p_i2c_hdmiphy_set_platdata(NULL);

	s5p_hdmi_set_platdata(&hdmiphy_info, NULL, 0);



#ifdef CONFIG_DRM_EXYNOS

#ifdef CONFIG_DRM_EXYNOS_FIMD

	s5p_device_fimd0.dev.platform_data = &drm_fimd_pdata;

	exynos4_fimd0_gpio_setup_24bpp();

#else

arch/arm/mach-exynos/mach-smdk4x12.c

+2 −2
Original line number Diff line number Diff line
@@ -246,7 +246,7 @@ static struct samsung_keypad_platdata smdk4x12_keypad_data __initdata = { 
	.cols		= 8,

};



#ifdef CONFIG_DRM_EXYNOS

#ifdef CONFIG_DRM_EXYNOS_FIMD

static struct exynos_drm_fimd_pdata drm_fimd_pdata = {

	.panel	= {

		.timing	= {
@@ -360,7 +360,7 @@ static void __init smdk4x12_machine_init(void) 


	s3c_hsotg_set_platdata(&smdk4x12_hsotg_pdata);



#ifdef CONFIG_DRM_EXYNOS

#ifdef CONFIG_DRM_EXYNOS_FIMD

	s5p_device_fimd0.dev.platform_data = &drm_fimd_pdata;

	exynos4_fimd0_gpio_setup_24bpp();

#else