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

Commit 738384aa authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'imx-fixes-for-arnd' of git://git.pengutronix.de/git/imx/linux-2.6 into fixes

parents dc47ce90 847a2ee7

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,

};

arch/arm/plat-mxc/cpufreq.c

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
 * the CPU clock speed on the fly.

 */



#include <linux/module.h>

#include <linux/cpufreq.h>

#include <linux/clk.h>

#include <linux/err.h>