Tue Mar 24 22:09:50 2020 UTC ()
ohci@fdt, ehci@fdt are machine independent; move from sunxi to sys/dev/fdt


(tnn)
diff -r1.67 -r1.68 src/sys/arch/arm/sunxi/files.sunxi
diff -r1.51 -r1.52 src/sys/dev/fdt/files.fdt
cvs diff -r1.67 -r1.68 src/sys/arch/arm/sunxi/files.sunxi (expand / switch to unified diff)

--- src/sys/arch/arm/sunxi/files.sunxi 2019/12/09 04:51:03 1.67
+++ src/sys/arch/arm/sunxi/files.sunxi 2020/03/24 22:09:50 1.68
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: files.sunxi,v 1.67 2019/12/09 04:51:03 riastradh Exp $ 1# $NetBSD: files.sunxi,v 1.68 2020/03/24 22:09:50 tnn Exp $
2# 2#
3# Configuration info for Allwinner sunxi family SoCs 3# Configuration info for Allwinner sunxi family SoCs
4# 4#
5# 5#
6 6
7file arch/arm/sunxi/sunxi_platform.c soc_sunxi 7file arch/arm/sunxi/sunxi_platform.c soc_sunxi
8 8
9file arch/arm/sunxi/sunxi_mc_smp.c soc_sunxi_mc 9file arch/arm/sunxi/sunxi_mc_smp.c soc_sunxi_mc
10file arch/arm/sunxi/sunxi_mc_mpstart.S soc_sunxi_mc 10file arch/arm/sunxi/sunxi_mc_mpstart.S soc_sunxi_mc
11 11
12# CCU 12# CCU
13define sunxi_ccu 13define sunxi_ccu
14file arch/arm/sunxi/sunxi_ccu.c sunxi_ccu 14file arch/arm/sunxi/sunxi_ccu.c sunxi_ccu
@@ -149,34 +149,26 @@ defparam opt_sunximmc.h SUNXI_MMC_DEB @@ -149,34 +149,26 @@ defparam opt_sunximmc.h SUNXI_MMC_DEB
149# USB PHY 149# USB PHY
150device sunxiusbphy 150device sunxiusbphy
151attach sunxiusbphy at fdt with sunxi_usbphy 151attach sunxiusbphy at fdt with sunxi_usbphy
152file arch/arm/sunxi/sunxi_usbphy.c sunxi_usbphy 152file arch/arm/sunxi/sunxi_usbphy.c sunxi_usbphy
153 153
154device sunxiusb3phy 154device sunxiusb3phy
155attach sunxiusb3phy at fdt with sunxi_usb3phy 155attach sunxiusb3phy at fdt with sunxi_usb3phy
156file arch/arm/sunxi/sunxi_usb3phy.c sunxi_usb3phy 156file arch/arm/sunxi/sunxi_usb3phy.c sunxi_usb3phy
157 157
158device sun9iusbphy 158device sun9iusbphy
159attach sun9iusbphy at fdt with sunxi_a80_usbphy 159attach sun9iusbphy at fdt with sunxi_a80_usbphy
160file arch/arm/sunxi/sun9i_a80_usbphy.c sunxi_a80_usbphy 160file arch/arm/sunxi/sun9i_a80_usbphy.c sunxi_a80_usbphy
161 161
162# EHCI 
163attach ehci at fdt with ehci_fdt 
164file dev/fdt/ehci_fdt.c ehci_fdt  
165 
166# OHCI 
167attach ohci at fdt with ohci_fdt 
168file dev/fdt/ohci_fdt.c ohci_fdt 
169 
170# TWI 162# TWI
171device sunxitwi: i2cbus, i2cexec, mvi2c 163device sunxitwi: i2cbus, i2cexec, mvi2c
172attach sunxitwi at fdt with sunxi_twi 164attach sunxitwi at fdt with sunxi_twi
173file arch/arm/sunxi/sunxi_twi.c sunxi_twi 165file arch/arm/sunxi/sunxi_twi.c sunxi_twi
174 166
175# P2WI/RSB 167# P2WI/RSB
176device sunxirsb: i2cbus, i2cexec 168device sunxirsb: i2cbus, i2cexec
177attach sunxirsb at fdt with sunxi_rsb 169attach sunxirsb at fdt with sunxi_rsb
178file arch/arm/sunxi/sunxi_rsb.c sunxi_rsb 170file arch/arm/sunxi/sunxi_rsb.c sunxi_rsb
179 171
180# RTC 172# RTC
181device sunxirtc 173device sunxirtc
182attach sunxirtc at fdt with sunxi_rtc 174attach sunxirtc at fdt with sunxi_rtc
cvs diff -r1.51 -r1.52 src/sys/dev/fdt/files.fdt (expand / switch to unified diff)

