From nobody Wed Jan 10 18:21:00 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 4T9GMK3cRxz55YDS; Wed, 10 Jan 2024 18:21:01 +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 4T9GMK1Yyqz4GKG; Wed, 10 Jan 2024 18:21:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704910861; 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=IP7oNYTGYNFaFpPNgvdP0KKM4SUHcjFWJwOC+Qt5XR4=; b=J6TApTF5KRk1/d6xbZHIrCQAnZEa10nSQ4Knw9J60SGafHfNsS4X+YsHo7cEPZ1BNVkiOK K+PkTjArgqqg+XLySkUFozdiYv3miVe4uKXCKXRxFz4TMayzLvFtRsR751PkYlf1JCsu5a aoxuaoaBxgTuxaSzd1YhIjru4LjBTWisI7CeVmhCrUqy8kcA1BYbw36CaWDymRU2PVlZCX qjeiH+LcUIyvH3BRivLAvYfjNy0ElTGOnHKxrr+rKNX+rVfa1wcJT6Y91LIZ1idPuYY9Fi aQk5amXWgObYDU4OQp3v4QwFOyJDWDI3KgwbVcCPCIdTyABcETKikq9lta787g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704910861; 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=IP7oNYTGYNFaFpPNgvdP0KKM4SUHcjFWJwOC+Qt5XR4=; b=NTykG8iblcgQeIMBsdWJnty+jC539wtylJA7ptK10/RG3CHDjahR/CEaUjMozV3oxZzYoP myQG668et/6s2kXIXOb4K6JFaWXEz/uJ4sjPHdergQ/aHhSk8dU7d5yJg+izLrF3fSygVm OzbThLfys/TjyMly8rMtnL1btFsUzgZDkHz0y2hYDZJSr46iO99eLnJVfiPXQigqiRvZH2 lfRts1Dhfx0EbZDtYbwVPo5AlVEO7Kl+X9d9gZnO0fLM/CnjrvlB81VYjZOKWi3K/AUT7/ 8Z6NrEArRIQlMs3lFmzEPNYPTPS881KXnsSnqIxr+1qzRhx6Dbz+sMXFBhDNMA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704910861; a=rsa-sha256; cv=none; b=nDgJStSCy+m6/Mo+VFILCpQqJteC77Z5HdleefC5y4Kccbfj7KpGc5JakM69PyRbNvv/MM X9RW7FDY62KrUFhhdmtNRTgtNIc56j4oCLeij5c/ZoG8rPZsO/kbN/pDUsG2d2Mb1rlSWz 57ZsjxkC2WmyzUglM8ClZx8Rn2wCL7Gv7OJo9kkU+3EeSraqC4f4UUg0Q5exy6JdCnTVlc GOThzzdabOsJjlcvGY464yOUztcI6F+qO7SYhCVsM1uak/fbUM8eob6CsWvJwG1UvS14ei nmsBhGh7CsvHQy+Bhl5xk3eWb0Kz/NVz7ek319Uz6a05NPUv9k3baUpAgZ9Ohg== 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 4T9GMK0LVrzmJK; Wed, 10 Jan 2024 18:21:01 +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 40AIL0tb052722; Wed, 10 Jan 2024 18:21:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40AIL0G4052719; Wed, 10 Jan 2024 18:21:00 GMT (envelope-from git) Date: Wed, 10 Jan 2024 18:21:00 GMT Message-Id: <202401101821.40AIL0G4052719@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: ec2b0ccdeed2 - main - spibus: Move allwinner 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: ec2b0ccdeed2cbd3f49b7a992023c351e239389b Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=ec2b0ccdeed2cbd3f49b7a992023c351e239389b commit ec2b0ccdeed2cbd3f49b7a992023c351e239389b Author: Emmanuel Vadot AuthorDate: 2023-12-25 18:33:02 +0000 Commit: Emmanuel Vadot CommitDate: 2024-01-10 18:20:15 +0000 spibus: Move allwinner driver into the common directory No need to keep it under sys/arm/allwinner It's easier to find which controller we support by looking under one directory. Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D43185 --- sys/conf/files.arm64 | 2 +- sys/{arm => dev/spibus/controller}/allwinner/aw_spi.c | 0 sys/modules/allwinner/aw_spi/Makefile | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64 index fa7c4e6362c4..1a141963a37e 100644 --- a/sys/conf/files.arm64 +++ b/sys/conf/files.arm64 @@ -391,6 +391,7 @@ 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/allwinner/aw_spi.c optional fdt aw_spi dev/spibus/controller/rockchip/rk_spi.c optional fdt rk_spi dev/uart/uart_cpu_arm64.c optional uart @@ -444,7 +445,6 @@ arm/allwinner/aw_r_intc.c optional aw_r_intc fdt arm/allwinner/aw_rsb.c optional aw_rsb fdt arm/allwinner/aw_rtc.c optional aw_rtc fdt arm/allwinner/aw_sid.c optional aw_sid nvmem fdt -arm/allwinner/aw_spi.c optional aw_spi fdt arm/allwinner/aw_syscon.c optional aw_syscon syscon fdt arm/allwinner/aw_thermal.c optional aw_thermal nvmem fdt arm/allwinner/aw_usbphy.c optional ehci aw_usbphy fdt diff --git a/sys/arm/allwinner/aw_spi.c b/sys/dev/spibus/controller/allwinner/aw_spi.c similarity index 100% rename from sys/arm/allwinner/aw_spi.c rename to sys/dev/spibus/controller/allwinner/aw_spi.c diff --git a/sys/modules/allwinner/aw_spi/Makefile b/sys/modules/allwinner/aw_spi/Makefile index e26ffd6589e5..3bab8c70e417 100644 --- a/sys/modules/allwinner/aw_spi/Makefile +++ b/sys/modules/allwinner/aw_spi/Makefile @@ -1,5 +1,5 @@ -.PATH: ${SRCTOP}/sys/arm/allwinner +.PATH: ${SRCTOP}/sys/dev/spibus/controller/allwinner/ KMOD= aw_spi SRCS= aw_spi.c