From nobody Wed Oct 18 14:33:06 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 4S9YH7489cz4x61s; Wed, 18 Oct 2023 14:33:07 +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 4S9YH65wbKz3QRg; Wed, 18 Oct 2023 14:33:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697639586; 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=o1rAeRi/lo2JvYnXZCeQ6cSGTKeoV5U0DbuoqUaRjN8=; b=W7jdKLy1syuopdBHhvBD6JtdiuS9a0Ggo+pAGDwpuBoOe69eRDDJMqXmcpDBA5wugti0jf aLbPVxdrb0GEdciBrJ3xP1nU3gDFfQzsRUPhL0IEUOwwA7AQlLer4dROxoqdsY5n+fNkKW mta5pOM0RI3k/kqg8Wwcjz/4yauNeDk+mpstQtT9tvgRTZpOCbVuqwiiPWenmNBLVs4r0n 01W+cJ9ENDB/DKkKufxJ7+SrqM18IGsF+kVg4TvGWYeW42WVXpit/rwu/DYqF5WlX9bBpw RRjf4tH2LOrWeqrbkAuXkmXoQKl9Vk6MvlUskGNq3eSexHp6EOwbE4SIKlrG/Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697639586; a=rsa-sha256; cv=none; b=tT/CuDASL91wXYXAn45lzjiCtcxSpHWmCTnAs30XW/IFz3qBUDFpP/vlM6liTLreqNgHFE kO+AwwztCQXEgK6PwIikv1lE6NJTrsIf93bWEnArZ/mXQtIU7H4JTqDoRovE/9U74Hs6MN V219ynh66vO1lfqoGw6mh6wValxitSY9rKfnenf6bPd5YO79AvJDzE2ibYv/tOaT+74xB2 1cEmIFr4tN+PB/naToSW5Z0MWHTuRNxnDAHPAzyF41VHYzs3p7e4Yb3dE7FfYqA2Q+mthl /++oUxemVJ/y1D+iYAwvFXTiU/8PuCEKdr2SK1FTBq/4GKh27JjgjeIjWg+oQA== 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=1697639586; 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=o1rAeRi/lo2JvYnXZCeQ6cSGTKeoV5U0DbuoqUaRjN8=; b=I6EXJ9+2rLJyPgaHU1B6TREBubY2Qu/03Zz/NX2QsxuwBmCXJAxDZVMnLlbBNH3uK4TPfk FNTngOahFZsWCyFMlF0SSvg0kqXzWVJgGVBjayBGzP4jos0+lWOMgkfTzLfYAAZNiuHccu HgsRt7b7TjngGQhBNkUr/COlosr2h7CyFPNdpV0KLXi/YiIOSkTWKy8pOGknrl74e8p7wJ X3Kt+hkWkKJQFB+iV8Wk70k6/Nno43M9FKN9alr6jrjMi+5l3s//tUQzKjhdYp2w/MNRND 1MVahTVkFnUe7E9wiBLKJCXfexjs8PXMab6IRnjlC/MD8NS8iq20O6zHt202HA== 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 4S9YH646p3z19GL; Wed, 18 Oct 2023 14:33:06 +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 39IEX6ol091803; Wed, 18 Oct 2023 14:33:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39IEX6bi091800; Wed, 18 Oct 2023 14:33:06 GMT (envelope-from git) Date: Wed, 18 Oct 2023 14:33:06 GMT Message-Id: <202310181433.39IEX6bi091800@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: 96edbfe36b05 - stable/14 - iicbus: Move i2c sensors drivers into new sensor subdirectory 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: 96edbfe36b0534c94998f0ae0decf01bbc6bd756 Auto-Submitted: auto-generated The branch stable/14 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=96edbfe36b0534c94998f0ae0decf01bbc6bd756 commit 96edbfe36b0534c94998f0ae0decf01bbc6bd756 Author: Emmanuel Vadot AuthorDate: 2023-09-19 09:51:40 +0000 Commit: Emmanuel Vadot CommitDate: 2023-10-18 14:32:14 +0000 iicbus: Move i2c sensors drivers into new sensor subdirectory No reason that they should live directly under iicbus Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D41913 (cherry picked from commit 7c569caa0a6fffa7e1cc0a7f61e986dbc7c59074) --- sys/conf/files | 6 +++--- sys/conf/files.powerpc | 6 +++--- sys/dev/iicbus/{ => sensor}/ds1631.c | 0 sys/dev/iicbus/{ => sensor}/ds1775.c | 0 sys/dev/iicbus/{ => sensor}/htu21.c | 0 sys/dev/iicbus/{ => sensor}/lm75.c | 0 sys/dev/iicbus/{ => sensor}/max44009.c | 0 sys/dev/iicbus/{ => sensor}/max6690.c | 0 sys/dev/iicbus/{ => sensor}/tmp461.c | 0 sys/modules/i2c/htu21/Makefile | 2 +- sys/modules/i2c/max44009/Makefile | 2 +- sys/modules/i2c/tmp461/Makefile | 2 +- 12 files changed, 9 insertions(+), 9 deletions(-) diff --git a/sys/conf/files b/sys/conf/files index 086143f3d93d..44646cb8f6bf 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -1792,7 +1792,6 @@ dev/ida/ida.c optional ida dev/ida/ida_disk.c optional ida dev/ida/ida_pci.c optional ida pci dev/iicbus/acpi_iicbus.c optional acpi iicbus | acpi compat_linuxkpi -dev/iicbus/htu21.c optional htu21 dev/iicbus/icee.c optional icee dev/iicbus/if_ic.c optional ic dev/iicbus/iic.c optional iic @@ -1808,8 +1807,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/lm75.c optional lm75 -dev/iicbus/max44009.c optional max44009 dev/iicbus/adc/ad7418.c optional ad7418 dev/iicbus/adc/ads111x.c optional ads111x dev/iicbus/adc/pcf8591.c optional pcf8591 @@ -1830,6 +1827,9 @@ 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/rtc/s35390a.c optional s35390a +dev/iicbus/sensor/htu21.c optional htu21 +dev/iicbus/sensor/lm75.c optional lm75 +dev/iicbus/sensor/max44009.c optional max44009 dev/iicbus/gpio/pcf8574.c optional pcf8574 dev/iicbus/gpio/tca64xx.c optional tca64xx fdt gpio dev/iicbus/pmic/fan53555.c optional fan53555 fdt | tcs4525 fdt diff --git a/sys/conf/files.powerpc b/sys/conf/files.powerpc index 76a0f4d707f3..0293efd28fbe 100644 --- a/sys/conf/files.powerpc +++ b/sys/conf/files.powerpc @@ -40,14 +40,14 @@ dev/hwpmc/hwpmc_mpc7xxx.c optional hwpmc dev/hwpmc/hwpmc_power8.c optional hwpmc dev/hwpmc/hwpmc_powerpc.c optional hwpmc dev/hwpmc/hwpmc_ppc970.c optional hwpmc -dev/iicbus/ds1631.c optional ds1631 powermac -dev/iicbus/ds1775.c optional ds1775 powermac -dev/iicbus/max6690.c optional max6690 powermac dev/iicbus/adc/ad7417.c optional ad7417 powermac dev/iicbus/ofw_iicbus.c optional iicbus aim dev/iicbus/ofw_iicbus_if.m optional iicbus aim dev/iicbus/pwm/adm1030.c optional powermac windtunnel | adm1030 powermac dev/iicbus/pwm/adt746x.c optional adt746x powermac +dev/iicbus/sensor/ds1631.c optional ds1631 powermac +dev/iicbus/sensor/ds1775.c optional ds1775 powermac +dev/iicbus/sensor/max6690.c optional max6690 powermac dev/ipmi/ipmi.c optional ipmi dev/ipmi/ipmi_opal.c optional powernv ipmi dev/ice/if_ice_iflib.c optional ice pci powerpc64 | ice pci powerpc64le \ diff --git a/sys/dev/iicbus/ds1631.c b/sys/dev/iicbus/sensor/ds1631.c similarity index 100% rename from sys/dev/iicbus/ds1631.c rename to sys/dev/iicbus/sensor/ds1631.c diff --git a/sys/dev/iicbus/ds1775.c b/sys/dev/iicbus/sensor/ds1775.c similarity index 100% rename from sys/dev/iicbus/ds1775.c rename to sys/dev/iicbus/sensor/ds1775.c diff --git a/sys/dev/iicbus/htu21.c b/sys/dev/iicbus/sensor/htu21.c similarity index 100% rename from sys/dev/iicbus/htu21.c rename to sys/dev/iicbus/sensor/htu21.c diff --git a/sys/dev/iicbus/lm75.c b/sys/dev/iicbus/sensor/lm75.c similarity index 100% rename from sys/dev/iicbus/lm75.c rename to sys/dev/iicbus/sensor/lm75.c diff --git a/sys/dev/iicbus/max44009.c b/sys/dev/iicbus/sensor/max44009.c similarity index 100% rename from sys/dev/iicbus/max44009.c rename to sys/dev/iicbus/sensor/max44009.c diff --git a/sys/dev/iicbus/max6690.c b/sys/dev/iicbus/sensor/max6690.c similarity index 100% rename from sys/dev/iicbus/max6690.c rename to sys/dev/iicbus/sensor/max6690.c diff --git a/sys/dev/iicbus/tmp461.c b/sys/dev/iicbus/sensor/tmp461.c similarity index 100% rename from sys/dev/iicbus/tmp461.c rename to sys/dev/iicbus/sensor/tmp461.c diff --git a/sys/modules/i2c/htu21/Makefile b/sys/modules/i2c/htu21/Makefile index a7108d62fd0b..e049139c20cf 100644 --- a/sys/modules/i2c/htu21/Makefile +++ b/sys/modules/i2c/htu21/Makefile @@ -1,5 +1,5 @@ -.PATH: ${SRCTOP}/sys/dev/iicbus +.PATH: ${SRCTOP}/sys/dev/iicbus/sensor KMOD= htu21 SRCS= htu21.c diff --git a/sys/modules/i2c/max44009/Makefile b/sys/modules/i2c/max44009/Makefile index 42c96bbbf883..c4342b5819aa 100644 --- a/sys/modules/i2c/max44009/Makefile +++ b/sys/modules/i2c/max44009/Makefile @@ -1,5 +1,5 @@ -.PATH: ${SRCTOP}/sys/dev/iicbus +.PATH: ${SRCTOP}/sys/dev/iicbus/sensor KMOD= max44009 SRCS= max44009.c diff --git a/sys/modules/i2c/tmp461/Makefile b/sys/modules/i2c/tmp461/Makefile index 4cd5be59fd18..9c4d6518d596 100644 --- a/sys/modules/i2c/tmp461/Makefile +++ b/sys/modules/i2c/tmp461/Makefile @@ -1,5 +1,5 @@ -.PATH: ${SRCTOP}/sys/dev/iicbus +.PATH: ${SRCTOP}/sys/dev/iicbus/sensor KMOD = tmp461 SRCS = tmp461.c bus_if.h device_if.h iicbus_if.h ofw_bus_if.h opt_platform.h