Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-25 21:51:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

MIPS: Malta: Fix CONFIG_BLK_DEV_IDE vestiges.

Browse Source 
Don't depend on CONFIG_IDE to make this more robust.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:
Ralf Baechle 2014-03-18 21:22:46 +01:00
parent 2685919819
commit a9dde2886b
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
arch/mips/mti-malta/malta-setup.c
View File

@ -165,7 +165,6 @@ static void __init plat_setup_iocoherency(void)
#endif #endif
} }
#ifdef CONFIG_BLK_DEV_IDE
static void __init pci_clock_check(void) static void __init pci_clock_check(void)
{ {
unsigned int __iomem *jmpr_p = unsigned int __iomem *jmpr_p =
@ -175,18 +174,25 @@ static void __init pci_clock_check(void)
33, 20, 25, 30, 12, 16, 37, 10 33, 20, 25, 30, 12, 16, 37, 10
}; };
int pciclock = pciclocks[jmpr]; int pciclock = pciclocks[jmpr];
char *argptr = fw_getcmdline(); char *optptr, *argptr = fw_getcmdline();
if (pciclock != 33 && !strstr(argptr, "idebus=")) { /*
pr_warn("WARNING: PCI clock is %dMHz, setting idebus\n", * If user passed a pci_clock= option, don't tack on another one
*/
optptr = strstr(argptr, "pci_clock=");
if (optptr && (optptr == argptr || optptr[-1] == ' '))
return;
if (pciclock != 33) {
pr_warn("WARNING: PCI clock is %dMHz, setting pci_clock\n",
pciclock); pciclock);
argptr += strlen(argptr); argptr += strlen(argptr);
sprintf(argptr, " idebus=%d", pciclock); sprintf(argptr, " pci_clock=%d", pciclock);
if (pciclock < 20 || pciclock > 66) if (pciclock < 20 || pciclock > 66)
pr_warn("WARNING: IDE timing calculations will be incorrect\n"); pr_warn("WARNING: IDE timing calculations will be "
"incorrect\n");
} }
} }
#endif
#if defined(CONFIG_VT) && defined(CONFIG_VGA_CONSOLE) #if defined(CONFIG_VT) && defined(CONFIG_VGA_CONSOLE)
static void __init screen_info_setup(void) static void __init screen_info_setup(void)
@ -272,9 +278,7 @@ void __init plat_mem_setup(void)
plat_setup_iocoherency(); plat_setup_iocoherency();
#ifdef CONFIG_BLK_DEV_IDE
pci_clock_check(); pci_clock_check();
#endif
#ifdef CONFIG_BLK_DEV_FD #ifdef CONFIG_BLK_DEV_FD
fd_activate(); fd_activate();