047-0018-ARM-dts-BCM5301X-Specify-serial-console-params-in-dt.patch 3.7 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161
  1. From 5be82d0475941dc96eeeee3c754baf48365f7bf5 Mon Sep 17 00:00:00 2001
  2. From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
  3. Date: Wed, 15 Mar 2017 18:03:27 +0100
  4. Subject: [PATCH] ARM: dts: BCM5301X: Specify serial console params in dtsi
  5. files
  6. MIME-Version: 1.0
  7. Content-Type: text/plain; charset=UTF-8
  8. Content-Transfer-Encoding: 8bit
  9. So far every Northstar device we have seen was using the same serial
  10. console params (115200n8). It probably make the most sense to put it in
  11. some proper dtsi files instead of repeating over and over for every
  12. single device. As different boards may use different bootloaders it
  13. seems the safest idea is to use board specific dtsi files.
  14. Just in case some vendor decides to use different UART (parameters) this
  15. can be always easily overwritten.
  16. Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
  17. Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
  18. ---
  19. arch/arm/boot/dts/bcm4708.dtsi | 8 ++++++++
  20. arch/arm/boot/dts/bcm47081.dtsi | 8 ++++++++
  21. arch/arm/boot/dts/bcm5301x.dtsi | 4 ----
  22. arch/arm/boot/dts/bcm94708.dts | 8 --------
  23. arch/arm/boot/dts/bcm94709.dts | 8 --------
  24. arch/arm/boot/dts/bcm953012er.dts | 8 --------
  25. arch/arm/boot/dts/bcm953012hr.dts | 5 -----
  26. arch/arm/boot/dts/bcm953012k.dts | 4 ----
  27. 8 files changed, 16 insertions(+), 37 deletions(-)
  28. --- a/arch/arm/boot/dts/bcm4708.dtsi
  29. +++ b/arch/arm/boot/dts/bcm4708.dtsi
  30. @@ -12,6 +12,14 @@
  31. / {
  32. compatible = "brcm,bcm4708";
  33. + aliases {
  34. + serial0 = &uart0;
  35. + };
  36. +
  37. + chosen {
  38. + stdout-path = "serial0:115200n8";
  39. + };
  40. +
  41. cpus {
  42. #address-cells = <1>;
  43. #size-cells = <0>;
  44. --- a/arch/arm/boot/dts/bcm47081.dtsi
  45. +++ b/arch/arm/boot/dts/bcm47081.dtsi
  46. @@ -22,6 +22,14 @@
  47. / {
  48. compatible = "brcm,bcm47081";
  49. + aliases {
  50. + serial0 = &uart0;
  51. + };
  52. +
  53. + chosen {
  54. + stdout-path = "serial0:115200n8";
  55. + };
  56. +
  57. cpus {
  58. #address-cells = <1>;
  59. #size-cells = <0>;
  60. --- a/arch/arm/boot/dts/bcm5301x.dtsi
  61. +++ b/arch/arm/boot/dts/bcm5301x.dtsi
  62. @@ -18,10 +18,6 @@
  63. / {
  64. interrupt-parent = <&gic>;
  65. - chosen {
  66. - stdout-path = &uart0;
  67. - };
  68. -
  69. chipcommonA {
  70. compatible = "simple-bus";
  71. ranges = <0x00000000 0x18000000 0x00001000>;
  72. --- a/arch/arm/boot/dts/bcm94708.dts
  73. +++ b/arch/arm/boot/dts/bcm94708.dts
  74. @@ -38,14 +38,6 @@
  75. model = "NorthStar SVK (BCM94708)";
  76. compatible = "brcm,bcm94708", "brcm,bcm4708";
  77. - aliases {
  78. - serial0 = &uart0;
  79. - };
  80. -
  81. - chosen {
  82. - stdout-path = "serial0:115200n8";
  83. - };
  84. -
  85. memory {
  86. reg = <0x00000000 0x08000000>;
  87. };
  88. --- a/arch/arm/boot/dts/bcm94709.dts
  89. +++ b/arch/arm/boot/dts/bcm94709.dts
  90. @@ -38,14 +38,6 @@
  91. model = "NorthStar SVK (BCM94709)";
  92. compatible = "brcm,bcm94709", "brcm,bcm4709", "brcm,bcm4708";
  93. - aliases {
  94. - serial0 = &uart0;
  95. - };
  96. -
  97. - chosen {
  98. - stdout-path = "serial0:115200n8";
  99. - };
  100. -
  101. memory {
  102. reg = <0x00000000 0x08000000>;
  103. };
  104. --- a/arch/arm/boot/dts/bcm953012er.dts
  105. +++ b/arch/arm/boot/dts/bcm953012er.dts
  106. @@ -39,14 +39,6 @@
  107. model = "NorthStar Enterprise Router (BCM953012ER)";
  108. compatible = "brcm,bcm953012er", "brcm,brcm53012", "brcm,bcm4708";
  109. - aliases {
  110. - serial0 = &uart0;
  111. - };
  112. -
  113. - chosen {
  114. - stdout-path = "serial0:115200n8";
  115. - };
  116. -
  117. memory {
  118. reg = <0x00000000 0x8000000>;
  119. };
  120. --- a/arch/arm/boot/dts/bcm953012hr.dts
  121. +++ b/arch/arm/boot/dts/bcm953012hr.dts
  122. @@ -40,16 +40,11 @@
  123. compatible = "brcm,bcm953012hr", "brcm,brcm53012", "brcm,bcm4708";
  124. aliases {
  125. - serial0 = &uart0;
  126. ethernet0 = &gmac0;
  127. ethernet1 = &gmac1;
  128. ethernet2 = &gmac2;
  129. };
  130. - chosen {
  131. - stdout-path = "serial0:115200n8";
  132. - };
  133. -
  134. memory@80000000 {
  135. reg = <0x80000000 0x10000000>;
  136. };
  137. --- a/arch/arm/boot/dts/bcm953012k.dts
  138. +++ b/arch/arm/boot/dts/bcm953012k.dts
  139. @@ -43,10 +43,6 @@
  140. serial1 = &uart1;
  141. };
  142. - chosen {
  143. - stdout-path = "serial0:115200n8";
  144. - };
  145. -
  146. memory {
  147. reg = <0x00000000 0x10000000>;
  148. };