From nobody Tue Oct 03 07:56:40 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 4S09Bc6GBcz4vwVT; Tue, 3 Oct 2023 07:56:40 +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 4S09Bc5Rwfz3Sf1; Tue, 3 Oct 2023 07:56:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696319800; 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=CAP96XLEzUZXBsOaFORxEDf3h+Mm5p9hplkC2Zf5hzA=; b=g+8Qz26T6biQayv5C+j3NrR6RJbRXwI8ZHxd0W8ap9fOdvTeX1oNYZCjzZJhBwkktFofHD dTMN+1CBg7opEsBbSPXyrpF22sn3bRWEUPYWq8lf2G+oVEZtzTgGCiAXCwLKI88YVxim2a wGckAoRhEiKcAtvWVO+MwdgTkQc0g1Ka3dYAuYu5WOcqhyzai6Zn7thS0pi09m141l+rH2 p1WAfg8H1M6zHphmqTqWEQ2sBrk8jcTqFgXyo0pawzPSpeKjcJ9mdPXbWKnibmUdOmc2KY ocrw1ec5gW2Pauy/3lwhSKsKzhR0e6KA0Hv3lh9nYDMSmraHNAmSpNOcgVlV1w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696319800; a=rsa-sha256; cv=none; b=L7ZqKeRj7cWidrGuU+Hk6fZpsK+renmUE6fmbLHyisfP4L5/spE/vjj8i/EtaHjxjxiIWn pr76fGAA8cUh33BUouDjL24irGSACYKTcGmiujIcoyymb2X6OrGmG2+YjI0tnAhU0yZOkz CETBu/6XuzVFmwt6qO38JcePaogamhIYymNWU4qhSdGo1/rpjBEt07VQaDknpmt31FX6Yl 7B3Nen3zMKf4/RBvTcOT/0NBRqOvF2NUlQkflMwT53qgGijMNJQvrT+haek87uOc+OTc0G KBMOPh2gd4azrkkBv6je1WqP9sXy0vHGCssk+yBJiCKg4dI/fnkptSBusxskhw== 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=1696319800; 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=CAP96XLEzUZXBsOaFORxEDf3h+Mm5p9hplkC2Zf5hzA=; b=HQ+jAoN2Qwk/r4QcQgWqlYP0xoLbEY6S0Tt7fQC+KCqgT2c5sX/hgM1d/T3p67Or26N5Wa CfzYcMKUtUTwlGa1xk2NhPDJxpibt6tEkLej3CELGPt3vL1wpI0vF3XQc2Az0enZgQELxc F5/MmWfBOg4S9vbU3v4KUCcIhBmQbAktNqdFjkxGqonFXjWRjQ7cWDJrRzjDShx7Sv13xg JeX6Yi5uecAN3w5+/aWrXELU/Mdq19YzxtsVA0hVThkHYw9LaSe9GVxDceFsrsn3g13x2R eqocSBKtYjcgkMUIKHcRPBtgWOep23Nispd0zgyy8bPADcYTevXlS4BM1LWGaA== 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 4S09Bc4BkVzmtc; Tue, 3 Oct 2023 07:56:40 +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 3937uehh035840; Tue, 3 Oct 2023 07:56:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3937ueRv035837; Tue, 3 Oct 2023 07:56:40 GMT (envelope-from git) Date: Tue, 3 Oct 2023 07:56:40 GMT Message-Id: <202310030756.3937ueRv035837@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: 125f5c5b48b1 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 125f5c5b48b1fdccf364b821ce48bfdbd9687ed1 Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=125f5c5b48b1fdccf364b821ce48bfdbd9687ed1 commit 125f5c5b48b1fdccf364b821ce48bfdbd9687ed1 Author: Emmanuel Vadot AuthorDate: 2023-09-19 10:06:32 +0000 Commit: Emmanuel Vadot CommitDate: 2023-10-03 07:56:20 +0000 iicbus: Move opencores i2c driver into controller subdirectory Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D41914 --- 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 36ba432cc93e..7701efbaac25 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 \