* [PATCH 2/2] arm64: dts: qcom: sc8280xp-crd: Fix naming of regulators
2023-06-20 20:39 [PATCH 1/2] arm64: dts: qcom: sc8280xp-crd: Correct vreg_misc_3p3 GPIO Bjorn Andersson
@ 2023-06-20 20:39 ` Bjorn Andersson
2023-06-20 20:42 ` Konrad Dybcio
2023-06-21 7:07 ` Johan Hovold
2023-06-20 20:41 ` [PATCH 1/2] arm64: dts: qcom: sc8280xp-crd: Correct vreg_misc_3p3 GPIO Konrad Dybcio
` (2 subsequent siblings)
3 siblings, 2 replies; 8+ messages in thread
From: Bjorn Andersson @ 2023-06-20 20:39 UTC (permalink / raw)
To: Bjorn Andersson, Konrad Dybcio, Johan Hovold
Cc: Rob Herring, Krzysztof Kozlowski, Conor Dooley, linux-arm-msm,
devicetree, linux-kernel
The external regulators in the CRD seems to have inherited their names
from the X13s DeviceTree, correct them.
Signed-off-by: Bjorn Andersson <quic_bjorande@quicinc.com>
---
arch/arm64/boot/dts/qcom/sc8280xp-crd.dts | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts b/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts
index b21b41a066b6..678cdf253f2e 100644
--- a/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts
+++ b/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts
@@ -133,7 +133,7 @@ vreg_edp_3p3: regulator-edp-3p3 {
vreg_edp_bl: regulator-edp-bl {
compatible = "regulator-fixed";
- regulator-name = "VBL9";
+ regulator-name = "VREG_EDP_BL";
regulator-min-microvolt = <3600000>;
regulator-max-microvolt = <3600000>;
@@ -149,7 +149,7 @@ vreg_edp_bl: regulator-edp-bl {
vreg_nvme: regulator-nvme {
compatible = "regulator-fixed";
- regulator-name = "VCC3_SSD";
+ regulator-name = "VREG_NVME_3P3";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
@@ -163,7 +163,7 @@ vreg_nvme: regulator-nvme {
vreg_misc_3p3: regulator-misc-3p3 {
compatible = "regulator-fixed";
- regulator-name = "VCC3B";
+ regulator-name = "VREG_MISC_3P3";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
@@ -180,7 +180,7 @@ vreg_misc_3p3: regulator-misc-3p3 {
vreg_wlan: regulator-wlan {
compatible = "regulator-fixed";
- regulator-name = "VCC_WLAN_3R9";
+ regulator-name = "VPH_PWR_WLAN";
regulator-min-microvolt = <3900000>;
regulator-max-microvolt = <3900000>;
@@ -196,7 +196,7 @@ vreg_wlan: regulator-wlan {
vreg_wwan: regulator-wwan {
compatible = "regulator-fixed";
- regulator-name = "VCC3B_WAN";
+ regulator-name = "SDX_VPH_PWR";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
--
2.25.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH 2/2] arm64: dts: qcom: sc8280xp-crd: Fix naming of regulators
2023-06-20 20:39 ` [PATCH 2/2] arm64: dts: qcom: sc8280xp-crd: Fix naming of regulators Bjorn Andersson
@ 2023-06-20 20:42 ` Konrad Dybcio
2023-06-21 6:52 ` Johan Hovold
2023-06-21 7:07 ` Johan Hovold
1 sibling, 1 reply; 8+ messages in thread
From: Konrad Dybcio @ 2023-06-20 20:42 UTC (permalink / raw)
To: Bjorn Andersson, Bjorn Andersson, Johan Hovold
Cc: Rob Herring, Krzysztof Kozlowski, Conor Dooley, linux-arm-msm,
devicetree, linux-kernel
On 20.06.2023 22:39, Bjorn Andersson wrote:
> The external regulators in the CRD seems to have inherited their names
> from the X13s DeviceTree, correct them.
>
> Signed-off-by: Bjorn Andersson <quic_bjorande@quicinc.com>
> ---
Please also update the node names to match.
Konrad
> arch/arm64/boot/dts/qcom/sc8280xp-crd.dts | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts b/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts
> index b21b41a066b6..678cdf253f2e 100644
> --- a/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts
> +++ b/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts
> @@ -133,7 +133,7 @@ vreg_edp_3p3: regulator-edp-3p3 {
> vreg_edp_bl: regulator-edp-bl {
> compatible = "regulator-fixed";
>
> - regulator-name = "VBL9";
> + regulator-name = "VREG_EDP_BL";
> regulator-min-microvolt = <3600000>;
> regulator-max-microvolt = <3600000>;
>
> @@ -149,7 +149,7 @@ vreg_edp_bl: regulator-edp-bl {
> vreg_nvme: regulator-nvme {
> compatible = "regulator-fixed";
>
> - regulator-name = "VCC3_SSD";
> + regulator-name = "VREG_NVME_3P3";
> regulator-min-microvolt = <3300000>;
> regulator-max-microvolt = <3300000>;
>
> @@ -163,7 +163,7 @@ vreg_nvme: regulator-nvme {
> vreg_misc_3p3: regulator-misc-3p3 {
> compatible = "regulator-fixed";
>
> - regulator-name = "VCC3B";
> + regulator-name = "VREG_MISC_3P3";
> regulator-min-microvolt = <3300000>;
> regulator-max-microvolt = <3300000>;
>
> @@ -180,7 +180,7 @@ vreg_misc_3p3: regulator-misc-3p3 {
> vreg_wlan: regulator-wlan {
> compatible = "regulator-fixed";
>
> - regulator-name = "VCC_WLAN_3R9";
> + regulator-name = "VPH_PWR_WLAN";
> regulator-min-microvolt = <3900000>;
> regulator-max-microvolt = <3900000>;
>
> @@ -196,7 +196,7 @@ vreg_wlan: regulator-wlan {
> vreg_wwan: regulator-wwan {
> compatible = "regulator-fixed";
>
> - regulator-name = "VCC3B_WAN";
> + regulator-name = "SDX_VPH_PWR";
> regulator-min-microvolt = <3300000>;
> regulator-max-microvolt = <3300000>;
>
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH 2/2] arm64: dts: qcom: sc8280xp-crd: Fix naming of regulators
2023-06-20 20:42 ` Konrad Dybcio
@ 2023-06-21 6:52 ` Johan Hovold
0 siblings, 0 replies; 8+ messages in thread
From: Johan Hovold @ 2023-06-21 6:52 UTC (permalink / raw)
To: Konrad Dybcio
Cc: Bjorn Andersson, Bjorn Andersson, Johan Hovold, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, linux-arm-msm, devicetree,
linux-kernel
On Tue, Jun 20, 2023 at 10:42:12PM +0200, Konrad Dybcio wrote:
> On 20.06.2023 22:39, Bjorn Andersson wrote:
> > The external regulators in the CRD seems to have inherited their names
> > from the X13s DeviceTree, correct them.
> >
> > Signed-off-by: Bjorn Andersson <quic_bjorande@quicinc.com>
> > ---
> Please also update the node names to match.
I don't think that's necessary in this case. The labels and node names
currently used are either close enough or more descriptive.
Johan
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 2/2] arm64: dts: qcom: sc8280xp-crd: Fix naming of regulators
2023-06-20 20:39 ` [PATCH 2/2] arm64: dts: qcom: sc8280xp-crd: Fix naming of regulators Bjorn Andersson
2023-06-20 20:42 ` Konrad Dybcio
@ 2023-06-21 7:07 ` Johan Hovold
1 sibling, 0 replies; 8+ messages in thread
From: Johan Hovold @ 2023-06-21 7:07 UTC (permalink / raw)
To: Bjorn Andersson
Cc: Bjorn Andersson, Konrad Dybcio, Johan Hovold, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, linux-arm-msm, devicetree,
linux-kernel
On Tue, Jun 20, 2023 at 01:39:15PM -0700, Bjorn Andersson wrote:
> The external regulators in the CRD seems to have inherited their names
> from the X13s DeviceTree, correct them.
Yeah, without access to the schematics that's a guess as good as
anything. Fortunately, you're there to dig out the names. :)
> Signed-off-by: Bjorn Andersson <quic_bjorande@quicinc.com>
Reviewed-by: Johan Hovold <johan+linaro@kernel.org>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 1/2] arm64: dts: qcom: sc8280xp-crd: Correct vreg_misc_3p3 GPIO
2023-06-20 20:39 [PATCH 1/2] arm64: dts: qcom: sc8280xp-crd: Correct vreg_misc_3p3 GPIO Bjorn Andersson
2023-06-20 20:39 ` [PATCH 2/2] arm64: dts: qcom: sc8280xp-crd: Fix naming of regulators Bjorn Andersson
@ 2023-06-20 20:41 ` Konrad Dybcio
2023-06-21 7:04 ` Johan Hovold
2023-07-10 5:07 ` (subset) " Bjorn Andersson
3 siblings, 0 replies; 8+ messages in thread
From: Konrad Dybcio @ 2023-06-20 20:41 UTC (permalink / raw)
To: Bjorn Andersson, Bjorn Andersson, Johan Hovold
Cc: Rob Herring, Krzysztof Kozlowski, Conor Dooley, linux-arm-msm,
devicetree, linux-kernel
On 20.06.2023 22:39, Bjorn Andersson wrote:
> The vreg_misc_3p3 regulator is controlled by PMC8280_1 GPIO 2, not 1, on
> the CRD.
>
> Fixes: ccd3517faf18 ("arm64: dts: qcom: sc8280xp: Add reference device")
> Signed-off-by: Bjorn Andersson <quic_bjorande@quicinc.com>
> ---
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Konrad
> arch/arm64/boot/dts/qcom/sc8280xp-crd.dts | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts b/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts
> index b566e403d1db..b21b41a066b6 100644
> --- a/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts
> +++ b/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts
> @@ -167,7 +167,7 @@ vreg_misc_3p3: regulator-misc-3p3 {
> regulator-min-microvolt = <3300000>;
> regulator-max-microvolt = <3300000>;
>
> - gpio = <&pmc8280_1_gpios 1 GPIO_ACTIVE_HIGH>;
> + gpio = <&pmc8280_1_gpios 2 GPIO_ACTIVE_HIGH>;
> enable-active-high;
>
> pinctrl-names = "default";
> @@ -757,7 +757,7 @@ edp_bl_reg_en: edp-bl-reg-en-state {
> };
>
> misc_3p3_reg_en: misc-3p3-reg-en-state {
> - pins = "gpio1";
> + pins = "gpio2";
> function = "normal";
> };
> };
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH 1/2] arm64: dts: qcom: sc8280xp-crd: Correct vreg_misc_3p3 GPIO
2023-06-20 20:39 [PATCH 1/2] arm64: dts: qcom: sc8280xp-crd: Correct vreg_misc_3p3 GPIO Bjorn Andersson
2023-06-20 20:39 ` [PATCH 2/2] arm64: dts: qcom: sc8280xp-crd: Fix naming of regulators Bjorn Andersson
2023-06-20 20:41 ` [PATCH 1/2] arm64: dts: qcom: sc8280xp-crd: Correct vreg_misc_3p3 GPIO Konrad Dybcio
@ 2023-06-21 7:04 ` Johan Hovold
2023-07-10 5:07 ` (subset) " Bjorn Andersson
3 siblings, 0 replies; 8+ messages in thread
From: Johan Hovold @ 2023-06-21 7:04 UTC (permalink / raw)
To: Bjorn Andersson
Cc: Bjorn Andersson, Konrad Dybcio, Johan Hovold, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, linux-arm-msm, devicetree,
linux-kernel
On Tue, Jun 20, 2023 at 01:39:14PM -0700, Bjorn Andersson wrote:
> The vreg_misc_3p3 regulator is controlled by PMC8280_1 GPIO 2, not 1, on
> the CRD.
>
> Fixes: ccd3517faf18 ("arm64: dts: qcom: sc8280xp: Add reference device")
> Signed-off-by: Bjorn Andersson <quic_bjorande@quicinc.com>
The old off-by-one again. Both of these are apparently configured as
outputs and driven high by the boot firmware.
Reviewed-by: Johan Hovold <johan+linaro@kernel.org>
Tested-by: Johan Hovold <johan+linaro@kernel.org>
Johan
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: (subset) [PATCH 1/2] arm64: dts: qcom: sc8280xp-crd: Correct vreg_misc_3p3 GPIO
2023-06-20 20:39 [PATCH 1/2] arm64: dts: qcom: sc8280xp-crd: Correct vreg_misc_3p3 GPIO Bjorn Andersson
` (2 preceding siblings ...)
2023-06-21 7:04 ` Johan Hovold
@ 2023-07-10 5:07 ` Bjorn Andersson
3 siblings, 0 replies; 8+ messages in thread
From: Bjorn Andersson @ 2023-07-10 5:07 UTC (permalink / raw)
To: Konrad Dybcio, Johan Hovold, Bjorn Andersson
Cc: Rob Herring, Krzysztof Kozlowski, Conor Dooley, linux-arm-msm,
devicetree, linux-kernel
On Tue, 20 Jun 2023 13:39:14 -0700, Bjorn Andersson wrote:
> The vreg_misc_3p3 regulator is controlled by PMC8280_1 GPIO 2, not 1, on
> the CRD.
>
>
Applied, thanks!
[1/2] arm64: dts: qcom: sc8280xp-crd: Correct vreg_misc_3p3 GPIO
commit: 9566b5271f68bdf6e69b7c511850e3fb75cd18be
[2/2] arm64: dts: qcom: sc8280xp-crd: Fix naming of regulators
commit: 8882ae076344f8b4e9f1e5a116e1a83c4292b790
Best regards,
--
Bjorn Andersson <andersson@kernel.org>
^ permalink raw reply [flat|nested] 8+ messages in thread