diff --git a/arch/arm64/boot/dts/amlogic/mesons5.dtsi b/arch/arm64/boot/dts/amlogic/mesons5.dtsi index 8c918f1c1..31d978cdb 100644 --- a/arch/arm64/boot/dts/amlogic/mesons5.dtsi +++ b/arch/arm64/boot/dts/amlogic/mesons5.dtsi @@ -540,98 +540,102 @@ vddcpua: pwm_cd-regulator { compatible = "pwm-regulator"; - pwms = <&pwm_cd MESON_PWM_1 1500 0>; + pwms = <&pwm_cd MESON_PWM_1 1512 0>; regulator-name = "vddcpua"; regulator-min-microvolt = <689000>; regulator-max-microvolt = <1049000>; regulator-always-on; - max-duty-cycle = <1500>; + max-duty-cycle = <1512>; + amlogic,vsel-step = <3>; + amlogic,usleep-time = <200>; /* Voltage Duty-Cycle */ voltage-table = <1049000 0>, <1039000 3>, <1029000 6>, - <1019000 9>, - <1009000 12>, + <1019000 8>, + <1009000 11>, <999000 14>, <989000 17>, - <979000 20>, - <969000 23>, - <959000 26>, - <949000 29>, + <979000 19>, + <969000 22>, + <959000 25>, + <949000 28>, <939000 31>, - <929000 34>, - <919000 37>, - <909000 40>, - <899000 43>, - <889000 45>, - <879000 48>, - <869000 51>, - <859000 54>, + <929000 33>, + <919000 36>, + <909000 39>, + <899000 42>, + <889000 44>, + <879000 47>, + <869000 50>, + <859000 53>, <849000 56>, - <839000 59>, - <829000 62>, - <819000 65>, - <809000 68>, - <799000 70>, - <789000 73>, - <779000 76>, - <769000 79>, + <839000 58>, + <829000 61>, + <819000 64>, + <809000 67>, + <799000 69>, + <789000 72>, + <779000 75>, + <769000 78>, <759000 81>, - <749000 84>, - <739000 87>, + <749000 83>, + <739000 86>, <729000 89>, <719000 92>, - <709000 95>, - <699000 98>, + <709000 94>, + <699000 97>, <689000 100>; status = "disabled"; }; vddcpub: pwm_ab-regulator { compatible = "pwm-regulator"; - pwms = <&pwm_ab MESON_PWM_0 1500 0>; + pwms = <&pwm_ab MESON_PWM_0 1512 0>; regulator-name = "vddcpub"; regulator-min-microvolt = <689000>; regulator-max-microvolt = <1049000>; regulator-always-on; - max-duty-cycle = <1500>; + max-duty-cycle = <1512>; + amlogic,vsel-step = <3>; + amlogic,usleep-time = <200>; /* Voltage Duty-Cycle */ voltage-table = <1049000 0>, <1039000 3>, <1029000 6>, - <1019000 9>, - <1009000 12>, + <1019000 8>, + <1009000 11>, <999000 14>, <989000 17>, - <979000 20>, - <969000 23>, - <959000 26>, - <949000 29>, + <979000 19>, + <969000 22>, + <959000 25>, + <949000 28>, <939000 31>, - <929000 34>, - <919000 37>, - <909000 40>, - <899000 43>, - <889000 45>, - <879000 48>, - <869000 51>, - <859000 54>, + <929000 33>, + <919000 36>, + <909000 39>, + <899000 42>, + <889000 44>, + <879000 47>, + <869000 50>, + <859000 53>, <849000 56>, - <839000 59>, - <829000 62>, - <819000 65>, - <809000 68>, - <799000 70>, - <789000 73>, - <779000 76>, - <769000 79>, + <839000 58>, + <829000 61>, + <819000 64>, + <809000 67>, + <799000 69>, + <789000 72>, + <779000 75>, + <769000 78>, <759000 81>, - <749000 84>, - <739000 87>, + <749000 83>, + <739000 86>, <729000 89>, <719000 92>, - <709000 95>, - <699000 98>, + <709000 94>, + <699000 97>, <689000 100>; status = "disabled"; }; diff --git a/arch/arm64/boot/dts/amlogic/s5_s928x_ax201.dts b/arch/arm64/boot/dts/amlogic/s5_s928x_ax201.dts index a0df38d63..4d9f7e061 100644 --- a/arch/arm64/boot/dts/amlogic/s5_s928x_ax201.dts +++ b/arch/arm64/boot/dts/amlogic/s5_s928x_ax201.dts @@ -640,38 +640,6 @@ 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>; @@ -680,7 +648,7 @@ regulator-max-microvolt = <910000>; pinctrl-names = "default"; gpio = <&gpio GPIOE_4 GPIO_ACTIVE_LOW>; - startup-delay-us = <70000>; + startup-delay-us = <7000>; enable-active-low; regulator-boot-on; //regulator-always-on; @@ -694,7 +662,7 @@ regulator-max-microvolt = <1100000>; pinctrl-names = "default"; gpio = <&gpio GPIOD_8 GPIO_ACTIVE_HIGH>; - startup-delay-us = <70000>; + startup-delay-us = <7000>; enable-active-high; regulator-boot-on; regulator-always-on; @@ -708,7 +676,7 @@ regulator-max-microvolt = <1100000>; pinctrl-names = "default"; gpio = <&gpio GPIOD_8 GPIO_ACTIVE_HIGH>; - startup-delay-us = <70000>; + startup-delay-us = <7000>; enable-active-high; regulator-boot-on; regulator-always-on; @@ -722,7 +690,7 @@ regulator-max-microvolt = <823000>; pinctrl-names = "default"; gpio = <&gpio GPIOD_8 GPIO_ACTIVE_HIGH>; - startup-delay-us = <70000>; + startup-delay-us = <7000>; enable-active-high; regulator-boot-on; regulator-always-on; @@ -766,7 +734,7 @@ regulator-max-microvolt = <3300000>; pinctrl-names = "default"; gpio = <&gpio GPIOD_10 GPIO_ACTIVE_HIGH>; - startup-delay-us = <70000>; + startup-delay-us = <7000>; enable-active-high; regulator-boot-on; regulator-always-on; @@ -802,6 +770,7 @@ gpio = <&gpio GPIOH_7 GPIO_ACTIVE_LOW>; // (GPIOH_7 |sdcard-3v3) out lo ACTIVE LOW enable-active-low; //3.3V , high: 0V + startup-delay-us = <7000>; regulator-boot-on; regulator-always-on; }; @@ -816,6 +785,7 @@ gpio = <&gpio GPIOH_8 GPIO_ACTIVE_HIGH>; // (GPIOH_8 |VDDIO_C) out lo : 3300mV, 3.3V gpios-states = <0>; + startup-delay-us = <7000>; /* Based on P200 schematics, signal CARD_1.8V/3.3V_CTR */ states = <1800000 1 @@ -1823,11 +1793,11 @@ &pwm_ab { pinctrl-0 = <&pwm_a_pins1>; pinctrl-names = "default"; - status = "disabled"; + status = "okay"; }; &pwm_cd { - status = "disabled"; + status = "okay"; }; &pwm_ef { 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 c60a72f13..d1c0f6300 100644 --- a/arch/arm64/boot/dts/amlogic/s5_s928x_ax201_drm.dts +++ b/arch/arm64/boot/dts/amlogic/s5_s928x_ax201_drm.dts @@ -641,38 +641,6 @@ 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>; @@ -681,7 +649,7 @@ regulator-max-microvolt = <910000>; pinctrl-names = "default"; gpio = <&gpio GPIOE_4 GPIO_ACTIVE_LOW>; - startup-delay-us = <70000>; + startup-delay-us = <7000>; enable-active-low; regulator-boot-on; //regulator-always-on; @@ -695,7 +663,7 @@ regulator-max-microvolt = <1100000>; pinctrl-names = "default"; gpio = <&gpio GPIOD_8 GPIO_ACTIVE_HIGH>; - startup-delay-us = <70000>; + startup-delay-us = <7000>; enable-active-high; regulator-boot-on; regulator-always-on; @@ -709,7 +677,7 @@ regulator-max-microvolt = <1100000>; pinctrl-names = "default"; gpio = <&gpio GPIOD_8 GPIO_ACTIVE_HIGH>; - startup-delay-us = <70000>; + startup-delay-us = <7000>; enable-active-high; regulator-boot-on; regulator-always-on; @@ -723,7 +691,7 @@ regulator-max-microvolt = <823000>; pinctrl-names = "default"; gpio = <&gpio GPIOD_8 GPIO_ACTIVE_HIGH>; - startup-delay-us = <70000>; + startup-delay-us = <7000>; enable-active-high; regulator-boot-on; regulator-always-on; @@ -767,7 +735,7 @@ regulator-max-microvolt = <3300000>; pinctrl-names = "default"; gpio = <&gpio GPIOD_10 GPIO_ACTIVE_HIGH>; - startup-delay-us = <70000>; + startup-delay-us = <7000>; enable-active-high; regulator-boot-on; regulator-always-on; @@ -803,6 +771,7 @@ gpio = <&gpio GPIOH_7 GPIO_ACTIVE_LOW>; // (GPIOH_7 |sdcard-3v3) out lo ACTIVE LOW enable-active-low; //3.3V , high: 0V + startup-delay-us = <7000>; regulator-boot-on; regulator-always-on; }; @@ -817,6 +786,7 @@ gpio = <&gpio GPIOH_8 GPIO_ACTIVE_HIGH>; // (GPIOH_8 |VDDIO_C) out lo : 3300mV, 3.3V gpios-states = <0>; + startup-delay-us = <7000>; /* Based on P200 schematics, signal CARD_1.8V/3.3V_CTR */ states = <1800000 1 @@ -1829,11 +1799,11 @@ &pwm_ab { pinctrl-0 = <&pwm_a_pins1>; pinctrl-names = "default"; - status = "disabled"; + status = "okay"; }; &pwm_cd { - status = "disabled"; + status = "okay"; }; &pwm_ef { 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 4619b8ce0..cd957d300 100644 --- a/arch/arm64/boot/dts/amlogic/s5_s928x_ax201_linux.dts +++ b/arch/arm64/boot/dts/amlogic/s5_s928x_ax201_linux.dts @@ -645,38 +645,6 @@ 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>; @@ -685,7 +653,7 @@ regulator-max-microvolt = <910000>; pinctrl-names = "default"; gpio = <&gpio GPIOE_4 GPIO_ACTIVE_LOW>; - startup-delay-us = <70000>; + startup-delay-us = <7000>; enable-active-low; regulator-boot-on; //regulator-always-on; @@ -699,7 +667,7 @@ regulator-max-microvolt = <1100000>; pinctrl-names = "default"; gpio = <&gpio GPIOD_8 GPIO_ACTIVE_HIGH>; - startup-delay-us = <70000>; + startup-delay-us = <7000>; enable-active-high; regulator-boot-on; regulator-always-on; @@ -713,7 +681,7 @@ regulator-max-microvolt = <1100000>; pinctrl-names = "default"; gpio = <&gpio GPIOD_8 GPIO_ACTIVE_HIGH>; - startup-delay-us = <70000>; + startup-delay-us = <7000>; enable-active-high; regulator-boot-on; regulator-always-on; @@ -727,7 +695,7 @@ regulator-max-microvolt = <823000>; pinctrl-names = "default"; gpio = <&gpio GPIOD_8 GPIO_ACTIVE_HIGH>; - startup-delay-us = <70000>; + startup-delay-us = <7000>; enable-active-high; regulator-boot-on; regulator-always-on; @@ -771,7 +739,7 @@ regulator-max-microvolt = <3300000>; pinctrl-names = "default"; gpio = <&gpio GPIOD_10 GPIO_ACTIVE_HIGH>; - startup-delay-us = <70000>; + startup-delay-us = <7000>; enable-active-high; regulator-boot-on; regulator-always-on; @@ -807,6 +775,7 @@ gpio = <&gpio GPIOH_7 GPIO_ACTIVE_LOW>; // (GPIOH_7 |sdcard-3v3) out lo ACTIVE LOW enable-active-low; //3.3V , high: 0V + startup-delay-us = <7000>; regulator-boot-on; regulator-always-on; }; @@ -821,6 +790,7 @@ gpio = <&gpio GPIOH_8 GPIO_ACTIVE_HIGH>; // (GPIOH_8 |VDDIO_C) out lo : 3300mV, 3.3V gpios-states = <0>; + startup-delay-us = <7000>; /* Based on P200 schematics, signal CARD_1.8V/3.3V_CTR */ states = <1800000 1 @@ -1836,11 +1806,11 @@ &pwm_ab { pinctrl-0 = <&pwm_a_pins1>; pinctrl-names = "default"; - status = "disabled"; + status = "okay"; }; &pwm_cd { - status = "disabled"; + status = "okay"; }; &pwm_ef { diff --git a/arch/arm64/boot/dts/amlogic/s5_s928x_ax201_mxl258c_drm.dts b/arch/arm64/boot/dts/amlogic/s5_s928x_ax201_mxl258c_drm.dts index e257267d5..6f20999ae 100644 --- a/arch/arm64/boot/dts/amlogic/s5_s928x_ax201_mxl258c_drm.dts +++ b/arch/arm64/boot/dts/amlogic/s5_s928x_ax201_mxl258c_drm.dts @@ -726,38 +726,6 @@ 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>; @@ -766,7 +734,7 @@ regulator-max-microvolt = <910000>; pinctrl-names = "default"; gpio = <&gpio GPIOE_4 GPIO_ACTIVE_LOW>; - startup-delay-us = <70000>; + startup-delay-us = <7000>; enable-active-low; regulator-boot-on; //regulator-always-on; @@ -780,7 +748,7 @@ regulator-max-microvolt = <1100000>; pinctrl-names = "default"; gpio = <&gpio GPIOD_8 GPIO_ACTIVE_HIGH>; - startup-delay-us = <70000>; + startup-delay-us = <7000>; enable-active-high; regulator-boot-on; regulator-always-on; @@ -794,7 +762,7 @@ regulator-max-microvolt = <1100000>; pinctrl-names = "default"; gpio = <&gpio GPIOD_8 GPIO_ACTIVE_HIGH>; - startup-delay-us = <70000>; + startup-delay-us = <7000>; enable-active-high; regulator-boot-on; regulator-always-on; @@ -808,7 +776,7 @@ regulator-max-microvolt = <823000>; pinctrl-names = "default"; gpio = <&gpio GPIOD_8 GPIO_ACTIVE_HIGH>; - startup-delay-us = <70000>; + startup-delay-us = <7000>; enable-active-high; regulator-boot-on; regulator-always-on; @@ -852,7 +820,7 @@ regulator-max-microvolt = <3300000>; pinctrl-names = "default"; gpio = <&gpio GPIOD_10 GPIO_ACTIVE_HIGH>; - startup-delay-us = <70000>; + startup-delay-us = <7000>; enable-active-high; regulator-boot-on; regulator-always-on; @@ -888,6 +856,7 @@ gpio = <&gpio GPIOH_7 GPIO_ACTIVE_LOW>; // (GPIOH_7 |sdcard-3v3) out lo ACTIVE LOW enable-active-low; //3.3V , high: 0V + startup-delay-us = <7000>; regulator-boot-on; regulator-always-on; }; @@ -902,6 +871,7 @@ gpio = <&gpio GPIOH_8 GPIO_ACTIVE_HIGH>; // (GPIOH_8 |VDDIO_C) out lo : 3300mV, 3.3V gpios-states = <0>; + startup-delay-us = <7000>; /* Based on P200 schematics, signal CARD_1.8V/3.3V_CTR */ states = <1800000 1 @@ -1928,11 +1898,11 @@ &pwm_ab { pinctrl-0 = <&pwm_a_pins1>; pinctrl-names = "default"; - status = "disabled"; + status = "okay"; }; &pwm_cd { - status = "disabled"; + status = "okay"; }; &pwm_ef { 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 708b40c6b..796a6a5a1 100644 --- a/arch/arm64/boot/dts/amlogic/s5_s928x_ax201_v2.dts +++ b/arch/arm64/boot/dts/amlogic/s5_s928x_ax201_v2.dts @@ -648,7 +648,7 @@ regulator-max-microvolt = <1100000>; pinctrl-names = "default"; gpio = <&gpio GPIOD_8 GPIO_ACTIVE_HIGH>; - startup-delay-us = <70000>; + startup-delay-us = <7000>; enable-active-high; regulator-boot-on; regulator-always-on; @@ -662,7 +662,7 @@ regulator-max-microvolt = <1100000>; pinctrl-names = "default"; gpio = <&gpio GPIOD_8 GPIO_ACTIVE_HIGH>; - startup-delay-us = <70000>; + startup-delay-us = <7000>; enable-active-high; regulator-boot-on; regulator-always-on; @@ -676,7 +676,7 @@ regulator-max-microvolt = <823000>; pinctrl-names = "default"; gpio = <&gpio GPIOD_8 GPIO_ACTIVE_HIGH>; - startup-delay-us = <70000>; + startup-delay-us = <7000>; enable-active-high; regulator-boot-on; regulator-always-on; @@ -720,7 +720,7 @@ regulator-max-microvolt = <3300000>; pinctrl-names = "default"; gpio = <&gpio GPIOD_10 GPIO_ACTIVE_HIGH>; - startup-delay-us = <70000>; + startup-delay-us = <7000>; enable-active-high; regulator-boot-on; regulator-always-on; @@ -756,6 +756,7 @@ gpio = <&gpio GPIOH_7 GPIO_ACTIVE_LOW>; // (GPIOH_7 |sdcard-3v3) out lo ACTIVE LOW enable-active-low; //3.3V , high: 0V + startup-delay-us = <7000>; regulator-boot-on; regulator-always-on; }; @@ -770,6 +771,7 @@ gpio = <&gpio GPIOH_8 GPIO_ACTIVE_HIGH>; // (GPIOH_8 |VDDIO_C) out lo : 3300mV, 3.3V gpios-states = <0>; + startup-delay-us = <7000>; /* Based on P200 schematics, signal CARD_1.8V/3.3V_CTR */ states = <1800000 1 @@ -1773,11 +1775,11 @@ &pwm_ab { pinctrl-0 = <&pwm_a_pins1>; pinctrl-names = "default"; - status = "disabled"; + status = "okay"; }; &pwm_cd { - status = "disabled"; + status = "okay"; }; &pwm_ef { 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 2e059dce4..ab6778690 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 @@ -641,6 +641,20 @@ key_tolerance = <40 40 40>; }; + 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 = <7000>; + enable-active-low; + regulator-boot-on; + //regulator-always-on; + }; + vddq_reg: fixedregulator@vddq { compatible = "regulator-fixed"; vin-supply = <&vbat>; @@ -649,7 +663,7 @@ regulator-max-microvolt = <1100000>; pinctrl-names = "default"; gpio = <&gpio GPIOD_8 GPIO_ACTIVE_HIGH>; - startup-delay-us = <70000>; + startup-delay-us = <7000>; enable-active-high; regulator-boot-on; regulator-always-on; @@ -663,7 +677,7 @@ regulator-max-microvolt = <1100000>; pinctrl-names = "default"; gpio = <&gpio GPIOD_8 GPIO_ACTIVE_HIGH>; - startup-delay-us = <70000>; + startup-delay-us = <7000>; enable-active-high; regulator-boot-on; regulator-always-on; @@ -677,7 +691,7 @@ regulator-max-microvolt = <823000>; pinctrl-names = "default"; gpio = <&gpio GPIOD_8 GPIO_ACTIVE_HIGH>; - startup-delay-us = <70000>; + startup-delay-us = <7000>; enable-active-high; regulator-boot-on; regulator-always-on; @@ -721,7 +735,7 @@ regulator-max-microvolt = <3300000>; pinctrl-names = "default"; gpio = <&gpio GPIOD_10 GPIO_ACTIVE_HIGH>; - startup-delay-us = <70000>; + startup-delay-us = <7000>; enable-active-high; regulator-boot-on; regulator-always-on; @@ -757,6 +771,7 @@ gpio = <&gpio GPIOH_7 GPIO_ACTIVE_LOW>; // (GPIOH_7 |sdcard-3v3) out lo ACTIVE LOW enable-active-low; //3.3V , high: 0V + startup-delay-us = <7000>; regulator-boot-on; regulator-always-on; }; @@ -771,6 +786,7 @@ gpio = <&gpio GPIOH_8 GPIO_ACTIVE_HIGH>; // (GPIOH_8 |VDDIO_C) out lo : 3300mV, 3.3V gpios-states = <0>; + startup-delay-us = <7000>; /* Based on P200 schematics, signal CARD_1.8V/3.3V_CTR */ states = <1800000 1 @@ -1778,11 +1794,11 @@ &pwm_ab { pinctrl-0 = <&pwm_a_pins1>; pinctrl-names = "default"; - status = "disabled"; + status = "okay"; }; &pwm_cd { - status = "disabled"; + status = "okay"; }; &pwm_ef { 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 9ceb49e0d..97c0184f8 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 @@ -653,7 +653,7 @@ regulator-max-microvolt = <1100000>; pinctrl-names = "default"; gpio = <&gpio GPIOD_8 GPIO_ACTIVE_HIGH>; - startup-delay-us = <70000>; + startup-delay-us = <7000>; enable-active-high; regulator-boot-on; regulator-always-on; @@ -667,7 +667,7 @@ regulator-max-microvolt = <1100000>; pinctrl-names = "default"; gpio = <&gpio GPIOD_8 GPIO_ACTIVE_HIGH>; - startup-delay-us = <70000>; + startup-delay-us = <7000>; enable-active-high; regulator-boot-on; regulator-always-on; @@ -681,7 +681,7 @@ regulator-max-microvolt = <823000>; pinctrl-names = "default"; gpio = <&gpio GPIOD_8 GPIO_ACTIVE_HIGH>; - startup-delay-us = <70000>; + startup-delay-us = <7000>; enable-active-high; regulator-boot-on; regulator-always-on; @@ -725,7 +725,7 @@ regulator-max-microvolt = <3300000>; pinctrl-names = "default"; gpio = <&gpio GPIOD_10 GPIO_ACTIVE_HIGH>; - startup-delay-us = <70000>; + startup-delay-us = <7000>; enable-active-high; regulator-boot-on; regulator-always-on; @@ -761,6 +761,7 @@ gpio = <&gpio GPIOH_7 GPIO_ACTIVE_LOW>; // (GPIOH_7 |sdcard-3v3) out lo ACTIVE LOW enable-active-low; //3.3V , high: 0V + startup-delay-us = <7000>; regulator-boot-on; regulator-always-on; }; @@ -775,6 +776,7 @@ gpio = <&gpio GPIOH_8 GPIO_ACTIVE_HIGH>; // (GPIOH_8 |VDDIO_C) out lo : 3300mV, 3.3V gpios-states = <0>; + startup-delay-us = <7000>; /* Based on P200 schematics, signal CARD_1.8V/3.3V_CTR */ states = <1800000 1 @@ -1786,11 +1788,11 @@ &pwm_ab { pinctrl-0 = <&pwm_a_pins1>; pinctrl-names = "default"; - status = "disabled"; + status = "okay"; }; &pwm_cd { - status = "disabled"; + status = "okay"; }; &pwm_ef { diff --git a/arch/arm64/boot/dts/amlogic/s5_s928x_ax201_v2_mxl258c_drm.dts b/arch/arm64/boot/dts/amlogic/s5_s928x_ax201_v2_mxl258c_drm.dts index d1dfcc192..57264889a 100644 --- a/arch/arm64/boot/dts/amlogic/s5_s928x_ax201_v2_mxl258c_drm.dts +++ b/arch/arm64/boot/dts/amlogic/s5_s928x_ax201_v2_mxl258c_drm.dts @@ -726,38 +726,6 @@ key_tolerance = <40 40 40>; }; - vddnpu_dvo_dos_vpu: pwm_ef-regulator { - compatible = "pwm-regulator"; - pwms = <&pwm_ef MESON_PWM_0 750 0>; - regulator-name = "vddnpu"; - regulator-min-microvolt = <720000>; - regulator-max-microvolt = <900000>; - //regulator-always-on; - max-duty-cycle = <750>; - /* 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>; @@ -766,7 +734,7 @@ regulator-max-microvolt = <1100000>; pinctrl-names = "default"; gpio = <&gpio GPIOD_8 GPIO_ACTIVE_HIGH>; - startup-delay-us = <70000>; + startup-delay-us = <7000>; enable-active-high; regulator-boot-on; regulator-always-on; @@ -780,7 +748,7 @@ regulator-max-microvolt = <1100000>; pinctrl-names = "default"; gpio = <&gpio GPIOD_8 GPIO_ACTIVE_HIGH>; - startup-delay-us = <70000>; + startup-delay-us = <7000>; enable-active-high; regulator-boot-on; regulator-always-on; @@ -794,7 +762,7 @@ regulator-max-microvolt = <823000>; pinctrl-names = "default"; gpio = <&gpio GPIOD_8 GPIO_ACTIVE_HIGH>; - startup-delay-us = <70000>; + startup-delay-us = <7000>; enable-active-high; regulator-boot-on; regulator-always-on; @@ -838,7 +806,7 @@ regulator-max-microvolt = <3300000>; pinctrl-names = "default"; gpio = <&gpio GPIOD_10 GPIO_ACTIVE_HIGH>; - startup-delay-us = <70000>; + startup-delay-us = <7000>; enable-active-high; regulator-boot-on; regulator-always-on; @@ -874,6 +842,7 @@ gpio = <&gpio GPIOH_7 GPIO_ACTIVE_LOW>; // (GPIOH_7 |sdcard-3v3) out lo ACTIVE LOW enable-active-low; //3.3V , high: 0V + startup-delay-us = <7000>; regulator-boot-on; regulator-always-on; }; @@ -888,6 +857,7 @@ gpio = <&gpio GPIOH_8 GPIO_ACTIVE_HIGH>; // (GPIOH_8 |VDDIO_C) out lo : 3300mV, 3.3V gpios-states = <0>; + startup-delay-us = <7000>; /* Based on P200 schematics, signal CARD_1.8V/3.3V_CTR */ states = <1800000 1 @@ -1914,11 +1884,11 @@ &pwm_ab { pinctrl-0 = <&pwm_a_pins1>; pinctrl-names = "default"; - status = "disabled"; + status = "okay"; }; &pwm_cd { - status = "disabled"; + status = "okay"; }; &pwm_ef { diff --git a/arch/arm64/boot/dts/amlogic/s5_s928x_ax208.dts b/arch/arm64/boot/dts/amlogic/s5_s928x_ax208.dts index c34b93771..a60fc8158 100644 --- a/arch/arm64/boot/dts/amlogic/s5_s928x_ax208.dts +++ b/arch/arm64/boot/dts/amlogic/s5_s928x_ax208.dts @@ -637,38 +637,6 @@ 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>; @@ -677,7 +645,7 @@ regulator-max-microvolt = <910000>; pinctrl-names = "default"; gpio = <&gpio GPIOE_4 GPIO_ACTIVE_LOW>; - startup-delay-us = <70000>; + startup-delay-us = <7000>; enable-active-low; regulator-boot-on; //regulator-always-on; @@ -691,7 +659,7 @@ regulator-max-microvolt = <1130000>; pinctrl-names = "default"; gpio = <&gpio GPIOD_8 GPIO_ACTIVE_HIGH>; - startup-delay-us = <70000>; + startup-delay-us = <7000>; enable-active-high; regulator-boot-on; regulator-always-on; @@ -705,7 +673,7 @@ regulator-max-microvolt = <600000>; pinctrl-names = "default"; gpio = <&gpio GPIOD_8 GPIO_ACTIVE_HIGH>; - startup-delay-us = <70000>; + startup-delay-us = <7000>; enable-active-high; regulator-boot-on; regulator-always-on; @@ -719,7 +687,7 @@ regulator-max-microvolt = <820000>; pinctrl-names = "default"; gpio = <&gpio GPIOD_8 GPIO_ACTIVE_HIGH>; - startup-delay-us = <70000>; + startup-delay-us = <7000>; enable-active-high; regulator-boot-on; regulator-always-on; @@ -753,7 +721,7 @@ regulator-max-microvolt = <1800000>; pinctrl-names = "default"; gpio = <&gpio GPIOD_10 GPIO_ACTIVE_HIGH>; - startup-delay-us = <70000>; + startup-delay-us = <7000>; enable-active-high; regulator-boot-on; regulator-always-on; @@ -767,7 +735,7 @@ regulator-max-microvolt = <3300000>; pinctrl-names = "default"; gpio = <&gpio GPIOD_10 GPIO_ACTIVE_HIGH>; - startup-delay-us = <70000>; + startup-delay-us = <7000>; enable-active-high; regulator-boot-on; regulator-always-on; @@ -781,7 +749,7 @@ regulator-max-microvolt = <800000>; pinctrl-names = "default"; gpio = <&gpio GPIOD_10 GPIO_ACTIVE_HIGH>; - startup-delay-us = <70000>; + startup-delay-us = <7000>; enable-active-high; regulator-boot-on; regulator-always-on; @@ -796,7 +764,7 @@ pinctrl-names = "default"; //open this gpio, reboot will hang !!! //gpio = <&gpio GPIOD_10 GPIO_ACTIVE_HIGH>; - startup-delay-us = <70000>; + startup-delay-us = <7000>; enable-active-high; regulator-boot-on; regulator-always-on; @@ -812,6 +780,7 @@ gpio = <&gpio GPIOH_7 GPIO_ACTIVE_LOW>; // (GPIOH_7 |sdcard-3v3) out lo ACTIVE LOW enable-active-low; //3.3V , high: 0V + startup-delay-us = <7000>; regulator-boot-on; regulator-always-on; }; @@ -826,7 +795,7 @@ gpio = <&gpio GPIOH_8 GPIO_ACTIVE_HIGH>; // (GPIOH_8 |VDDIO_C) out lo : 3300mV, 3.3V gpios-states = <0>; - + startup-delay-us = <7000>; /* Based on P200 schematics, signal CARD_1.8V/3.3V_CTR */ states = <1800000 1 3300000 0>; @@ -1812,11 +1781,11 @@ &pwm_ab { pinctrl-0 = <&pwm_a_pins1>; pinctrl-names = "default"; - status = "disabled"; + status = "okay"; }; &pwm_cd { - status = "disabled"; + status = "okay"; }; &pwm_ef { 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 3a29757bb..d5a3b1391 100644 --- a/arch/arm64/boot/dts/amlogic/s5_s928x_ax208_v2.dts +++ b/arch/arm64/boot/dts/amlogic/s5_s928x_ax208_v2.dts @@ -645,7 +645,7 @@ regulator-max-microvolt = <1130000>; pinctrl-names = "default"; gpio = <&gpio GPIOD_8 GPIO_ACTIVE_HIGH>; - startup-delay-us = <70000>; + startup-delay-us = <7000>; enable-active-high; regulator-boot-on; regulator-always-on; @@ -659,7 +659,7 @@ regulator-max-microvolt = <600000>; pinctrl-names = "default"; gpio = <&gpio GPIOD_8 GPIO_ACTIVE_HIGH>; - startup-delay-us = <70000>; + startup-delay-us = <7000>; enable-active-high; regulator-boot-on; regulator-always-on; @@ -673,7 +673,7 @@ regulator-max-microvolt = <820000>; pinctrl-names = "default"; gpio = <&gpio GPIOD_8 GPIO_ACTIVE_HIGH>; - startup-delay-us = <70000>; + startup-delay-us = <7000>; enable-active-high; regulator-boot-on; regulator-always-on; @@ -707,7 +707,7 @@ regulator-max-microvolt = <1800000>; pinctrl-names = "default"; gpio = <&gpio GPIOD_10 GPIO_ACTIVE_HIGH>; - startup-delay-us = <70000>; + startup-delay-us = <7000>; enable-active-high; regulator-boot-on; regulator-always-on; @@ -721,7 +721,7 @@ regulator-max-microvolt = <3300000>; pinctrl-names = "default"; gpio = <&gpio GPIOD_10 GPIO_ACTIVE_HIGH>; - startup-delay-us = <70000>; + startup-delay-us = <7000>; enable-active-high; regulator-boot-on; regulator-always-on; @@ -735,7 +735,7 @@ regulator-max-microvolt = <800000>; pinctrl-names = "default"; gpio = <&gpio GPIOD_10 GPIO_ACTIVE_HIGH>; - startup-delay-us = <70000>; + startup-delay-us = <7000>; enable-active-high; regulator-boot-on; regulator-always-on; @@ -750,7 +750,7 @@ pinctrl-names = "default"; //open this gpio, reboot will hang !!! //gpio = <&gpio GPIOD_10 GPIO_ACTIVE_HIGH>; - startup-delay-us = <70000>; + startup-delay-us = <7000>; enable-active-high; regulator-boot-on; regulator-always-on; @@ -766,6 +766,7 @@ gpio = <&gpio GPIOH_7 GPIO_ACTIVE_LOW>; // (GPIOH_7 |sdcard-3v3) out lo ACTIVE LOW enable-active-low; //3.3V , high: 0V + startup-delay-us = <7000>; regulator-boot-on; regulator-always-on; }; @@ -780,7 +781,7 @@ gpio = <&gpio GPIOH_8 GPIO_ACTIVE_HIGH>; // (GPIOH_8 |VDDIO_C) out lo : 3300mV, 3.3V gpios-states = <0>; - + startup-delay-us = <7000>; /* Based on P200 schematics, signal CARD_1.8V/3.3V_CTR */ states = <1800000 1 3300000 0>; @@ -1765,11 +1766,11 @@ &pwm_ab { pinctrl-0 = <&pwm_a_pins1>; pinctrl-names = "default"; - status = "disabled"; + status = "okay"; }; &pwm_cd { - status = "disabled"; + status = "okay"; }; &pwm_ef { diff --git a/arch/arm64/boot/dts/amlogic/s5_s928x_ax209.dts b/arch/arm64/boot/dts/amlogic/s5_s928x_ax209.dts index 6bf9e915c..b502d9b99 100644 --- a/arch/arm64/boot/dts/amlogic/s5_s928x_ax209.dts +++ b/arch/arm64/boot/dts/amlogic/s5_s928x_ax209.dts @@ -633,38 +633,6 @@ 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>; @@ -673,7 +641,7 @@ regulator-max-microvolt = <910000>; pinctrl-names = "default"; gpio = <&gpio GPIOE_4 GPIO_ACTIVE_LOW>; - startup-delay-us = <70000>; + startup-delay-us = <7000>; enable-active-low; regulator-boot-on; //regulator-always-on; @@ -687,7 +655,7 @@ regulator-max-microvolt = <1200000>; pinctrl-names = "default"; gpio = <&gpio GPIOD_8 GPIO_ACTIVE_HIGH>; - startup-delay-us = <70000>; + startup-delay-us = <7000>; enable-active-high; regulator-boot-on; regulator-always-on; @@ -701,7 +669,7 @@ regulator-max-microvolt = <820000>; pinctrl-names = "default"; gpio = <&gpio GPIOD_8 GPIO_ACTIVE_HIGH>; - startup-delay-us = <70000>; + startup-delay-us = <7000>; enable-active-high; regulator-boot-on; regulator-always-on; @@ -767,6 +735,7 @@ gpio = <&gpio GPIOH_7 GPIO_ACTIVE_LOW>; // (GPIOH_7 |sdcard-3v3) out lo ACTIVE LOW enable-active-low; //3.3V , high: 0V + startup-delay-us = <7000>; regulator-boot-on; regulator-always-on; }; @@ -1751,11 +1720,11 @@ &pwm_ab { pinctrl-0 = <&pwm_a_pins1>; pinctrl-names = "default"; - status = "disabled"; + status = "okay"; }; &pwm_cd { - status = "disabled"; + status = "okay"; }; &pwm_ef { 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 31d94f43b..423b14307 100644 --- a/arch/arm64/boot/dts/amlogic/s5_s928x_ax209_v2.dts +++ b/arch/arm64/boot/dts/amlogic/s5_s928x_ax209_v2.dts @@ -641,7 +641,7 @@ regulator-max-microvolt = <1200000>; pinctrl-names = "default"; gpio = <&gpio GPIOD_8 GPIO_ACTIVE_HIGH>; - startup-delay-us = <70000>; + startup-delay-us = <7000>; enable-active-high; regulator-boot-on; regulator-always-on; @@ -655,7 +655,7 @@ regulator-max-microvolt = <820000>; pinctrl-names = "default"; gpio = <&gpio GPIOD_8 GPIO_ACTIVE_HIGH>; - startup-delay-us = <70000>; + startup-delay-us = <7000>; enable-active-high; regulator-boot-on; regulator-always-on; @@ -721,6 +721,7 @@ gpio = <&gpio GPIOH_7 GPIO_ACTIVE_LOW>; // (GPIOH_7 |sdcard-3v3) out lo ACTIVE LOW enable-active-low; //3.3V , high: 0V + startup-delay-us = <7000>; regulator-boot-on; regulator-always-on; }; @@ -1701,11 +1702,11 @@ &pwm_ab { pinctrl-0 = <&pwm_a_pins1>; pinctrl-names = "default"; - status = "disabled"; + status = "okay"; }; &pwm_cd { - status = "disabled"; + status = "okay"; }; &pwm_ef {