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

Commit a9dde288 authored by Ralf Baechle's avatar Ralf Baechle
Browse files

MIPS: Malta: Fix CONFIG_BLK_DEV_IDE vestiges. 



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

Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 26859198

arch/mips/mti-malta/malta-setup.c

+13 −9
Original line number Diff line number Diff line
@@ -165,7 +165,6 @@ static void __init plat_setup_iocoherency(void) 
#endif

}



#ifdef CONFIG_BLK_DEV_IDE

static void __init pci_clock_check(void)

{

	unsigned int __iomem *jmpr_p =
@@ -175,18 +174,25 @@ static void __init pci_clock_check(void) 
		33, 20, 25, 30, 12, 16, 37, 10

	};

	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);

		argptr += strlen(argptr);

		sprintf(argptr, " idebus=%d", pciclock);

		sprintf(argptr, " pci_clock=%d", pciclock);

		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)

static void __init screen_info_setup(void)
@@ -272,9 +278,7 @@ void __init plat_mem_setup(void) 


	plat_setup_iocoherency();



#ifdef CONFIG_BLK_DEV_IDE

	pci_clock_check();

#endif



#ifdef CONFIG_BLK_DEV_FD

	fd_activate();