From owner-dev-commits-src-main@freebsd.org Thu May 13 16:15:46 2021 Return-Path: Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 85968647055; Thu, 13 May 2021 16:15:46 +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 4FgxbQ38Khz3NBN; Thu, 13 May 2021 16:15:46 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 5744721FC4; Thu, 13 May 2021 16:15:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 14DGFkah081497; Thu, 13 May 2021 16:15:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14DGFkNv081496; Thu, 13 May 2021 16:15:46 GMT (envelope-from git) Date: Thu, 13 May 2021 16:15:46 GMT Message-Id: <202105131615.14DGFkNv081496@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: eb094080855e - main - arm64: rockchip: Add some DTSO to disable sd/mmc 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: eb094080855e1e8c28a70dbebab3e6ecbf8c1255 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 May 2021 16:15:46 -0000 The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=eb094080855e1e8c28a70dbebab3e6ecbf8c1255 commit eb094080855e1e8c28a70dbebab3e6ecbf8c1255 Author: Emmanuel Vadot AuthorDate: 2021-04-21 13:25:29 +0000 Commit: Emmanuel Vadot CommitDate: 2021-05-13 16:15:31 +0000 arm64: rockchip: Add some DTSO to disable sd/mmc This helps during developement to reduce the number of mmc controller. --- sys/dts/arm64/overlays/rk3399-mmc0-disable.dtso | 10 ++++++++++ sys/dts/arm64/overlays/rk3399-mmc1-disable.dtso | 10 ++++++++++ sys/dts/arm64/overlays/rk3399-sdhci-disable.dtso | 10 ++++++++++ sys/modules/dtb/rockchip/Makefile | 5 ++++- 4 files changed, 34 insertions(+), 1 deletion(-) diff --git a/sys/dts/arm64/overlays/rk3399-mmc0-disable.dtso b/sys/dts/arm64/overlays/rk3399-mmc0-disable.dtso new file mode 100644 index 000000000000..a638ed65c717 --- /dev/null +++ b/sys/dts/arm64/overlays/rk3399-mmc0-disable.dtso @@ -0,0 +1,10 @@ +/dts-v1/; +/plugin/; + +/ { + compatible = "rockchip,rk3399"; +}; + +&{/mmc@fe310000} { + status = "disabled"; +}; diff --git a/sys/dts/arm64/overlays/rk3399-mmc1-disable.dtso b/sys/dts/arm64/overlays/rk3399-mmc1-disable.dtso new file mode 100644 index 000000000000..333be61da216 --- /dev/null +++ b/sys/dts/arm64/overlays/rk3399-mmc1-disable.dtso @@ -0,0 +1,10 @@ +/dts-v1/; +/plugin/; + +/ { + compatible = "rockchip,rk3399"; +}; + +&{/mmc@fe320000} { + status = "disabled"; +}; diff --git a/sys/dts/arm64/overlays/rk3399-sdhci-disable.dtso b/sys/dts/arm64/overlays/rk3399-sdhci-disable.dtso new file mode 100644 index 000000000000..b386cc12e62a --- /dev/null +++ b/sys/dts/arm64/overlays/rk3399-sdhci-disable.dtso @@ -0,0 +1,10 @@ +/dts-v1/; +/plugin/; + +/ { + compatible = "rockchip,rk3399"; +}; + +&{/sdhci@fe330000} { + status = "disabled"; +}; diff --git a/sys/modules/dtb/rockchip/Makefile b/sys/modules/dtb/rockchip/Makefile index 12f59e4ee973..20df656bd148 100644 --- a/sys/modules/dtb/rockchip/Makefile +++ b/sys/modules/dtb/rockchip/Makefile @@ -15,7 +15,10 @@ DTS= \ rockchip/rk3399-firefly.dts \ rockchip/rk3399-rockpro64.dts -DTSO= rk3328-dwc3.dtso +DTSO= rk3328-dwc3.dtso \ + rk3399-mmc0-disable.dtso \ + rk3399-mmc1-disable.dtso \ + rk3399-sdhci-disable.dtso .endif .include