aboutsummaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorEmmanuel Vadot <manu@FreeBSD.org>2023-12-26 17:56:52 +0000
committerEmmanuel Vadot <manu@FreeBSD.org>2024-01-10 18:20:34 +0000
commit950a6087ec18cd22464b3297573f54a6d9223c99 (patch)
tree6fb7d91c0ac8713e46b737d2f56ed08e04922613 /sys/dev
parentb2f0caf160993c30a0d0e3d52e8a2d03616908cd (diff)
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/pci/pci_dw_mv.c2
-rw-r--r--sys/dev/phy/phy.c (renamed from sys/dev/extres/phy/phy.c)4
-rw-r--r--sys/dev/phy/phy.h (renamed from sys/dev/extres/phy/phy.h)7
-rw-r--r--sys/dev/phy/phy_internal.h (renamed from sys/dev/extres/phy/phy_internal.h)6
-rw-r--r--sys/dev/phy/phy_usb.c (renamed from sys/dev/extres/phy/phy_usb.c)4
-rw-r--r--sys/dev/phy/phy_usb.h (renamed from sys/dev/extres/phy/phy_usb.h)8
-rw-r--r--sys/dev/phy/phydev_if.m (renamed from sys/dev/extres/phy/phydev_if.m)0
-rw-r--r--sys/dev/phy/phynode_if.m (renamed from sys/dev/extres/phy/phynode_if.m)2
-rw-r--r--sys/dev/phy/phynode_usb_if.m (renamed from sys/dev/extres/phy/phynode_usb_if.m)0
-rw-r--r--sys/dev/qcom_dwc3/qcom_dwc3.c2
-rw-r--r--sys/dev/sdhci/sdhci_fdt.c2
-rw-r--r--sys/dev/usb/controller/dwc3/aw_dwc3.c2
-rw-r--r--sys/dev/usb/controller/dwc3/dwc3.c2
-rw-r--r--sys/dev/usb/controller/dwc3/rk_dwc3.c2
-rw-r--r--sys/dev/usb/controller/generic_ehci_fdt.c4
-rw-r--r--sys/dev/usb/controller/generic_ohci.c4
-rw-r--r--sys/dev/usb/controller/generic_xhci_fdt.c2
-rw-r--r--sys/dev/usb/controller/musb_otg_allwinner.c4
-rw-r--r--sys/dev/usb/controller/usb_nop_xceiv.c2
-rw-r--r--sys/dev/usb/controller/xlnx_dwc3.c2
20 files changed, 31 insertions, 30 deletions
diff --git a/sys/dev/pci/pci_dw_mv.c b/sys/dev/pci/pci_dw_mv.c
index 4f0671cb23d9..97d957932d42 100644
--- a/sys/dev/pci/pci_dw_mv.c
+++ b/sys/dev/pci/pci_dw_mv.c
@@ -45,7 +45,7 @@
#include <machine/resource.h>
#include <dev/clk/clk.h>
-#include <dev/extres/phy/phy.h>
+#include <dev/phy/phy.h>
#include <dev/ofw/ofw_bus.h>
#include <dev/ofw/ofw_bus_subr.h>
#include <dev/ofw/ofw_pci.h>
diff --git a/sys/dev/extres/phy/phy.c b/sys/dev/phy/phy.c
index 8861102b8508..07ffd85377c9 100644
--- a/sys/dev/extres/phy/phy.c
+++ b/sys/dev/phy/phy.c
@@ -40,8 +40,8 @@
#include <dev/ofw/ofw_bus_subr.h>
#endif
-#include <dev/extres/phy/phy.h>
-#include <dev/extres/phy/phy_internal.h>
+#include <dev/phy/phy.h>
+#include <dev/phy/phy_internal.h>
#ifdef FDT
#include "phydev_if.h"
diff --git a/sys/dev/extres/phy/phy.h b/sys/dev/phy/phy.h
index a72904a10e2b..ae610ab74d10 100644
--- a/sys/dev/extres/phy/phy.h
+++ b/sys/dev/phy/phy.h
@@ -23,8 +23,9 @@
*
*/
-#ifndef DEV_EXTRES_PHY_H
-#define DEV_EXTRES_PHY_H
+#ifndef _DEV_PHY_H_
+#define _DEV_PHY_H_
+
#include "opt_platform.h"
#include <sys/kobj.h>
@@ -148,4 +149,4 @@ int phy_get_by_ofw_property(device_t consumer, phandle_t node, char *name,
phy_t *phy);
#endif
-#endif /* DEV_EXTRES_PHY_H */
+#endif /* _DEV_PHY_H_ */
diff --git a/sys/dev/extres/phy/phy_internal.h b/sys/dev/phy/phy_internal.h
index 7f680a1c87fb..d5872d84b8c9 100644
--- a/sys/dev/extres/phy/phy_internal.h
+++ b/sys/dev/phy/phy_internal.h
@@ -23,8 +23,8 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef DEV_EXTRES_PHY_INTERNAL_H
-#define DEV_EXTRES_PHY_INTERNAL_H
+#ifndef _DEV_PHY_INTERNAL_H_
+#define _DEV_PHY_INTERNAL_H_
/* Forward declarations. */
struct phy;
@@ -78,4 +78,4 @@ struct phy {
extern struct sx phynode_topo_lock;
-#endif /* DEV_EXTRES_PHY_INTERNAL_H */
+#endif /* _DEV_PHY_INTERNAL_H_ */
diff --git a/sys/dev/extres/phy/phy_usb.c b/sys/dev/phy/phy_usb.c
index 9e5556cf7f49..6a4fb17ca199 100644
--- a/sys/dev/extres/phy/phy_usb.c
+++ b/sys/dev/phy/phy_usb.c
@@ -32,8 +32,8 @@
#include <sys/sx.h>
-#include <dev/extres/phy/phy_usb.h>
-#include <dev/extres/phy/phy_internal.h>
+#include <dev/phy/phy_usb.h>
+#include <dev/phy/phy_internal.h>
/*
* USB phy controller methods.
diff --git a/sys/dev/extres/phy/phy_usb.h b/sys/dev/phy/phy_usb.h
index ae175c6700c5..eaaff6ee700c 100644
--- a/sys/dev/extres/phy/phy_usb.h
+++ b/sys/dev/phy/phy_usb.h
@@ -24,10 +24,10 @@
* SUCH DAMAGE.
*/
-#ifndef _DEV_EXTRES_PHY_USB_H_
-#define _DEV_EXTRES_PHY_USB_H_
+#ifndef _DEV_PHY_USB_H_
+#define _DEV_PHY_USB_H_
-#include <dev/extres/phy/phy.h>
+#include <dev/phy/phy.h>
#include "phynode_usb_if.h"
#define PHY_USB_MODE_UNKNOWN 0
@@ -80,4 +80,4 @@ int phynode_usb_get_mode(struct phynode *phynode, int *usb_mode);
int phy_usb_set_mode(phy_t phy, int usb_mode);
int phy_usb_get_mode(phy_t phy, int *usb_mode);
-#endif /*_DEV_EXTRES_PHY_USB_H_*/
+#endif /*_DEV_PHY_USB_H_*/
diff --git a/sys/dev/extres/phy/phydev_if.m b/sys/dev/phy/phydev_if.m
index 310b056c68df..310b056c68df 100644
--- a/sys/dev/extres/phy/phydev_if.m
+++ b/sys/dev/phy/phydev_if.m
diff --git a/sys/dev/extres/phy/phynode_if.m b/sys/dev/phy/phynode_if.m
index 18b798227109..425deb6bcfbe 100644
--- a/sys/dev/extres/phy/phynode_if.m
+++ b/sys/dev/phy/phynode_if.m
@@ -26,7 +26,7 @@
INTERFACE phynode;
HEADER {
- #include <dev/extres/phy/phy.h>
+ #include <dev/phy/phy.h>
struct phynode;
}
diff --git a/sys/dev/extres/phy/phynode_usb_if.m b/sys/dev/phy/phynode_usb_if.m
index 2a3906522740..2a3906522740 100644
--- a/sys/dev/extres/phy/phynode_usb_if.m
+++ b/sys/dev/phy/phynode_usb_if.m
diff --git a/sys/dev/qcom_dwc3/qcom_dwc3.c b/sys/dev/qcom_dwc3/qcom_dwc3.c
index 71c95096e5cf..cd58b9ef7705 100644
--- a/sys/dev/qcom_dwc3/qcom_dwc3.c
+++ b/sys/dev/qcom_dwc3/qcom_dwc3.c
@@ -47,7 +47,7 @@
#include <dev/clk/clk.h>
#include <dev/hwreset/hwreset.h>
-#include <dev/extres/phy/phy_usb.h>
+#include <dev/phy/phy_usb.h>
#include <dev/extres/syscon/syscon.h>
static struct ofw_compat_data compat_data[] = {
diff --git a/sys/dev/sdhci/sdhci_fdt.c b/sys/dev/sdhci/sdhci_fdt.c
index bf9f81108467..3914c96b5165 100644
--- a/sys/dev/sdhci/sdhci_fdt.c
+++ b/sys/dev/sdhci/sdhci_fdt.c
@@ -53,7 +53,7 @@
#include <dev/clk/clk.h>
#include <dev/clk/clk_fixed.h>
#include <dev/extres/syscon/syscon.h>
-#include <dev/extres/phy/phy.h>
+#include <dev/phy/phy.h>
#include <dev/mmc/bridge.h>
diff --git a/sys/dev/usb/controller/dwc3/aw_dwc3.c b/sys/dev/usb/controller/dwc3/aw_dwc3.c
index 67331f2f1be9..802c46bdae28 100644
--- a/sys/dev/usb/controller/dwc3/aw_dwc3.c
+++ b/sys/dev/usb/controller/dwc3/aw_dwc3.c
@@ -47,7 +47,7 @@
#include <dev/clk/clk.h>
#include <dev/hwreset/hwreset.h>
-#include <dev/extres/phy/phy_usb.h>
+#include <dev/phy/phy_usb.h>
static struct ofw_compat_data compat_data[] = {
{ "allwinner,sun50i-h6-dwc3", 1 },
diff --git a/sys/dev/usb/controller/dwc3/dwc3.c b/sys/dev/usb/controller/dwc3/dwc3.c
index e0ad19fb835f..a44c2371b891 100644
--- a/sys/dev/usb/controller/dwc3/dwc3.c
+++ b/sys/dev/usb/controller/dwc3/dwc3.c
@@ -66,7 +66,7 @@
#include <dev/ofw/ofw_subr.h>
#include <dev/clk/clk.h>
-#include <dev/extres/phy/phy_usb.h>
+#include <dev/phy/phy_usb.h>
#endif
#ifdef DEV_ACPI
diff --git a/sys/dev/usb/controller/dwc3/rk_dwc3.c b/sys/dev/usb/controller/dwc3/rk_dwc3.c
index b34ec4880895..b3345fb4a67b 100644
--- a/sys/dev/usb/controller/dwc3/rk_dwc3.c
+++ b/sys/dev/usb/controller/dwc3/rk_dwc3.c
@@ -47,7 +47,7 @@
#include <dev/clk/clk.h>
#include <dev/hwreset/hwreset.h>
-#include <dev/extres/phy/phy_usb.h>
+#include <dev/phy/phy_usb.h>
#include <dev/extres/syscon/syscon.h>
enum rk_dwc3_type {
diff --git a/sys/dev/usb/controller/generic_ehci_fdt.c b/sys/dev/usb/controller/generic_ehci_fdt.c
index e88895d20664..af22d0bdef73 100644
--- a/sys/dev/usb/controller/generic_ehci_fdt.c
+++ b/sys/dev/usb/controller/generic_ehci_fdt.c
@@ -56,8 +56,8 @@
#include <dev/clk/clk.h>
#include <dev/hwreset/hwreset.h>
-#include <dev/extres/phy/phy.h>
-#include <dev/extres/phy/phy_usb.h>
+#include <dev/phy/phy.h>
+#include <dev/phy/phy_usb.h>
#include "generic_ehci.h"
diff --git a/sys/dev/usb/controller/generic_ohci.c b/sys/dev/usb/controller/generic_ohci.c
index b71c269cfdcd..f3a9e0481bb2 100644
--- a/sys/dev/usb/controller/generic_ohci.c
+++ b/sys/dev/usb/controller/generic_ohci.c
@@ -55,8 +55,8 @@
#include <dev/clk/clk.h>
#include <dev/hwreset/hwreset.h>
-#include <dev/extres/phy/phy.h>
-#include <dev/extres/phy/phy_usb.h>
+#include <dev/phy/phy.h>
+#include <dev/phy/phy_usb.h>
#include "generic_usb_if.h"
diff --git a/sys/dev/usb/controller/generic_xhci_fdt.c b/sys/dev/usb/controller/generic_xhci_fdt.c
index a5c3f190783f..66fc1ab65a23 100644
--- a/sys/dev/usb/controller/generic_xhci_fdt.c
+++ b/sys/dev/usb/controller/generic_xhci_fdt.c
@@ -51,7 +51,7 @@
#include <dev/ofw/ofw_bus.h>
#include <dev/ofw/ofw_bus_subr.h>
-#include <dev/extres/phy/phy.h>
+#include <dev/phy/phy.h>
#include "generic_xhci.h"
diff --git a/sys/dev/usb/controller/musb_otg_allwinner.c b/sys/dev/usb/controller/musb_otg_allwinner.c
index a8961bed6385..3bfe2b525138 100644
--- a/sys/dev/usb/controller/musb_otg_allwinner.c
+++ b/sys/dev/usb/controller/musb_otg_allwinner.c
@@ -60,8 +60,8 @@
#include <dev/clk/clk.h>
#include <dev/hwreset/hwreset.h>
-#include <dev/extres/phy/phy.h>
-#include <dev/extres/phy/phy_usb.h>
+#include <dev/phy/phy.h>
+#include <dev/phy/phy_usb.h>
#ifdef __arm__
#include <arm/allwinner/aw_machdep.h>
diff --git a/sys/dev/usb/controller/usb_nop_xceiv.c b/sys/dev/usb/controller/usb_nop_xceiv.c
index e9503a35531a..9821f4b5e92a 100644
--- a/sys/dev/usb/controller/usb_nop_xceiv.c
+++ b/sys/dev/usb/controller/usb_nop_xceiv.c
@@ -43,7 +43,7 @@
#include <dev/clk/clk.h>
#include <dev/regulator/regulator.h>
-#include <dev/extres/phy/phy_usb.h>
+#include <dev/phy/phy_usb.h>
#include "phynode_if.h"
diff --git a/sys/dev/usb/controller/xlnx_dwc3.c b/sys/dev/usb/controller/xlnx_dwc3.c
index facc44823523..9b9d10e81ad8 100644
--- a/sys/dev/usb/controller/xlnx_dwc3.c
+++ b/sys/dev/usb/controller/xlnx_dwc3.c
@@ -49,7 +49,7 @@
#include <dev/clk/clk.h>
#include <dev/hwreset/hwreset.h>
-#include <dev/extres/phy/phy_usb.h>
+#include <dev/phy/phy_usb.h>
#include <dev/extres/syscon/syscon.h>
static struct ofw_compat_data compat_data[] = {
generated by cgit v1.3 (git 2.53.0) at 2026-05-30 17:55:13 +0000