All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/5] arm64: dts: qcom: apq8096-db820c: specify adsp firmware name
@ 2021-11-04  0:29 Dmitry Baryshkov
  2021-11-04  0:29 ` [PATCH 2/5] arm64: dts: qcom: apq8096-db820c: add missing regulator details Dmitry Baryshkov
                   ` (4 more replies)
  0 siblings, 5 replies; 6+ messages in thread
From: Dmitry Baryshkov @ 2021-11-04  0:29 UTC (permalink / raw)
  To: Andy Gross, Bjorn Andersson, Rob Herring; +Cc: linux-arm-msm, devicetree

Specify firmware name to be used for the ADSP. Quoting Bjorn from the
respective apq8016-sbc commit:

The firmware for the modem and WiFi subsystems platform specific and is
signed with a OEM specific key (or a test key). In order to support more
than a single device it is therefor not possible to rely on the default
path and stash these files directly in the firmware directory.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
 arch/arm64/boot/dts/qcom/apq8096-db820c.dts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm64/boot/dts/qcom/apq8096-db820c.dts b/arch/arm64/boot/dts/qcom/apq8096-db820c.dts
index d01a512634cf..7e7b416e7d21 100644
--- a/arch/arm64/boot/dts/qcom/apq8096-db820c.dts
+++ b/arch/arm64/boot/dts/qcom/apq8096-db820c.dts
@@ -166,6 +166,7 @@ bluetooth {
 
 &adsp_pil {
 	status = "okay";
+	firmware-name = "qcom/apq8096/adsp.mbn";
 };
 
 &blsp2_i2c1 {
-- 
2.33.0


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [PATCH 2/5] arm64: dts: qcom: apq8096-db820c: add missing regulator details
  2021-11-04  0:29 [PATCH 1/5] arm64: dts: qcom: apq8096-db820c: specify adsp firmware name Dmitry Baryshkov
@ 2021-11-04  0:29 ` Dmitry Baryshkov
  2021-11-04  0:29 ` [PATCH 3/5] arm64: dts: qcom:apq8096-db820c: correct lvs1 and lvs2 supply property Dmitry Baryshkov
                   ` (3 subsequent siblings)
  4 siblings, 0 replies; 6+ messages in thread
From: Dmitry Baryshkov @ 2021-11-04  0:29 UTC (permalink / raw)
  To: Andy Gross, Bjorn Andersson, Rob Herring; +Cc: linux-arm-msm, devicetree

Specify that S11 (well, whole block of s8+s9+s10+s11) of pm8994 and S2
(s2 + s3) of pmi8994 are supplied by vph_pwr. While we are at it, add
regulator name to S11, so that is displayed as VDD_APCC in the system.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
 arch/arm64/boot/dts/qcom/apq8096-db820c.dts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/arch/arm64/boot/dts/qcom/apq8096-db820c.dts b/arch/arm64/boot/dts/qcom/apq8096-db820c.dts
index 7e7b416e7d21..9dbac589482b 100644
--- a/arch/arm64/boot/dts/qcom/apq8096-db820c.dts
+++ b/arch/arm64/boot/dts/qcom/apq8096-db820c.dts
@@ -633,6 +633,8 @@ &pm8994_mpps {
 
 &pm8994_spmi_regulators {
 	qcom,saw-reg = <&saw3>;
+	vdd_s11-supply = <&vph_pwr>;
+
 	s9 {
 		qcom,saw-slave;
 	};
@@ -641,6 +643,7 @@ s10 {
 	};
 	s11 {
 		qcom,saw-leader;
+		regulator-name = "VDD_APCC";
 		regulator-always-on;
 		regulator-min-microvolt = <980000>;
 		regulator-max-microvolt = <980000>;
@@ -673,6 +676,8 @@ pinconf {
 };
 
 &pmi8994_spmi_regulators {
+	vdd_s2-supply = <&vph_pwr>;
+
 	vdd_gfx: s2@1700 {
 		reg = <0x1700 0x100>;
 		regulator-name = "VDD_GFX";
-- 
2.33.0


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [PATCH 3/5] arm64: dts: qcom:apq8096-db820c: correct lvs1 and lvs2 supply property
  2021-11-04  0:29 [PATCH 1/5] arm64: dts: qcom: apq8096-db820c: specify adsp firmware name Dmitry Baryshkov
  2021-11-04  0:29 ` [PATCH 2/5] arm64: dts: qcom: apq8096-db820c: add missing regulator details Dmitry Baryshkov
@ 2021-11-04  0:29 ` Dmitry Baryshkov
  2021-11-04  0:29 ` [PATCH 4/5] arm64: dts: qcom: msm8994-sony-xperia-kitakami: " Dmitry Baryshkov
                   ` (2 subsequent siblings)
  4 siblings, 0 replies; 6+ messages in thread
From: Dmitry Baryshkov @ 2021-11-04  0:29 UTC (permalink / raw)
  To: Andy Gross, Bjorn Andersson, Rob Herring; +Cc: linux-arm-msm, devicetree

The qcom_rpm_smd_regulator driver uses vdd_lvs1_2-supply property to
specify the supply regulator for LVS1 and LVS2 (following the pin name
in the PMIC datasheet). Correct the board's device tree property, so
that the regulator supply is setup properly.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
 arch/arm64/boot/dts/qcom/apq8096-db820c.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/qcom/apq8096-db820c.dts b/arch/arm64/boot/dts/qcom/apq8096-db820c.dts
index 9dbac589482b..28403d2ffd31 100644
--- a/arch/arm64/boot/dts/qcom/apq8096-db820c.dts
+++ b/arch/arm64/boot/dts/qcom/apq8096-db820c.dts
@@ -715,7 +715,7 @@ pm8994-regulators {
 		vdd_l17_l29-supply = <&vph_pwr_bbyp>;
 		vdd_l20_l21-supply = <&vph_pwr_bbyp>;
 		vdd_l25-supply = <&vreg_s3a_1p3>;
-		vdd_lvs1_lvs2-supply = <&vreg_s4a_1p8>;
+		vdd_lvs1_2-supply = <&vreg_s4a_1p8>;
 
 		vreg_s3a_1p3: s3 {
 			regulator-name = "vreg_s3a_1p3";
-- 
2.33.0


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [PATCH 4/5] arm64: dts: qcom: msm8994-sony-xperia-kitakami: correct lvs1 and lvs2 supply property
  2021-11-04  0:29 [PATCH 1/5] arm64: dts: qcom: apq8096-db820c: specify adsp firmware name Dmitry Baryshkov
  2021-11-04  0:29 ` [PATCH 2/5] arm64: dts: qcom: apq8096-db820c: add missing regulator details Dmitry Baryshkov
  2021-11-04  0:29 ` [PATCH 3/5] arm64: dts: qcom:apq8096-db820c: correct lvs1 and lvs2 supply property Dmitry Baryshkov
@ 2021-11-04  0:29 ` Dmitry Baryshkov
  2021-11-04  0:29 ` [PATCH 5/5] arm64: dts: qcom: msm8996-sony-xperia-tone: fix SPMI regulators declaration Dmitry Baryshkov
  2021-11-20 23:55 ` [PATCH 1/5] arm64: dts: qcom: apq8096-db820c: specify adsp firmware name Bjorn Andersson
  4 siblings, 0 replies; 6+ messages in thread
From: Dmitry Baryshkov @ 2021-11-04  0:29 UTC (permalink / raw)
  To: Andy Gross, Bjorn Andersson, Rob Herring
  Cc: linux-arm-msm, devicetree, Konrad Dybcio

The qcom_rpm_smd_regulator driver uses vdd_lvs1_2-supply property to
specify the supply regulator for LVS1 and LVS2 (following the pin name
in the PMIC datasheet). Correct the board's device tree property, so
that the regulator supply is setup properly.

Cc: Konrad Dybcio <konrad.dybcio@somainline.org>
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
 arch/arm64/boot/dts/qcom/msm8994-sony-xperia-kitakami.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/qcom/msm8994-sony-xperia-kitakami.dtsi b/arch/arm64/boot/dts/qcom/msm8994-sony-xperia-kitakami.dtsi
index 48de66bf19c4..7cc564d8ca7c 100644
--- a/arch/arm64/boot/dts/qcom/msm8994-sony-xperia-kitakami.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8994-sony-xperia-kitakami.dtsi
@@ -223,7 +223,7 @@ pm8994_regulators: pm8994-regulators {
 		vdd_l17_l29-supply = <&pmi8994_bby>;
 		vdd_l20_l21-supply = <&pmi8994_bby>;
 		vdd_l25-supply = <&pm8994_s3>;
-		vdd_lvs1_lvs2-supply = <&pm8994_s4>;
+		vdd_lvs1_2-supply = <&pm8994_s4>;
 
 		/* S1, S2, S6 and S12 are managed by RPMPD */
 
-- 
2.33.0


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [PATCH 5/5] arm64: dts: qcom: msm8996-sony-xperia-tone: fix SPMI regulators declaration
  2021-11-04  0:29 [PATCH 1/5] arm64: dts: qcom: apq8096-db820c: specify adsp firmware name Dmitry Baryshkov
                   ` (2 preceding siblings ...)
  2021-11-04  0:29 ` [PATCH 4/5] arm64: dts: qcom: msm8994-sony-xperia-kitakami: " Dmitry Baryshkov
@ 2021-11-04  0:29 ` Dmitry Baryshkov
  2021-11-20 23:55 ` [PATCH 1/5] arm64: dts: qcom: apq8096-db820c: specify adsp firmware name Bjorn Andersson
  4 siblings, 0 replies; 6+ messages in thread
From: Dmitry Baryshkov @ 2021-11-04  0:29 UTC (permalink / raw)
  To: Andy Gross, Bjorn Andersson, Rob Herring
  Cc: linux-arm-msm, devicetree, AngeloGioacchino Del Regno

Device tree for the Sony Xperia tone family of devices specifies
S9+S10+S11 SAW regulator as a part of the pmi8994_spmi_regulators device
tree node. However PMI8994 does not have these regulators, they are part
of the PM8994 device. All other MSM8996-based devices list them in the
pm8994_spmi_regulators device tree node. Move them accordingly.

Cc: AngeloGioacchino Del Regno <angelogioacchino.delregno@somainline.org>
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
 .../dts/qcom/msm8996-sony-xperia-tone.dtsi    | 29 ++++++++++---------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/arch/arm64/boot/dts/qcom/msm8996-sony-xperia-tone.dtsi b/arch/arm64/boot/dts/qcom/msm8996-sony-xperia-tone.dtsi
index 4c26e66f0610..11acd9e31a75 100644
--- a/arch/arm64/boot/dts/qcom/msm8996-sony-xperia-tone.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8996-sony-xperia-tone.dtsi
@@ -595,34 +595,37 @@ pmi-gpio10-nc {
 	};
 };
 
-&pmi8994_spmi_regulators {
+&pm8994_spmi_regulators {
 	qcom,saw-reg = <&saw3>;
 
-	vdd_gfx:
-	pmi8994_s2: s2 {
-		/* Pinned to a high value for now to avoid random crashes. */
-		regulator-min-microvolt = <1015000>;
-		regulator-max-microvolt = <1015000>;
-		regulator-name = "vdd_gfx";
-		regulator-always-on;
-	};
-
-	pmi8994_s9: s9 {
+	pm8994_s9: s9 {
 		qcom,saw-slave;
 	};
 
-	pmi8994_s10: s10 {
+	pm8994_s10: s10 {
 		qcom,saw-slave;
 	};
 
-	pmi8994_s11: s11 {
+	pm8994_s11: s11 {
 		qcom,saw-leader;
+		regulator-name = "vdd_apcc";
 		regulator-always-on;
 		regulator-min-microvolt = <470000>;
 		regulator-max-microvolt = <1140000>;
 	};
 };
 
+&pmi8994_spmi_regulators {
+	vdd_gfx:
+	pmi8994_s2: s2 {
+		/* Pinned to a high value for now to avoid random crashes. */
+		regulator-min-microvolt = <1015000>;
+		regulator-max-microvolt = <1015000>;
+		regulator-name = "vdd_gfx";
+		regulator-always-on;
+	};
+};
+
 &pmi8994_wled {
 	status = "okay";
 	default-brightness = <512>;
-- 
2.33.0


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [PATCH 1/5] arm64: dts: qcom: apq8096-db820c: specify adsp firmware name
  2021-11-04  0:29 [PATCH 1/5] arm64: dts: qcom: apq8096-db820c: specify adsp firmware name Dmitry Baryshkov
                   ` (3 preceding siblings ...)
  2021-11-04  0:29 ` [PATCH 5/5] arm64: dts: qcom: msm8996-sony-xperia-tone: fix SPMI regulators declaration Dmitry Baryshkov
@ 2021-11-20 23:55 ` Bjorn Andersson
  4 siblings, 0 replies; 6+ messages in thread
From: Bjorn Andersson @ 2021-11-20 23:55 UTC (permalink / raw)
  To: Rob Herring, Dmitry Baryshkov, Andy Gross; +Cc: linux-arm-msm, devicetree

On Thu, 4 Nov 2021 03:29:45 +0300, Dmitry Baryshkov wrote:
> Specify firmware name to be used for the ADSP. Quoting Bjorn from the
> respective apq8016-sbc commit:
> 
> The firmware for the modem and WiFi subsystems platform specific and is
> signed with a OEM specific key (or a test key). In order to support more
> than a single device it is therefor not possible to rely on the default
> path and stash these files directly in the firmware directory.
> 
> [...]

Applied, thanks!

[1/5] arm64: dts: qcom: apq8096-db820c: specify adsp firmware name
      commit: e2bbebf3b04c62fc3f7e64525c43bf5118a3cc88
[2/5] arm64: dts: qcom: apq8096-db820c: add missing regulator details
      commit: 7c57dcae949d1d39068f1e92233a9bc2dc7dcfba
[3/5] arm64: dts: qcom:apq8096-db820c: correct lvs1 and lvs2 supply property
      commit: a49c3dd1f7827fa7ee3a861b4292dd7d1c346fb2
[4/5] arm64: dts: qcom: msm8994-sony-xperia-kitakami: correct lvs1 and lvs2 supply property
      commit: 227ee1583ba4b3bb973e2a3e32351c242fdfc49d
[5/5] arm64: dts: qcom: msm8996-sony-xperia-tone: fix SPMI regulators declaration
      commit: 4c821bd42ccceca5e0fdc5491374e3d7e6941c2e

Best regards,
-- 
Bjorn Andersson <bjorn.andersson@linaro.org>

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2021-11-20 23:55 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-04  0:29 [PATCH 1/5] arm64: dts: qcom: apq8096-db820c: specify adsp firmware name Dmitry Baryshkov
2021-11-04  0:29 ` [PATCH 2/5] arm64: dts: qcom: apq8096-db820c: add missing regulator details Dmitry Baryshkov
2021-11-04  0:29 ` [PATCH 3/5] arm64: dts: qcom:apq8096-db820c: correct lvs1 and lvs2 supply property Dmitry Baryshkov
2021-11-04  0:29 ` [PATCH 4/5] arm64: dts: qcom: msm8994-sony-xperia-kitakami: " Dmitry Baryshkov
2021-11-04  0:29 ` [PATCH 5/5] arm64: dts: qcom: msm8996-sony-xperia-tone: fix SPMI regulators declaration Dmitry Baryshkov
2021-11-20 23:55 ` [PATCH 1/5] arm64: dts: qcom: apq8096-db820c: specify adsp firmware name Bjorn Andersson

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.