kernel: bump 5.4 to 5.4.48
[oweals/openwrt.git] / target / linux / bcm27xx / patches-5.4 / 950-0347-overlays-Remove-hack-from-uart0-overlay.patch
1 From d24bb9c4b5d3b0bb2bd5dd922bae3fce894ab87e Mon Sep 17 00:00:00 2001
2 From: Phil Elwell <phil@raspberrypi.org>
3 Date: Tue, 1 Oct 2019 10:19:50 +0100
4 Subject: [PATCH] overlays: Remove hack from uart0 overlay
5
6 The uart0 overlay contained a hack to return GPIOs 14 and 15 to inputs
7 when the UART0 function was moved to alternative pins. This has the
8 unwanted side effect of claiming GPIOs 14 & 15, preventing them being
9 used for something else.
10
11 See: https://github.com/raspberrypi/linux/issues/2856
12      https://www.raspberrypi.org/forums/viewtopic.php?f=98&t=252911
13
14 Signed-off-by: Stefan Enge <stefan.enge@escatec.com>
15 Signed-off-by: Phil Elwell <phil@raspberrypi.org>
16 ---
17  arch/arm/boot/dts/overlays/uart0-overlay.dts | 13 ++++++-------
18  1 file changed, 6 insertions(+), 7 deletions(-)
19
20 --- a/arch/arm/boot/dts/overlays/uart0-overlay.dts
21 +++ b/arch/arm/boot/dts/overlays/uart0-overlay.dts
22 @@ -17,17 +17,16 @@
23                 target = <&gpio>;
24                 __overlay__ {
25                         uart0_pins: uart0_pins {
26 -                               brcm,pins = <14 15 14 15>;
27 -                               brcm,function = <0 0 4 4>; /* alt0 */
28 -                               brcm,pull = <0 0 0 2>;
29 +                               brcm,pins = <14 15>;
30 +                               brcm,function = <4>; /* alt0 */
31 +                               brcm,pull = <0 2>;
32                         };
33                 };
34         };
35  
36         __overrides__ {
37 -               txd0_pin = <&uart0_pins>,"brcm,pins:8";
38 -               rxd0_pin = <&uart0_pins>,"brcm,pins:12";
39 -               pin_func = <&uart0_pins>,"brcm,function:8",
40 -                          <&uart0_pins>,"brcm,function:12";
41 +               txd0_pin = <&uart0_pins>,"brcm,pins:0";
42 +               rxd0_pin = <&uart0_pins>,"brcm,pins:4";
43 +               pin_func = <&uart0_pins>,"brcm,function:0";
44         };
45  };