From nobody Wed Jan 10 18:21:06 2024 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 4T9GMR1Bn6z55YHJ; Wed, 10 Jan 2024 18:21:07 +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 4T9GMQ5grtz4Gk7; Wed, 10 Jan 2024 18:21:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704910866; 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=19ubGhRse8DmeDItw4kdsi8ST+AVgsLRz3Gt4j1gbyM=; b=qcH+/BH/Ihpr38BwhTX96Kpi/ed/iBHPDV+55z4JvYkIoSDDLCy7IF1POKLa6cnQR0UNGf W+VeG0LkGnMm7chrhk/JQKTbztSlw4ci1ZRWn8Y4O/Bwv970N1p/zBZO+2o8LJbLV9wYsU tdxZWbczbkYcE2AoyVqc7Ltt15bjFnOtxTuTV20olj2tD5ctZqiGoWNMLCkj4yvhyGsLME SRRGsEdK05wpgbBAGCUKqBP763zCcHevkWYJb54VVmz1t94/6xQqzeR5Snp88QCkHMGQzZ el1BVOlnF8+Aiqi09CwzWB4rQ70XAN783EYkSnRtiAWlgw4xcuTn7YZnFgSBhg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704910866; 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=19ubGhRse8DmeDItw4kdsi8ST+AVgsLRz3Gt4j1gbyM=; b=OTHe6JasVlWrNHK+dSKI9+LTPwceCXwI2TmHs21nxoNOFA6BqncOvusRw/Hhiw7pSelw5g yKj+tVeEVK6jxQ098fHIl6qIN6wZJi4kKKFBrqOR+8CFlB5PRR7PK1lxjobkUJ0HzGA4po Fdi+bLN98m/KhdpA9xdoFHk6G6cBMzul7Igkq6dMKG2ff5Ss8P18kajOtZFyi6R6K7eOv8 tUIQVz1SqgPijThsv11ze7IFszhCOuIf0WeSKa3H0mghHmwPZFb+wRMNTdctrPVWZA1kH/ 9BbJExG4EYyP4pBR0G0fHtpt1QgCEoF2S0oJUFbyDxX11TA/Q7uSq3V5q1exXg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704910866; a=rsa-sha256; cv=none; b=CtMRZgWlLwGvtoOnSXMZKfqcvQq82lc8vXvRothG3o87uK/6EBzIKr/Pchtp2zFnK2z0v9 voEYpfQ5crqK9S6jO1A5JjM3f70ircZpSTM9n62cVfCikI3QiScy8Y2nOjM1wgvEaaoAgs Rid/yjEBCAXNdGu/b7trGIr2t9IiRzri68coiMcVYOr+xaq78/rtc1BcZoH7fBerl2nJcj 1o7NnwCbDDlIh9tiCOEYepkoFW2uIlDfHrXBy5i7KzYW6UjhNmJbxX8bTO8bxguZs2gp2H hrzNs572m9VclM/mLWUI805x+J5s691DEK4T335E5Ut6FrpywBZi9AtYPBbwCw== 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 4T9GMQ4n7szmJR; Wed, 10 Jan 2024 18:21:06 +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 40AIL6a4052985; Wed, 10 Jan 2024 18:21:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40AIL638052982; Wed, 10 Jan 2024 18:21:06 GMT (envelope-from git) Date: Wed, 10 Jan 2024 18:21:06 GMT Message-Id: <202401101821.40AIL638052982@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: fe75646a0234 - main - usb: dwc3: Move driver under a subdirectory 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: fe75646a0234a261c0013bf1840fdac4acaf0cec Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=fe75646a0234a261c0013bf1840fdac4acaf0cec commit fe75646a0234a261c0013bf1840fdac4acaf0cec Author: Emmanuel Vadot AuthorDate: 2023-12-25 20:06:41 +0000 Commit: Emmanuel Vadot CommitDate: 2024-01-10 18:20:24 +0000 usb: dwc3: Move driver under a subdirectory dwc3 is big enough to have its own subdirectory. While here only make it depend on kernel option dwc3 and rk_dwc3 without any SOC options. Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D43190 --- sys/conf/files.arm | 2 +- sys/conf/files.arm64 | 7 ++++--- sys/{arm/allwinner => dev/usb/controller/dwc3}/aw_dwc3.c | 0 sys/dev/usb/controller/{ => dwc3}/dwc3.c | 5 ++--- sys/dev/usb/controller/{ => dwc3}/dwc3.h | 0 sys/{arm64/rockchip => dev/usb/controller/dwc3}/rk_dwc3.c | 0 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sys/conf/files.arm b/sys/conf/files.arm index 075b05e36d78..28e80016d97b 100644 --- a/sys/conf/files.arm +++ b/sys/conf/files.arm @@ -104,7 +104,7 @@ dev/psci/smccc_arm.S optional psci dev/syscons/scgfbrndr.c optional sc dev/uart/uart_cpu_fdt.c optional uart fdt -dev/usb/controller/dwc3.c optional fdt dwc3 +dev/usb/controller/dwc3/dwc3.c optional fdt dwc3 dev/usb/controller/generic_xhci.c optional xhci dev/usb/controller/generic_xhci_fdt.c optional xhci fdt diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64 index 6c761b37f191..0eed3db41b16 100644 --- a/sys/conf/files.arm64 +++ b/sys/conf/files.arm64 @@ -402,7 +402,6 @@ dev/uart/uart_dev_mu.c optional uart uart_mu fdt dev/uart/uart_dev_pl011.c optional uart pl011 dev/usb/controller/dwc_otg_hisi.c optional dwcotg fdt soc_hisi_hi6220 -dev/usb/controller/dwc3.c optional xhci acpi dwc3 | xhci fdt dwc3 dev/usb/controller/ehci_mv.c optional ehci_mv fdt dev/usb/controller/generic_ehci.c optional ehci dev/usb/controller/generic_ehci_acpi.c optional ehci acpi @@ -415,6 +414,10 @@ dev/usb/controller/generic_xhci.c optional xhci dev/usb/controller/generic_xhci_acpi.c optional xhci acpi dev/usb/controller/generic_xhci_fdt.c optional xhci fdt +dev/usb/controller/dwc3/dwc3.c optional xhci acpi dwc3 | xhci fdt dwc3 +dev/usb/controller/dwc3/aw_dwc3.c optional xhci fdt dwc3 aw_dwc3 +dev/usb/controller/dwc3/rk_dwc3.c optional xhci fdt dwc3 rk_dwc3 + dev/vnic/mrml_bridge.c optional vnic fdt dev/vnic/nic_main.c optional vnic pci dev/vnic/nicvf_main.c optional vnic pci pci_iov @@ -437,7 +440,6 @@ arm/allwinner/a33_codec.c optional fdt sound a33_codec arm/allwinner/a64/sun50i_a64_acodec.c optional fdt sound a64_codec arm/allwinner/sunxi_dma_if.m optional a31_dmac arm/allwinner/aw_cir.c optional evdev aw_cir fdt -arm/allwinner/aw_dwc3.c optional aw_dwc3 fdt arm/allwinner/aw_gpio.c optional gpio aw_gpio fdt arm/allwinner/aw_i2s.c optional fdt sound aw_i2s arm/allwinner/aw_mmc.c optional mmc aw_mmc fdt | mmccam aw_mmc fdt @@ -664,7 +666,6 @@ arm64/rockchip/rk3399_emmcphy.c optional fdt rk_emmcphy soc_rockchip_rk3399 arm64/rockchip/rk3568_combphy.c optional fdt rk_combphy soc_rockchip_rk3568 arm64/rockchip/rk3568_pcie.c optional fdt pci soc_rockchip_rk3568 arm64/rockchip/rk3568_pciephy.c optional fdt pci soc_rockchip_rk3568 -arm64/rockchip/rk_dwc3.c optional fdt rk_dwc3 soc_rockchip_rk3399 | fdt rk_dwc3 soc_rockchip_rk3568 arm64/rockchip/rk_i2s.c optional fdt sound soc_rockchip_rk3328 | fdt sound soc_rockchip_rk3399 arm64/rockchip/rk_otp.c optional fdt soc_rockchip_rk3568 arm64/rockchip/rk_otp_if.m optional fdt soc_rockchip_rk3568 diff --git a/sys/arm/allwinner/aw_dwc3.c b/sys/dev/usb/controller/dwc3/aw_dwc3.c similarity index 100% rename from sys/arm/allwinner/aw_dwc3.c rename to sys/dev/usb/controller/dwc3/aw_dwc3.c diff --git a/sys/dev/usb/controller/dwc3.c b/sys/dev/usb/controller/dwc3/dwc3.c similarity index 99% rename from sys/dev/usb/controller/dwc3.c rename to sys/dev/usb/controller/dwc3/dwc3.c index bf3001c0389e..d97b0b11d44c 100644 --- a/sys/dev/usb/controller/dwc3.c +++ b/sys/dev/usb/controller/dwc3/dwc3.c @@ -53,8 +53,9 @@ #include #include +#include #include -#include +#include #ifdef FDT #include @@ -74,8 +75,6 @@ #include #endif -#include "generic_xhci.h" - struct snps_dwc3_softc { struct xhci_softc sc; device_t dev; diff --git a/sys/dev/usb/controller/dwc3.h b/sys/dev/usb/controller/dwc3/dwc3.h similarity index 100% rename from sys/dev/usb/controller/dwc3.h rename to sys/dev/usb/controller/dwc3/dwc3.h diff --git a/sys/arm64/rockchip/rk_dwc3.c b/sys/dev/usb/controller/dwc3/rk_dwc3.c similarity index 100% rename from sys/arm64/rockchip/rk_dwc3.c rename to sys/dev/usb/controller/dwc3/rk_dwc3.c