Advertisement
Guest User

0021-arm64-dts-allwinner-h6-OPi3-stability.patch

a guest
Sep 15th, 2021
148
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
  1. --- a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts
  2. +++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts
  3. @@ -63,27 +63,7 @@ reg_vcc5v: vcc5v {
  4. regulator-max-microvolt = <5000000>;
  5. regulator-always-on;
  6. };
  7. -
  8. - reg_vcc33_wifi: vcc33-wifi {
  9. - /* Always on 3.3V regulator for WiFi and BT */
  10. - compatible = "regulator-fixed";
  11. - regulator-name = "vcc33-wifi";
  12. - regulator-min-microvolt = <3300000>;
  13. - regulator-max-microvolt = <3300000>;
  14. - regulator-always-on;
  15. - vin-supply = <&reg_vcc5v>;
  16. - };
  17. -
  18. - reg_vcc_wifi_io: vcc-wifi-io {
  19. - /* Always on 1.8V/300mA regulator for WiFi and BT IO */
  20. - compatible = "regulator-fixed";
  21. - regulator-name = "vcc-wifi-io";
  22. - regulator-min-microvolt = <1800000>;
  23. - regulator-max-microvolt = <1800000>;
  24. - regulator-always-on;
  25. - vin-supply = <&reg_vcc33_wifi>;
  26. - };
  27. -
  28. +
  29. wifi_pwrseq: wifi-pwrseq {
  30. compatible = "mmc-pwrseq-simple";
  31. clocks = <&rtc 1>;
  32. @@ -136,8 +116,8 @@ &mmc0 {
  33. };
  34.  
  35. &mmc1 {
  36. - vmmc-supply = <&reg_vcc33_wifi>;
  37. - vqmmc-supply = <&reg_vcc_wifi_io>;
  38. + vmmc-supply = <&reg_cldo2>;
  39. + vqmmc-supply = <&reg_bldo3>;
  40. mmc-pwrseq = <&wifi_pwrseq>;
  41. bus-width = <4>;
  42. non-removable;
  43. @@ -172,13 +152,17 @@ &ohci3 {
  44. &pio {
  45. vcc-pc-supply = <&reg_bldo2>;
  46. vcc-pd-supply = <&reg_cldo1>;
  47. - vcc-pg-supply = <&reg_vcc_wifi_io>;
  48. + vcc-pg-supply = <&reg_bldo3>;
  49. };
  50.  
  51. &r_ir {
  52. status = "okay";
  53. };
  54.  
  55. +&r_pio {
  56. + vcc-pm-supply = <&reg_bldo3>;
  57. +};
  58. +
  59. &r_rsb {
  60. status = "okay";
  61.  
  62. @@ -234,13 +218,12 @@ reg_bldo2: bldo2 {
  63. regulator-max-microvolt = <1800000>;
  64. regulator-name = "vcc-efuse-pcie-hdmi-pc";
  65. };
  66. -
  67. - bldo3 {
  68. - /* unused */
  69. - };
  70. -
  71. - bldo4 {
  72. - /* unused */
  73. +
  74. + reg_bldo3: bldo3 {
  75. + regulator-always-on;
  76. + regulator-min-microvolt = <1800000>;
  77. + regulator-max-microvolt = <1800000>;
  78. + regulator-name = "vcc-dcxoio";
  79. };
  80.  
  81. reg_cldo1: cldo1 {
  82. @@ -250,19 +233,34 @@ reg_cldo1: cldo1 {
  83. regulator-name = "vcc33-io-pd-emmc-sd-usb-uart-2";
  84. };
  85.  
  86. - cldo2 {
  87. - /* unused */
  88. + reg_cldo2: cldo2 {
  89. + /*
  90. + * This regulator is connected with CLDO3.
  91. + * Before the kernel can support synchronized
  92. + * enable of coupled regulators, keep them
  93. + * both always on as a ugly hack.
  94. + */
  95. + regulator-always-on;
  96. + regulator-min-microvolt = <3300000>;
  97. + regulator-max-microvolt = <3300000>;
  98. + regulator-name = "vcc-wifi-1";
  99. };
  100.  
  101. cldo3 {
  102. - /* unused */
  103. + /*
  104. + * This regulator is connected with CLDO2.
  105. + * See the comments for CLDO2.
  106. + */
  107. + regulator-always-on;
  108. + regulator-min-microvolt = <3300000>;
  109. + regulator-max-microvolt = <3300000>;
  110. + regulator-name = "vcc-wifi-2";
  111. };
  112.  
  113. reg_dcdca: dcdca {
  114. regulator-always-on;
  115. - regulator-min-microvolt = <800000>;
  116. - regulator-max-microvolt = <1160000>;
  117. - regulator-ramp-delay = <2500>;
  118. + regulator-min-microvolt = <810000>;
  119. + regulator-max-microvolt = <1080000>;
  120. regulator-name = "vdd-cpu";
  121. };
  122.  
  123.  
Advertisement
Advertisement
Advertisement
RAW Paste Data Copied
Advertisement