| Message ID | 20241015122601.16127-1-johan+linaro@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 87c1870b5aea744d73f0e4442a285056c64d1239 |
| Headers | show |
| Series | arm64: dts: qcom: x1e80100: rename vph-pwr regulator nodes | expand |
On 15/10/2024 14:26, Johan Hovold wrote: > Rename the x1e80100 vph-pwr regulator nodes to use "regulator" as a > prefix for consistency with the other fixed regulators. > > Signed-off-by: Johan Hovold <johan+linaro@kernel.org> > --- > .../dts/qcom/x1e80100-asus-vivobook-s15.dts | 22 +++++++++---------- > arch/arm64/boot/dts/qcom/x1e80100-crd.dts | 22 +++++++++---------- > .../dts/qcom/x1e80100-lenovo-yoga-slim7x.dts | 22 +++++++++---------- > .../dts/qcom/x1e80100-microsoft-romulus.dtsi | 22 +++++++++---------- > 4 files changed, 44 insertions(+), 44 deletions(-) > > diff --git a/arch/arm64/boot/dts/qcom/x1e80100-asus-vivobook-s15.dts b/arch/arm64/boot/dts/qcom/x1e80100-asus-vivobook-s15.dts > index 20616bd4aa6c..b1f190a9686f 100644 > --- a/arch/arm64/boot/dts/qcom/x1e80100-asus-vivobook-s15.dts > +++ b/arch/arm64/boot/dts/qcom/x1e80100-asus-vivobook-s15.dts > @@ -94,17 +94,6 @@ linux,cma { > }; > }; > > - vph_pwr: vph-pwr-regulator { > - compatible = "regulator-fixed"; > - > - regulator-name = "vph_pwr"; > - regulator-min-microvolt = <3700000>; > - regulator-max-microvolt = <3700000>; > - > - regulator-always-on; > - regulator-boot-on; > - }; > - > vreg_edp_3p3: regulator-edp-3p3 { > compatible = "regulator-fixed"; > > @@ -135,6 +124,17 @@ vreg_nvme: regulator-nvme { > pinctrl-0 = <&nvme_reg_en>; > pinctrl-names = "default"; > }; > + > + vph_pwr: regulator-vph-pwr { > + compatible = "regulator-fixed"; > + > + regulator-name = "vph_pwr"; > + regulator-min-microvolt = <3700000>; > + regulator-max-microvolt = <3700000>; > + > + regulator-always-on; > + regulator-boot-on; > + }; > }; > > &apps_rsc { > diff --git a/arch/arm64/boot/dts/qcom/x1e80100-crd.dts b/arch/arm64/boot/dts/qcom/x1e80100-crd.dts > index 4ab7078f76e0..4ab9e0ca4591 100644 > --- a/arch/arm64/boot/dts/qcom/x1e80100-crd.dts > +++ b/arch/arm64/boot/dts/qcom/x1e80100-crd.dts > @@ -261,17 +261,6 @@ platform { > }; > }; > > - vph_pwr: vph-pwr-regulator { > - compatible = "regulator-fixed"; > - > - regulator-name = "vph_pwr"; > - regulator-min-microvolt = <3700000>; > - regulator-max-microvolt = <3700000>; > - > - regulator-always-on; > - regulator-boot-on; > - }; > - > vreg_edp_3p3: regulator-edp-3p3 { > compatible = "regulator-fixed"; > > @@ -319,6 +308,17 @@ vreg_nvme: regulator-nvme { > pinctrl-0 = <&nvme_reg_en>; > }; > > + vph_pwr: regulator-vph-pwr { > + compatible = "regulator-fixed"; > + > + regulator-name = "vph_pwr"; > + regulator-min-microvolt = <3700000>; > + regulator-max-microvolt = <3700000>; > + > + regulator-always-on; > + regulator-boot-on; > + }; > + > vreg_wwan: regulator-wwan { > compatible = "regulator-fixed"; > > diff --git a/arch/arm64/boot/dts/qcom/x1e80100-lenovo-yoga-slim7x.dts b/arch/arm64/boot/dts/qcom/x1e80100-lenovo-yoga-slim7x.dts > index 3c13331a9ef4..10ba934652c3 100644 > --- a/arch/arm64/boot/dts/qcom/x1e80100-lenovo-yoga-slim7x.dts > +++ b/arch/arm64/boot/dts/qcom/x1e80100-lenovo-yoga-slim7x.dts > @@ -166,17 +166,6 @@ platform { > }; > }; > > - vph_pwr: vph-pwr-regulator { > - compatible = "regulator-fixed"; > - > - regulator-name = "vph_pwr"; > - regulator-min-microvolt = <3700000>; > - regulator-max-microvolt = <3700000>; > - > - regulator-always-on; > - regulator-boot-on; > - }; > - > vreg_edp_3p3: regulator-edp-3p3 { > compatible = "regulator-fixed"; > > @@ -206,6 +195,17 @@ vreg_nvme: regulator-nvme { > pinctrl-0 = <&nvme_reg_en>; > pinctrl-names = "default"; > }; > + > + vph_pwr: regulator-vph-pwr { > + compatible = "regulator-fixed"; > + > + regulator-name = "vph_pwr"; > + regulator-min-microvolt = <3700000>; > + regulator-max-microvolt = <3700000>; > + > + regulator-always-on; > + regulator-boot-on; > + }; > }; > > &apps_rsc { > diff --git a/arch/arm64/boot/dts/qcom/x1e80100-microsoft-romulus.dtsi b/arch/arm64/boot/dts/qcom/x1e80100-microsoft-romulus.dtsi > index 42e02ad6a9c3..c47a63b5c85b 100644 > --- a/arch/arm64/boot/dts/qcom/x1e80100-microsoft-romulus.dtsi > +++ b/arch/arm64/boot/dts/qcom/x1e80100-microsoft-romulus.dtsi > @@ -125,17 +125,6 @@ linux,cma { > }; > }; > > - vph_pwr: vph-pwr-regulator { > - compatible = "regulator-fixed"; > - > - regulator-name = "vph_pwr"; > - regulator-min-microvolt = <3700000>; > - regulator-max-microvolt = <3700000>; > - > - regulator-always-on; > - regulator-boot-on; > - }; > - > vreg_edp_3p3: regulator-edp-3p3 { > compatible = "regulator-fixed"; > > @@ -165,6 +154,17 @@ vreg_nvme: regulator-nvme { > pinctrl-0 = <&nvme_reg_en>; > pinctrl-names = "default"; > }; > + > + vph_pwr: regulator-vph-pwr { > + compatible = "regulator-fixed"; > + > + regulator-name = "vph_pwr"; > + regulator-min-microvolt = <3700000>; > + regulator-max-microvolt = <3700000>; > + > + regulator-always-on; > + regulator-boot-on; > + }; > }; > > &apps_rsc { Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
On Tue, Oct 15, 2024 at 02:26:00PM +0200, Johan Hovold wrote: > Rename the x1e80100 vph-pwr regulator nodes to use "regulator" as a > prefix for consistency with the other fixed regulators. > > Signed-off-by: Johan Hovold <johan+linaro@kernel.org> > --- > .../dts/qcom/x1e80100-asus-vivobook-s15.dts | 22 +++++++++---------- > arch/arm64/boot/dts/qcom/x1e80100-crd.dts | 22 +++++++++---------- > .../dts/qcom/x1e80100-lenovo-yoga-slim7x.dts | 22 +++++++++---------- > .../dts/qcom/x1e80100-microsoft-romulus.dtsi | 22 +++++++++---------- > 4 files changed, 44 insertions(+), 44 deletions(-) > Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
On Tue, 15 Oct 2024 14:26:00 +0200, Johan Hovold wrote: > Rename the x1e80100 vph-pwr regulator nodes to use "regulator" as a > prefix for consistency with the other fixed regulators. > > Applied, thanks! [1/1] arm64: dts: qcom: x1e80100: rename vph-pwr regulator nodes commit: 87c1870b5aea744d73f0e4442a285056c64d1239 Best regards,
diff --git a/arch/arm64/boot/dts/qcom/x1e80100-asus-vivobook-s15.dts b/arch/arm64/boot/dts/qcom/x1e80100-asus-vivobook-s15.dts index 20616bd4aa6c..b1f190a9686f 100644 --- a/arch/arm64/boot/dts/qcom/x1e80100-asus-vivobook-s15.dts +++ b/arch/arm64/boot/dts/qcom/x1e80100-asus-vivobook-s15.dts @@ -94,17 +94,6 @@ linux,cma { }; }; - vph_pwr: vph-pwr-regulator { - compatible = "regulator-fixed"; - - regulator-name = "vph_pwr"; - regulator-min-microvolt = <3700000>; - regulator-max-microvolt = <3700000>; - - regulator-always-on; - regulator-boot-on; - }; - vreg_edp_3p3: regulator-edp-3p3 { compatible = "regulator-fixed"; @@ -135,6 +124,17 @@ vreg_nvme: regulator-nvme { pinctrl-0 = <&nvme_reg_en>; pinctrl-names = "default"; }; + + vph_pwr: regulator-vph-pwr { + compatible = "regulator-fixed"; + + regulator-name = "vph_pwr"; + regulator-min-microvolt = <3700000>; + regulator-max-microvolt = <3700000>; + + regulator-always-on; + regulator-boot-on; + }; }; &apps_rsc { diff --git a/arch/arm64/boot/dts/qcom/x1e80100-crd.dts b/arch/arm64/boot/dts/qcom/x1e80100-crd.dts index 4ab7078f76e0..4ab9e0ca4591 100644 --- a/arch/arm64/boot/dts/qcom/x1e80100-crd.dts +++ b/arch/arm64/boot/dts/qcom/x1e80100-crd.dts @@ -261,17 +261,6 @@ platform { }; }; - vph_pwr: vph-pwr-regulator { - compatible = "regulator-fixed"; - - regulator-name = "vph_pwr"; - regulator-min-microvolt = <3700000>; - regulator-max-microvolt = <3700000>; - - regulator-always-on; - regulator-boot-on; - }; - vreg_edp_3p3: regulator-edp-3p3 { compatible = "regulator-fixed"; @@ -319,6 +308,17 @@ vreg_nvme: regulator-nvme { pinctrl-0 = <&nvme_reg_en>; }; + vph_pwr: regulator-vph-pwr { + compatible = "regulator-fixed"; + + regulator-name = "vph_pwr"; + regulator-min-microvolt = <3700000>; + regulator-max-microvolt = <3700000>; + + regulator-always-on; + regulator-boot-on; + }; + vreg_wwan: regulator-wwan { compatible = "regulator-fixed"; diff --git a/arch/arm64/boot/dts/qcom/x1e80100-lenovo-yoga-slim7x.dts b/arch/arm64/boot/dts/qcom/x1e80100-lenovo-yoga-slim7x.dts index 3c13331a9ef4..10ba934652c3 100644 --- a/arch/arm64/boot/dts/qcom/x1e80100-lenovo-yoga-slim7x.dts +++ b/arch/arm64/boot/dts/qcom/x1e80100-lenovo-yoga-slim7x.dts @@ -166,17 +166,6 @@ platform { }; }; - vph_pwr: vph-pwr-regulator { - compatible = "regulator-fixed"; - - regulator-name = "vph_pwr"; - regulator-min-microvolt = <3700000>; - regulator-max-microvolt = <3700000>; - - regulator-always-on; - regulator-boot-on; - }; - vreg_edp_3p3: regulator-edp-3p3 { compatible = "regulator-fixed"; @@ -206,6 +195,17 @@ vreg_nvme: regulator-nvme { pinctrl-0 = <&nvme_reg_en>; pinctrl-names = "default"; }; + + vph_pwr: regulator-vph-pwr { + compatible = "regulator-fixed"; + + regulator-name = "vph_pwr"; + regulator-min-microvolt = <3700000>; + regulator-max-microvolt = <3700000>; + + regulator-always-on; + regulator-boot-on; + }; }; &apps_rsc { diff --git a/arch/arm64/boot/dts/qcom/x1e80100-microsoft-romulus.dtsi b/arch/arm64/boot/dts/qcom/x1e80100-microsoft-romulus.dtsi index 42e02ad6a9c3..c47a63b5c85b 100644 --- a/arch/arm64/boot/dts/qcom/x1e80100-microsoft-romulus.dtsi +++ b/arch/arm64/boot/dts/qcom/x1e80100-microsoft-romulus.dtsi @@ -125,17 +125,6 @@ linux,cma { }; }; - vph_pwr: vph-pwr-regulator { - compatible = "regulator-fixed"; - - regulator-name = "vph_pwr"; - regulator-min-microvolt = <3700000>; - regulator-max-microvolt = <3700000>; - - regulator-always-on; - regulator-boot-on; - }; - vreg_edp_3p3: regulator-edp-3p3 { compatible = "regulator-fixed"; @@ -165,6 +154,17 @@ vreg_nvme: regulator-nvme { pinctrl-0 = <&nvme_reg_en>; pinctrl-names = "default"; }; + + vph_pwr: regulator-vph-pwr { + compatible = "regulator-fixed"; + + regulator-name = "vph_pwr"; + regulator-min-microvolt = <3700000>; + regulator-max-microvolt = <3700000>; + + regulator-always-on; + regulator-boot-on; + }; }; &apps_rsc {
Rename the x1e80100 vph-pwr regulator nodes to use "regulator" as a prefix for consistency with the other fixed regulators. Signed-off-by: Johan Hovold <johan+linaro@kernel.org> --- .../dts/qcom/x1e80100-asus-vivobook-s15.dts | 22 +++++++++---------- arch/arm64/boot/dts/qcom/x1e80100-crd.dts | 22 +++++++++---------- .../dts/qcom/x1e80100-lenovo-yoga-slim7x.dts | 22 +++++++++---------- .../dts/qcom/x1e80100-microsoft-romulus.dtsi | 22 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-)