From: Frank Wang <frank.wang@rock-chips.com>
To: heiko@sntech.de, robh+dt@kernel.org, mark.rutland@arm.com,
linux@armlinux.org.uk, wim@iguana.be, linux@roeck-us.net,
ellisys@163.com
Cc: linux-arm-kernel@lists.infradead.org,
linux-rockchip@lists.infradead.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org, charles.chen@rock-chips.com,
cody.xie@rock-chips.com, kevan.lan@rock-chips.com,
huangtao@rock-chips.com, sugar.zhang@rock-chips.com,
wmc@rock-chips.com, Frank Wang <frank.wang@rock-chips.com>
Subject: [PATCH v2 2/3] arm: dts: rk322x: correct uart2 pinctrl and add another sets
Date: Wed, 17 May 2017 17:52:25 +0800 [thread overview]
Message-ID: <1495014746-27621-3-git-send-email-frank.wang@rock-chips.com> (raw)
In-Reply-To: <1495014746-27621-1-git-send-email-frank.wang@rock-chips.com>
Correct UART2 PINCTRL flag and add another PINCTRL sets for UART2
in case of confict with SDMMC.
Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
---
arch/arm/boot/dts/rk322x.dtsi | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/rk322x.dtsi b/arch/arm/boot/dts/rk322x.dtsi
index cc6a27d..fe6530f 100644
--- a/arch/arm/boot/dts/rk322x.dtsi
+++ b/arch/arm/boot/dts/rk322x.dtsi
@@ -693,7 +693,7 @@
uart2 {
uart2_xfer: uart2-xfer {
- rockchip,pins = <1 18 RK_FUNC_2 &pcfg_pull_none>,
+ rockchip,pins = <1 18 RK_FUNC_2 &pcfg_pull_up>,
<1 19 RK_FUNC_2 &pcfg_pull_none>;
};
@@ -705,5 +705,12 @@
rockchip,pins = <0 24 RK_FUNC_1 &pcfg_pull_none>;
};
};
+
+ uart2-1 {
+ uart21_xfer: uart21-xfer {
+ rockchip,pins = <1 10 RK_FUNC_2 &pcfg_pull_up>,
+ <1 9 RK_FUNC_2 &pcfg_pull_none>;
+ };
+ };
};
};
--
2.0.0
next prev parent reply other threads:[~2017-05-17 9:52 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-17 9:52 [PATCH v2 0/3] add and fix some device node for rk322x SoC Frank Wang
2017-05-17 9:52 ` [PATCH v2 1/3] arm: dts: rk322x: fix i2s1 pinctrl error Frank Wang
2017-05-17 18:10 ` Heiko Stuebner
2017-05-17 9:52 ` Frank Wang [this message]
[not found] ` <1495014746-27621-3-git-send-email-frank.wang-TNX95d0MmH7DzftRWevZcw@public.gmane.org>
2017-05-17 18:26 ` [PATCH v2 2/3] arm: dts: rk322x: correct uart2 pinctrl and add another sets Heiko Stuebner
2017-05-17 9:52 ` [PATCH v2 3/3] arm: dts: rk322x: add watchdog device node Frank Wang
2017-05-17 17:33 ` Heiko Stuebner
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=1495014746-27621-3-git-send-email-frank.wang@rock-chips.com \
--to=frank.wang@rock-chips.com \
--cc=charles.chen@rock-chips.com \
--cc=cody.xie@rock-chips.com \
--cc=devicetree@vger.kernel.org \
--cc=ellisys@163.com \
--cc=heiko@sntech.de \
--cc=huangtao@rock-chips.com \
--cc=kevan.lan@rock-chips.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=linux@armlinux.org.uk \
--cc=linux@roeck-us.net \
--cc=mark.rutland@arm.com \
--cc=robh+dt@kernel.org \
--cc=sugar.zhang@rock-chips.com \
--cc=wim@iguana.be \
--cc=wmc@rock-chips.com \
/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).