0208-BCM270X_DT-Remove-explicit-claiming-of-UART-pins.patch 2.1 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374757677787980818283848586878889
  1. From a2f5eadfa43687957033e3ee56c945db0d8842ff 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. It is convenient to be able to map a different function to the UART
  6. pins (e.g. DPI for vga666) without having to disable the UART first.
  7. Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  8. ---
  9. arch/arm/boot/dts/bcm2710-rpi-3-b.dts | 6 +++---
  10. .../boot/dts/overlays/pi3-disable-bt-overlay.dts | 10 ++++-----
  11. .../boot/dts/overlays/pi3-miniuart-bt-overlay.dts | 25 +++++++++++-----------
  12. 3 files changed, 20 insertions(+), 21 deletions(-)
  13. --- a/arch/arm/boot/dts/bcm2710-rpi-3-b.dts
  14. +++ b/arch/arm/boot/dts/bcm2710-rpi-3-b.dts
  15. @@ -57,9 +57,9 @@
  16. };
  17. uart1_pins: uart1_pins {
  18. - brcm,pins = <14 15>;
  19. - brcm,function = <2>; /* alt5=UART1 */
  20. - brcm,pull = <0 2>;
  21. + brcm,pins;
  22. + brcm,function;
  23. + brcm,pull;
  24. };
  25. };
  26. --- a/arch/arm/boot/dts/overlays/pi3-disable-bt-overlay.dts
  27. +++ b/arch/arm/boot/dts/overlays/pi3-disable-bt-overlay.dts
  28. @@ -28,13 +28,11 @@
  29. };
  30. fragment@2 {
  31. - target = <&gpio>;
  32. + target = <&uart0_pins>;
  33. __overlay__ {
  34. - uart0_pins: uart0_pins {
  35. - brcm,pins = <14 15>;
  36. - brcm,function = <4>; /* alt0 */
  37. - brcm,pull = <0 2>;
  38. - };
  39. + brcm,pins;
  40. + brcm,function;
  41. + brcm,pull;
  42. };
  43. };
  44. --- a/arch/arm/boot/dts/overlays/pi3-miniuart-bt-overlay.dts
  45. +++ b/arch/arm/boot/dts/overlays/pi3-miniuart-bt-overlay.dts
  46. @@ -37,23 +37,24 @@
  47. };
  48. fragment@2 {
  49. - target = <&gpio>;
  50. + target = <&uart0_pins>;
  51. __overlay__ {
  52. - uart0_pins: uart0_pins {
  53. - brcm,pins = <14 15>;
  54. - brcm,function = <4>; /* alt0 */
  55. - brcm,pull = <0 2>;
  56. - };
  57. -
  58. - uart1_pins: uart1_pins {
  59. - brcm,pins = <32 33>;
  60. - brcm,function = <2>; /* alt5=UART1 */
  61. - brcm,pull = <0 2>;
  62. - };
  63. + brcm,pins;
  64. + brcm,function;
  65. + brcm,pull;
  66. };
  67. };
  68. fragment@3 {
  69. + target = <&uart1_pins>;
  70. + __overlay__ {
  71. + brcm,pins = <32 33>;
  72. + brcm,function = <2>; /* alt5=UART1 */
  73. + brcm,pull = <0 2>;
  74. + };
  75. + };
  76. +
  77. + fragment@4 {
  78. target-path = "/aliases";
  79. __overlay__ {
  80. serial0 = "/soc/uart@7e201000";