devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Chen-Yu Tsai <wens-jdAy2FN1RRM@public.gmane.org>
To: Lee Jones <lee.jones-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>,
	Maxime Ripard
	<maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
Cc: Chen-Yu Tsai <wens-jdAy2FN1RRM@public.gmane.org>,
	linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org,
	devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	linux-sunxi-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org,
	Quentin Schulz
	<quentin.schulz-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
Subject: [PATCH v2 6/8] ARM: dts: sun8i: a83t: Move mmc1 pinctrl setting to dtsi file
Date: Wed, 18 Oct 2017 16:31:36 +0800	[thread overview]
Message-ID: <20171018083138.14517-7-wens@csie.org> (raw)
In-Reply-To: <20171018083138.14517-1-wens-jdAy2FN1RRM@public.gmane.org>

mmc1 only has 1 possible pinmux setting.

Move any settings to the dtsi file and set it by default.

Signed-off-by: Chen-Yu Tsai <wens-jdAy2FN1RRM@public.gmane.org>
---
 arch/arm/boot/dts/sun8i-a83t-tbs-a711.dts | 2 --
 arch/arm/boot/dts/sun8i-a83t.dtsi         | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/boot/dts/sun8i-a83t-tbs-a711.dts b/arch/arm/boot/dts/sun8i-a83t-tbs-a711.dts
index 723641f56a74..de0be140338b 100644
--- a/arch/arm/boot/dts/sun8i-a83t-tbs-a711.dts
+++ b/arch/arm/boot/dts/sun8i-a83t-tbs-a711.dts
@@ -115,8 +115,6 @@
 &mmc1 {
 	mmc-pwrseq = <&wifi_pwrseq>;
 	bus-width = <4>;
-	pinctrl-names = "default";
-	pinctrl-0 = <&mmc1_pins>;
 	vmmc-supply = <&reg_vcc3v3>;
 	vqmmc-supply = <&reg_vcc3v3>;
 	non-removable;
diff --git a/arch/arm/boot/dts/sun8i-a83t.dtsi b/arch/arm/boot/dts/sun8i-a83t.dtsi
index ce6e887c8938..19acae1b4089 100644
--- a/arch/arm/boot/dts/sun8i-a83t.dtsi
+++ b/arch/arm/boot/dts/sun8i-a83t.dtsi
@@ -212,6 +212,8 @@
 			resets = <&ccu RST_BUS_MMC1>;
 			reset-names = "ahb";
 			interrupts = <GIC_SPI 61 IRQ_TYPE_LEVEL_HIGH>;
+			pinctrl-names = "default";
+			pinctrl-0 = <&mmc1_pins>;
 			status = "disabled";
 			#address-cells = <1>;
 			#size-cells = <0>;
-- 
2.14.2

  parent reply	other threads:[~2017-10-18  8:31 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-10-18  8:31 [PATCH v2 0/8] ARM: sun8i: a83t: Enable AXP813/AXP818 regulators Chen-Yu Tsai
2017-10-18  8:31 ` [PATCH v2 1/8] mfd: axp20x: Add axp20x-regulator cell for AXP813 Chen-Yu Tsai
     [not found]   ` <20171018083138.14517-2-wens-jdAy2FN1RRM@public.gmane.org>
2017-10-31 13:36     ` Maxime Ripard
2017-10-31 15:07       ` Lee Jones
2017-10-31 15:12         ` Chen-Yu Tsai
2017-11-01  9:28     ` Lee Jones
     [not found] ` <20171018083138.14517-1-wens-jdAy2FN1RRM@public.gmane.org>
2017-10-18  8:31   ` [PATCH v2 2/8] ARM: dts: sunxi: Add dtsi for AXP81x PMIC Chen-Yu Tsai
2017-10-18  8:31   ` [PATCH v2 3/8] ARM: dts: sun8i: a83t: cubietruck-plus: Add AXP818 regulator nodes Chen-Yu Tsai
2017-10-18  8:31   ` [PATCH v2 4/8] ARM: dts: sun8i: a83t: bananapi-m3: Add AXP813 " Chen-Yu Tsai
2017-10-18  8:31   ` [PATCH v2 5/8] ARM: dts: sun8i: a83t: allwinner-h8homlet-v2: Add AXP818 " Chen-Yu Tsai
2017-10-18  8:31   ` Chen-Yu Tsai [this message]
2017-10-18 15:00     ` [linux-sunxi] [PATCH v2 6/8] ARM: dts: sun8i: a83t: Move mmc1 pinctrl setting to dtsi file Joonas Kylmälä
     [not found]       ` <f85a30e2-5a9d-a7ba-0010-6602cabaf83e-sGOZH3hwPm2sTnJN9+BGXg@public.gmane.org>
2017-10-19  6:48         ` Chen-Yu Tsai
     [not found]           ` <CAGb2v64O+eyriHG-FirtPKo6hACfbV9JcJRUUZ+rY1QM2w_r1g-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2017-10-19  8:18             ` icenowy-h8G6r0blFSE
     [not found]               ` <0e934ef6b4254fc94f613d1305c06cde-h8G6r0blFSE@public.gmane.org>
2017-10-19  8:24                 ` Chen-Yu Tsai
2017-10-19 16:02             ` [linux-sunxi] " Joonas Kylmälä
     [not found]               ` <4a2734fb-71ab-7cd9-2b17-669f2fdf9a2c-sGOZH3hwPm2sTnJN9+BGXg@public.gmane.org>
2017-10-19 16:34                 ` Chen-Yu Tsai
2017-10-18  8:31   ` [PATCH v2 7/8] ARM: dts: sun8i: a83t: cubietruck-plus: Enable AP6330 WiFi on mmc1 Chen-Yu Tsai
2017-10-18  8:31   ` [PATCH v2 8/8] ARM: dts: sun8i: a83t: bananapi-m3: Enable AP6212 " Chen-Yu Tsai
2017-10-18 13:23   ` [PATCH v2 0/8] ARM: sun8i: a83t: Enable AXP813/AXP818 regulators Maxime Ripard
2017-11-02  8:10   ` Maxime Ripard

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=20171018083138.14517-7-wens@csie.org \
    --to=wens-jday2fn1rrm@public.gmane.org \
    --cc=devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=lee.jones-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org \
    --cc=linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \
    --cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=linux-sunxi-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org \
    --cc=maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org \
    --cc=quentin.schulz-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.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).