Date: Thu, 5 Oct 2023 15:34:53 GMT From: Emmanuel Vadot <manu@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 432ae724e6eb - main - dwc: Move every sub drivers to dev/dwc Message-ID: <202310051534.395FYrOK012013@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=432ae724e6ebac4696a7baf5020e2445db06dc2f commit 432ae724e6ebac4696a7baf5020e2445db06dc2f Author: Emmanuel Vadot <manu@FreeBSD.org> AuthorDate: 2023-09-23 14:38:32 +0000 Commit: Emmanuel Vadot <manu@FreeBSD.org> CommitDate: 2023-10-05 15:34:38 +0000 dwc: Move every sub drivers to dev/dwc It makes it easier to find all the sub drivers and change them if needed. While here do not gate dwc_rk with soc options, dwc_rk is made for all rockchip SoCs. Same thing for dwc_socfpga --- sys/arm/allwinner/files.allwinner | 2 +- sys/arm/rockchip/files.rk32xx | 2 +- sys/conf/files.arm64 | 5 +++-- sys/{arm/allwinner/aw_if_dwc.c => dev/dwc/if_dwc_aw.c} | 0 sys/{arm64/rockchip => dev/dwc}/if_dwc_rk.c | 0 sys/dev/{altera => }/dwc/if_dwc_socfpga.c | 0 6 files changed, 5 insertions(+), 4 deletions(-) diff --git a/sys/arm/allwinner/files.allwinner b/sys/arm/allwinner/files.allwinner index cc609e50f2bd..a136b2e050ac 100644 --- a/sys/arm/allwinner/files.allwinner +++ b/sys/arm/allwinner/files.allwinner @@ -5,7 +5,6 @@ arm/allwinner/a10_dmac.c optional a10_dmac arm/allwinner/a31_dmac.c optional a31_dmac arm/allwinner/a10_sramc.c optional SOC_ALLWINNER_A10 arm/allwinner/aw_gpio.c optional gpio -arm/allwinner/aw_if_dwc.c optional dwc arm/allwinner/aw_machdep.c standard arm/allwinner/aw_mmc.c optional mmc | mmccam arm/allwinner/aw_mp.c optional smp @@ -22,6 +21,7 @@ arm/allwinner/axp81x.c optional axp81x arm/allwinner/if_awg.c optional awg syscon arm/allwinner/if_emac.c optional emac arm/allwinner/sunxi_dma_if.m optional a10_dmac | a31_dmac +dev/dwc/if_dwc_aw.c optional dwc dev/iicbus/controller/twsi/a10_twsi.c optional twsi dev/usb/controller/generic_ohci.c optional ohci dev/usb/controller/generic_usb_if.m optional ohci diff --git a/sys/arm/rockchip/files.rk32xx b/sys/arm/rockchip/files.rk32xx index 4dc9a4df908c..0f2774fd76cc 100644 --- a/sys/arm/rockchip/files.rk32xx +++ b/sys/arm/rockchip/files.rk32xx @@ -2,7 +2,6 @@ kern/kern_clocksource.c standard arm/rockchip/rk32xx_machdep.c standard arm/rockchip/rk32xx_mp.c optional smp -arm64/rockchip/if_dwc_rk.c standard arm64/rockchip/rk_i2c.c standard arm64/rockchip/rk_iodomain.c standard arm64/rockchip/rk_gpio.c standard @@ -22,6 +21,7 @@ arm64/rockchip/clk/rk_clk_pll.c standard arm64/rockchip/clk/rk_cru.c standard arm64/rockchip/clk/rk3288_cru.c standard +dev/dwc/if_dwc_rk.c standard dev/iicbus/pmic/act8846.c standard dev/iicbus/pmic/act8846_regulator.c standard dev/iicbus/pmic/fan53555.c standard diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64 index baf8734fb38f..eaf4577ee14e 100644 --- a/sys/conf/files.arm64 +++ b/sys/conf/files.arm64 @@ -224,8 +224,11 @@ dev/dpaa2/memac_mdio_common.c optional soc_nxp_ls dpaa2 acpi | soc_nxp_ls dpaa dev/dpaa2/memac_mdio_fdt.c optional soc_nxp_ls dpaa2 fdt dev/dpaa2/memac_mdio_if.m optional soc_nxp_ls dpaa2 acpi | soc_nxp_ls dpaa2 fdt +# Synopsys DesignWare Ethernet Controller dev/dwc/if_dwc.c optional fdt dwc_rk soc_rockchip_rk3328 | fdt dwc_rk soc_rockchip_rk3399 | fdt dwc_socfpga soc_intel_stratix10 dev/dwc/if_dwc_if.m optional fdt dwc_rk soc_rockchip_rk3328 | fdt dwc_rk soc_rockchip_rk3399 | fdt dwc_socfpga soc_intel_stratix10 +dev/dwc/if_dwc_rk.c optional fdt dwc_rk soc_rockchip_rk3328 | fdt dwc_rk soc_rockchip_rk3399 +dev/dwc/if_dwc_socfpga.c optional fdt dwc_socfpga dev/enetc/enetc_mdio.c optional enetc soc_nxp_ls dev/enetc/if_enetc.c optional enetc iflib pci fdt soc_nxp_ls @@ -469,7 +472,6 @@ arm/allwinner/h6/h6_padconf.c optional soc_allwinner_h6 fdt arm/allwinner/h6/h6_r_padconf.c optional soc_allwinner_h6 fdt # Altera/Intel -dev/altera/dwc/if_dwc_socfpga.c optional fdt dwc_socfpga arm64/intel/stratix10-soc-fpga-mgr.c optional soc_intel_stratix10 fdt arm64/intel/stratix10-svc.c optional soc_intel_stratix10 fdt @@ -672,7 +674,6 @@ arm64/rockchip/rk_iodomain.c optional fdt rk_iodomain arm64/rockchip/rk_spi.c optional fdt rk_spi arm64/rockchip/rk_usb2phy.c optional fdt rk_usb2phy soc_rockchip_rk3328 | fdt rk_usb2phy soc_rockchip_rk3399 | fdt rk_usb2phy soc_rockchip_rk3568 arm64/rockchip/rk_typec_phy.c optional fdt rk_typec_phy soc_rockchip_rk3399 -arm64/rockchip/if_dwc_rk.c optional fdt dwc_rk soc_rockchip_rk3328 | fdt dwc_rk soc_rockchip_rk3399 arm64/rockchip/rk_tsadc_if.m optional fdt soc_rockchip_rk3399 | fdt soc_rockchip_rk3568 arm64/rockchip/rk_tsadc.c optional fdt soc_rockchip_rk3399 | fdt soc_rockchip_rk3568 arm64/rockchip/rk_pwm.c optional fdt rk_pwm diff --git a/sys/arm/allwinner/aw_if_dwc.c b/sys/dev/dwc/if_dwc_aw.c similarity index 100% rename from sys/arm/allwinner/aw_if_dwc.c rename to sys/dev/dwc/if_dwc_aw.c diff --git a/sys/arm64/rockchip/if_dwc_rk.c b/sys/dev/dwc/if_dwc_rk.c similarity index 100% rename from sys/arm64/rockchip/if_dwc_rk.c rename to sys/dev/dwc/if_dwc_rk.c diff --git a/sys/dev/altera/dwc/if_dwc_socfpga.c b/sys/dev/dwc/if_dwc_socfpga.c similarity index 100% rename from sys/dev/altera/dwc/if_dwc_socfpga.c rename to sys/dev/dwc/if_dwc_socfpga.c
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202310051534.395FYrOK012013>