From 6baf2cc3b21c30039e040727667de3ca23048659 Mon Sep 17 00:00:00 2001 From: Jagan Teki Date: Tue, 10 Jul 2018 23:29:36 +0530 Subject: [PATCH] UPSTREAM: usb: host: Drop [e-o]hci-sunxi drivers Now Allwinner platform is all set to use Generic USB controller drivers, so remove the legacy sunxi drivers. Conflicts: drivers/usb/host/ehci-sunxi.c drivers/usb/host/ohci-sunxi.c scripts/config_whitelist.txt Change-Id: I68dec1660d92dce8833d5a05584694d7b7c4ab36 Signed-off-by: Jagan Teki Acked-by: Maxime Ripard (cherry picked from commit 543049ab590620a91b37fa0296edd3bcddd0eba2) --- drivers/usb/host/Makefile | 2 -- scripts/config_whitelist.txt | 3 --- 2 files changed, 5 deletions(-) diff --git a/drivers/usb/host/Makefile b/drivers/usb/host/Makefile index d0c28dcbae..2e1ab6c228 100644 --- a/drivers/usb/host/Makefile +++ b/drivers/usb/host/Makefile @@ -17,7 +17,6 @@ obj-$(CONFIG_USB_OHCI_DA8XX) += ohci-da8xx.o obj-$(CONFIG_USB_R8A66597_HCD) += r8a66597-hcd.o obj-$(CONFIG_USB_SL811HS) += sl811-hcd.o obj-$(CONFIG_USB_OHCI_EP93XX) += ohci-ep93xx.o -obj-$(CONFIG_USB_OHCI_SUNXI) += ohci-sunxi.o obj-$(CONFIG_USB_OHCI_LPC32XX) += ohci-lpc32xx.o obj-$(CONFIG_USB_OHCI_GENERIC) += ohci-generic.o @@ -39,7 +38,6 @@ obj-$(CONFIG_USB_EHCI_MARVELL) += ehci-marvell.o obj-$(CONFIG_USB_EHCI_MSM) += ehci-msm.o obj-$(CONFIG_USB_EHCI_PCI) += ehci-pci.o obj-$(CONFIG_USB_EHCI_SPEAR) += ehci-spear.o -obj-$(CONFIG_USB_EHCI_SUNXI) += ehci-sunxi.o obj-$(CONFIG_USB_EHCI_TEGRA) += ehci-tegra.o obj-$(CONFIG_USB_EHCI_VCT) += ehci-vct.o obj-$(CONFIG_USB_EHCI_VF) += ehci-vf.o diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index fca2d78950..400f1aba1c 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -4965,7 +4965,6 @@ CONFIG_USB_EHCI_MXC CONFIG_USB_EHCI_MXS CONFIG_USB_EHCI_RMOBILE CONFIG_USB_EHCI_SPEAR -CONFIG_USB_EHCI_SUNXI CONFIG_USB_EHCI_TEGRA CONFIG_USB_EHCI_TXFIFO_THRESH CONFIG_USB_EHCI_VCT @@ -5015,8 +5014,6 @@ CONFIG_USB_OHCI CONFIG_USB_OHCI_EP93XX CONFIG_USB_OHCI_LPC32XX CONFIG_USB_OHCI_NEW -CONFIG_USB_OHCI_SUNXI -CONFIG_USB_OMAP3 CONFIG_USB_OTG CONFIG_USB_OTG_BLACKLIST_HUB CONFIG_USB_PHY_CFG_BASE