API tools faq
paste
Advertisement
Guest User

Untitled

a guest
May 12th, 2021
190
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 5.88 KB | None | 0 0
raw download clone embed print report
  1. diff -Naur u-boot-sunxi-647b392bf20614006917d5fcd3390347a668eee5-old/arch/arm/dts/Makefile u-boot-sunxi-647b392bf20614006917d5fcd3390347a668eee5-new/arch/arm/dts/Makefile
  2. --- u-boot-sunxi-647b392bf20614006917d5fcd3390347a668eee5-old/arch/arm/dts/Makefile 2021-04-26 11:12:35.000000000 +0200
  3. +++ u-boot-sunxi-647b392bf20614006917d5fcd3390347a668eee5-new/arch/arm/dts/Makefile 2021-05-11 21:07:30.613333253 +0200
  4. @@ -622,7 +622,8 @@
  5. sun50i-h6-pine-h64.dtb \
  6. sun50i-h6-tanix-tx6.dtb
  7. dtb-$(CONFIG_MACH_SUN50I_H616) += \
  8. - sun50i-h616-orangepi-zero2.dtb
  9. + sun50i-h616-orangepi-zero2.dtb \
  10. + sun50i-h616-tanix-tx6s.dtb
  11. dtb-$(CONFIG_MACH_SUN50I) += \
  12. sun50i-a64-amarula-relic.dtb \
  13. sun50i-a64-bananapi-m64.dtb \
  14. diff -Naur u-boot-sunxi-647b392bf20614006917d5fcd3390347a668eee5-old/arch/arm/dts/sun50i-h616-tanix-tx6s.dts u-boot-sunxi-647b392bf20614006917d5fcd3390347a668eee5-new/arch/arm/dts/sun50i-h616-tanix-tx6s.dts
  15. --- u-boot-sunxi-647b392bf20614006917d5fcd3390347a668eee5-old/arch/arm/dts/sun50i-h616-tanix-tx6s.dts 1970-01-01 01:00:00.000000000 +0100
  16. +++ u-boot-sunxi-647b392bf20614006917d5fcd3390347a668eee5-new/arch/arm/dts/sun50i-h616-tanix-tx6s.dts 2021-05-11 20:52:30.906666606 +0200
  17. @@ -0,0 +1,189 @@
  18. +// SPDX-License-Identifier: (GPL-2.0+ or MIT)
  19. +/*
  20. + * Copyright (C) 2021 Arm Ltd.
  21. + */
  22. +
  23. +/dts-v1/;
  24. +
  25. +#include "sun50i-h616.dtsi"
  26. +
  27. +#include <dt-bindings/gpio/gpio.h>
  28. +#include <dt-bindings/interrupt-controller/arm-gic.h>
  29. +#include <dt-bindings/leds/common.h>
  30. +
  31. +/ {
  32. + model = "Tanix TX6s";
  33. + compatible = "tanix,tx6s", "allwinner,sun50i-h616";
  34. +
  35. + aliases {
  36. + serial0 = &uart0;
  37. + };
  38. +
  39. + chosen {
  40. + stdout-path = "serial0:115200n8";
  41. + };
  42. +
  43. + reg_vcc5v: vcc5v {
  44. + /* board wide 5V supply directly from the DC input */
  45. + compatible = "regulator-fixed";
  46. + regulator-name = "vcc-5v";
  47. + regulator-min-microvolt = <5000000>;
  48. + regulator-max-microvolt = <5000000>;
  49. + regulator-always-on;
  50. + };
  51. +};
  52. +
  53. +&ehci0 {
  54. + status = "okay";
  55. +};
  56. +
  57. +&ehci2 {
  58. + status = "okay";
  59. +};
  60. +
  61. +&ir {
  62. + status = "okay";
  63. +};
  64. +
  65. +&mmc1 {
  66. + vmmc-supply = <&reg_dcdce>;
  67. + cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; /* PF6 */
  68. + bus-width = <4>;
  69. + status = "okay";
  70. +};
  71. +
  72. +&ohci0 {
  73. + status = "okay";
  74. +};
  75. +
  76. +&ohci2 {
  77. + status = "okay";
  78. +};
  79. +
  80. +&r_rsb {
  81. + status = "okay";
  82. +
  83. + axp305: pmic@745 {
  84. + compatible = "x-powers,axp305", "x-powers,axp805",
  85. + "x-powers,axp806";
  86. + interrupt-controller;
  87. + #interrupt-cells = <1>;
  88. + reg = <0x745>;
  89. +
  90. + x-powers,self-working-mode;
  91. + vina-supply = <&reg_vcc5v>;
  92. + vinb-supply = <&reg_vcc5v>;
  93. + vinc-supply = <&reg_vcc5v>;
  94. + vind-supply = <&reg_vcc5v>;
  95. + vine-supply = <&reg_vcc5v>;
  96. + aldoin-supply = <&reg_vcc5v>;
  97. + bldoin-supply = <&reg_vcc5v>;
  98. + cldoin-supply = <&reg_vcc5v>;
  99. +
  100. + regulators {
  101. + reg_aldo1: aldo1 {
  102. + regulator-always-on;
  103. + regulator-min-microvolt = <3300000>;
  104. + regulator-max-microvolt = <3300000>;
  105. + regulator-name = "vcc-sys";
  106. + };
  107. +
  108. + reg_aldo2: aldo2 {
  109. + regulator-min-microvolt = <3300000>;
  110. + regulator-max-microvolt = <3300000>;
  111. + regulator-name = "vcc3v3-ext";
  112. + status = "disabled";
  113. + };
  114. +
  115. + reg_aldo3: aldo3 {
  116. + regulator-min-microvolt = <3300000>;
  117. + regulator-max-microvolt = <3300000>;
  118. + regulator-name = "vcc3v3-ext2";
  119. + status = "disabled";
  120. + };
  121. +
  122. + reg_bldo1: bldo1 {
  123. + regulator-always-on;
  124. + regulator-min-microvolt = <1800000>;
  125. + regulator-max-microvolt = <1800000>;
  126. + regulator-name = "vcc1v8";
  127. + };
  128. +
  129. + reg_bldo2: bldo2 {
  130. + regulator-min-microvolt = <1800000>;
  131. + regulator-max-microvolt = <1800000>;
  132. + regulator-name = "vcc1v8-2";
  133. + status = "disabled";
  134. + };
  135. +
  136. + bldo3 {
  137. + /* unused */
  138. + };
  139. +
  140. + bldo4 {
  141. + /* unused */
  142. + };
  143. +
  144. + cldo1 {
  145. + regulator-min-microvolt = <2500000>;
  146. + regulator-max-microvolt = <2500000>;
  147. + regulator-name = "vcc2v5";
  148. + };
  149. +
  150. + cldo2 {
  151. + /* unused */
  152. + };
  153. +
  154. + cldo3 {
  155. + /* unused */
  156. + };
  157. +
  158. + reg_dcdca: dcdca {
  159. + regulator-always-on;
  160. + regulator-min-microvolt = <810000>;
  161. + regulator-max-microvolt = <1080000>;
  162. + regulator-name = "vdd-cpu";
  163. + };
  164. +
  165. + reg_dcdcc: dcdcc {
  166. + regulator-always-on;
  167. + regulator-min-microvolt = <810000>;
  168. + regulator-max-microvolt = <1080000>;
  169. + regulator-name = "vdd-gpu-sys";
  170. + };
  171. +
  172. + reg_dcdcd: dcdcd {
  173. + regulator-always-on;
  174. + regulator-min-microvolt = <1360000>;
  175. + regulator-max-microvolt = <1360000>;
  176. + regulator-name = "vdd-dram";
  177. + };
  178. +
  179. + reg_dcdce: dcdce {
  180. + regulator-boot-on;
  181. + regulator-min-microvolt = <3300000>;
  182. + regulator-max-microvolt = <3300000>;
  183. + regulator-name = "vcc-eth-mmc";
  184. + };
  185. +
  186. + sw {
  187. + /* unused */
  188. + };
  189. + };
  190. + };
  191. +};
  192. +
  193. +&uart0 {
  194. + pinctrl-names = "default";
  195. + pinctrl-0 = <&uart0_ph_pins>;
  196. + status = "okay";
  197. +};
  198. +
  199. +&usbotg {
  200. + dr_mode = "host"; /* USB A type receptable */
  201. + status = "okay";
  202. +};
  203. +
  204. +&usbphy {
  205. + status = "okay";
  206. +};
  207. diff -Naur u-boot-sunxi-647b392bf20614006917d5fcd3390347a668eee5-old/configs/tanix_tx6s_defconfig u-boot-sunxi-647b392bf20614006917d5fcd3390347a668eee5-new/configs/tanix_tx6s_defconfig
  208. --- u-boot-sunxi-647b392bf20614006917d5fcd3390347a668eee5-old/configs/tanix_tx6s_defconfig 1970-01-01 01:00:00.000000000 +0100
  209. +++ u-boot-sunxi-647b392bf20614006917d5fcd3390347a668eee5-new/configs/tanix_tx6s_defconfig 2021-05-11 20:49:24.476666604 +0200
  210. @@ -0,0 +1,15 @@
  211. +CONFIG_ARM=y
  212. +CONFIG_ARCH_SUNXI=y
  213. +CONFIG_SPL=y
  214. +CONFIG_DRAM_SUN50I_H616_WRITE_LEVELING=y
  215. +CONFIG_DRAM_SUN50I_H616_READ_CALIBRATION=y
  216. +CONFIG_DRAM_SUN50I_H616_READ_TRAINING=y
  217. +CONFIG_DRAM_SUN50I_H616_WRITE_TRAINING=y
  218. +CONFIG_MACH_SUN50I_H616=y
  219. +CONFIG_MMC1_CD_PIN="PF6"
  220. +CONFIG_R_I2C_ENABLE=y
  221. +CONFIG_DEFAULT_DEVICE_TREE="sun50i-h616-tanix-tx6s"
  222. +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
  223. +CONFIG_SPL_I2C_SUPPORT=y
  224. +CONFIG_PHY_REALTEK=y
  225. +CONFIG_SUN8I_EMAC=y
  226.  
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!