0064-riscv-dts-allwinner-d1-Hook-up-PWM-controlled-CPU-vo.patch 3.3 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124
  1. From 5479c8efb6ffbbc8b7fd1068337037faf9c20a36 Mon Sep 17 00:00:00 2001
  2. From: Samuel Holland <[email protected]>
  3. Date: Thu, 11 Aug 2022 22:25:40 -0500
  4. Subject: [PATCH 064/117] riscv: dts: allwinner: d1: Hook up PWM-controlled CPU
  5. voltage regulators
  6. Signed-off-by: Samuel Holland <[email protected]>
  7. ---
  8. .../allwinner/sun20i-d1-clockworkpi-v3.14.dts | 19 +++++++++++--------
  9. .../sun20i-d1-dongshan-nezha-stu.dts | 19 +++++++++++--------
  10. .../boot/dts/allwinner/sun20i-d1-nezha.dts | 19 +++++++++++--------
  11. 3 files changed, 33 insertions(+), 24 deletions(-)
  12. --- a/arch/riscv/boot/dts/allwinner/sun20i-d1-clockworkpi-v3.14.dts
  13. +++ b/arch/riscv/boot/dts/allwinner/sun20i-d1-clockworkpi-v3.14.dts
  14. @@ -48,16 +48,13 @@
  15. };
  16. };
  17. - /*
  18. - * This regulator is PWM-controlled, but the PWM controller is not
  19. - * yet supported, so fix the regulator to its default voltage.
  20. - */
  21. reg_vdd_cpu: vdd-cpu {
  22. - compatible = "regulator-fixed";
  23. + compatible = "pwm-regulator";
  24. + pwms = <&pwm 0 50000 0>;
  25. + pwm-supply = <&reg_vcc>;
  26. regulator-name = "vdd-cpu";
  27. - regulator-min-microvolt = <1100000>;
  28. - regulator-max-microvolt = <1100000>;
  29. - vin-supply = <&reg_vcc>;
  30. + regulator-min-microvolt = <810000>;
  31. + regulator-max-microvolt = <1160000>;
  32. };
  33. wifi_pwrseq: wifi-pwrseq {
  34. @@ -254,6 +251,12 @@
  35. };
  36. };
  37. +&pwm {
  38. + pinctrl-0 = <&pwm0_pd16_pin>;
  39. + pinctrl-names = "default";
  40. + status = "okay";
  41. +};
  42. +
  43. &uart0 {
  44. pinctrl-0 = <&uart0_pb8_pins>;
  45. pinctrl-names = "default";
  46. --- a/arch/riscv/boot/dts/allwinner/sun20i-d1-dongshan-nezha-stu.dts
  47. +++ b/arch/riscv/boot/dts/allwinner/sun20i-d1-dongshan-nezha-stu.dts
  48. @@ -43,16 +43,13 @@
  49. vin-supply = <&reg_vcc>;
  50. };
  51. - /*
  52. - * This regulator is PWM-controlled, but the PWM controller is not
  53. - * yet supported, so fix the regulator to its default voltage.
  54. - */
  55. reg_vdd_cpu: vdd-cpu {
  56. - compatible = "regulator-fixed";
  57. + compatible = "pwm-regulator";
  58. + pwms = <&pwm 0 50000 0>;
  59. + pwm-supply = <&reg_vcc>;
  60. regulator-name = "vdd-cpu";
  61. - regulator-min-microvolt = <1100000>;
  62. - regulator-max-microvolt = <1100000>;
  63. - vin-supply = <&reg_vcc>;
  64. + regulator-min-microvolt = <810000>;
  65. + regulator-max-microvolt = <1160000>;
  66. };
  67. };
  68. @@ -95,6 +92,12 @@
  69. status = "okay";
  70. };
  71. +&pwm {
  72. + pinctrl-0 = <&pwm0_pd16_pin>;
  73. + pinctrl-names = "default";
  74. + status = "okay";
  75. +};
  76. +
  77. &uart0 {
  78. pinctrl-0 = <&uart0_pb8_pins>;
  79. pinctrl-names = "default";
  80. --- a/arch/riscv/boot/dts/allwinner/sun20i-d1-nezha.dts
  81. +++ b/arch/riscv/boot/dts/allwinner/sun20i-d1-nezha.dts
  82. @@ -35,16 +35,13 @@
  83. vin-supply = <&reg_vcc>;
  84. };
  85. - /*
  86. - * This regulator is PWM-controlled, but the PWM controller is not
  87. - * yet supported, so fix the regulator to its default voltage.
  88. - */
  89. reg_vdd_cpu: vdd-cpu {
  90. - compatible = "regulator-fixed";
  91. + compatible = "pwm-regulator";
  92. + pwms = <&pwm 0 50000 0>;
  93. + pwm-supply = <&reg_vcc>;
  94. regulator-name = "vdd-cpu";
  95. - regulator-min-microvolt = <1100000>;
  96. - regulator-max-microvolt = <1100000>;
  97. - vin-supply = <&reg_vcc>;
  98. + regulator-min-microvolt = <810000>;
  99. + regulator-max-microvolt = <1160000>;
  100. };
  101. wifi_pwrseq: wifi-pwrseq {
  102. @@ -155,6 +152,12 @@
  103. status = "okay";
  104. };
  105. +&pwm {
  106. + pinctrl-0 = <&pwm0_pd16_pin>;
  107. + pinctrl-names = "default";
  108. + status = "okay";
  109. +};
  110. +
  111. &uart0 {
  112. pinctrl-0 = <&uart0_pb8_pins>;
  113. pinctrl-names = "default";