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

Commit 3f5fcf60 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc 

* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM: OMAP: rx51: fix USB
  ARM: OMAP: mcbsp: Fix possible memory corruption
  arm/imx: fix power button on imx51 babbage board
  ARM: imx: fix cpufreq build errors
  ARM: mx5: add __initconst for fec pdata
  MXC PWM: should active during DOZE/WAIT/DBG mode
  ARM: EXYNOS: Fix build error without CONFIG_LOCAL_TIMERS
  ARM: EXYNOS: Fix for stall in case of cpu hotplug or sleep
  ARM: S5PV210: Set 1000ns as PWM backlight period on SMDKV210
  ARM: SAMSUNG: remove duplicated header include
parents b0d78ee8 98bf55c4

arch/arm/mach-exynos/mct.c

+10 −3
Original line number Diff line number Diff line
@@ -44,8 +44,6 @@ struct mct_clock_event_device { 
	char name[10];

};



static DEFINE_PER_CPU(struct mct_clock_event_device, percpu_mct_tick);



static void exynos4_mct_write(unsigned int value, void *addr)

{

	void __iomem *stat_addr;
@@ -264,6 +262,9 @@ static void exynos4_clockevent_init(void) 
}



#ifdef CONFIG_LOCAL_TIMERS



static DEFINE_PER_CPU(struct mct_clock_event_device, percpu_mct_tick);



/* Clock event handling */

static void exynos4_mct_tick_stop(struct mct_clock_event_device *mevt)

{
@@ -428,9 +429,13 @@ int __cpuinit local_timer_setup(struct clock_event_device *evt) 


void local_timer_stop(struct clock_event_device *evt)

{

	unsigned int cpu = smp_processor_id();

	evt->set_mode(CLOCK_EVT_MODE_UNUSED, evt);

	if (mct_int_type == MCT_INT_SPI)

		disable_irq(evt->irq);

		if (cpu == 0)

			remove_irq(evt->irq, &mct_tick0_event_irq);

		else

			remove_irq(evt->irq, &mct_tick1_event_irq);

	else

		disable_percpu_irq(IRQ_MCT_LOCALTIMER);

}
@@ -443,6 +448,7 @@ static void __init exynos4_timer_resources(void) 


	clk_rate = clk_get_rate(mct_clk);



#ifdef CONFIG_LOCAL_TIMERS

	if (mct_int_type == MCT_INT_PPI) {

		int err;
@@ -452,6 +458,7 @@ static void __init exynos4_timer_resources(void) 
		WARN(err, "MCT: can't request IRQ %d (%d)\n",

		     IRQ_MCT_LOCALTIMER, err);

	}

#endif /* CONFIG_LOCAL_TIMERS */

}



static void __init exynos4_timer_init(void)

arch/arm/mach-mx5/board-mx51_babbage.c

+1 −1
Original line number Diff line number Diff line
@@ -362,7 +362,7 @@ static void __init mx51_babbage_init(void) 
{

	iomux_v3_cfg_t usbh1stp = MX51_PAD_USBH1_STP__USBH1_STP;

	iomux_v3_cfg_t power_key = NEW_PAD_CTRL(MX51_PAD_EIM_A27__GPIO2_21,

		PAD_CTL_SRE_FAST | PAD_CTL_DSE_HIGH | PAD_CTL_PUS_100K_UP);

		PAD_CTL_SRE_FAST | PAD_CTL_DSE_HIGH);



	imx51_soc_init();

arch/arm/mach-mx5/board-mx53_evk.c

+1 −1
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ static inline void mx53_evk_fec_reset(void) 
	gpio_set_value(MX53_EVK_FEC_PHY_RST, 1);

}



static struct fec_platform_data mx53_evk_fec_pdata = {

static const struct fec_platform_data mx53_evk_fec_pdata __initconst = {

	.phy = PHY_INTERFACE_MODE_RMII,

};

arch/arm/mach-mx5/board-mx53_loco.c

+1 −1
Original line number Diff line number Diff line
@@ -242,7 +242,7 @@ static inline void mx53_loco_fec_reset(void) 
	gpio_set_value(LOCO_FEC_PHY_RST, 1);

}



static struct fec_platform_data mx53_loco_fec_data = {

static const struct fec_platform_data mx53_loco_fec_data __initconst = {

	.phy = PHY_INTERFACE_MODE_RMII,

};

arch/arm/mach-mx5/board-mx53_smd.c

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ static inline void mx53_smd_fec_reset(void) 
	gpio_set_value(SMD_FEC_PHY_RST, 1);

}



static struct fec_platform_data mx53_smd_fec_data = {

static const struct fec_platform_data mx53_smd_fec_data __initconst = {

	.phy = PHY_INTERFACE_MODE_RMII,

};