brcm2708: update linux 4.4 patches to latest version
[openwrt/openwrt.git] / target / linux / brcm2708 / patches-4.4 / 0208-BCM270X_DT-Remove-explicit-claiming-of-UART-pins.patch
1 From 678f08c4c3fd62b5e3cd95cc9596733354b2ba19 Mon Sep 17 00:00:00 2001
2 From: Phil Elwell <phil@raspberrypi.org>
3 Date: Sat, 19 Mar 2016 16:51:37 +0000
4 Subject: [PATCH] BCM270X_DT: Remove explicit claiming of UART pins
5
6 It is convenient to be able to map a different function to the UART
7 pins (e.g. DPI for vga666) without having to disable the UART first.
8
9 Signed-off-by: Phil Elwell <phil@raspberrypi.org>
10 ---
11 arch/arm/boot/dts/bcm2710-rpi-3-b.dts | 6 +++---
12 .../boot/dts/overlays/pi3-disable-bt-overlay.dts | 10 ++++-----
13 .../boot/dts/overlays/pi3-miniuart-bt-overlay.dts | 25 +++++++++++-----------
14 3 files changed, 20 insertions(+), 21 deletions(-)
15
16 --- a/arch/arm/boot/dts/bcm2710-rpi-3-b.dts
17 +++ b/arch/arm/boot/dts/bcm2710-rpi-3-b.dts
18 @@ -57,9 +57,9 @@
19 };
20
21 uart1_pins: uart1_pins {
22 - brcm,pins = <14 15>;
23 - brcm,function = <2>; /* alt5=UART1 */
24 - brcm,pull = <0 2>;
25 + brcm,pins;
26 + brcm,function;
27 + brcm,pull;
28 };
29 };
30
31 --- a/arch/arm/boot/dts/overlays/pi3-disable-bt-overlay.dts
32 +++ b/arch/arm/boot/dts/overlays/pi3-disable-bt-overlay.dts
33 @@ -28,13 +28,11 @@
34 };
35
36 fragment@2 {
37 - target = <&gpio>;
38 + target = <&uart0_pins>;
39 __overlay__ {
40 - uart0_pins: uart0_pins {
41 - brcm,pins = <14 15>;
42 - brcm,function = <4>; /* alt0 */
43 - brcm,pull = <0 2>;
44 - };
45 + brcm,pins;
46 + brcm,function;
47 + brcm,pull;
48 };
49 };
50
51 --- a/arch/arm/boot/dts/overlays/pi3-miniuart-bt-overlay.dts
52 +++ b/arch/arm/boot/dts/overlays/pi3-miniuart-bt-overlay.dts
53 @@ -37,23 +37,24 @@
54 };
55
56 fragment@2 {
57 - target = <&gpio>;
58 + target = <&uart0_pins>;
59 __overlay__ {
60 - uart0_pins: uart0_pins {
61 - brcm,pins = <14 15>;
62 - brcm,function = <4>; /* alt0 */
63 - brcm,pull = <0 2>;
64 - };
65 -
66 - uart1_pins: uart1_pins {
67 - brcm,pins = <32 33>;
68 - brcm,function = <2>; /* alt5=UART1 */
69 - brcm,pull = <0 2>;
70 - };
71 + brcm,pins;
72 + brcm,function;
73 + brcm,pull;
74 };
75 };
76
77 fragment@3 {
78 + target = <&uart1_pins>;
79 + __overlay__ {
80 + brcm,pins = <32 33>;
81 + brcm,function = <2>; /* alt5=UART1 */
82 + brcm,pull = <0 2>;
83 + };
84 + };
85 +
86 + fragment@4 {
87 target-path = "/aliases";
88 __overlay__ {
89 serial0 = "/soc/uart@7e201000";