Date: Thu, 5 Oct 2023 15:35:01 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: c36125f6cc8b - main - dwc: Rename if_dwc.h to dwc1000_reg.h Message-ID: <202310051535.395FZ1ef012344@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=c36125f6cc8b3577f913da757ae588dd357a765c commit c36125f6cc8b3577f913da757ae588dd357a765c Author: Emmanuel Vadot <manu@FreeBSD.org> AuthorDate: 2023-09-25 17:56:31 +0000 Commit: Emmanuel Vadot <manu@FreeBSD.org> CommitDate: 2023-10-05 15:34:39 +0000 dwc: Rename if_dwc.h to dwc1000_reg.h Synopsis/Designware controller have multiple version. The version currently supported by dwc(4) is the version 3 and it's usually called 1000 for gigabit. This file only have definition for the registers of this version so rename it. No functional changes intended. --- sys/dev/dwc/{if_dwc.h => dwc1000_reg.h} | 7 +++---- sys/dev/dwc/if_dwc.c | 5 +++-- sys/dev/dwc/if_dwc_aw.c | 13 +++++++------ sys/dev/dwc/if_dwc_if.m | 2 +- sys/dev/dwc/if_dwc_rk.c | 7 ++++--- sys/dev/dwc/if_dwc_socfpga.c | 7 ++++--- 6 files changed, 22 insertions(+), 19 deletions(-) diff --git a/sys/dev/dwc/if_dwc.h b/sys/dev/dwc/dwc1000_reg.h similarity index 99% rename from sys/dev/dwc/if_dwc.h rename to sys/dev/dwc/dwc1000_reg.h index be27b189e4e8..1f0957b688ac 100644 --- a/sys/dev/dwc/if_dwc.h +++ b/sys/dev/dwc/dwc1000_reg.h @@ -1,6 +1,5 @@ /*- * Copyright (c) 2014 Ruslan Bukin <br@bsdpad.com> - * All rights reserved. * * This software was developed by SRI International and the University of * Cambridge Computer Laboratory under DARPA/AFRL contract (FA8750-10-C-0237) @@ -32,8 +31,8 @@ * Register names were taken almost as is from the documentation. */ -#ifndef __IF_DWC_H__ -#define __IF_DWC_H__ +#ifndef __DWC1000_REG_H__ +#define __DWC1000_REG_H__ #define PHY_MODE_UNKNOWN 0x0 #define PHY_MODE_RMII 0x1 @@ -302,4 +301,4 @@ #define GMAC_MII_CLK_DIV16 0xe #define GMAC_MII_CLK_DIV18 0xf -#endif /* __IF_DWC_H__ */ +#endif /* __DWC1000_REG_H__ */ diff --git a/sys/dev/dwc/if_dwc.c b/sys/dev/dwc/if_dwc.c index 6dca1e204c41..86e00c76a1be 100644 --- a/sys/dev/dwc/if_dwc.c +++ b/sys/dev/dwc/if_dwc.c @@ -63,14 +63,15 @@ #include <dev/extres/clk/clk.h> #include <dev/extres/hwreset/hwreset.h> -#include <dev/dwc/if_dwc.h> -#include <dev/dwc/if_dwcvar.h> #include <dev/mii/mii.h> #include <dev/mii/miivar.h> #include <dev/ofw/ofw_bus.h> #include <dev/ofw/ofw_bus_subr.h> #include <dev/mii/mii_fdt.h> +#include <dev/dwc/dwc1000_reg.h> +#include <dev/dwc/if_dwcvar.h> + #include "if_dwc_if.h" #include "gpio_if.h" #include "miibus_if.h" diff --git a/sys/dev/dwc/if_dwc_aw.c b/sys/dev/dwc/if_dwc_aw.c index 2e34a311b0a7..e6cf30f91fc3 100644 --- a/sys/dev/dwc/if_dwc_aw.c +++ b/sys/dev/dwc/if_dwc_aw.c @@ -36,17 +36,18 @@ #include <machine/bus.h> -#include <dev/extres/clk/clk.h> -#include <dev/extres/hwreset/hwreset.h> - -#include <dev/dwc/if_dwc.h> -#include <dev/dwc/if_dwcvar.h> #include <dev/ofw/ofw_bus.h> #include <dev/ofw/ofw_bus_subr.h> -#include <arm/allwinner/aw_machdep.h> +#include <dev/extres/clk/clk.h> +#include <dev/extres/hwreset/hwreset.h> #include <dev/extres/regulator/regulator.h> +#include <arm/allwinner/aw_machdep.h> + +#include <dev/dwc/if_dwcvar.h> +#include <dev/dwc/dwc1000_reg.h> + #include "if_dwc_if.h" static int diff --git a/sys/dev/dwc/if_dwc_if.m b/sys/dev/dwc/if_dwc_if.m index 8e3a4196fdbf..0d0d9ee114f7 100644 --- a/sys/dev/dwc/if_dwc_if.m +++ b/sys/dev/dwc/if_dwc_if.m @@ -27,7 +27,7 @@ INTERFACE if_dwc; -#include <dev/dwc/if_dwc.h> +#include <dev/dwc/dwc1000_reg.h> CODE { static int diff --git a/sys/dev/dwc/if_dwc_rk.c b/sys/dev/dwc/if_dwc_rk.c index 49cf5fef7808..d05352a27793 100644 --- a/sys/dev/dwc/if_dwc_rk.c +++ b/sys/dev/dwc/if_dwc_rk.c @@ -38,15 +38,16 @@ #include <net/if.h> #include <net/if_media.h> +#include <dev/ofw/ofw_bus.h> +#include <dev/ofw/ofw_bus_subr.h> + #include <dev/extres/clk/clk.h> #include <dev/extres/hwreset/hwreset.h> #include <dev/extres/regulator/regulator.h> #include <dev/extres/syscon/syscon.h> -#include <dev/dwc/if_dwc.h> #include <dev/dwc/if_dwcvar.h> -#include <dev/ofw/ofw_bus.h> -#include <dev/ofw/ofw_bus_subr.h> +#include <dev/dwc/dwc1000_reg.h> #include "if_dwc_if.h" #include "syscon_if.h" diff --git a/sys/dev/dwc/if_dwc_socfpga.c b/sys/dev/dwc/if_dwc_socfpga.c index 63a19ed12977..7b4ead1a940c 100644 --- a/sys/dev/dwc/if_dwc_socfpga.c +++ b/sys/dev/dwc/if_dwc_socfpga.c @@ -42,13 +42,14 @@ #include <machine/bus.h> +#include <dev/ofw/ofw_bus.h> +#include <dev/ofw/ofw_bus_subr.h> + #include <dev/extres/clk/clk.h> #include <dev/extres/hwreset/hwreset.h> -#include <dev/dwc/if_dwc.h> #include <dev/dwc/if_dwcvar.h> -#include <dev/ofw/ofw_bus.h> -#include <dev/ofw/ofw_bus_subr.h> +#include <dev/dwc/dwc1000_reg.h> #include "if_dwc_if.h"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202310051535.395FZ1ef012344>