public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
From: "Clément Péron" <peron.clem@gmail.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 1/4] arm: dts: h6: move MMC pinctrl to soc
Date: Mon,  8 Apr 2019 18:49:48 +0200	[thread overview]
Message-ID: <20190408164951.1819-2-peron.clem@gmail.com> (raw)
In-Reply-To: <20190408164951.1819-1-peron.clem@gmail.com>

There is only one muxing avalaible for each MMC controller.

Move this pinmux to the SOC dtsi.

Signed-off-by: Clément Péron <peron.clem@gmail.com>
---
 arch/arm/dts/sun50i-h6-orangepi.dtsi | 2 --
 arch/arm/dts/sun50i-h6-pine-h64.dts  | 4 ----
 arch/arm/dts/sun50i-h6.dtsi          | 4 ++++
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/arch/arm/dts/sun50i-h6-orangepi.dtsi b/arch/arm/dts/sun50i-h6-orangepi.dtsi
index 0612c19cd9..3748dcaa70 100644
--- a/arch/arm/dts/sun50i-h6-orangepi.dtsi
+++ b/arch/arm/dts/sun50i-h6-orangepi.dtsi
@@ -24,8 +24,6 @@
 };
 
 &mmc0 {
-	pinctrl-names = "default";
-	pinctrl-0 = <&mmc0_pins>;
 	vmmc-supply = <&reg_cldo1>;
 	cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>;
 	bus-width = <4>;
diff --git a/arch/arm/dts/sun50i-h6-pine-h64.dts b/arch/arm/dts/sun50i-h6-pine-h64.dts
index ceffc40810..a26314c084 100644
--- a/arch/arm/dts/sun50i-h6-pine-h64.dts
+++ b/arch/arm/dts/sun50i-h6-pine-h64.dts
@@ -42,16 +42,12 @@
 };
 
 &mmc0 {
-	pinctrl-names = "default";
-	pinctrl-0 = <&mmc0_pins>;
 	vmmc-supply = <&reg_cldo1>;
 	cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>;
 	status = "okay";
 };
 
 &mmc2 {
-	pinctrl-names = "default";
-	pinctrl-0 = <&mmc2_pins>;
 	vmmc-supply = <&reg_cldo1>;
 	vqmmc-supply = <&reg_bldo2>;
 	non-removable;
diff --git a/arch/arm/dts/sun50i-h6.dtsi b/arch/arm/dts/sun50i-h6.dtsi
index cfa5fffcf6..617cea35d1 100644
--- a/arch/arm/dts/sun50i-h6.dtsi
+++ b/arch/arm/dts/sun50i-h6.dtsi
@@ -158,6 +158,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>;
@@ -186,6 +188,8 @@
 			resets = <&ccu RST_BUS_MMC2>;
 			reset-names = "ahb";
 			interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>;
+			pinctrl-names = "default";
+			pinctrl-0 = <&mmc2_pins>;
 			status = "disabled";
 			#address-cells = <1>;
 			#size-cells = <0>;
-- 
2.17.1

  reply	other threads:[~2019-04-08 16:49 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-04-08 16:49 [U-Boot] [PATCH 0/4] Add Beelink GS1 Clément Péron
2019-04-08 16:49 ` Clément Péron [this message]
2019-04-12 13:36   ` [U-Boot] [linux-sunxi] [PATCH 1/4] arm: dts: h6: move MMC pinctrl to soc Jagan Teki
2019-04-12 13:52     ` Clément Péron
2019-04-08 16:49 ` [U-Boot] [PATCH 2/4] arm: dts: h6: Add Beelink GS1 initial support Clément Péron
2019-04-11 22:53   ` Clément Péron
2019-04-08 16:49 ` [U-Boot] [PATCH 3/4] arm: sunxi: h6: fix reset using r_wdog Clément Péron
2019-04-08 16:47   ` Clément Péron
2019-04-11 11:13     ` Clément Péron
2019-04-08 16:49 ` [U-Boot] [PATCH 4/4] arm: dts: h6: minor sync with linux 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=20190408164951.1819-2-peron.clem@gmail.com \
    --to=peron.clem@gmail.com \
    --cc=u-boot@lists.denx.de \
    /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