From owner-dev-commits-src-branches@freebsd.org Thu Jul 22 17:29:36 2021 Return-Path: Delivered-To: dev-commits-src-branches@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 5C10166296D; Thu, 22 Jul 2021 17:29:36 +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 4GVzwJ1PJVz4YPh; Thu, 22 Jul 2021 17:29:36 +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 094D315EAA; Thu, 22 Jul 2021 17:29:36 +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 16MHTZeU006142; Thu, 22 Jul 2021 17:29:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16MHTZbV006141; Thu, 22 Jul 2021 17:29:35 GMT (envelope-from git) Date: Thu, 22 Jul 2021 17:29:35 GMT Message-Id: <202107221729.16MHTZbV006141@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: 4e6f174686f6 - stable/13 - arm: allwinner: dtb: Add overlays to disable SD/MMC node 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 4e6f174686f621fc2c4f17536f26457cca852a2e Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the stable branches of the FreeBSD src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Jul 2021 17:29:36 -0000 The branch stable/13 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=4e6f174686f621fc2c4f17536f26457cca852a2e commit 4e6f174686f621fc2c4f17536f26457cca852a2e Author: Emmanuel Vadot AuthorDate: 2021-05-26 10:58:50 +0000 Commit: Emmanuel Vadot CommitDate: 2021-07-22 17:29:21 +0000 arm: allwinner: dtb: Add overlays to disable SD/MMC node Useful for dev Sponsored by: Diablotin Systems (cherry picked from commit bc805293d8dac3a984edc45a5acf3906af791c13) --- sys/dts/arm/overlays/sun8i-h3-mmc0-disable.dtso | 10 ++++++++++ sys/dts/arm/overlays/sun8i-h3-mmc1-disable.dtso | 10 ++++++++++ sys/dts/arm/overlays/sun8i-h3-mmc2-disable.dtso | 10 ++++++++++ sys/modules/dtb/allwinner/Makefile | 5 ++++- 4 files changed, 34 insertions(+), 1 deletion(-) diff --git a/sys/dts/arm/overlays/sun8i-h3-mmc0-disable.dtso b/sys/dts/arm/overlays/sun8i-h3-mmc0-disable.dtso new file mode 100644 index 000000000000..137c66081efd --- /dev/null +++ b/sys/dts/arm/overlays/sun8i-h3-mmc0-disable.dtso @@ -0,0 +1,10 @@ +/dts-v1/; +/plugin/; + +/ { + compatible = "allwinner,sun8i-h3"; +}; + +&{/soc/mmc@1c0f000} { + status = "disabled"; +}; diff --git a/sys/dts/arm/overlays/sun8i-h3-mmc1-disable.dtso b/sys/dts/arm/overlays/sun8i-h3-mmc1-disable.dtso new file mode 100644 index 000000000000..36854b4b0c39 --- /dev/null +++ b/sys/dts/arm/overlays/sun8i-h3-mmc1-disable.dtso @@ -0,0 +1,10 @@ +/dts-v1/; +/plugin/; + +/ { + compatible = "allwinner,sun8i-h3"; +}; + +&{/soc/mmc@1c10000} { + status = "disabled"; +}; diff --git a/sys/dts/arm/overlays/sun8i-h3-mmc2-disable.dtso b/sys/dts/arm/overlays/sun8i-h3-mmc2-disable.dtso new file mode 100644 index 000000000000..ad0fc625a4a2 --- /dev/null +++ b/sys/dts/arm/overlays/sun8i-h3-mmc2-disable.dtso @@ -0,0 +1,10 @@ +/dts-v1/; +/plugin/; + +/ { + compatible = "allwinner,sun8i-h3"; +}; + +&{/soc/mmc@1c11000} { + status = "disabled"; +}; diff --git a/sys/modules/dtb/allwinner/Makefile b/sys/modules/dtb/allwinner/Makefile index 184cadb63fb9..fe3dccc7fd91 100644 --- a/sys/modules/dtb/allwinner/Makefile +++ b/sys/modules/dtb/allwinner/Makefile @@ -25,7 +25,10 @@ DTS= \ sun8i-h3-orangepi-plus2e.dts DTSO= sun8i-a83t-sid.dtso \ - sun8i-h3-i2c0.dtso + sun8i-h3-i2c0.dtso \ + sun8i-h3-mmc0-disable.dtso \ + sun8i-h3-mmc1-disable.dtso \ + sun8i-h3-mmc2-disable.dtso LINKS= \ ${DTBDIR}/sun4i-a10-cubieboard.dtb ${DTBDIR}/cubieboard.dtb \