xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge tag 'imx-cleanup' of git://git.pengutronix.de/git/imx/linux-2.6 into next/cleanup

Browse Source 
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>
This commit is contained in:
Arnd Bergmann
2012-07-06 21:28:33 +02:00
parent a26361a77e bec31a85f0
commit 0508c8e7d4
33 changed files with 90 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
arch/arm/mach-imx/mach-cpuimx35.c
View File

@@ -141,18 +141,18 @@ static const struct fsl_usb2_platform_data otg_device_pdata __initconst = {
.workaround = FLS_USB2_WORKAROUND_ENGCM09152,
};
static int otg_mode_host;
static bool otg_mode_host __initdata;
static int __init eukrea_cpuimx35_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_cpuimx35_otg_mode);
@@ -167,7 +167,7 @@ static void __init eukrea_cpuimx35_init(void)
ARRAY_SIZE(eukrea_cpuimx35_pads));
imx35_add_fec(NULL);
imx35_add_imx2_wdt(NULL);
imx35_add_imx2_wdt();
imx35_add_imx_uart0(&uart_pdata);
imx35_add_mxc_nand(&eukrea_cpuimx35_nand_board_info);