From nobody Wed Jan 10 18:20:58 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 4T9GMG6mJKz55YJk; Wed, 10 Jan 2024 18:20:58 +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 4T9GMG6Fnlz4GRR; Wed, 10 Jan 2024 18:20:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704910858; 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=24+5dsP2sB4PFN5kwR/h0W8TL4Zk4Rfyk3Rtu2YVJ+Q=; b=kDMXpKZh+/3uGxZPzw81M4VWLsSz62XB99/NzpCIqyRSkwBYHVs5DFW521etGo/wR2r9D0 1tDWnEmAABN0110nEO4ZXuVnckWLkFxV3aFMFN4dAnHxrlFegUCduGlWxZDeq3deqWBuwL LuLCCmkQxRwTAPVr11dM5n8sLeIAKx72TWh+EEBpfkmo9im0fBAPYQEoT9nttfMNU5qHzE IZTwI19OocQjluLATSMWJq/OqZ1jsMMVwCh7hIT6BS22KHs8yEfnJsLU4cUVBqX4+0IAro bo+HC+rJqkpx1T0vRZd5LyLuzVM8S6UHCs3+sKq/vQt6MeBj/GUiPQB4WnolZw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704910858; 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=24+5dsP2sB4PFN5kwR/h0W8TL4Zk4Rfyk3Rtu2YVJ+Q=; b=lbePXSiKvEKcHAHMUubznxB5k7ebqxKl9qgyx1mYIHP6+QyW52o8ivU8Mq1vNZw//x0HSB q0P3KwtGiAMpJ5ElKOVTWqAQpePn6675hWneAFKrnOMDiZRt4DYo8Cncv23YQReDJxMc23 WN6YwMixjNEo0BHvzVrZ6tOaYfyGSWlIAtjWFiMxA9IoTQ2yH7jfask76IQPNjah+61sv+ WvoELPFUo1wOLmzwFzYivpKYzkybXOMx19p0jjrgGcw3T+7BZrUrwnm+qafSVPo+SxzgVX jnw4urdXvNiYVAFz2KmNOvhLwdXppd4F6XH0bKy5BBKbTNtLcKab5OI5Th3sDg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704910858; a=rsa-sha256; cv=none; b=Kki15A3LHDKMoeyxPtb2rlPku8GGV2TaFBDTW2AT8M6v2oc7ecXlKhS9pGBrBOJUsLXPcv vLz6OW6ouhOPukksvtoGpNmmMyxN6dclHgy1ptVKON7rlf1HZ9jHU/dlu7kPUnjao9Cmfk zhywTXvlV/BYOYu/SAOtt/tpqgy7dMDOloE94NzOu79m/HM8Yb/WSxDVvkH3u39QFHQx0f 8uqAqM9DXeU1YACdnMy7F5GsINyHdvvKFR+VSGazARJwGAHuGpdqukQd97okhpl4Xo0VId NeR8//L6oMSbx2waVLjCCaSOQMxEIk6zQUTZpFz4ArKJL4SWSDoPYPoQ10ZSgw== 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 4T9GMG5JSwzmNY; Wed, 10 Jan 2024 18:20:58 +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 40AIKwpO052607; Wed, 10 Jan 2024 18:20:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40AIKw8O052604; Wed, 10 Jan 2024 18:20:58 GMT (envelope-from git) Date: Wed, 10 Jan 2024 18:20:58 GMT Message-Id: <202401101820.40AIKw8O052604@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: 3c2b2a28b9c1 - main - iicbus: Move rockchip driver into the common directory 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: 3c2b2a28b9c102d9aa368663ea250fd644f96b46 Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=3c2b2a28b9c102d9aa368663ea250fd644f96b46 commit 3c2b2a28b9c102d9aa368663ea250fd644f96b46 Author: Emmanuel Vadot AuthorDate: 2023-12-25 18:21:52 +0000 Commit: Emmanuel Vadot CommitDate: 2024-01-10 18:20:10 +0000 iicbus: Move rockchip driver into the common directory No need to keep it under sys/arm64/rockchip It's easier to find which controller we support by looking under one directory. While here remove the condition on SOC option, device rk_i2c is enough as all Rockchip SoC that we support have this controller. Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D43184 --- sys/arm/rockchip/files.rk32xx | 2 +- sys/conf/files.arm64 | 2 +- sys/{arm64 => dev/iicbus/controller}/rockchip/rk_i2c.c | 0 sys/modules/rockchip/rk_i2c/Makefile | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/arm/rockchip/files.rk32xx b/sys/arm/rockchip/files.rk32xx index 0f2774fd76cc..e8f838fb186a 100644 --- a/sys/arm/rockchip/files.rk32xx +++ b/sys/arm/rockchip/files.rk32xx @@ -2,7 +2,7 @@ kern/kern_clocksource.c standard arm/rockchip/rk32xx_machdep.c standard arm/rockchip/rk32xx_mp.c optional smp -arm64/rockchip/rk_i2c.c standard +dev/iicbus/controller/rockchip/rk_i2c.c standard arm64/rockchip/rk_iodomain.c standard arm64/rockchip/rk_gpio.c standard arm64/rockchip/rk_grf.c standard diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64 index e6f525e63e64..21ad400bc2a7 100644 --- a/sys/conf/files.arm64 +++ b/sys/conf/files.arm64 @@ -344,6 +344,7 @@ ice_ddp.fw optional ice_ddp \ dev/iicbus/controller/twsi/mv_twsi.c optional twsi fdt dev/iicbus/controller/twsi/a10_twsi.c optional twsi fdt dev/iicbus/controller/twsi/twsi.c optional twsi fdt +dev/iicbus/controller/rockchip/rk_i2c.c optional rk_i2c fdt dev/ipmi/ipmi.c optional ipmi dev/ipmi/ipmi_acpi.c optional ipmi acpi @@ -660,7 +661,6 @@ arm64/rockchip/rk3568_combphy.c optional fdt rk_combphy soc_rockchip_rk3568 arm64/rockchip/rk3568_pcie.c optional fdt pci soc_rockchip_rk3568 arm64/rockchip/rk3568_pciephy.c optional fdt pci soc_rockchip_rk3568 arm64/rockchip/rk_dwc3.c optional fdt rk_dwc3 soc_rockchip_rk3399 | fdt rk_dwc3 soc_rockchip_rk3568 -arm64/rockchip/rk_i2c.c optional fdt rk_i2c soc_rockchip_rk3328 | fdt rk_i2c soc_rockchip_rk3399 | fdt rk_i2c soc_rockchip_rk3568 arm64/rockchip/rk_i2s.c optional fdt sound soc_rockchip_rk3328 | fdt sound soc_rockchip_rk3399 arm64/rockchip/rk_otp.c optional fdt soc_rockchip_rk3568 arm64/rockchip/rk_otp_if.m optional fdt soc_rockchip_rk3568 diff --git a/sys/arm64/rockchip/rk_i2c.c b/sys/dev/iicbus/controller/rockchip/rk_i2c.c similarity index 100% rename from sys/arm64/rockchip/rk_i2c.c rename to sys/dev/iicbus/controller/rockchip/rk_i2c.c diff --git a/sys/modules/rockchip/rk_i2c/Makefile b/sys/modules/rockchip/rk_i2c/Makefile index b90b65f1410d..3cf847e1d1cc 100644 --- a/sys/modules/rockchip/rk_i2c/Makefile +++ b/sys/modules/rockchip/rk_i2c/Makefile @@ -1,5 +1,5 @@ -.PATH: ${SRCTOP}/sys/arm64/rockchip +.PATH: ${SRCTOP}/sys/dev/iicbus/controller/rockchip KMOD= rk_i2c SRCS= rk_i2c.c