From nobody Wed Oct 18 14:33:00 2023 X-Original-To: dev-commits-src-branches@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 4S9YH11STtz4x63p; Wed, 18 Oct 2023 14:33:01 +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 4S9YH10ZGYz3QFM; Wed, 18 Oct 2023 14:33:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697639581; 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=//+wYk9UUKRw2scKvKQ3JJjJancfv/etrw49LdR6h9E=; b=yPVk6DHXd/hUK/q93CB2oVHnYeS1TcHQ4EAUFfNYW8xjjWRf+HOXH/OQWZ4sV12h9vvHh7 QYdSzxSjrN0vkQmY3y0qUwFteapddUPkxpaB7QM2xGmNQFPpw8/vblqSzT51nbMG2rD6ZP kOrOc3WADgteJFXI15LX9wxHomW5xH9Ht+HpFGCLYzWjWty2mTUQseOlt22K9chh6DtRXT S6Druqnuy8j/X060DnpHvC1C2oUAitR01jliF+6xQmI15dd3kHrxVOzceRChnkJiht/MEt Gqaj2Pf+82qQ1XI5CHZmFPLO2N7TZgBDQ5F4YwmO9eyIZPhXypz20wqmLOJWtw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697639581; a=rsa-sha256; cv=none; b=KdGNycBZ35hJEAJ45b9zRcMeVxjId8Knze0bFNV9JSGsEFuUAO6phcxeuai14T6PSHS8Ti aUzrGIBYIQJabtAqtq2oeCSdECEPp2pS5kum1LRbjm6b4QF96YnVFiN3z947ZHop0Q3tyJ k8Oisvg91xOjyz22GgrkJN/FMMCEMpvoFjU9t4nuLjGHWzPqCQqLdz4rgVn7j1E5AKonGK OBCNo3qvEw30F0tR/MGQOL+sKO0ba11OiC1aq3Nwaf5S657FJ+2mmgOtKgISqxogzU+chi o0fISo5M5R7nG2NerSAH2rTG5DhkyQzwJ7MAzWBzQP62NCT11QijkH3Sw2S9Qg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697639581; 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=//+wYk9UUKRw2scKvKQ3JJjJancfv/etrw49LdR6h9E=; b=RcqeJ4CPDB1eMFrZLCd1LNWdOUHzPY7Fii4EyWVdNWa+a4UaBu2PuEv0oPtSmiMLDLlcsd OtG+mxyejS2fhbZIcvrYR6r0bjNSOtc2T/9G+XkyNUCsWh8XdEPQgr77jPuy1Sgh5cdUZg ygFbqFDYJMfDxpONrsu6F7KIL2Xbo6Hnf9Jmo4cMcaV+RKl51HmB3dhfAcVcFiedfoWYwN lA02wx3Pv5LmtVPRShxxmJyR6oJaOQsq61qxE/4B5gtTsbpp1aKS0uc+qV9I8u1culcuNd 3EYmbeMJOuyPCjxUt9i+THoQk/rqih+qEgupsD/G/sHXZUMQBwHiDT+qBWWj4A== 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 4S9YH06k9Zz19GJ; Wed, 18 Oct 2023 14:33:00 +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 39IEX0Kv091529; Wed, 18 Oct 2023 14:33:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39IEX0WO091526; Wed, 18 Oct 2023 14:33:00 GMT (envelope-from git) Date: Wed, 18 Oct 2023 14:33:00 GMT Message-Id: <202310181433.39IEX0WO091526@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: 5e25c410bde7 - stable/14 - iicbus: Move remaining rtc driver into rtc subfolder List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 5e25c410bde7e7eadc9556d6eb1c97ea373b20ea Auto-Submitted: auto-generated The branch stable/14 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=5e25c410bde7e7eadc9556d6eb1c97ea373b20ea commit 5e25c410bde7e7eadc9556d6eb1c97ea373b20ea Author: Emmanuel Vadot AuthorDate: 2023-09-19 07:49:45 +0000 Commit: Emmanuel Vadot CommitDate: 2023-10-18 14:32:07 +0000 iicbus: Move remaining rtc driver into rtc subfolder No reason that they should live directly under iicbus Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D41908 (cherry picked from commit 2f16049c985a364e2bd2b256f5bef9af17e10c62) --- sys/conf/files | 16 ++++++++-------- sys/dev/iicbus/{ => rtc}/ds1307.c | 2 +- sys/dev/iicbus/{ => rtc}/ds1307reg.h | 0 sys/dev/iicbus/{ => rtc}/ds13rtc.c | 0 sys/dev/iicbus/{ => rtc}/ds1672.c | 0 sys/dev/iicbus/{ => rtc}/ds3231.c | 2 +- sys/dev/iicbus/{ => rtc}/ds3231reg.h | 0 sys/dev/iicbus/{ => rtc}/isl12xx.c | 0 sys/dev/iicbus/{ => rtc}/nxprtc.c | 0 sys/dev/iicbus/{ => rtc}/rtc8583.c | 0 sys/dev/iicbus/{ => rtc}/s35390a.c | 0 sys/modules/i2c/ds1307/Makefile | 2 +- sys/modules/i2c/ds13rtc/Makefile | 2 +- sys/modules/i2c/ds1672/Makefile | 2 +- sys/modules/i2c/ds3231/Makefile | 2 +- sys/modules/i2c/isl12xx/Makefile | 2 +- sys/modules/i2c/nxprtc/Makefile | 2 +- sys/modules/i2c/rtc8583/Makefile | 2 +- sys/modules/i2c/s35390a/Makefile | 2 +- 19 files changed, 18 insertions(+), 18 deletions(-) diff --git a/sys/conf/files b/sys/conf/files index 2b4bebaa6831..1fad62fd61f3 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -1794,10 +1794,6 @@ dev/ida/ida_pci.c optional ida pci dev/iicbus/acpi_iicbus.c optional acpi iicbus | acpi compat_linuxkpi dev/iicbus/ad7418.c optional ad7418 dev/iicbus/ads111x.c optional ads111x -dev/iicbus/ds1307.c optional ds1307 -dev/iicbus/ds13rtc.c optional ds13rtc | ds133x | ds1374 -dev/iicbus/ds1672.c optional ds1672 -dev/iicbus/ds3231.c optional ds3231 dev/iicbus/htu21.c optional htu21 dev/iicbus/icee.c optional icee dev/iicbus/if_ic.c optional ic @@ -1814,7 +1810,6 @@ dev/iicbus/iicsmb.c optional iicsmb \ dev/iicbus/iicoc.c optional iicoc dev/iicbus/iicoc_fdt.c optional iicoc fdt dev/iicbus/iicoc_pci.c optional iicoc pci -dev/iicbus/isl12xx.c optional isl12xx dev/iicbus/lm75.c optional lm75 dev/iicbus/max44009.c optional max44009 dev/iicbus/mux/iicmux.c optional iicmux @@ -1822,15 +1817,20 @@ dev/iicbus/mux/iicmux_if.m optional iicmux dev/iicbus/mux/iic_gpiomux.c optional iic_gpiomux fdt dev/iicbus/mux/ltc430x.c optional ltc430x dev/iicbus/mux/pca954x.c optional pca954x iicbus iicmux -dev/iicbus/nxprtc.c optional nxprtc | pcf8563 dev/iicbus/ofw_iicbus.c optional fdt iicbus dev/iicbus/ofw_iicbus_if.m optional fdt iicbus dev/iicbus/pcf8574.c optional pcf8574 dev/iicbus/pcf8591.c optional pcf8591 -dev/iicbus/rtc8583.c optional rtc8583 +dev/iicbus/rtc/ds1307.c optional ds1307 +dev/iicbus/rtc/ds13rtc.c optional ds13rtc | ds133x | ds1374 +dev/iicbus/rtc/ds1672.c optional ds1672 +dev/iicbus/rtc/ds3231.c optional ds3231 +dev/iicbus/rtc/isl12xx.c optional isl12xx +dev/iicbus/rtc/nxprtc.c optional nxprtc | pcf8563 dev/iicbus/rtc/pcf85063.c optional pcf85063 iicbus fdt +dev/iicbus/rtc/rtc8583.c optional rtc8583 dev/iicbus/rtc/rx8803.c optional rx8803 iicbus fdt -dev/iicbus/s35390a.c optional s35390a +dev/iicbus/rtc/s35390a.c optional s35390a dev/iicbus/sy8106a.c optional sy8106a fdt dev/iicbus/syr827.c optional syr827 fdt dev/iicbus/gpio/tca64xx.c optional tca64xx fdt gpio diff --git a/sys/dev/iicbus/ds1307.c b/sys/dev/iicbus/rtc/ds1307.c similarity index 99% rename from sys/dev/iicbus/ds1307.c rename to sys/dev/iicbus/rtc/ds1307.c index 6522b3284bf3..e8d24880571c 100644 --- a/sys/dev/iicbus/ds1307.c +++ b/sys/dev/iicbus/rtc/ds1307.c @@ -48,7 +48,7 @@ #include #endif -#include +#include #include "clock_if.h" #include "iicbus_if.h" diff --git a/sys/dev/iicbus/ds1307reg.h b/sys/dev/iicbus/rtc/ds1307reg.h similarity index 100% rename from sys/dev/iicbus/ds1307reg.h rename to sys/dev/iicbus/rtc/ds1307reg.h diff --git a/sys/dev/iicbus/ds13rtc.c b/sys/dev/iicbus/rtc/ds13rtc.c similarity index 100% rename from sys/dev/iicbus/ds13rtc.c rename to sys/dev/iicbus/rtc/ds13rtc.c diff --git a/sys/dev/iicbus/ds1672.c b/sys/dev/iicbus/rtc/ds1672.c similarity index 100% rename from sys/dev/iicbus/ds1672.c rename to sys/dev/iicbus/rtc/ds1672.c diff --git a/sys/dev/iicbus/ds3231.c b/sys/dev/iicbus/rtc/ds3231.c similarity index 99% rename from sys/dev/iicbus/ds3231.c rename to sys/dev/iicbus/rtc/ds3231.c index eb45f6fcf6e6..23e88eb7ecd3 100644 --- a/sys/dev/iicbus/ds3231.c +++ b/sys/dev/iicbus/rtc/ds3231.c @@ -47,7 +47,7 @@ #include #endif -#include +#include #include "clock_if.h" #include "iicbus_if.h" diff --git a/sys/dev/iicbus/ds3231reg.h b/sys/dev/iicbus/rtc/ds3231reg.h similarity index 100% rename from sys/dev/iicbus/ds3231reg.h rename to sys/dev/iicbus/rtc/ds3231reg.h diff --git a/sys/dev/iicbus/isl12xx.c b/sys/dev/iicbus/rtc/isl12xx.c similarity index 100% rename from sys/dev/iicbus/isl12xx.c rename to sys/dev/iicbus/rtc/isl12xx.c diff --git a/sys/dev/iicbus/nxprtc.c b/sys/dev/iicbus/rtc/nxprtc.c similarity index 100% rename from sys/dev/iicbus/nxprtc.c rename to sys/dev/iicbus/rtc/nxprtc.c diff --git a/sys/dev/iicbus/rtc8583.c b/sys/dev/iicbus/rtc/rtc8583.c similarity index 100% rename from sys/dev/iicbus/rtc8583.c rename to sys/dev/iicbus/rtc/rtc8583.c diff --git a/sys/dev/iicbus/s35390a.c b/sys/dev/iicbus/rtc/s35390a.c similarity index 100% rename from sys/dev/iicbus/s35390a.c rename to sys/dev/iicbus/rtc/s35390a.c diff --git a/sys/modules/i2c/ds1307/Makefile b/sys/modules/i2c/ds1307/Makefile index 9699a1057dc3..363aa412cbdc 100644 --- a/sys/modules/i2c/ds1307/Makefile +++ b/sys/modules/i2c/ds1307/Makefile @@ -1,5 +1,5 @@ -.PATH: ${SRCTOP}/sys/dev/iicbus +.PATH: ${SRCTOP}/sys/dev/iicbus/rtc KMOD = ds1307 SRCS = ds1307.c bus_if.h clock_if.h device_if.h iicbus_if.h ofw_bus_if.h opt_platform.h diff --git a/sys/modules/i2c/ds13rtc/Makefile b/sys/modules/i2c/ds13rtc/Makefile index ffeab1c12dd7..a9616765b7a5 100644 --- a/sys/modules/i2c/ds13rtc/Makefile +++ b/sys/modules/i2c/ds13rtc/Makefile @@ -1,5 +1,5 @@ -.PATH: ${SRCTOP}/sys/dev/iicbus +.PATH: ${SRCTOP}/sys/dev/iicbus/rtc KMOD = ds13rtc SRCS = ds13rtc.c bus_if.h clock_if.h device_if.h iicbus_if.h ofw_bus_if.h opt_platform.h diff --git a/sys/modules/i2c/ds1672/Makefile b/sys/modules/i2c/ds1672/Makefile index 1b1fd9ab038c..c160e317c36d 100644 --- a/sys/modules/i2c/ds1672/Makefile +++ b/sys/modules/i2c/ds1672/Makefile @@ -1,5 +1,5 @@ -.PATH: ${SRCTOP}/sys/dev/iicbus +.PATH: ${SRCTOP}/sys/dev/iicbus/rtc KMOD = ds1672 SRCS = ds1672.c diff --git a/sys/modules/i2c/ds3231/Makefile b/sys/modules/i2c/ds3231/Makefile index 7548f6ef8282..4c6a7241bf76 100644 --- a/sys/modules/i2c/ds3231/Makefile +++ b/sys/modules/i2c/ds3231/Makefile @@ -1,5 +1,5 @@ -.PATH: ${SRCTOP}/sys/dev/iicbus +.PATH: ${SRCTOP}/sys/dev/iicbus/rtc KMOD = ds3231 SRCS = ds3231.c bus_if.h clock_if.h device_if.h iicbus_if.h ofw_bus_if.h opt_platform.h diff --git a/sys/modules/i2c/isl12xx/Makefile b/sys/modules/i2c/isl12xx/Makefile index 98411b78aae6..be0b409eeff2 100644 --- a/sys/modules/i2c/isl12xx/Makefile +++ b/sys/modules/i2c/isl12xx/Makefile @@ -1,5 +1,5 @@ -.PATH: ${SRCTOP}/sys/dev/iicbus +.PATH: ${SRCTOP}/sys/dev/iicbus/rtc KMOD = isl12xx SRCS = isl12xx.c bus_if.h clock_if.h device_if.h iicbus_if.h ofw_bus_if.h opt_platform.h diff --git a/sys/modules/i2c/nxprtc/Makefile b/sys/modules/i2c/nxprtc/Makefile index 23efdcfe7754..3501909f6ea4 100644 --- a/sys/modules/i2c/nxprtc/Makefile +++ b/sys/modules/i2c/nxprtc/Makefile @@ -1,5 +1,5 @@ -.PATH: ${SRCTOP}/sys/dev/iicbus +.PATH: ${SRCTOP}/sys/dev/iicbus/rtc KMOD = nxprtc SRCS = nxprtc.c bus_if.h clock_if.h device_if.h iicbus_if.h ofw_bus_if.h opt_platform.h diff --git a/sys/modules/i2c/rtc8583/Makefile b/sys/modules/i2c/rtc8583/Makefile index 23cb48afd33c..a474da20685e 100644 --- a/sys/modules/i2c/rtc8583/Makefile +++ b/sys/modules/i2c/rtc8583/Makefile @@ -1,5 +1,5 @@ -.PATH: ${SRCTOP}/sys/dev/iicbus +.PATH: ${SRCTOP}/sys/dev/iicbus/rtc KMOD = rtc8583 SRCS = rtc8583.c diff --git a/sys/modules/i2c/s35390a/Makefile b/sys/modules/i2c/s35390a/Makefile index d1091db58abc..e12ddeece2ec 100644 --- a/sys/modules/i2c/s35390a/Makefile +++ b/sys/modules/i2c/s35390a/Makefile @@ -1,5 +1,5 @@ -.PATH: ${SRCTOP}/sys/dev/iicbus +.PATH: ${SRCTOP}/sys/dev/iicbus/rtc KMOD = s35390a SRCS = s35390a.c bus_if.h clock_if.h device_if.h iicbus_if.h ofw_bus_if.h opt_platform.h