]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
MIPS: OCTEON: dma-octeon: fix OHCI USB config check
authorAaro Koskinen <aaro.koskinen@iki.fi>
Wed, 4 Mar 2015 21:08:49 +0000 (23:08 +0200)
committerRalf Baechle <ralf@linux-mips.org>
Wed, 25 Mar 2015 12:47:57 +0000 (13:47 +0100)
CONFIG_USB_OCTEON_OHCI is deprecated and no longer needed to use OHCI
on OCTEON II. Instead, CONFIG_USB_OHCI_HCD_PLATFORM should be used.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Cc: Aleksey Makarov <aleksey.makarov@auriga.com>
Cc: David Daney <david.daney@cavium.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/9421/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
arch/mips/cavium-octeon/dma-octeon.c

index 7d8987818ccf51ed6aa82463fbe3de5dd599557e..d8960d46417b07ec5e3b0603b2f934efe4c1f54c 100644 (file)
@@ -306,7 +306,7 @@ void __init plat_swiotlb_setup(void)
                swiotlbsize = 64 * (1<<20);
        }
 #endif
-#ifdef CONFIG_USB_OCTEON_OHCI
+#ifdef CONFIG_USB_OHCI_HCD_PLATFORM
        /* OCTEON II ohci is only 32-bit. */
        if (OCTEON_IS_OCTEON2() && max_addr >= 0x100000000ul)
                swiotlbsize = 64 * (1<<20);