From nobody Wed Jan 10 18:20:59 2024 X-Original-To: dev-commits-src-main@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 4T9GMJ1MFpz55YDM; Wed, 10 Jan 2024 18:21:00 +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 4T9GMJ0VQqz4GK3; Wed, 10 Jan 2024 18:21:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704910860; 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=4XVJnmPLLZbWqLbmrgR1GFL8Rs+FPP7j37gtXsrDwR0=; b=ZJ+tscTqze31N7LF3NI8VqkWI9Xqim8K8YOkjvvcnSubDwhSoF3jrHDbg74IUwLbvEcUtl H4YfwkjsqeDsn11DuPcUouVLGdZfFfAhceBcopbrqXdUloNXjnXl7FRTJFSlLSh478j5F+ sqRFQLibbB4LYWamW0hIlpEWexeWyZvsvfdpb6BfimRg99aDTrBe5ifIPRqsctwSwrxYoP N0n+AGdu72diFQdBUJ6Yh3EiRux6U9HT3kHFXpZ5GEi9dr5IlG1yUGoLY6EH4FSL3RBcBo r7GRZkLrxQaCP6zewpYF01zNCJg5pgviFTWv0p3pQ/qG8Nt34PZ3HFDvO+lv3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704910860; 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=4XVJnmPLLZbWqLbmrgR1GFL8Rs+FPP7j37gtXsrDwR0=; b=sfNQ7jrkjvJ3jq8r9dV2TV5mW8v5Dv9W0DwAwOTNVLyeT9hxSaKMDZAlbzP+nxDks3wHv+ XIjDPy56e//IdSOHMiNlH7+snW3Z1VTpWFyUAFgEZSW30uHnYuELaTKzUnHsmicTEUImha pBJGXG8m+Dc4dAc85EDR+6FtCmYDxODzf8Asakk7RQjIf3UU99Jr6zkUfhwukcbmFKZXAU dgWbOeOZFnBLV3PLJDt5r5PDFO33Z8mUPDqIlFSQIrfHy/Qmda+bLxGiE07ICkmYwrHeXX EQ+YfJp0KbqVaRVeVUNGnLw5JU7Pr3IoRs3dz1RXWaxQY1V/Cs7b7rJ2lwSNXw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704910860; a=rsa-sha256; cv=none; b=dr1TqLCiyiZNMCmLD0mYRlgJ335XcZiuxiq7ksRxsYUP5d0LNGLD/vz9w2oJ7Io2uE53Yi c77C71mplj0ZEFaRiAonqZkeD6yTY0QdgMqngqT2ef6Bh9ucp+PdQfeU1sG4gw8L1s44xm 3ceEwe5bqoILQos9Qok/HQZ/z3eIc0hq4W5y9ABzkC9woM3sYHdFpaYtWBdw+8iW6esS4E I/hYjfVY+a4m2ugCEGPE+yEtIqkWt7cGBTR6WG2b/r3nso38S8tbXfUwO6J0Qgpq7sL07Y oysv5n+p3a76j27HqFdSqdbVrJ8JjRLS2m8Pfeq19yvDI5jj6xD1ivTwmiU8Bg== 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 4T9GMH6PRbzmNZ; Wed, 10 Jan 2024 18:20:59 +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 40AIKxeo052661; Wed, 10 Jan 2024 18:20:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40AIKxng052658; Wed, 10 Jan 2024 18:20:59 GMT (envelope-from git) Date: Wed, 10 Jan 2024 18:20:59 GMT Message-Id: <202401101820.40AIKxng052658@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: 994c943a0098 - main - spibus: Move rockchip driver into the common directory List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 994c943a0098e38bff96f9f9169cbb38542c39c1 Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=994c943a0098e38bff96f9f9169cbb38542c39c1 commit 994c943a0098e38bff96f9f9169cbb38542c39c1 Author: Emmanuel Vadot AuthorDate: 2023-12-25 18:30:05 +0000 Commit: Emmanuel Vadot CommitDate: 2024-01-10 18:20:13 +0000 spibus: 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. Sponsored by: Beckhoff Automation GmbH & Co. KG --- sys/conf/files.arm64 | 3 ++- sys/{arm64 => dev/spibus/controller}/rockchip/rk_spi.c | 0 sys/modules/rockchip/rk_spi/Makefile | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64 index 21ad400bc2a7..fa7c4e6362c4 100644 --- a/sys/conf/files.arm64 +++ b/sys/conf/files.arm64 @@ -391,6 +391,8 @@ dev/sdhci/sdhci_xenon_fdt.c optional sdhci_xenon sdhci fdt dev/sram/mmio_sram.c optional fdt mmio_sram dev/sram/mmio_sram_if.m optional fdt mmio_sram +dev/spibus/controller/rockchip/rk_spi.c optional fdt rk_spi + dev/uart/uart_cpu_arm64.c optional uart dev/uart/uart_dev_mu.c optional uart uart_mu fdt dev/uart/uart_dev_pl011.c optional uart pl011 @@ -675,7 +677,6 @@ arm64/rockchip/rk_grf.c optional fdt soc_rockchip_rk3328 | fdt soc_rockchip_r arm64/rockchip/rk_pinctrl.c optional fdt rk_pinctrl soc_rockchip_rk3328 | fdt rk_pinctrl soc_rockchip_rk3399 | fdt soc_rockchip_rk3568 arm64/rockchip/rk_gpio.c optional fdt rk_gpio soc_rockchip_rk3328 | fdt rk_gpio soc_rockchip_rk3399 | fdt soc_rockchip_rk3568 arm64/rockchip/rk_iodomain.c optional fdt rk_iodomain -arm64/rockchip/rk_spi.c optional fdt rk_spi arm64/rockchip/rk_usb2phy.c optional fdt rk_usb2phy soc_rockchip_rk3328 | fdt rk_usb2phy soc_rockchip_rk3399 | fdt rk_usb2phy soc_rockchip_rk3568 arm64/rockchip/rk_typec_phy.c optional fdt rk_typec_phy soc_rockchip_rk3399 arm64/rockchip/rk_tsadc_if.m optional fdt soc_rockchip_rk3399 | fdt soc_rockchip_rk3568 diff --git a/sys/arm64/rockchip/rk_spi.c b/sys/dev/spibus/controller/rockchip/rk_spi.c similarity index 100% rename from sys/arm64/rockchip/rk_spi.c rename to sys/dev/spibus/controller/rockchip/rk_spi.c diff --git a/sys/modules/rockchip/rk_spi/Makefile b/sys/modules/rockchip/rk_spi/Makefile index 614ea680ce56..70526cdaf2c2 100644 --- a/sys/modules/rockchip/rk_spi/Makefile +++ b/sys/modules/rockchip/rk_spi/Makefile @@ -1,5 +1,5 @@ -.PATH: ${SRCTOP}/sys/arm64/rockchip +.PATH: ${SRCTOP}/sys/dev/spibus/controller/rockchip KMOD= rk_spi SRCS= rk_spi.c