From nobody Wed Oct 18 14:33:07 2023 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 4S9YH83vxHz4x6Ns; Wed, 18 Oct 2023 14:33:08 +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 4S9YH761x8z3Qcx; Wed, 18 Oct 2023 14:33:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697639587; 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=Q8ZqiJ6vjaW6qH6ynI+9EvYunou8TdF+cpVvsHeOSRY=; b=x2+mlXzyAxflkqgJj1kImS4F/mYpsmsBFtPYINp0BKIhAUpsNjM602JSB+d/8fvnR0TwkK Zv+2ftEzLdBscbS53yjUugnGU+R5RS+8X4IbI3C+Lz6eOBGQYk2hympjB9jgqCOD5Dy2CG u0t/tsd69dOUxlbF6Enk8kytnVxKUITsgJKNY3xtPw9fcII4SFYWLoGyR5HL/ImbCrJveY vrIEXdEynLg81txz9ZxfizBdvSwZd8JzOdnqwh7oLJK/h6z4nrHhRa8jCfjSDlCCuaoeL/ BDA1GJNrgd00a5H6S6gm0HdQHw41KZ29QHYkHkZxBawyGlJn3+bV1QUaY2dkPA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697639587; a=rsa-sha256; cv=none; b=Io9ZdMMC6H2Xa/UbMuxvv2sRUTePsW/i5i6vi2KBJ+MF99rr//1sIhd0rwD3XCHa3A7TFn KJdS0xzO1yQEL14sKKkF4GGJfQjyJiWDMR7UUZ6a7BzW0379v82MHzZgp9lnQMyzILLCNR z4KL6mKd847om7zp0Ko0VppNrshXcJoj7XxKETfWBfDI9z1aeo7OscbsjBsoQY652Q4dDm L0wcdz48pUDVC8LyrFYr6uCaXiHofmekf/f49Hcc4aLLrEsxrfqwB8/X455le4RLgCj6gi 5swABFcJp8pVZ5hk8Vs6NRyJ0FtNxkJncSYAFYwBv+zSK0+HluIjmzlANt2tLw== 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=1697639587; 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=Q8ZqiJ6vjaW6qH6ynI+9EvYunou8TdF+cpVvsHeOSRY=; b=iT0J72FEonaIhjOyAggQ3NOuy9O/dUIWIjqOtCd0Q2ZEVSih+4Wn7GS5SUe5nkn8jf9uSA W7+5p8FUmwaL0dhoju60V7a+7WxsbW9/WVuKb70tflZUloOeKi2usLi9NdlP7WVsKSN+JE saNRnAw1Gt0udETl/F5YIptuYoyPwbrZ79kzFingJVwlmAa3s1VinrdZ57bpSaFQ1fFvJr 9EkfdAqfDAkflv+i/8mPdiWzv2Hhl9ilPfEMMeYGLhw6OO9LbtMCIbXmyS892dIiVBP6FI y86sKubqDaf6GjXw9Tp0am4LPDnljlrEiJb4vrbj0qO5khXr2aof2kjCf+QZtg== 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 4S9YH757k6z18rr; Wed, 18 Oct 2023 14:33:07 +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 39IEX7Fk091857; Wed, 18 Oct 2023 14:33:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39IEX7Pf091854; Wed, 18 Oct 2023 14:33:07 GMT (envelope-from git) Date: Wed, 18 Oct 2023 14:33:07 GMT Message-Id: <202310181433.39IEX7Pf091854@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: c1335891057c - stable/14 - iicbus: Move opencores i2c driver into controller subdirectory 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/stable/14 X-Git-Reftype: branch X-Git-Commit: c1335891057c90000ab185c1c1fbd893a809fa8b Auto-Submitted: auto-generated The branch stable/14 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=c1335891057c90000ab185c1c1fbd893a809fa8b commit c1335891057c90000ab185c1c1fbd893a809fa8b Author: Emmanuel Vadot AuthorDate: 2023-09-19 10:06:32 +0000 Commit: Emmanuel Vadot CommitDate: 2023-10-18 14:32:15 +0000 iicbus: Move opencores i2c driver into controller subdirectory Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D41914 (cherry picked from commit 125f5c5b48b1fdccf364b821ce48bfdbd9687ed1) --- sys/conf/files | 6 +++--- sys/dev/iicbus/{ => controller/opencores}/iicoc.c | 0 sys/dev/iicbus/{ => controller/opencores}/iicoc.h | 0 sys/dev/iicbus/{ => controller/opencores}/iicoc_fdt.c | 0 sys/dev/iicbus/{ => controller/opencores}/iicoc_pci.c | 0 sys/modules/i2c/controllers/iicoc/Makefile | 2 +- 6 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/conf/files b/sys/conf/files index 44646cb8f6bf..f113794ab68a 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -1804,12 +1804,12 @@ dev/iicbus/iichid.c optional iichid acpi hid iicbus dev/iicbus/iiconf.c optional iicbus | compat_linuxkpi dev/iicbus/iicsmb.c optional iicsmb \ dependency "iicbus_if.h" -dev/iicbus/iicoc.c optional iicoc -dev/iicbus/iicoc_fdt.c optional iicoc fdt -dev/iicbus/iicoc_pci.c optional iicoc pci dev/iicbus/adc/ad7418.c optional ad7418 dev/iicbus/adc/ads111x.c optional ads111x dev/iicbus/adc/pcf8591.c optional pcf8591 +dev/iicbus/controller/opencores/iicoc.c optional iicoc +dev/iicbus/controller/opencores/iicoc_fdt.c optional iicoc fdt +dev/iicbus/controller/opencores/iicoc_pci.c optional iicoc pci dev/iicbus/mux/iicmux.c optional iicmux dev/iicbus/mux/iicmux_if.m optional iicmux dev/iicbus/mux/iic_gpiomux.c optional iic_gpiomux fdt diff --git a/sys/dev/iicbus/iicoc.c b/sys/dev/iicbus/controller/opencores/iicoc.c similarity index 100% rename from sys/dev/iicbus/iicoc.c rename to sys/dev/iicbus/controller/opencores/iicoc.c diff --git a/sys/dev/iicbus/iicoc.h b/sys/dev/iicbus/controller/opencores/iicoc.h similarity index 100% rename from sys/dev/iicbus/iicoc.h rename to sys/dev/iicbus/controller/opencores/iicoc.h diff --git a/sys/dev/iicbus/iicoc_fdt.c b/sys/dev/iicbus/controller/opencores/iicoc_fdt.c similarity index 100% rename from sys/dev/iicbus/iicoc_fdt.c rename to sys/dev/iicbus/controller/opencores/iicoc_fdt.c diff --git a/sys/dev/iicbus/iicoc_pci.c b/sys/dev/iicbus/controller/opencores/iicoc_pci.c similarity index 100% rename from sys/dev/iicbus/iicoc_pci.c rename to sys/dev/iicbus/controller/opencores/iicoc_pci.c diff --git a/sys/modules/i2c/controllers/iicoc/Makefile b/sys/modules/i2c/controllers/iicoc/Makefile index f6902f1f864a..f86a6513ad22 100644 --- a/sys/modules/i2c/controllers/iicoc/Makefile +++ b/sys/modules/i2c/controllers/iicoc/Makefile @@ -1,4 +1,4 @@ -.PATH: ${SRCTOP}/sys/dev/iicbus +.PATH: ${SRCTOP}/sys/dev/iicbus/controller/opencores KMOD = iicoc SRCS = device_if.h bus_if.h iicbus_if.h \