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