Skip to content

Commit 9883ed4

Browse files
committed
Merge tag 'sunxi-fixes-for-4.9' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into fixes
Allwinner fixes for 4.9 A fix to reintroduce missing pinmux options that turned out not to be optional. * tag 'sunxi-fixes-for-4.9' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux: ARM: dts: sun8i: fix the pinmux for UART1 Signed-off-by: Olof Johansson <[email protected]>
2 parents c28aede + b7f865e commit 9883ed4

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

arch/arm/boot/dts/sun8i-a23-a33.dtsi

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -282,11 +282,15 @@
282282
uart1_pins_a: uart1@0 {
283283
allwinner,pins = "PG6", "PG7";
284284
allwinner,function = "uart1";
285+
allwinner,drive = <SUN4I_PINCTRL_10_MA>;
286+
allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
285287
};
286288

287289
uart1_pins_cts_rts_a: uart1-cts-rts@0 {
288290
allwinner,pins = "PG8", "PG9";
289291
allwinner,function = "uart1";
292+
allwinner,drive = <SUN4I_PINCTRL_10_MA>;
293+
allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
290294
};
291295

292296
mmc0_pins_a: mmc0@0 {

0 commit comments

Comments
 (0)