From nobody Thu Oct 05 15:34:53 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S1bGP6hr8z4vnFV; Thu, 5 Oct 2023 15:34:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S1bGP6Dpxz4cYQ; Thu, 5 Oct 2023 15:34:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696520093; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KEnH9AW5cQrC8QEEwpufvxSnOh4BRrnYJ2eoDOpH840=; b=tsPbA7yourDgEWHpt910fsndEpmPT1fSV0nlrAt4xt7/eLvs+owPdYfQX5oT5QjtAL/+e9 vdBa95NtIwEGaMzcvDel/cPjYG6aNw1BVQ707E/jUM77jkUXSV3J1mCJifj54WCclMwJb1 GuggN3H2K594CsOVaR8ljB0Q6SWJvAaJTw+wjf7LkfBdxeOHv0kzHkO0cx412N0EW/dllg w1QASw9HFU8vNZUydc7P/JQdiV5qFoazzTwuzYUxgmcYDFsXEtOA6h5jKV4QoCHLWfVRGg NHIYPxM4PIpczQr3pframrjmW5/S6Lo7bSEQELDaEjz0ZSAJazto7gORYzhkjA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696520093; a=rsa-sha256; cv=none; b=TlI5+FPo9yd4LBef1nfPCMOx0MWQ1Z0rsm1f22AJScxMDlxomGKiSX0UT/p4T3tEjlCzI6 ao01776LcXpUBTZzruf93xVO/5jTXhFzWEc1y5nb/R00QGWzd9WEBW50BfkWTUvxPlXcqh bFSF+nqeexWFg45I4yer8mKl+LPb5kqhSearJwfyxb1VMDSc/SWcMAzCLaNiJ6PYaUFTQ8 tN4yTEfbtugY+Vg6rYXTkbiRvgsr0SCRCruEXIz2mg5EAghvhr8Of14/hdE5yZGLDFB7op fWoZfQtH0t/iGlxlu/DepSPYMk5ZiLlIFRXfzY8ITIeznh3R3HBC9AdySVPPiw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696520093; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KEnH9AW5cQrC8QEEwpufvxSnOh4BRrnYJ2eoDOpH840=; b=gXFogRPebN11SCh8nt361NGBNfmD9uUwQlJOZJxrzI2ybI2J85odAb/lY5dnfXCNfuhhE0 pCUDiHUfQI4LFk0si6C3rIQXZhtXx+NRr1lKFM5ptKRFgW8V/Fo8IgykhvuBaqYeL2KZJV KX12WpFlo4pnJ5Aemw8IT74Cm25b6Bq6uW6Sk3CizXpin7hD+kZOD2+QXXVG/e+TkJ/5yS fh4nERY1tlS0dxgbdW02JI01Bi3OCyZYcHMTJX0uVLxqpKccAExmbKk3trVQucFUybbpeN +wi3axdV3nZLXgT8mYvNMBt5vx2JHYEVpDsfAzsJ9qe8G5zcDKAjFexo9eOD2A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S1bGP5HN9z1PGn; Thu, 5 Oct 2023 15:34:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 395FYrZt012016; Thu, 5 Oct 2023 15:34:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 395FYrOK012013; Thu, 5 Oct 2023 15:34:53 GMT (envelope-from git) Date: Thu, 5 Oct 2023 15:34:53 GMT Message-Id: <202310051534.395FYrOK012013@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 432ae724e6eb - main - dwc: Move every sub drivers to dev/dwc List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 432ae724e6ebac4696a7baf5020e2445db06dc2f Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=432ae724e6ebac4696a7baf5020e2445db06dc2f commit 432ae724e6ebac4696a7baf5020e2445db06dc2f Author: Emmanuel Vadot AuthorDate: 2023-09-23 14:38:32 +0000 Commit: Emmanuel Vadot 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