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

Commit 6960d46a authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'imx-fixes-3.8-2' of git://git.linaro.org/people/shawnguo/linux-2.6 into fixes 

From Shawn Guo:
It's the second batch of fixes for 3.8, which includes one fixing for
!CONFIG_SMP build, two patches fixing broken imxfb driver caused by
multiplatform conversion, and a couple of pm/hotplug fixes.

* tag 'imx-fixes-3.8-2' of git://git.linaro.org/people/shawnguo/linux-2.6

:
  ARM: imx: correct low-power mode setting
  ARM: imx: disable cpu in .cpu_kill hook
  video: imxfb: fix imxfb_info configuration order
  ARM: imx: platform-imx-fb: modifies platform device name
  ARM: imx: fix build error with !CONFIG_SMP

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 72533b77 83ae2098

arch/arm/mach-imx/Kconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -853,6 +853,7 @@ config SOC_IMX6Q 
	select HAVE_CAN_FLEXCAN if CAN

	select HAVE_CAN_FLEXCAN if CAN

	select HAVE_IMX_GPC

	select HAVE_IMX_GPC

	select HAVE_IMX_MMDC

	select HAVE_IMX_MMDC

	select HAVE_IMX_SRC

	select HAVE_SMP

	select HAVE_SMP

	select MFD_SYSCON

	select MFD_SYSCON

	select PINCTRL

	select PINCTRL

arch/arm/mach-imx/clk-imx6q.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -436,6 +436,9 @@ int __init mx6q_clocks_init(void) 
	for (i = 0; i < ARRAY_SIZE(clks_init_on); i++)

	for (i = 0; i < ARRAY_SIZE(clks_init_on); i++)

		clk_prepare_enable(clk[clks_init_on[i]]);

		clk_prepare_enable(clk[clks_init_on[i]]);





	/* Set initial power mode */

	imx6q_set_lpm(WAIT_CLOCKED);



	np = of_find_compatible_node(NULL, NULL, "fsl,imx6q-gpt");

	np = of_find_compatible_node(NULL, NULL, "fsl,imx6q-gpt");

	base = of_iomap(np, 0);

	base = of_iomap(np, 0);

	WARN_ON(!base);

	WARN_ON(!base);

arch/arm/mach-imx/common.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -142,6 +142,7 @@ extern int imx6q_set_lpm(enum mxc_cpu_pwr_mode mode); 
extern void imx6q_clock_map_io(void);

extern void imx6q_clock_map_io(void);





extern void imx_cpu_die(unsigned int cpu);

extern void imx_cpu_die(unsigned int cpu);

extern int imx_cpu_kill(unsigned int cpu);





#ifdef CONFIG_PM

#ifdef CONFIG_PM

extern void imx6q_pm_init(void);

extern void imx6q_pm_init(void);

arch/arm/mach-imx/devices/platform-imx-fb.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -54,7 +54,7 @@ struct platform_device *__init imx_add_imx_fb( 
			.flags = IORESOURCE_IRQ,

			.flags = IORESOURCE_IRQ,

		},

		},

	};

	};

	return imx_add_platform_device_dmamask("imx-fb", 0,

	return imx_add_platform_device_dmamask(data->devid, 0,

			res, ARRAY_SIZE(res),

			res, ARRAY_SIZE(res),

			pdata, sizeof(*pdata), DMA_BIT_MASK(32));

			pdata, sizeof(*pdata), DMA_BIT_MASK(32));

}
 
}

arch/arm/mach-imx/hotplug.c

+6 −4
Original line number Original line Diff line number Diff line
@@ -46,9 +46,11 @@ static inline void cpu_enter_lowpower(void) 
void imx_cpu_die(unsigned int cpu)

void imx_cpu_die(unsigned int cpu)

{

{

	cpu_enter_lowpower();

	cpu_enter_lowpower();

	imx_enable_cpu(cpu, false);

	cpu_do_idle();

}





	/* spin here until hardware takes it down */

int imx_cpu_kill(unsigned int cpu)

	while (1)

{

		;

	imx_enable_cpu(cpu, false);

	return 1;

}
 
}