From nobody Tue Feb 27 22:10:40 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 4TksB93R9Qz5Bmwm; Tue, 27 Feb 2024 22:10:41 +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 4TksB90y40z4BNx; Tue, 27 Feb 2024 22:10:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709071841; 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=lX91vGGkl6PGwHJSgs9BvFMOARiWAmNTSd097iBkkE4=; b=RUh8qQvnmTPpfQraCoZKexQuFnxHwg8JdBXyEl52Tst9KF8LiWiZxS+E0eBj9kp+iZ8IZh jHRHzBgdd8DGh9JDOMxl7w3htVfnjhFL3vIKwMLQ7icORn0gTbwO4wluqViLUAjyj3YfLT +wG1CQ57yoxxEL+b1M/StleGFUUrBzzrYHFN8gbS6B68Qz//Eo6FqyI9DPmAsn5HYrwP7W 5hSOFlI4otJbihhlxGim9ndnZ+7D1a/aXIR9tmD7MpGYRnARe+TFsybLBHkItwBtodUhuS rqVF2J5R8Rln49ZmuFWiX+Vfs/yJ0JYMDc6o9xmnGMUg3PQC4c7/xWlfZeD6Iw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709071841; a=rsa-sha256; cv=none; b=Bi+HSrhKVO7XttvdYk/G4bkgpTk6s8ooqAOLU3MX26hRJmVNC6dR2ouel7H67nacJYPQpI dbCUHB7xB8Q/NWy20v8S1IZWGMcMGxwSfaLTthRfAmJjHF74TXPEu1V9W2Bn71gFsRx+ox UU7amfD5I6fivKaC5S0z18/AhcKWFO+Q0vQYjay465a04/XQBuTw1bwShyv1bhMVC0sMA9 jpHby1tcsfB3MKqesmU/EbXmOJCOvmsbety9v2GuICW3z9kdzie1eawBm2rTHnl76O+Ndo tN05enIFBk4N0OEiIFVK3/zibCSemRo0At11eurlrghhx+tuDNcdzEvOX94a5A== 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=1709071841; 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=lX91vGGkl6PGwHJSgs9BvFMOARiWAmNTSd097iBkkE4=; b=YYmzAmMfzY/4eKJo7g8L92Tj0eqWh90j6dZ5CEVPlMyQpclQGmYIbpf6uWXdtMzuSNAz4v I2JU5qKjJ/QqMKNHizqq6Q5RzGA1gaxTaS1rD6jCp+G+wQGufKV9ILa1/R9OWa/SUcMX5R 3IOs1qZdI3Jj6VLmu/tMbb3Gxw3nJ3UhKkOMr5KbRNOtC+MbbXrkQ4IJtgxkei39tKX2iT u0qEDQuvONK0CZk7Ipu3QdKWRzKmchEyGH/qvKhmiKeX51ac1nREuDDVm2msS/qKGHL6tI w6iVpmmK+6SBYV1T36mTk5R/ezzFCaGoava9kL6gFjqx7SXZwkhR3L+CSJLV1A== 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 4TksB86x5mzWJd; Tue, 27 Feb 2024 22:10: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 41RMAe0e040375; Tue, 27 Feb 2024 22:10:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41RMAelO040372; Tue, 27 Feb 2024 22:10:40 GMT (envelope-from git) Date: Tue, 27 Feb 2024 22:10:40 GMT Message-Id: <202402272210.41RMAelO040372@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: f84e9df6d0e5 - main - conf: deduplicate dwmmc config logic 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: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f84e9df6d0e56168d8d5d0514557cc345938bef7 Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=f84e9df6d0e56168d8d5d0514557cc345938bef7 commit f84e9df6d0e56168d8d5d0514557cc345938bef7 Author: Mitchell Horne AuthorDate: 2024-02-27 22:00:24 +0000 Commit: Mitchell Horne CommitDate: 2024-02-27 22:10:14 +0000 conf: deduplicate dwmmc config logic The core of this driver is supported by multiple architectures. Move the config entries to the MI conf/files. This hardware is found on several available/emerging RISC-V SoCs, so we will soon need it on this architecture. Reviewed by: manu MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D44104 --- sys/arm/altera/socfpga/files.socfpga | 1 - sys/arm/rockchip/files.rk32xx | 1 - sys/conf/files | 1 + sys/conf/files.arm64 | 1 - 4 files changed, 1 insertion(+), 3 deletions(-) diff --git a/sys/arm/altera/socfpga/files.socfpga b/sys/arm/altera/socfpga/files.socfpga index 986c08184570..1cf8d95b9fa3 100644 --- a/sys/arm/altera/socfpga/files.socfpga +++ b/sys/arm/altera/socfpga/files.socfpga @@ -5,7 +5,6 @@ arm/altera/socfpga/socfpga_manager.c standard arm/altera/socfpga/socfpga_rstmgr.c standard arm/altera/socfpga/socfpga_mp.c optional smp -dev/mmc/host/dwmmc.c optional dwmmc dev/mmc/host/dwmmc_altera.c optional dwmmc # Arria 10 diff --git a/sys/arm/rockchip/files.rk32xx b/sys/arm/rockchip/files.rk32xx index 5f15a22cc334..a9ca6cb1b5ae 100644 --- a/sys/arm/rockchip/files.rk32xx +++ b/sys/arm/rockchip/files.rk32xx @@ -26,5 +26,4 @@ dev/iicbus/pmic/act8846.c standard dev/iicbus/pmic/act8846_regulator.c standard dev/iicbus/pmic/fan53555.c standard dev/iicbus/rtc/hym8563.c standard -dev/mmc/host/dwmmc.c optional dwmmc dev/mmc/host/dwmmc_rockchip.c optional dwmmc diff --git a/sys/conf/files b/sys/conf/files index cc476dc88210..3c87c0b88528 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -2408,6 +2408,7 @@ dev/mlxfw/mlxfw_mfa2_tlv_multi.c optional mlxfw \ dev/mlx/mlx.c optional mlx dev/mlx/mlx_disk.c optional mlx dev/mlx/mlx_pci.c optional mlx pci +dev/mmc/host/dwmmc.c optional dwmmc fdt dev/mmc/mmc_subr.c optional mmc | mmcsd !mmccam dev/mmc/mmc.c optional mmc !mmccam dev/mmc/mmcbr_if.m standard diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64 index 5ff090fcf8b2..ef00857b61c0 100644 --- a/sys/conf/files.arm64 +++ b/sys/conf/files.arm64 @@ -384,7 +384,6 @@ dev/ipmi/ipmi_smic.c optional ipmi dev/mailbox/arm/arm_doorbell.c optional fdt arm_doorbell dev/mbox/mbox_if.m optional soc_brcm_bcm2837 -dev/mmc/host/dwmmc.c optional dwmmc fdt dev/mmc/host/dwmmc_altera.c optional dwmmc dwmmc_altera fdt dev/mmc/host/dwmmc_hisi.c optional dwmmc dwmmc_hisi fdt dev/mmc/host/dwmmc_rockchip.c optional dwmmc rk_dwmmc fdt