From mboxrd@z Thu Jan 1 00:00:00 1970 From: frank.wang@rock-chips.com (Frank Wang) Date: Wed, 17 May 2017 11:40:50 +0800 Subject: [PATCH 2/3] arm: dts: rk322x: correct uart2 pinctrl and add another sets In-Reply-To: <1494992451-32542-1-git-send-email-frank.wang@rock-chips.com> References: <1494992451-32542-1-git-send-email-frank.wang@rock-chips.com> Message-ID: <1494992451-32542-3-git-send-email-frank.wang@rock-chips.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Correct UART2 PINCTRL flag and add another PINCTRL sets for UART2 in case of confict with SDMMC. Signed-off-by: Frank Wang --- arch/arm/boot/dts/rk322x.dtsi | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/rk322x.dtsi b/arch/arm/boot/dts/rk322x.dtsi index cc6a27d..ea1239a 100644 --- a/arch/arm/boot/dts/rk322x.dtsi +++ b/arch/arm/boot/dts/rk322x.dtsi @@ -222,7 +222,7 @@ clocks = <&cru SCLK_UART2>, <&cru PCLK_UART2>; clock-names = "baudclk", "apb_pclk"; pinctrl-names = "default"; - pinctrl-0 = <&uart2_xfer>; + pinctrl-0 = <&uart21_xfer>; reg-shift = <2>; reg-io-width = <4>; status = "disabled"; @@ -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