diff options
| author | Emmanuel Vadot <manu@FreeBSD.org> | 2023-12-26 17:51:22 +0000 |
|---|---|---|
| committer | Emmanuel Vadot <manu@FreeBSD.org> | 2024-01-10 18:20:31 +0000 |
| commit | e51b3d8e53cee7d6a36e34e1cd4d588593d71b40 (patch) | |
| tree | c9a7b6197d9ec4341dea1df7bbdb466ae6d1e0e7 | |
| parent | 1f469a9fc498c3d406ef7c4e347232678f49da0a (diff) | |
| download | src-e51b3d8e53cee7d6a36e34e1cd4d588593d71b40.tar.gz src-e51b3d8e53cee7d6a36e34e1cd4d588593d71b40.zip | |
nvmem: Move nvmem code in dev/nvmem
We've removed kernel option EXT_RESOURCES almost two years ago.
While it was ok to have some code under a common 'extres' subdirectory
at first, we now have a lot of consumer of it and we made it mandatory
so no need to have it under a cryptic name.
Reviewed by: dab, imp
Sponsored by: Beckhoff Automation GmbH & Co. KG
Differential Revision: https://reviews.freebsd.org/D43193
| -rw-r--r-- | sys/arm/allwinner/aw_thermal.c | 2 | ||||
| -rw-r--r-- | sys/conf/files | 4 | ||||
| -rw-r--r-- | sys/dev/nvmem/nvmem.c (renamed from sys/dev/extres/nvmem/nvmem.c) | 0 | ||||
| -rw-r--r-- | sys/dev/nvmem/nvmem.h (renamed from sys/dev/extres/nvmem/nvmem.h) | 6 | ||||
| -rw-r--r-- | sys/dev/nvmem/nvmem_if.m (renamed from sys/dev/extres/nvmem/nvmem_if.m) | 0 |
5 files changed, 6 insertions, 6 deletions
diff --git a/sys/arm/allwinner/aw_thermal.c b/sys/arm/allwinner/aw_thermal.c index d9293b5cb171..bdb7e2dacc4e 100644 --- a/sys/arm/allwinner/aw_thermal.c +++ b/sys/arm/allwinner/aw_thermal.c @@ -45,7 +45,7 @@ #include <dev/clk/clk.h> #include <dev/hwreset/hwreset.h> -#include <dev/extres/nvmem/nvmem.h> +#include <dev/nvmem/nvmem.h> #include <arm/allwinner/aw_sid.h> diff --git a/sys/conf/files b/sys/conf/files index 95228194fc5a..e07ac548d93a 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -1682,8 +1682,6 @@ dev/extres/phy/phydev_if.m optional phy fdt dev/extres/phy/phynode_if.m optional phy dev/extres/phy/phy_usb.c optional phy dev/extres/phy/phynode_usb_if.m optional phy -dev/extres/nvmem/nvmem.c optional nvmem fdt -dev/extres/nvmem/nvmem_if.m optional nvmem dev/extres/regulator/regdev_if.m optional regulator fdt dev/extres/regulator/regnode_if.m optional regulator dev/extres/regulator/regulator.c optional regulator @@ -2531,6 +2529,8 @@ dev/nvme/nvme_sim.c optional nvme scbus dev/nvme/nvme_sysctl.c optional nvme dev/nvme/nvme_test.c optional nvme dev/nvme/nvme_util.c optional nvme +dev/nvmem/nvmem.c optional nvmem fdt +dev/nvmem/nvmem_if.m optional nvmem dev/oce/oce_hw.c optional oce pci dev/oce/oce_if.c optional oce pci dev/oce/oce_mbox.c optional oce pci diff --git a/sys/dev/extres/nvmem/nvmem.c b/sys/dev/nvmem/nvmem.c index 0e89a8b6f369..0e89a8b6f369 100644 --- a/sys/dev/extres/nvmem/nvmem.c +++ b/sys/dev/nvmem/nvmem.c diff --git a/sys/dev/extres/nvmem/nvmem.h b/sys/dev/nvmem/nvmem.h index f9589b1e0b2c..83e24577787c 100644 --- a/sys/dev/extres/nvmem/nvmem.h +++ b/sys/dev/nvmem/nvmem.h @@ -23,8 +23,8 @@ * SUCH DAMAGE. */ -#ifndef _DEV_EXTRES_NVMEM_H_ -#define _DEV_EXTRES_NVMEM_H_ +#ifndef _DEV_NVMEM_H_ +#define _DEV_NVMEM_H_ int nvmem_get_cell_len(phandle_t node, const char *name); int nvmem_read_cell_by_name(phandle_t node, const char *name, void *cell, size_t buflen); @@ -32,4 +32,4 @@ int nvmem_read_cell_by_idx(phandle_t node, int idx, void *cell, size_t buflen); int nvmem_write_cell_by_name(phandle_t node, const char *name, void *cell, size_t buflen); int nvmem_write_cell_by_idx(phandle_t node, int idx, void *cell, size_t buflen); -#endif /* _DEV_EXTRES_NVMEM_H_ */ +#endif /* _DEV_NVMEM_H_ */ diff --git a/sys/dev/extres/nvmem/nvmem_if.m b/sys/dev/nvmem/nvmem_if.m index e7f31ba0755a..e7f31ba0755a 100644 --- a/sys/dev/extres/nvmem/nvmem_if.m +++ b/sys/dev/nvmem/nvmem_if.m |