aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mach-imx/mach-cpuimx51sd.c
diff options
context:
space:
mode:
authorArnd Bergmann2012-07-06 21:28:33 +0200
committerArnd Bergmann2012-07-06 21:28:33 +0200
commit0508c8e7d47bb64a13cb5d080c4520fe90880b18 (patch)
treed9eafb85892d0b2860cff28bc2c06f6c03472204 /arch/arm/mach-imx/mach-cpuimx51sd.c
parenta26361a77edc724492558a458af6c19cf821ab87 (diff)
parentbec31a85f0f83567ed4b77e0cd6399bac2f0f037 (diff)
Merge tag 'imx-cleanup' of git://git.pengutronix.de/git/imx/linux-2.6 into next/cleanup
From Sascha Hauer <s.hauer@pengutronix.de>: ARM i.MX cleanups for v3.6 * tag 'imx-cleanup' of git://git.pengutronix.de/git/imx/linux-2.6: ARM: imx: remove unused pdata from device macros ARM: imx: Kconfig: Remove IMX_HAVE_PLATFORM_IMX_SSI from MACH_MX25_3DS ARM: imx27/dt: make dt_compat entry const ARM: imx: cleanup otg_mode Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-imx/mach-cpuimx51sd.c')
-rw-r--r--arch/arm/mach-imx/mach-cpuimx51sd.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-imx/mach-cpuimx51sd.c b/arch/arm/mach-imx/mach-cpuimx51sd.c
index 1e09de50cbcd..e78b40b41462 100644
--- a/arch/arm/mach-imx/mach-cpuimx51sd.c
+++ b/arch/arm/mach-imx/mach-cpuimx51sd.c
@@ -217,18 +217,18 @@ static const struct mxc_usbh_platform_data usbh1_config __initconst = {
.portsc = MXC_EHCI_MODE_ULPI,
};
-static int otg_mode_host;
+static bool otg_mode_host __initdata;
static int __init eukrea_cpuimx51sd_otg_mode(char *options)
{
if (!strcmp(options, "host"))
- otg_mode_host = 1;
+ otg_mode_host = true;
else if (!strcmp(options, "device"))
- otg_mode_host = 0;
+ otg_mode_host = false;
else
pr_info("otg_mode neither \"host\" nor \"device\". "
"Defaulting to device\n");
- return 0;
+ return 1;
}
__setup("otg_mode=", eukrea_cpuimx51sd_otg_mode);
@@ -292,7 +292,7 @@ static void __init eukrea_cpuimx51sd_init(void)
imx51_add_imx_uart(0, &uart_pdata);
imx51_add_mxc_nand(&eukrea_cpuimx51sd_nand_board_info);
- imx51_add_imx2_wdt(0, NULL);
+ imx51_add_imx2_wdt(0);
gpio_request(ETH_RST, "eth_rst");
gpio_set_value(ETH_RST, 1);