From nobody Wed Jan 10 18:21:10 2024 X-Original-To: dev-commits-src-all@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 4T9GMV47K5z55YSQ; Wed, 10 Jan 2024 18:21:10 +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 4T9GMV21cnz4GTB; Wed, 10 Jan 2024 18:21:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704910870; 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=O/rV6hCzAAv1UT3tlTwShp/UEKr8xTr369W8BXeTK8g=; b=NP0cNS0rnLRLkb5rPSZ6eORHAXLG5SoC1Ga+MERMDeKXaXG2jE+5BPc3IkWQt2XZ2+sin5 Qo9CPJgd2L3rgtl5MprhkvddrkGCl11JK3RZg9NqoSXbSrswJr5l3Xwxlyr1bkBKE2GqN3 cw5hdqhNOkQ4Wz6QG6p4Yp2QeA9dtX0Ip1lofXft3y2OOoFggL6fAwl5BK4UT86WnVA237 TpSHptp5g0OOH2dmIidEyEwnrhrOtwepJTR0NSgxUXtET2nMgA1OsriLy+UkPNKnuoFJyI gAUHifpXOKdvWgfv79D+ZfWF1tE0gusgDZcsm7XvWek51DJ53KF9fz60gpJkqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704910870; 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=O/rV6hCzAAv1UT3tlTwShp/UEKr8xTr369W8BXeTK8g=; b=q3C/AK3Lwg8m4GirBweB1PXN30Eax6KA8oeoB1Vhf73yJTFRnabKMqIQxNYSoSfffMwshq L3U/AUz7J/xu/RnAWJOdd+oWSAtaDUJMDuKqZnEx3q7Qflw7R9thtPYbQSBmLzUxMKX3B4 LC/qAc8CDZYzxND8WhWqDDIJBievJUIZ9hrQeHG6fwoLpoYfJ7y3HIG0vmueCqBeioQeig pyP7ZQw2TaHGtrQz9BJx2bQ39wkvdbVKwTO7Rhd9Ue1o9YkwQlMNJwsEHZJJyV82g/X6C8 tqyFWbeyoZmApPsiQMC+dzyME3SgFEm19Xuh5Q1z3mRDoW7E0SDslXmg8gnGqA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704910870; a=rsa-sha256; cv=none; b=BwasyNBlky9FtjR3Gjb3hpdyR/ogHAW+4Ng0a6SpDBYBcaWQoZwixmYltTmFwIKZairfza ZZVWFD9K/DOw3BrGPdhpXplYDh8EQd8neNYZ/XXFN2iS1gkM8AB0gfxqlM2fI3M8QcopNl 5xhasWtT6BICCrg4FAoJzWk19MUWh66tDgFniTJHMXPJfsBANs7hFp1Jxb6R0BDOBX1mbi SvxLjAGpD7tLxuxIt9dE3t9h8gghz2VglE+/3u0ALMlc4m49uMDUfi6wIRHh6nJ7+Np6Kq Zy+0KtG2OyjFudTy26kQ/MSnrIsZiqmNYN3rRQe9X7mRoYnqyH5CFZt9JLq5JQ== 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 4T9GMV10DkzmNt; Wed, 10 Jan 2024 18:21:10 +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 40AILAhV053133; Wed, 10 Jan 2024 18:21:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40AILAZk053130; Wed, 10 Jan 2024 18:21:10 GMT (envelope-from git) Date: Wed, 10 Jan 2024 18:21:10 GMT Message-Id: <202401101821.40AILAZk053130@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: e51b3d8e53ce - main - nvmem: Move nvmem code in dev/nvmem List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: e51b3d8e53cee7d6a36e34e1cd4d588593d71b40 Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=e51b3d8e53cee7d6a36e34e1cd4d588593d71b40 commit e51b3d8e53cee7d6a36e34e1cd4d588593d71b40 Author: Emmanuel Vadot AuthorDate: 2023-12-26 17:51:22 +0000 Commit: Emmanuel Vadot CommitDate: 2024-01-10 18:20:31 +0000 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 --- sys/arm/allwinner/aw_thermal.c | 2 +- sys/conf/files | 4 ++-- sys/dev/{extres => }/nvmem/nvmem.c | 0 sys/dev/{extres => }/nvmem/nvmem.h | 6 +++--- 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 #include -#include +#include #include 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 similarity index 100% rename from sys/dev/extres/nvmem/nvmem.c rename to sys/dev/nvmem/nvmem.c diff --git a/sys/dev/extres/nvmem/nvmem.h b/sys/dev/nvmem/nvmem.h similarity index 95% rename from sys/dev/extres/nvmem/nvmem.h rename to 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 similarity index 100% rename from sys/dev/extres/nvmem/nvmem_if.m rename to sys/dev/nvmem/nvmem_if.m