diff --git a/arch/arm64/boot/dts/amlogic/mesons5.dtsi b/arch/arm64/boot/dts/amlogic/mesons5.dtsi index 2dda5d454..5e438cbdf 100644 --- a/arch/arm64/boot/dts/amlogic/mesons5.dtsi +++ b/arch/arm64/boot/dts/amlogic/mesons5.dtsi @@ -626,52 +626,6 @@ status = "disabled"; }; - vddnpu: pwm_ef-regulator { - compatible = "pwm-regulator"; - pwms = <&pwm_ef MESON_PWM_0 1500 0>; - regulator-name = "vddnpu"; - regulator-min-microvolt = <720000>; - regulator-max-microvolt = <900000>; - //regulator-always-on; - max-duty-cycle = <1500>; - /* Voltage Duty-Cycle */ - voltage-table = - <900000 0>, - <890000 5>, - <880000 11>, - <870000 17>, - <860000 21>, - <850000 28>, - <840000 33>, - <830000 39>, - <820000 44>, - <810000 50>, - <800000 56>, - <790000 61>, - <780000 67>, - <770000 72>, - <760000 78>, - <750000 83>, - <740000 89>, - <730000 95>, - <720000 100>; - status = "disabled"; - }; - - vdd_npu: fixedregulator@vdd_npu { - compatible = "regulator-fixed"; - vin-supply = <&vbat>; - regulator-name = "vdd_npu"; - regulator-min-microvolt = <910000>; - regulator-max-microvolt = <910000>; - pinctrl-names = "default"; - gpio = <&gpio GPIOE_4 GPIO_ACTIVE_LOW>; - startup-delay-us = <70000>; - enable-active-low; - regulator-boot-on; - //regulator-always-on; - }; - a76_opp_table0: a76_opp_table0 { compatible = "operating-points-v2"; opp-shared; diff --git a/arch/arm64/boot/dts/amlogic/s5_s928x_ax201.dts b/arch/arm64/boot/dts/amlogic/s5_s928x_ax201.dts index 4d1d75723..57a9f095d 100644 --- a/arch/arm64/boot/dts/amlogic/s5_s928x_ax201.dts +++ b/arch/arm64/boot/dts/amlogic/s5_s928x_ax201.dts @@ -921,6 +921,52 @@ key_tolerance = <40 40 40>; }; + vddnpu: pwm_ef-regulator { + compatible = "pwm-regulator"; + pwms = <&pwm_ef MESON_PWM_0 1500 0>; + regulator-name = "vddnpu"; + regulator-min-microvolt = <720000>; + regulator-max-microvolt = <900000>; + //regulator-always-on; + max-duty-cycle = <1500>; + /* Voltage Duty-Cycle */ + voltage-table = + <900000 0>, + <890000 5>, + <880000 11>, + <870000 17>, + <860000 21>, + <850000 28>, + <840000 33>, + <830000 39>, + <820000 44>, + <810000 50>, + <800000 56>, + <790000 61>, + <780000 67>, + <770000 72>, + <760000 78>, + <750000 83>, + <740000 89>, + <730000 95>, + <720000 100>; + status = "okay"; + }; + + vdd_npu: fixedregulator@vdd_npu { + compatible = "regulator-fixed"; + vin-supply = <&vbat>; + regulator-name = "vdd_npu"; + regulator-min-microvolt = <910000>; + regulator-max-microvolt = <910000>; + pinctrl-names = "default"; + gpio = <&gpio GPIOE_4 GPIO_ACTIVE_LOW>; + startup-delay-us = <70000>; + enable-active-low; + regulator-boot-on; + //regulator-always-on; + }; + vddq_reg: fixedregulator@vddq { compatible = "regulator-fixed"; vin-supply = <&vbat>; @@ -2039,17 +2085,17 @@ &pwm_ab { pinctrl-0 = <&pwm_a_pins1>; pinctrl-names = "default"; - status = "disabled"; + status = "okay"; }; &pwm_cd { - status = "disabled"; + status = "okay"; }; &pwm_ef { pinctrl-0 = <&pwm_f_pins>; pinctrl-names = "default"; - status = "disabled"; + status = "okay"; }; &irblaster { @@ -2068,7 +2114,3 @@ &vddcpub { status = "okay"; }; - -&vddnpu { - status = "okay"; -}; diff --git a/arch/arm64/boot/dts/amlogic/s5_s928x_ax201_drm.dts b/arch/arm64/boot/dts/amlogic/s5_s928x_ax201_drm.dts index a684607f5..af5f4cc6e 100644 --- a/arch/arm64/boot/dts/amlogic/s5_s928x_ax201_drm.dts +++ b/arch/arm64/boot/dts/amlogic/s5_s928x_ax201_drm.dts @@ -1001,6 +1001,52 @@ key_tolerance = <40 40 40>; }; + vddnpu: pwm_ef-regulator { + compatible = "pwm-regulator"; + pwms = <&pwm_ef MESON_PWM_0 1500 0>; + regulator-name = "vddnpu"; + regulator-min-microvolt = <720000>; + regulator-max-microvolt = <900000>; + //regulator-always-on; + max-duty-cycle = <1500>; + /* Voltage Duty-Cycle */ + voltage-table = + <900000 0>, + <890000 5>, + <880000 11>, + <870000 17>, + <860000 21>, + <850000 28>, + <840000 33>, + <830000 39>, + <820000 44>, + <810000 50>, + <800000 56>, + <790000 61>, + <780000 67>, + <770000 72>, + <760000 78>, + <750000 83>, + <740000 89>, + <730000 95>, + <720000 100>; + status = "okay"; + }; + + vdd_npu: fixedregulator@vdd_npu { + compatible = "regulator-fixed"; + vin-supply = <&vbat>; + regulator-name = "vdd_npu"; + regulator-min-microvolt = <910000>; + regulator-max-microvolt = <910000>; + pinctrl-names = "default"; + gpio = <&gpio GPIOE_4 GPIO_ACTIVE_LOW>; + startup-delay-us = <70000>; + enable-active-low; + regulator-boot-on; + //regulator-always-on; + }; + vddq_reg: fixedregulator@vddq { compatible = "regulator-fixed"; vin-supply = <&vbat>; @@ -2148,17 +2194,17 @@ &pwm_ab { pinctrl-0 = <&pwm_a_pins1>; pinctrl-names = "default"; - status = "disabled"; + status = "okay"; }; &pwm_cd { - status = "disabled"; + status = "okay"; }; &pwm_ef { pinctrl-0 = <&pwm_f_pins>; pinctrl-names = "default"; - status = "disabled"; + status = "okay"; }; &irblaster { diff --git a/arch/arm64/boot/dts/amlogic/s5_s928x_ax201_linux.dts b/arch/arm64/boot/dts/amlogic/s5_s928x_ax201_linux.dts index cbee8bea3..1aa2e320e 100644 --- a/arch/arm64/boot/dts/amlogic/s5_s928x_ax201_linux.dts +++ b/arch/arm64/boot/dts/amlogic/s5_s928x_ax201_linux.dts @@ -907,6 +907,52 @@ key_tolerance = <40 40 40>; }; + vddnpu: pwm_ef-regulator { + compatible = "pwm-regulator"; + pwms = <&pwm_ef MESON_PWM_0 1500 0>; + regulator-name = "vddnpu"; + regulator-min-microvolt = <720000>; + regulator-max-microvolt = <900000>; + //regulator-always-on; + max-duty-cycle = <1500>; + /* Voltage Duty-Cycle */ + voltage-table = + <900000 0>, + <890000 5>, + <880000 11>, + <870000 17>, + <860000 21>, + <850000 28>, + <840000 33>, + <830000 39>, + <820000 44>, + <810000 50>, + <800000 56>, + <790000 61>, + <780000 67>, + <770000 72>, + <760000 78>, + <750000 83>, + <740000 89>, + <730000 95>, + <720000 100>; + status = "okay"; + }; + + vdd_npu: fixedregulator@vdd_npu { + compatible = "regulator-fixed"; + vin-supply = <&vbat>; + regulator-name = "vdd_npu"; + regulator-min-microvolt = <910000>; + regulator-max-microvolt = <910000>; + pinctrl-names = "default"; + gpio = <&gpio GPIOE_4 GPIO_ACTIVE_LOW>; + startup-delay-us = <70000>; + enable-active-low; + regulator-boot-on; + //regulator-always-on; + }; + vddq_reg: fixedregulator@vddq { compatible = "regulator-fixed"; vin-supply = <&vbat>; @@ -2029,17 +2075,17 @@ &pwm_ab { pinctrl-0 = <&pwm_a_pins1>; pinctrl-names = "default"; - status = "disabled"; + status = "okay"; }; &pwm_cd { - status = "disabled"; + status = "okay"; }; &pwm_ef { pinctrl-0 = <&pwm_f_pins>; pinctrl-names = "default"; - status = "disabled"; + status = "okay"; }; &irblaster { diff --git a/arch/arm64/boot/dts/amlogic/s5_s928x_ax201_v2.dts b/arch/arm64/boot/dts/amlogic/s5_s928x_ax201_v2.dts index 0ac1f97a7..9b5cb7b23 100644 --- a/arch/arm64/boot/dts/amlogic/s5_s928x_ax201_v2.dts +++ b/arch/arm64/boot/dts/amlogic/s5_s928x_ax201_v2.dts @@ -921,6 +921,38 @@ key_tolerance = <40 40 40>; }; + vddnpu_dvo_dos_vpu: pwm_ef-regulator { + compatible = "pwm-regulator"; + pwms = <&pwm_ef MESON_PWM_0 1500 0>; + regulator-name = "vddnpu"; + regulator-min-microvolt = <720000>; + regulator-max-microvolt = <900000>; + //regulator-always-on; + max-duty-cycle = <1500>; + /* Voltage Duty-Cycle */ + voltage-table = + <900000 0>, + <890000 5>, + <880000 11>, + <870000 17>, + <860000 21>, + <850000 28>, + <840000 33>, + <830000 39>, + <820000 44>, + <810000 50>, + <800000 56>, + <790000 61>, + <780000 67>, + <770000 72>, + <760000 78>, + <750000 83>, + <740000 89>, + <730000 95>, + <720000 100>; + status = "okay"; + }; + vddq_reg: fixedregulator@vddq { compatible = "regulator-fixed"; vin-supply = <&vbat>; @@ -2039,17 +2071,17 @@ &pwm_ab { pinctrl-0 = <&pwm_a_pins1>; pinctrl-names = "default"; - status = "disabled"; + status = "okay"; }; &pwm_cd { - status = "disabled"; + status = "okay"; }; &pwm_ef { pinctrl-0 = <&pwm_f_pins>; pinctrl-names = "default"; - status = "disabled"; + status = "okay"; }; &irblaster { @@ -2068,7 +2100,3 @@ &vddcpub { status = "okay"; }; - -&vddnpu { - status = "okay"; -}; diff --git a/arch/arm64/boot/dts/amlogic/s5_s928x_ax201_v2_drm.dts b/arch/arm64/boot/dts/amlogic/s5_s928x_ax201_v2_drm.dts index 1f065bfd1..eca712f5b 100644 --- a/arch/arm64/boot/dts/amlogic/s5_s928x_ax201_v2_drm.dts +++ b/arch/arm64/boot/dts/amlogic/s5_s928x_ax201_v2_drm.dts @@ -1001,6 +1001,38 @@ key_tolerance = <40 40 40>; }; + vddnpu_dvo_dos_vpu: pwm_ef-regulator { + compatible = "pwm-regulator"; + pwms = <&pwm_ef MESON_PWM_0 1500 0>; + regulator-name = "vddnpu"; + regulator-min-microvolt = <720000>; + regulator-max-microvolt = <900000>; + //regulator-always-on; + max-duty-cycle = <1500>; + /* Voltage Duty-Cycle */ + voltage-table = + <900000 0>, + <890000 5>, + <880000 11>, + <870000 17>, + <860000 21>, + <850000 28>, + <840000 33>, + <830000 39>, + <820000 44>, + <810000 50>, + <800000 56>, + <790000 61>, + <780000 67>, + <770000 72>, + <760000 78>, + <750000 83>, + <740000 89>, + <730000 95>, + <720000 100>; + status = "okay"; + }; + vddq_reg: fixedregulator@vddq { compatible = "regulator-fixed"; vin-supply = <&vbat>; @@ -2148,17 +2180,17 @@ &pwm_ab { pinctrl-0 = <&pwm_a_pins1>; pinctrl-names = "default"; - status = "disabled"; + status = "okay"; }; &pwm_cd { - status = "disabled"; + status = "okay"; }; &pwm_ef { pinctrl-0 = <&pwm_f_pins>; pinctrl-names = "default"; - status = "disabled"; + status = "okay"; }; &irblaster { diff --git a/arch/arm64/boot/dts/amlogic/s5_s928x_ax201_v2_linux.dts b/arch/arm64/boot/dts/amlogic/s5_s928x_ax201_v2_linux.dts index de073dd78..22b05e7be 100644 --- a/arch/arm64/boot/dts/amlogic/s5_s928x_ax201_v2_linux.dts +++ b/arch/arm64/boot/dts/amlogic/s5_s928x_ax201_v2_linux.dts @@ -907,6 +907,38 @@ key_tolerance = <40 40 40>; }; + vddnpu_dvo_dos_vpu: pwm_ef-regulator { + compatible = "pwm-regulator"; + pwms = <&pwm_ef MESON_PWM_0 1500 0>; + regulator-name = "vddnpu"; + regulator-min-microvolt = <720000>; + regulator-max-microvolt = <900000>; + //regulator-always-on; + max-duty-cycle = <1500>; + /* Voltage Duty-Cycle */ + voltage-table = + <900000 0>, + <890000 5>, + <880000 11>, + <870000 17>, + <860000 21>, + <850000 28>, + <840000 33>, + <830000 39>, + <820000 44>, + <810000 50>, + <800000 56>, + <790000 61>, + <780000 67>, + <770000 72>, + <760000 78>, + <750000 83>, + <740000 89>, + <730000 95>, + <720000 100>; + status = "okay"; + }; + vddq_reg: fixedregulator@vddq { compatible = "regulator-fixed"; vin-supply = <&vbat>; @@ -2029,17 +2061,17 @@ &pwm_ab { pinctrl-0 = <&pwm_a_pins1>; pinctrl-names = "default"; - status = "disabled"; + status = "okay"; }; &pwm_cd { - status = "disabled"; + status = "okay"; }; &pwm_ef { pinctrl-0 = <&pwm_f_pins>; pinctrl-names = "default"; - status = "disabled"; + status = "okay"; }; &irblaster { diff --git a/arch/arm64/boot/dts/amlogic/s5_s928x_ax208.dts b/arch/arm64/boot/dts/amlogic/s5_s928x_ax208.dts index 1ba51dfce..a346aaa05 100644 --- a/arch/arm64/boot/dts/amlogic/s5_s928x_ax208.dts +++ b/arch/arm64/boot/dts/amlogic/s5_s928x_ax208.dts @@ -919,6 +919,52 @@ key_tolerance = <40 40 40>; }; + vddnpu: pwm_ef-regulator { + compatible = "pwm-regulator"; + pwms = <&pwm_ef MESON_PWM_0 1500 0>; + regulator-name = "vddnpu"; + regulator-min-microvolt = <720000>; + regulator-max-microvolt = <900000>; + //regulator-always-on; + max-duty-cycle = <1500>; + /* Voltage Duty-Cycle */ + voltage-table = + <900000 0>, + <890000 5>, + <880000 11>, + <870000 17>, + <860000 21>, + <850000 28>, + <840000 33>, + <830000 39>, + <820000 44>, + <810000 50>, + <800000 56>, + <790000 61>, + <780000 67>, + <770000 72>, + <760000 78>, + <750000 83>, + <740000 89>, + <730000 95>, + <720000 100>; + status = "okay"; + }; + + vdd_npu: fixedregulator@vdd_npu { + compatible = "regulator-fixed"; + vin-supply = <&vbat>; + regulator-name = "vdd_npu"; + regulator-min-microvolt = <910000>; + regulator-max-microvolt = <910000>; + pinctrl-names = "default"; + gpio = <&gpio GPIOE_4 GPIO_ACTIVE_LOW>; + startup-delay-us = <70000>; + enable-active-low; + regulator-boot-on; + //regulator-always-on; + }; + vddq_reg: fixedregulator@vddq { compatible = "regulator-fixed"; vin-supply = <&vbat>; @@ -2035,17 +2081,17 @@ &pwm_ab { pinctrl-0 = <&pwm_a_pins1>; pinctrl-names = "default"; - status = "disabled"; + status = "okay"; }; &pwm_cd { - status = "disabled"; + status = "okay"; }; &pwm_ef { pinctrl-0 = <&pwm_f_pins>; pinctrl-names = "default"; - status = "disabled"; + status = "okay"; }; &irblaster { @@ -2064,7 +2110,3 @@ &vddcpub { status = "okay"; }; - -&vddnpu { - status = "okay"; -}; diff --git a/arch/arm64/boot/dts/amlogic/s5_s928x_ax208_v2.dts b/arch/arm64/boot/dts/amlogic/s5_s928x_ax208_v2.dts index 4d7b45386..c5f724048 100644 --- a/arch/arm64/boot/dts/amlogic/s5_s928x_ax208_v2.dts +++ b/arch/arm64/boot/dts/amlogic/s5_s928x_ax208_v2.dts @@ -919,6 +919,38 @@ key_tolerance = <40 40 40>; }; + vddnpu: pwm_ef-regulator { + compatible = "pwm-regulator"; + pwms = <&pwm_ef MESON_PWM_0 1500 0>; + regulator-name = "vddnpu"; + regulator-min-microvolt = <720000>; + regulator-max-microvolt = <900000>; + //regulator-always-on; + max-duty-cycle = <1500>; + /* Voltage Duty-Cycle */ + voltage-table = + <900000 0>, + <890000 5>, + <880000 11>, + <870000 17>, + <860000 21>, + <850000 28>, + <840000 33>, + <830000 39>, + <820000 44>, + <810000 50>, + <800000 56>, + <790000 61>, + <780000 67>, + <770000 72>, + <760000 78>, + <750000 83>, + <740000 89>, + <730000 95>, + <720000 100>; + status = "okay"; + }; + vddq_reg: fixedregulator@vddq { compatible = "regulator-fixed"; vin-supply = <&vbat>; @@ -2035,17 +2067,17 @@ &pwm_ab { pinctrl-0 = <&pwm_a_pins1>; pinctrl-names = "default"; - status = "disabled"; + status = "okay"; }; &pwm_cd { - status = "disabled"; + status = "okay"; }; &pwm_ef { pinctrl-0 = <&pwm_f_pins>; pinctrl-names = "default"; - status = "disabled"; + status = "okay"; }; &irblaster { @@ -2064,7 +2096,3 @@ &vddcpub { status = "okay"; }; - -&vddnpu { - status = "okay"; -}; diff --git a/arch/arm64/boot/dts/amlogic/s5_s928x_ax209.dts b/arch/arm64/boot/dts/amlogic/s5_s928x_ax209.dts index ff16e9b50..d6b0af8a7 100644 --- a/arch/arm64/boot/dts/amlogic/s5_s928x_ax209.dts +++ b/arch/arm64/boot/dts/amlogic/s5_s928x_ax209.dts @@ -867,6 +867,52 @@ key_tolerance = <40 40 40>; }; + vddnpu: pwm_ef-regulator { + compatible = "pwm-regulator"; + pwms = <&pwm_ef MESON_PWM_0 1500 0>; + regulator-name = "vddnpu"; + regulator-min-microvolt = <720000>; + regulator-max-microvolt = <900000>; + //regulator-always-on; + max-duty-cycle = <1500>; + /* Voltage Duty-Cycle */ + voltage-table = + <900000 0>, + <890000 5>, + <880000 11>, + <870000 17>, + <860000 21>, + <850000 28>, + <840000 33>, + <830000 39>, + <820000 44>, + <810000 50>, + <800000 56>, + <790000 61>, + <780000 67>, + <770000 72>, + <760000 78>, + <750000 83>, + <740000 89>, + <730000 95>, + <720000 100>; + status = "okay"; + }; + + vdd_npu: fixedregulator@vdd_npu { + compatible = "regulator-fixed"; + vin-supply = <&vbat>; + regulator-name = "vdd_npu"; + regulator-min-microvolt = <910000>; + regulator-max-microvolt = <910000>; + pinctrl-names = "default"; + gpio = <&gpio GPIOE_4 GPIO_ACTIVE_LOW>; + startup-delay-us = <70000>; + enable-active-low; + regulator-boot-on; + //regulator-always-on; + }; + vddq_reg: fixedregulator@vddq { compatible = "regulator-fixed"; vin-supply = <&vbat>; @@ -1891,17 +1937,17 @@ &pwm_ab { pinctrl-0 = <&pwm_a_pins1>; pinctrl-names = "default"; - status = "disabled"; + status = "okay"; }; &pwm_cd { - status = "disabled"; + status = "okay"; }; &pwm_ef { pinctrl-0 = <&pwm_f_pins>; pinctrl-names = "default"; - status = "disabled"; + status = "okay"; }; &irblaster { @@ -1920,7 +1966,3 @@ &vddcpub { status = "okay"; }; - -&vddnpu { - status = "okay"; -}; diff --git a/arch/arm64/boot/dts/amlogic/s5_s928x_ax209_v2.dts b/arch/arm64/boot/dts/amlogic/s5_s928x_ax209_v2.dts index 84eb01957..9daea1279 100644 --- a/arch/arm64/boot/dts/amlogic/s5_s928x_ax209_v2.dts +++ b/arch/arm64/boot/dts/amlogic/s5_s928x_ax209_v2.dts @@ -867,6 +867,38 @@ key_tolerance = <40 40 40>; }; + vddnpu: pwm_ef-regulator { + compatible = "pwm-regulator"; + pwms = <&pwm_ef MESON_PWM_0 1500 0>; + regulator-name = "vddnpu"; + regulator-min-microvolt = <720000>; + regulator-max-microvolt = <900000>; + //regulator-always-on; + max-duty-cycle = <1500>; + /* Voltage Duty-Cycle */ + voltage-table = + <900000 0>, + <890000 5>, + <880000 11>, + <870000 17>, + <860000 21>, + <850000 28>, + <840000 33>, + <830000 39>, + <820000 44>, + <810000 50>, + <800000 56>, + <790000 61>, + <780000 67>, + <770000 72>, + <760000 78>, + <750000 83>, + <740000 89>, + <730000 95>, + <720000 100>; + status = "okay"; + }; + vddq_reg: fixedregulator@vddq { compatible = "regulator-fixed"; vin-supply = <&vbat>; @@ -1891,17 +1923,17 @@ &pwm_ab { pinctrl-0 = <&pwm_a_pins1>; pinctrl-names = "default"; - status = "disabled"; + status = "okay"; }; &pwm_cd { - status = "disabled"; + status = "okay"; }; &pwm_ef { pinctrl-0 = <&pwm_f_pins>; pinctrl-names = "default"; - status = "disabled"; + status = "okay"; }; &irblaster { @@ -1920,7 +1952,3 @@ &vddcpub { status = "okay"; }; - -&vddnpu { - status = "okay"; -};