Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9883ed44 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'sunxi-fixes-for-4.9' of... 

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: default avatarOlof Johansson <olof@lixom.net>
parents c28aedec b7f865ed

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

+4 −0
Original line number Original line Diff line number Diff line
@@ -282,11 +282,15 @@ 
			uart1_pins_a: uart1@0 {

			uart1_pins_a: uart1@0 {

				allwinner,pins = "PG6", "PG7";

				allwinner,pins = "PG6", "PG7";

				allwinner,function = "uart1";

				allwinner,function = "uart1";

				allwinner,drive = <SUN4I_PINCTRL_10_MA>;

				allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;

			};

			};





			uart1_pins_cts_rts_a: uart1-cts-rts@0 {

			uart1_pins_cts_rts_a: uart1-cts-rts@0 {

				allwinner,pins = "PG8", "PG9";

				allwinner,pins = "PG8", "PG9";

				allwinner,function = "uart1";

				allwinner,function = "uart1";

				allwinner,drive = <SUN4I_PINCTRL_10_MA>;

				allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;

			};

			};





			mmc0_pins_a: mmc0@0 {

			mmc0_pins_a: mmc0@0 {