spacepaste

Paste details

reply | raw

  1.  
  2. diff --git a/arch/arm/boot/dts/sun8i-a83t-bananapi-m3.dts b/arch/arm/boot/dts/sun8i-a83t-bananapi-m3.dts
  3. index d966fe3e23ac..c15725414d22 100644
  4. --- a/arch/arm/boot/dts/sun8i-a83t-bananapi-m3.dts
  5. +++ b/arch/arm/boot/dts/sun8i-a83t-bananapi-m3.dts
  6. @@ -44,7 +44,6 @@
  8. /dts-v1/;
  9. #include "sun8i-a83t.dtsi"
  10. -
  11. #include <dt-bindings/gpio/gpio.h>
  13. / {
  14. @@ -80,6 +79,29 @@
  15. /* enables internal regulator and de-asserts reset */
  16. reset-gpios = <&r_pio 0 2 GPIO_ACTIVE_LOW>; /* PL2 WL-PMU-EN */
  17. };
  18. +
  19. +/*
  20. + reg_vcc3v0: vcc3v0 {
  21. + compatible = "regulator-fixed";
  22. + regulator-name = "vcc3v0";
  23. + regulator-min-microvolt = <3000000>;
  24. + regulator-max-microvolt = <3000000>;
  25. + };
  26. +*/
  27. + reg_vcc3v3: vcc3v3 {
  28. + compatible = "regulator-fixed";
  29. + regulator-name = "vcc3v3";
  30. + regulator-min-microvolt = <3300000>;
  31. + regulator-max-microvolt = <3300000>;
  32. + };
  33. +/*
  34. + reg_vcc5v0: vcc5v0 {
  35. + compatible = "regulator-fixed";
  36. + regulator-name = "vcc5v0";
  37. + regulator-min-microvolt = <5000000>;
  38. + regulator-max-microvolt = <5000000>;
  39. + };
  40. +*/
  41. };
  43. &crypto {
  44. @@ -96,11 +118,11 @@
  45. &emac {
  46. pinctrl-names = "default";
  47. pinctrl-0 = <&emac_rgmii_pins>;
  48. - phy-supply = <&reg_sw>;
  49. phy-handle = <&rgmii_phy>;
  50. phy-mode = "rgmii";
  51. allwinner,rx-delay-ps = <700>;
  52. allwinner,tx-delay-ps = <700>;
  53. +
  54. status = "okay";
  55. };
  57. @@ -114,35 +136,17 @@
  58. &mmc0 {
  59. pinctrl-names = "default";
  60. pinctrl-0 = <&mmc0_pins>;
  61. - vmmc-supply = <&reg_dcdc1>;
  62. + vmmc-supply = <&reg_vcc3v3>;
  63. bus-width = <4>;
  64. cd-gpios = <&pio 5 6 GPIO_ACTIVE_HIGH>; /* PF6 */
  65. cd-inverted;
  66. status = "okay";
  67. };
  69. -&mmc1 {
  70. - vmmc-supply = <&reg_dldo1>;
  71. - vqmmc-supply = <&reg_dldo1>;
  72. - mmc-pwrseq = <&wifi_pwrseq>;
  73. - bus-width = <4>;
  74. - non-removable;
  75. - status = "okay";
  76. -
  77. - brcmf: wifi@1 {
  78. - reg = <1>;
  79. - compatible = "brcm,bcm4329-fmac";
  80. - interrupt-parent = <&r_pio>;
  81. - interrupts = <0 3 IRQ_TYPE_LEVEL_LOW>;
  82. - interrupt-names = "host-wake";
  83. - };
  84. -};
  85. -
  86. &mmc2 {
  87. pinctrl-names = "default";
  88. pinctrl-0 = <&mmc2_8bit_emmc_pins>;
  89. - vmmc-supply = <&reg_dcdc1>;
  90. - vqmmc-supply = <&reg_dcdc1>;
  91. + vmmc-supply = <&reg_vcc3v3>;
  92. bus-width = <8>;
  93. non-removable;
  94. cap-mmc-hw-reset;
  95. @@ -157,10 +161,6 @@
  96. reg = <0x3a3>;
  97. interrupt-parent = <&r_intc>;
  98. interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
  99. - eldoin-supply = <&reg_dcdc1>;
  100. - fldoin-supply = <&reg_dcdc5>;
  101. - swin-supply = <&reg_dcdc1>;
  102. - x-powers,drive-vbus-en;
  103. };
  105. ac100: codec@e89 {
  106. @@ -188,128 +188,11 @@
  107. };
  108. };
  110. -#include "axp81x.dtsi"
  111. -
  112. -&reg_aldo1 {
  113. - regulator-always-on;
  114. - regulator-min-microvolt = <1800000>;
  115. - regulator-max-microvolt = <1800000>;
  116. - regulator-name = "vcc-1v8";
  117. -};
  118. -
  119. -&reg_aldo2 {
  120. - regulator-always-on;
  121. - regulator-min-microvolt = <1800000>;
  122. - regulator-max-microvolt = <1800000>;
  123. - regulator-name = "dram-pll";
  124. -};
  125. -
  126. -&reg_aldo3 {
  127. - regulator-always-on;
  128. - regulator-min-microvolt = <3000000>;
  129. - regulator-max-microvolt = <3000000>;
  130. - regulator-name = "avcc";
  131. -};
  132. -
  133. -&reg_dcdc1 {
  134. - /* schematics says 3.1V but FEX file says 3.3V */
  135. - regulator-always-on;
  136. - regulator-min-microvolt = <3300000>;
  137. - regulator-max-microvolt = <3300000>;
  138. - regulator-name = "vcc-3v3";
  139. -};
  140. -
  141. -&reg_dcdc2 {
  142. - regulator-always-on;
  143. - regulator-min-microvolt = <700000>;
  144. - regulator-max-microvolt = <1100000>;
  145. - regulator-name = "vdd-cpua";
  146. -};
  147. -
  148. -&reg_dcdc3 {
  149. - regulator-always-on;
  150. - regulator-min-microvolt = <700000>;
  151. - regulator-max-microvolt = <1100000>;
  152. - regulator-name = "vdd-cpub";
  153. -};
  154. -
  155. -&reg_dcdc4 {
  156. - regulator-min-microvolt = <700000>;
  157. - regulator-max-microvolt = <1100000>;
  158. - regulator-name = "vdd-gpu";
  159. -};
  160. -
  161. -&reg_dcdc5 {
  162. - regulator-always-on;
  163. - regulator-min-microvolt = <1200000>;
  164. - regulator-max-microvolt = <1200000>;
  165. - regulator-name = "vcc-dram";
  166. -};
  167. -
  168. -&reg_dcdc6 {
  169. - regulator-always-on;
  170. - regulator-min-microvolt = <900000>;
  171. - regulator-max-microvolt = <900000>;
  172. - regulator-name = "vdd-sys";
  173. -};
  174. -
  175. -&reg_dldo1 {
  176. - /*
  177. - * This powers both the WiFi/BT module's main power, I/O supply,
  178. - * and external pull-ups on all the data lines. It should be set
  179. - * to the same voltage as the I/O supply (DCDC1 in this case) to
  180. - * avoid any leakage or mismatch.
  181. - */
  182. - regulator-min-microvolt = <3300000>;
  183. - regulator-max-microvolt = <3300000>;
  184. - regulator-name = "vcc-wifi";
  185. -};
  186. -
  187. -&reg_dldo3 {
  188. - regulator-always-on;
  189. - regulator-min-microvolt = <2500000>;
  190. - regulator-max-microvolt = <2500000>;
  191. - regulator-name = "vcc-pd";
  192. -};
  193. -
  194. -&reg_drivevbus {
  195. - regulator-name = "usb0-vbus";
  196. +&reg_usb1_vbus {
  197. + gpio = <&pio 3 24 GPIO_ACTIVE_HIGH>; /* PD24 */
  198. status = "okay";
  199. };
  201. -&reg_fldo1 {
  202. - regulator-min-microvolt = <1080000>;
  203. - regulator-max-microvolt = <1320000>;
  204. - regulator-name = "vdd12-hsic";
  205. -};
  206. -
  207. -&reg_fldo2 {
  208. - /*
  209. - * Despite the embedded CPUs core not being used in any way,
  210. - * this must remain on or the system will hang.
  211. - */
  212. - regulator-always-on;
  213. - regulator-min-microvolt = <700000>;
  214. - regulator-max-microvolt = <1100000>;
  215. - regulator-name = "vdd-cpus";
  216. -};
  217. -
  218. -&reg_rtc_ldo {
  219. - regulator-name = "vcc-rtc";
  220. -};
  221. -
  222. -&reg_sw {
  223. - /*
  224. - * The PHY requires 20ms after all voltages
  225. - * are applied until core logic is ready and
  226. - * 30ms after the reset pin is de-asserted.
  227. - * Set a 100ms delay to account for PMIC
  228. - * ramp time and board traces.
  229. - */
  230. - regulator-enable-ramp-delay = <100000>;
  231. - regulator-name = "vcc-ephy";
  232. -};
  233. -
  234. &uart0 {
  235. pinctrl-names = "default";
  236. pinctrl-0 = <&uart0_pb_pins>;
  237.  
Powered by spacepaste. Paste removal.