046-0001-ARM-BCM5301X-Enable-UART-by-default-for-BCM4708-1-BC.patch 5.8 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269
  1. From 2b354a7c56f375ba414b9b9c96f160f5749e5e64 Mon Sep 17 00:00:00 2001
  2. From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
  3. Date: Thu, 1 Dec 2016 18:40:51 +0100
  4. Subject: [PATCH 1/6] ARM: BCM5301X: Enable UART by default for BCM4708(1),
  5. BCM4709(4) & BCM53012
  6. MIME-Version: 1.0
  7. Content-Type: text/plain; charset=UTF-8
  8. Content-Transfer-Encoding: 8bit
  9. Every device tested so far got UART0 (at 0x18000300) working as serial
  10. console. It's most likely part of reference design and all vendors use
  11. it that way.
  12. It seems to be easier to enable it by default and just disable it if we
  13. ever see a device with different hardware design.
  14. Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
  15. Acked-by: Jon Mason <jon.mason@broadcom.com>
  16. Acked-by: Hauke Mehrtens <hauke@hauke-m.de>
  17. Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
  18. ---
  19. arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts | 4 ----
  20. arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts | 4 ----
  21. arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts | 4 ----
  22. arch/arm/boot/dts/bcm4708-netgear-r6250.dts | 4 ----
  23. arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts | 4 ----
  24. arch/arm/boot/dts/bcm4708.dtsi | 4 ++++
  25. arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts | 4 ----
  26. arch/arm/boot/dts/bcm47081.dtsi | 4 ++++
  27. arch/arm/boot/dts/bcm4709-netgear-r7000.dts | 4 ----
  28. arch/arm/boot/dts/bcm4709-netgear-r8000.dts | 4 ----
  29. arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts | 4 ----
  30. arch/arm/boot/dts/bcm4709.dtsi | 1 +
  31. arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts | 4 ----
  32. arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts | 4 ----
  33. arch/arm/boot/dts/bcm47094-netgear-r8500.dts | 4 ----
  34. arch/arm/boot/dts/bcm47094.dtsi | 1 +
  35. arch/arm/boot/dts/bcm94708.dts | 4 ----
  36. arch/arm/boot/dts/bcm94709.dts | 4 ----
  37. arch/arm/boot/dts/bcm953012er.dts | 4 ----
  38. arch/arm/boot/dts/bcm953012k.dts | 1 -
  39. 20 files changed, 10 insertions(+), 61 deletions(-)
  40. --- a/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts
  41. +++ b/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts
  42. @@ -136,10 +136,6 @@
  43. };
  44. };
  45. -&uart0 {
  46. - status = "okay";
  47. -};
  48. -
  49. &usb2 {
  50. vcc-gpio = <&chipcommon 9 GPIO_ACTIVE_HIGH>;
  51. };
  52. --- a/arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts
  53. +++ b/arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts
  54. @@ -55,10 +55,6 @@
  55. };
  56. };
  57. -&uart0 {
  58. - status = "okay";
  59. -};
  60. -
  61. &spi_nor {
  62. status = "okay";
  63. };
  64. --- a/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts
  65. +++ b/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts
  66. @@ -56,10 +56,6 @@
  67. };
  68. };
  69. -&uart0 {
  70. - status = "okay";
  71. -};
  72. -
  73. &spi_nor {
  74. status = "okay";
  75. };
  76. --- a/arch/arm/boot/dts/bcm4708-netgear-r6250.dts
  77. +++ b/arch/arm/boot/dts/bcm4708-netgear-r6250.dts
  78. @@ -83,10 +83,6 @@
  79. };
  80. };
  81. -&uart0 {
  82. - status = "okay";
  83. -};
  84. -
  85. &usb3 {
  86. vcc-gpio = <&chipcommon 0 GPIO_ACTIVE_HIGH>;
  87. };
  88. --- a/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts
  89. +++ b/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts
  90. @@ -119,10 +119,6 @@
  91. };
  92. };
  93. -&uart0 {
  94. - status = "okay";
  95. -};
  96. -
  97. &spi_nor {
  98. status = "okay";
  99. };
  100. --- a/arch/arm/boot/dts/bcm4708.dtsi
  101. +++ b/arch/arm/boot/dts/bcm4708.dtsi
  102. @@ -34,3 +34,7 @@
  103. };
  104. };
  105. +
  106. +&uart0 {
  107. + status = "okay";
  108. +};
  109. --- a/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
  110. +++ b/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
  111. @@ -122,7 +122,3 @@
  112. };
  113. };
  114. };
  115. -
  116. -&uart0 {
  117. - status = "okay";
  118. -};
  119. --- a/arch/arm/boot/dts/bcm47081.dtsi
  120. +++ b/arch/arm/boot/dts/bcm47081.dtsi
  121. @@ -24,3 +24,7 @@
  122. };
  123. };
  124. };
  125. +
  126. +&uart0 {
  127. + status = "okay";
  128. +};
  129. --- a/arch/arm/boot/dts/bcm4709-netgear-r7000.dts
  130. +++ b/arch/arm/boot/dts/bcm4709-netgear-r7000.dts
  131. @@ -100,7 +100,3 @@
  132. };
  133. };
  134. };
  135. -
  136. -&uart0 {
  137. - status = "okay";
  138. -};
  139. --- a/arch/arm/boot/dts/bcm4709-netgear-r8000.dts
  140. +++ b/arch/arm/boot/dts/bcm4709-netgear-r8000.dts
  141. @@ -107,10 +107,6 @@
  142. };
  143. };
  144. -&uart0 {
  145. - status = "okay";
  146. -};
  147. -
  148. &usb2 {
  149. vcc-gpio = <&chipcommon 0 GPIO_ACTIVE_HIGH>;
  150. };
  151. --- a/arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts
  152. +++ b/arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts
  153. @@ -97,10 +97,6 @@
  154. };
  155. };
  156. -&uart0 {
  157. - status = "okay";
  158. -};
  159. -
  160. &usb2 {
  161. vcc-gpio = <&chipcommon 13 GPIO_ACTIVE_HIGH>;
  162. };
  163. --- a/arch/arm/boot/dts/bcm4709.dtsi
  164. +++ b/arch/arm/boot/dts/bcm4709.dtsi
  165. @@ -8,4 +8,5 @@
  166. &uart0 {
  167. clock-frequency = <125000000>;
  168. + status = "okay";
  169. };
  170. --- a/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts
  171. +++ b/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts
  172. @@ -105,10 +105,6 @@
  173. };
  174. };
  175. -&uart0 {
  176. - status = "okay";
  177. -};
  178. -
  179. &usb3 {
  180. vcc-gpio = <&chipcommon 18 GPIO_ACTIVE_HIGH>;
  181. };
  182. --- a/arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts
  183. +++ b/arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts
  184. @@ -98,10 +98,6 @@
  185. };
  186. };
  187. -&uart0 {
  188. - status = "okay";
  189. -};
  190. -
  191. &usb3 {
  192. vcc-gpio = <&chipcommon 18 GPIO_ACTIVE_HIGH>;
  193. };
  194. --- a/arch/arm/boot/dts/bcm47094-netgear-r8500.dts
  195. +++ b/arch/arm/boot/dts/bcm47094-netgear-r8500.dts
  196. @@ -97,7 +97,3 @@
  197. };
  198. };
  199. };
  200. -
  201. -&uart0 {
  202. - status = "okay";
  203. -};
  204. --- a/arch/arm/boot/dts/bcm47094.dtsi
  205. +++ b/arch/arm/boot/dts/bcm47094.dtsi
  206. @@ -14,4 +14,5 @@
  207. &uart0 {
  208. clock-frequency = <125000000>;
  209. + status = "okay";
  210. };
  211. --- a/arch/arm/boot/dts/bcm94708.dts
  212. +++ b/arch/arm/boot/dts/bcm94708.dts
  213. @@ -50,7 +50,3 @@
  214. reg = <0x00000000 0x08000000>;
  215. };
  216. };
  217. -
  218. -&uart0 {
  219. - status = "okay";
  220. -};
  221. --- a/arch/arm/boot/dts/bcm94709.dts
  222. +++ b/arch/arm/boot/dts/bcm94709.dts
  223. @@ -50,7 +50,3 @@
  224. reg = <0x00000000 0x08000000>;
  225. };
  226. };
  227. -
  228. -&uart0 {
  229. - status = "okay";
  230. -};
  231. --- a/arch/arm/boot/dts/bcm953012er.dts
  232. +++ b/arch/arm/boot/dts/bcm953012er.dts
  233. @@ -70,10 +70,6 @@
  234. };
  235. };
  236. -&uart0 {
  237. - status = "okay";
  238. -};
  239. -
  240. &spi_nor {
  241. status = "okay";
  242. };
  243. --- a/arch/arm/boot/dts/bcm953012k.dts
  244. +++ b/arch/arm/boot/dts/bcm953012k.dts
  245. @@ -54,7 +54,6 @@
  246. &uart0 {
  247. clock-frequency = <62499840>;
  248. - status = "okay";
  249. };
  250. &uart1 {