svn commit: r353063 - in head/sys: arm/allwinner arm64/conf conf

[Emmanuel Vadot]

Author: manu
Date: Thu Oct  3 18:58:15 2019
New Revision: 353063
URL: https://svnweb.freebsd.org/changeset/base/353063

Log:
  allwinner: Remove a10_ehci driver
  
  We have generic-ehci since r353062 so use it.
  
  MFC after:	1 month
  X-MFC-With:	r353062

Deleted:
  head/sys/arm/allwinner/a10_ehci.c
Modified:
  head/sys/arm/allwinner/files.allwinner
  head/sys/arm64/conf/GENERIC
  head/sys/conf/files.arm64

Modified: head/sys/arm/allwinner/files.allwinner
==============================================================================
--- head/sys/arm/allwinner/files.allwinner	Thu Oct  3 18:53:03 2019	(r353062)
+++ head/sys/arm/allwinner/files.allwinner	Thu Oct  3 18:58:15 2019	(r353063)
@@ -4,7 +4,6 @@ arm/allwinner/a10_ahci.c		optional	ahci
 arm/allwinner/a10_codec.c		optional	sound
 arm/allwinner/a10_dmac.c		optional	a10_dmac
 arm/allwinner/a31_dmac.c		optional	a31_dmac
-arm/allwinner/a10_ehci.c		optional	ehci
 arm/allwinner/a10_sramc.c		optional	SOC_ALLWINNER_A10
 arm/allwinner/aw_gpio.c			optional	gpio
 arm/allwinner/aw_if_dwc.c		optional	dwc
@@ -26,6 +25,8 @@ arm/allwinner/sunxi_dma_if.m		optional	a10_dmac | a31_
 dev/iicbus/twsi/a10_twsi.c		optional	twsi
 dev/usb/controller/generic_ohci.c	optional	ohci
 dev/usb/controller/generic_usb_if.m	optional	ohci
+dev/usb/controller/generic_ehci.c	optional	ehci
+dev/usb/controller/generic_ehci_fdt.c	optional	ehci
 arm/allwinner/aw_sid.c			optional	aw_sid
 arm/allwinner/aw_thermal.c		optional	aw_thermal
 arm/allwinner/aw_cir.c			optional	aw_cir evdev

Modified: head/sys/arm64/conf/GENERIC
==============================================================================
--- head/sys/arm64/conf/GENERIC	Thu Oct  3 18:53:03 2019	(r353062)
+++ head/sys/arm64/conf/GENERIC	Thu Oct  3 18:58:15 2019	(r353063)
@@ -203,7 +203,6 @@ device		uart_snps
 device		pl011
 
 # USB support
-device		aw_ehci			# Allwinner EHCI USB interface (USB 2.0)
 device		aw_usbphy		# Allwinner USB PHY
 device		rk_usb2phy		# Rockchip USB2PHY
 device		dwcotg			# DWC OTG controller

Modified: head/sys/conf/files.arm64
==============================================================================
--- head/sys/conf/files.arm64	Thu Oct  3 18:53:03 2019	(r353062)
+++ head/sys/conf/files.arm64	Thu Oct  3 18:58:15 2019	(r353063)
@@ -25,7 +25,6 @@ cloudabi64_vdso_blob.o		optional	compat_cloudabi64	\
 #
 
 # Allwinner common files
-arm/allwinner/a10_ehci.c	optional	ehci aw_ehci fdt
 arm/allwinner/a10_timer.c	optional	a10_timer fdt
 arm/allwinner/a10_codec.c	optional	sound a10_codec
 arm/allwinner/a31_dmac.c	optional	a31_dmac