--- src/sys/dev/fdt/files.fdt 2020/02/22 00:28:35 1.51
+++ src/sys/dev/fdt/files.fdt 2020/03/24 22:09:50 1.52
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: files.fdt,v 1.51 2020/02/22 00:28:35 jmcneill Exp $ 1# $NetBSD: files.fdt,v 1.52 2020/03/24 22:09:50 tnn Exp $
2 2
3include "external/bsd/libfdt/conf/files.libfdt" 3include "external/bsd/libfdt/conf/files.libfdt"
4 4
5defflag opt_fdt.h FDTBASE : libfdt, ofw_subr 5defflag opt_fdt.h FDTBASE : libfdt, ofw_subr
6defflag opt_fdt.h FDT: FDTBASE 6defflag opt_fdt.h FDT: FDTBASE
7 7
8define fdt { [pass = 10] } : clk, pwm 8define fdt { [pass = 10] } : clk, pwm
9 9
10device simplebus { } : fdt 10device simplebus { } : fdt
11attach simplebus at fdt 11attach simplebus at fdt
12file dev/fdt/fdtbus.c fdt 12file dev/fdt/fdtbus.c fdt
13 13
14device fregulator 14device fregulator
@@ -106,26 +106,34 @@ attach spdiftx at fdt @@ -106,26 +106,34 @@ attach spdiftx at fdt
106file dev/fdt/spdif_tx.c spdiftx 106file dev/fdt/spdif_tx.c spdiftx
107 107
108define fdt_display_timing 108define fdt_display_timing
109file dev/fdt/display_timing.c fdt_display_timing 109file dev/fdt/display_timing.c fdt_display_timing
110 110
111# Display controller 111# Display controller
112attach genfb at fdt with simplefb 112attach genfb at fdt with simplefb
113file dev/fdt/simplefb.c simplefb 113file dev/fdt/simplefb.c simplefb
114 114
115# Designware APB UART 115# Designware APB UART
116attach com at fdt with dw_apb_uart 116attach com at fdt with dw_apb_uart
117file dev/fdt/dw_apb_uart.c dw_apb_uart 117file dev/fdt/dw_apb_uart.c dw_apb_uart
118 118
 119# EHCI
 120attach ehci at fdt with ehci_fdt
 121file dev/fdt/ehci_fdt.c ehci_fdt
 122
 123# OHCI
 124attach ohci at fdt with ohci_fdt
 125file dev/fdt/ohci_fdt.c ohci_fdt
 126
119# Designware USB2 OTG 127# Designware USB2 OTG
120attach dwctwo at fdt with dwc2_fdt 128attach dwctwo at fdt with dwc2_fdt
121file dev/fdt/dwc2_fdt.c dwc2_fdt 129file dev/fdt/dwc2_fdt.c dwc2_fdt
122 130
123# Designware USB3 XHCI 131# Designware USB3 XHCI
124attach xhci at fdt with dwc3_fdt 132attach xhci at fdt with dwc3_fdt
125file dev/fdt/dwc3_fdt.c dwc3_fdt 133file dev/fdt/dwc3_fdt.c dwc3_fdt
126 134
127# Designware SD/MMC 135# Designware SD/MMC
128attach dwcmmc at fdt with dwcmmc_fdt 136attach dwcmmc at fdt with dwcmmc_fdt
129file dev/fdt/dwcmmc_fdt.c dwcmmc_fdt 137file dev/fdt/dwcmmc_fdt.c dwcmmc_fdt
130 138
131# Designware Watchdog Timer 139# Designware Watchdog Timer