| Message ID | 1495014746-27621-3-git-send-email-frank.wang@rock-chips.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Am Mittwoch, 17. Mai 2017, 17:52:25 CEST schrieb Frank Wang: > 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> I've split that into 2 patches: - pull-up fix - addition of alternative pinctrl (also moved the uart21-xfer into the uart2 group directly below the uart2-xfer pinctrl) I've fixed up the subject in both (ARM: dts: rockchip:) and applied everything for 4.13 Heiko
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>; + }; + }; }; };
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(-)