From: "Clément Péron" <peron.clem@gmail.com>
To: Rob Herring <robh+dt@kernel.org>,
Maxime Ripard <maxime.ripard@bootlin.com>,
Chen-Yu Tsai <wens@csie.org>, Icenowy Zheng <icenowy@aosc.io>,
Jagan Teki <jagan@amarulasolutions.com>
Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-sunxi@googlegroups.com,
"Clément Péron" <peron.clem@gmail.com>
Subject: [PATCH v2 3/5] arm64: dts: allwinner: h6: move MMC pinctrl to dtsi
Date: Fri, 5 Apr 2019 14:24:44 +0200 [thread overview]
Message-ID: <20190405122446.2101-3-peron.clem@gmail.com> (raw)
In-Reply-To: <20190405122446.2101-1-peron.clem@gmail.com>
There is only one pinmuxing available for each MMC controller.
Move the pinctrl to the SOC
Signed-off-by: Clément Péron <peron.clem@gmail.com>
---
arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi | 2 --
arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts | 4 ----
arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 4 ++++
3 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi
index fd2af5095425..88b3a13f2360 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi
@@ -56,8 +56,6 @@
};
&mmc0 {
- pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_cldo1>;
cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>;
bus-width = <4>;
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts b/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts
index 8b0b7675a53c..d8b0138be3d6 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts
@@ -104,8 +104,6 @@
};
&mmc0 {
- pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_cldo1>;
cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>;
bus-width = <4>;
@@ -113,8 +111,6 @@
};
&mmc2 {
- pinctrl-names = "default";
- pinctrl-0 = <&mmc2_pins>;
vmmc-supply = <®_cldo1>;
vqmmc-supply = <®_bldo2>;
non-removable;
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
index 91fecab58836..93ad756c0c95 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
@@ -273,6 +273,8 @@
resets = <&ccu RST_BUS_MMC0>;
reset-names = "ahb";
interrupts = <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&mmc0_pins>;
status = "disabled";
#address-cells = <1>;
#size-cells = <0>;
@@ -301,6 +303,8 @@
resets = <&ccu RST_BUS_MMC2>;
reset-names = "ahb";
interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&mmc0_pins>;
status = "disabled";
#address-cells = <1>;
#size-cells = <0>;
--
2.17.1
next prev parent reply other threads:[~2019-04-05 12:24 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-05 12:24 [PATCH v2 1/5] arm64: allwinner: h6: orangepi: Add PIO regulators Clément Péron
2019-04-05 12:24 ` [PATCH v2 2/5] arm64: dts: allwinner: h6: pine64: " Clément Péron
2019-04-05 12:24 ` Clément Péron [this message]
2019-04-05 12:24 ` [PATCH v2 4/5] dt-bindings: vendor-prefixes: add AZW Clément Péron
2019-04-05 12:42 ` Robin Murphy
2019-04-05 12:24 ` [PATCH v2 5/5] ARM: dts: sun50i: h6: Introduce Beelink GS1 board Clément Péron
2019-04-05 12:53 ` Clément Péron
2019-04-05 13:07 ` Clément Péron
[not found] ` <CAJiuCcfbnR+Jfj8Je_4HwgycCBEe92sx6zqwqgXpeiMe2jKL-Q-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2019-04-05 15:11 ` Maxime Ripard
2019-04-05 16:40 ` Clément Péron
[not found] ` <20190405122446.2101-5-peron.clem-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2019-04-05 15:10 ` Maxime Ripard
2019-04-05 15:08 ` [PATCH v2 1/5] arm64: allwinner: h6: orangepi: Add PIO regulators Maxime Ripard
2019-04-05 16:42 ` Clément Péron
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190405122446.2101-3-peron.clem@gmail.com \
--to=peron.clem@gmail.com \
--cc=devicetree@vger.kernel.org \
--cc=icenowy@aosc.io \
--cc=jagan@amarulasolutions.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sunxi@googlegroups.com \
--cc=maxime.ripard@bootlin.com \
--cc=robh+dt@kernel.org \
--cc=wens@csie.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).