* [PATCH 02/11] arm64: dts: qcom: msm8992-bullhead: Update regulator config
2021-01-18 16:24 [PATCH 01/11] arm64: dts: qcom: Add support for remaining Sony Kitakami boards Konrad Dybcio
@ 2021-01-18 16:24 ` Konrad Dybcio
2021-01-18 16:24 ` [PATCH 03/11] arm64: dts: qcom: msm8992-libra: " Konrad Dybcio
` (9 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Konrad Dybcio @ 2021-01-18 16:24 UTC (permalink / raw)
To: phone-devel
Cc: ~postmarketos/upstreaming, Konrad Dybcio, Andy Gross,
Bjorn Andersson, Rob Herring, linux-arm-msm, devicetree,
linux-kernel
* Include pm(i)8994 dtsi
* Add PMI8994 RPM regulators
* Add comments concerning "missing" regulators
Signed-off-by: Konrad Dybcio <konrad.dybcio@somainline.org>
---
.../dts/qcom/msm8992-bullhead-rev-101.dts | 39 +++++++++++++------
1 file changed, 27 insertions(+), 12 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/msm8992-bullhead-rev-101.dts b/arch/arm64/boot/dts/qcom/msm8992-bullhead-rev-101.dts
index 5969b5cfdc85..cacbfdbd69e3 100644
--- a/arch/arm64/boot/dts/qcom/msm8992-bullhead-rev-101.dts
+++ b/arch/arm64/boot/dts/qcom/msm8992-bullhead-rev-101.dts
@@ -6,6 +6,8 @@
/dts-v1/;
#include "msm8992.dtsi"
+#include "pm8994.dtsi"
+#include "pmi8994.dtsi"
/ {
model = "LG Nexus 5X";
@@ -44,7 +46,7 @@ &blsp1_uart2 {
};
&rpm_requests {
- pm8994-regulators {
+ pm8994_regulators: pm8994-regulators {
compatible = "qcom,rpm-pm8994-regulators";
vdd_l1-supply = <&pm8994_s1>;
@@ -53,15 +55,17 @@ pm8994-regulators {
vdd_l4_27_31-supply = <&pm8994_s3>;
vdd_l5_7-supply = <&pm8994_s3>;
vdd_l6_12_32-supply = <&pm8994_s5>;
- vdd_l8_16_30-supply = <&vreg_vph_pwr>;
- vdd_l9_10_18_22-supply = <&vreg_vph_pwr>;
- vdd_l13_19_23_24-supply = <&vreg_vph_pwr>;
+ vdd_l8_16_30-supply = <&vph_pwr>;
+ vdd_l9_10_18_22-supply = <&vph_pwr>;
+ vdd_l13_19_23_24-supply = <&vph_pwr>;
vdd_l14_15-supply = <&pm8994_s5>;
- vdd_l17_29-supply = <&vreg_vph_pwr>;
- vdd_l20_21-supply = <&vreg_vph_pwr>;
+ vdd_l17_29-supply = <&vph_pwr>;
+ vdd_l20_21-supply = <&vph_pwr>;
vdd_l25-supply = <&pm8994_s5>;
vdd_lvs1_2 = <&pm8994_s4>;
+ /* S1, S2, S6 and S12 are managed by RPMPD */
+
pm8994_s1: s1 {
regulator-min-microvolt = <800000>;
regulator-max-microvolt = <800000>;
@@ -93,6 +97,8 @@ pm8994_s7: s7 {
regulator-max-microvolt = <1000000>;
};
+ /* S8, S9, S10 and S11 - SPMI-managed VDD_APC */
+
pm8994_l1: l1 {
regulator-min-microvolt = <1000000>;
regulator-max-microvolt = <1000000>;
@@ -113,18 +119,14 @@ pm8994_l4: l4 {
regulator-max-microvolt = <1225000>;
};
- pm8994_l5: l5 {
- /* TODO */
- };
+ /* L5 is inaccessible from RPM */
pm8994_l6: l6 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
};
- pm8994_l7: l7 {
- /* TODO */
- };
+ /* L7 is inaccessible from RPM */
pm8994_l8: l8 {
regulator-min-microvolt = <1800000>;
@@ -266,6 +268,19 @@ pm8994_l32: l32 {
*/
};
};
+
+ pmi8994_regulators: pmi8994-regulators {
+ compatible = "qcom,rpm-pmi8994-regulators";
+
+ vdd_s1-supply = <&vph_pwr>;
+ vdd_bst_byp-supply = <&vph_pwr>;
+
+ pmi8994_s1: s1 {};
+
+ /* S2 & S3 - VDD_GFX */
+
+ pmi8994_bby: boost-bypass {};
+ };
};
&sdhc_1 {
--
2.29.2
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 03/11] arm64: dts: qcom: msm8992-libra: Update regulator config
2021-01-18 16:24 [PATCH 01/11] arm64: dts: qcom: Add support for remaining Sony Kitakami boards Konrad Dybcio
2021-01-18 16:24 ` [PATCH 02/11] arm64: dts: qcom: msm8992-bullhead: Update regulator config Konrad Dybcio
@ 2021-01-18 16:24 ` Konrad Dybcio
2021-01-18 16:24 ` [PATCH 04/11] arm64: dts: qcom: msm8992/4: Rename vreg_vph_pwr to vph_pwr Konrad Dybcio
` (8 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Konrad Dybcio @ 2021-01-18 16:24 UTC (permalink / raw)
To: phone-devel
Cc: ~postmarketos/upstreaming, Konrad Dybcio, Andy Gross,
Bjorn Andersson, Rob Herring, linux-arm-msm, devicetree,
linux-kernel
* Add PMI8994 RPM regulators
* Add missing PM8994 LVSes
* Add comments concerning "missing" regulators
Signed-off-by: Konrad Dybcio <konrad.dybcio@somainline.org>
---
.../boot/dts/qcom/msm8992-xiaomi-libra.dts | 53 +++++++++++--------
1 file changed, 31 insertions(+), 22 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/msm8992-xiaomi-libra.dts b/arch/arm64/boot/dts/qcom/msm8992-xiaomi-libra.dts
index 4f64ca3ea1ef..5dab8ee0c7d3 100644
--- a/arch/arm64/boot/dts/qcom/msm8992-xiaomi-libra.dts
+++ b/arch/arm64/boot/dts/qcom/msm8992-xiaomi-libra.dts
@@ -144,24 +144,16 @@ pm8994-regulators {
vdd_l4_27_31-supply = <&pm8994_s3>;
vdd_l5_7-supply = <&pm8994_s3>;
vdd_l6_12_32-supply = <&pm8994_s5>;
- vdd_l8_16_30-supply = <&vreg_vph_pwr>;
- vdd_l9_10_18_22-supply = <&vreg_vph_pwr>;
- vdd_l13_19_23_24-supply = <&vreg_vph_pwr>;
+ vdd_l8_16_30-supply = <&vph_pwr>;
+ vdd_l9_10_18_22-supply = <&vph_pwr>;
+ vdd_l13_19_23_24-supply = <&vph_pwr>;
vdd_l14_15-supply = <&pm8994_s5>;
- vdd_l17_29-supply = <&vreg_vph_pwr>;
- vdd_l20_21-supply = <&vreg_vph_pwr>;
+ vdd_l17_29-supply = <&vph_pwr>;
+ vdd_l20_21-supply = <&vph_pwr>;
vdd_l25-supply = <&pm8994_s5>;
vdd_lvs1_2 = <&pm8994_s4>;
- pm8994_s1: s1 {
- /* unused */
- status = "disabled";
- };
-
- pm8994_s2: s2 {
- /* unused */
- status = "disabled";
- };
+ /* S1, S2, S6 and S12 are managed by RPMPD */
pm8994_s3: s3 {
regulator-min-microvolt = <1300000>;
@@ -186,6 +178,8 @@ pm8994_s7: s7 {
regulator-max-microvolt = <1000000>;
};
+ /* S8, S9, S10 and S11 - SPMI-managed VDD_APC */
+
pm8994_l1: l1 {
regulator-min-microvolt = <1000000>;
regulator-max-microvolt = <1000000>;
@@ -206,20 +200,14 @@ pm8994_l4: l4 {
regulator-max-microvolt = <1225000>;
};
- pm8994_l5: l5 {
- /* unused */
- status = "disabled";
- };
+ /* L5 is inaccessible from RPM */
pm8994_l6: l6 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
};
- pm8994_l7: l7 {
- /* unused */
- status = "disabled";
- };
+ /* L7 is inaccessible from RPM */
pm8994_l8: l8 {
regulator-min-microvolt = <1800000>;
@@ -352,6 +340,27 @@ pm8994_l32: l32 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
};
+
+ pm8994_lvs1: lvs1 {};
+ pm8994_lvs2: lvs2 {};
+ };
+
+ pmi8994_regulators: pmi8994-regulators {
+ compatible = "qcom,rpm-pmi8994-regulators";
+ vdd_s1-supply = <&vph_pwr>;
+ vdd_bst_byp-supply = <&vph_pwr>;
+
+ pmi8994_s1: s1 {
+ regulator-min-microvolt = <1025000>;
+ regulator-max-microvolt = <1025000>;
+ };
+
+ /* S2 & S3 - VDD_GFX */
+
+ pmi8994_bby: boost-bypass {
+ regulator-min-microvolt = <3150000>;
+ regulator-max-microvolt = <3600000>;
+ };
};
};
--
2.29.2
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 04/11] arm64: dts: qcom: msm8992/4: Rename vreg_vph_pwr to vph_pwr
2021-01-18 16:24 [PATCH 01/11] arm64: dts: qcom: Add support for remaining Sony Kitakami boards Konrad Dybcio
2021-01-18 16:24 ` [PATCH 02/11] arm64: dts: qcom: msm8992-bullhead: Update regulator config Konrad Dybcio
2021-01-18 16:24 ` [PATCH 03/11] arm64: dts: qcom: msm8992-libra: " Konrad Dybcio
@ 2021-01-18 16:24 ` Konrad Dybcio
2021-01-18 16:24 ` [PATCH 05/11] arm64: dts: qcom: msm/apq8994-kitakami: Add regulator config Konrad Dybcio
` (7 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Konrad Dybcio @ 2021-01-18 16:24 UTC (permalink / raw)
To: phone-devel
Cc: ~postmarketos/upstreaming, Konrad Dybcio, Andy Gross,
Bjorn Andersson, Rob Herring, linux-arm-msm, devicetree,
linux-kernel
Rename the fixed regulator to follow the common naming scheme
Signed-off-by: Konrad Dybcio <konrad.dybcio@somainline.org>
---
arch/arm64/boot/dts/qcom/msm8992.dtsi | 5 ++---
arch/arm64/boot/dts/qcom/msm8994.dtsi | 4 ++--
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/msm8992.dtsi b/arch/arm64/boot/dts/qcom/msm8992.dtsi
index 0c422af47917..7c2770f60b07 100644
--- a/arch/arm64/boot/dts/qcom/msm8992.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8992.dtsi
@@ -725,10 +725,9 @@ timer {
<GIC_PPI 1 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>;
};
- vreg_vph_pwr: vreg-vph-pwr {
+ vph_pwr: vph-pwr-regulator {
compatible = "regulator-fixed";
- status = "okay";
- regulator-name = "vph-pwr";
+ regulator-name = "vph_pwr";
regulator-min-microvolt = <3600000>;
regulator-max-microvolt = <3600000>;
diff --git a/arch/arm64/boot/dts/qcom/msm8994.dtsi b/arch/arm64/boot/dts/qcom/msm8994.dtsi
index 6e083a2f690b..f7e6423db8d4 100644
--- a/arch/arm64/boot/dts/qcom/msm8994.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8994.dtsi
@@ -790,9 +790,9 @@ timer {
<GIC_PPI 1 0xff08>;
};
- vreg_vph_pwr: vreg-vph-pwr {
+ vph_pwr: vph-pwr-regulator {
compatible = "regulator-fixed";
- regulator-name = "vph-pwr";
+ regulator-name = "vph_pwr";
regulator-min-microvolt = <3600000>;
regulator-max-microvolt = <3600000>;
--
2.29.2
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 05/11] arm64: dts: qcom: msm/apq8994-kitakami: Add regulator config
2021-01-18 16:24 [PATCH 01/11] arm64: dts: qcom: Add support for remaining Sony Kitakami boards Konrad Dybcio
` (2 preceding siblings ...)
2021-01-18 16:24 ` [PATCH 04/11] arm64: dts: qcom: msm8992/4: Rename vreg_vph_pwr to vph_pwr Konrad Dybcio
@ 2021-01-18 16:24 ` Konrad Dybcio
2021-01-18 16:24 ` [PATCH 06/11] arm64: dts: qcom: msm8994-kitakami: Add Synaptics RMI touchscreen Konrad Dybcio
` (6 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Konrad Dybcio @ 2021-01-18 16:24 UTC (permalink / raw)
To: phone-devel
Cc: ~postmarketos/upstreaming, Konrad Dybcio, Andy Gross,
Bjorn Andersson, Rob Herring, linux-arm-msm, devicetree,
linux-kernel
Add regulator config for all Kitakami devices, commonizing where
applicable.
Signed-off-by: Konrad Dybcio <konrad.dybcio@somainline.org>
---
...q8094-sony-xperia-kitakami-karin_windy.dts | 3 +
.../qcom/msm8994-sony-xperia-kitakami-ivy.dts | 13 +
.../msm8994-sony-xperia-kitakami-karin.dts | 22 ++
.../msm8994-sony-xperia-kitakami-satsuki.dts | 5 +
.../msm8994-sony-xperia-kitakami-sumire.dts | 2 +
.../msm8994-sony-xperia-kitakami-suzuran.dts | 7 +
.../qcom/msm8994-sony-xperia-kitakami.dtsi | 304 ++++++++++++++----
7 files changed, 297 insertions(+), 59 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/apq8094-sony-xperia-kitakami-karin_windy.dts b/arch/arm64/boot/dts/qcom/apq8094-sony-xperia-kitakami-karin_windy.dts
index 60497457a555..a8dffc8c64ea 100644
--- a/arch/arm64/boot/dts/qcom/apq8094-sony-xperia-kitakami-karin_windy.dts
+++ b/arch/arm64/boot/dts/qcom/apq8094-sony-xperia-kitakami-karin_windy.dts
@@ -18,3 +18,6 @@ / {
*/
qcom,msm-id = <253 0x20000>, <253 0x20001>;
};
+
+/delete-node/ &pm8994_l1;
+/delete-node/ &pm8994_l19;
diff --git a/arch/arm64/boot/dts/qcom/msm8994-sony-xperia-kitakami-ivy.dts b/arch/arm64/boot/dts/qcom/msm8994-sony-xperia-kitakami-ivy.dts
index 4c7a90987f08..b5e90c85aaf6 100644
--- a/arch/arm64/boot/dts/qcom/msm8994-sony-xperia-kitakami-ivy.dts
+++ b/arch/arm64/boot/dts/qcom/msm8994-sony-xperia-kitakami-ivy.dts
@@ -11,3 +11,16 @@ / {
model = "Sony Xperia Z3+/Z4";
compatible = "sony,ivy-row", "qcom,msm8994";
};
+
+&pm8994_l3 {
+ regulator-min-microvolt = <1000000>;
+ regulator-max-microvolt = <1000000>;
+};
+
+&pm8994_l17 {
+ regulator-min-microvolt = <2700000>;
+ regulator-max-microvolt = <2700000>;
+};
+
+/delete-node/ &pm8994_l19;
+/delete-node/ &pm8994_l32;
diff --git a/arch/arm64/boot/dts/qcom/msm8994-sony-xperia-kitakami-karin.dts b/arch/arm64/boot/dts/qcom/msm8994-sony-xperia-kitakami-karin.dts
index 7e657861387b..743a2a076552 100644
--- a/arch/arm64/boot/dts/qcom/msm8994-sony-xperia-kitakami-karin.dts
+++ b/arch/arm64/boot/dts/qcom/msm8994-sony-xperia-kitakami-karin.dts
@@ -19,3 +19,25 @@ &blsp_i2c5 {
* sii8620 HDMI/MHL bridge @ 72 (kitakami-common)
*/
};
+
+&pm8994_l3 {
+ regulator-min-microvolt = <1050000>;
+ regulator-max-microvolt = <1050000>;
+};
+
+&pm8994_l17 {
+ regulator-min-microvolt = <2700000>;
+ regulator-max-microvolt = <2700000>;
+};
+
+&pm8994_l22 {
+ regulator-min-microvolt = <3100000>;
+ regulator-max-microvolt = <3100000>;
+};
+
+&pm8994_l25 {
+ regulator-min-microvolt = <1037500>;
+ regulator-max-microvolt = <1037500>;
+};
+
+/delete-node/ &pm8994_l32;
diff --git a/arch/arm64/boot/dts/qcom/msm8994-sony-xperia-kitakami-satsuki.dts b/arch/arm64/boot/dts/qcom/msm8994-sony-xperia-kitakami-satsuki.dts
index 1081fe6a4d67..1385956a69f3 100644
--- a/arch/arm64/boot/dts/qcom/msm8994-sony-xperia-kitakami-satsuki.dts
+++ b/arch/arm64/boot/dts/qcom/msm8994-sony-xperia-kitakami-satsuki.dts
@@ -11,3 +11,8 @@ / {
model = "Sony Xperia Z5 Premium";
compatible = "sony,satsuki-row", "qcom,msm8994";
};
+
+&pm8994_l14 {
+ regulator-min-microvolt = <1850000>;
+ regulator-max-microvolt = <1850000>;
+};
diff --git a/arch/arm64/boot/dts/qcom/msm8994-sony-xperia-kitakami-sumire.dts b/arch/arm64/boot/dts/qcom/msm8994-sony-xperia-kitakami-sumire.dts
index 5d6bbbf6c119..868a2c9d6496 100644
--- a/arch/arm64/boot/dts/qcom/msm8994-sony-xperia-kitakami-sumire.dts
+++ b/arch/arm64/boot/dts/qcom/msm8994-sony-xperia-kitakami-sumire.dts
@@ -11,3 +11,5 @@ / {
model = "Sony Xperia Z5";
compatible = "sony,sumire-row", "qcom,msm8994";
};
+
+/delete-node/ &pm8994_l19;
diff --git a/arch/arm64/boot/dts/qcom/msm8994-sony-xperia-kitakami-suzuran.dts b/arch/arm64/boot/dts/qcom/msm8994-sony-xperia-kitakami-suzuran.dts
index 2c670ab28613..f129479bbf95 100644
--- a/arch/arm64/boot/dts/qcom/msm8994-sony-xperia-kitakami-suzuran.dts
+++ b/arch/arm64/boot/dts/qcom/msm8994-sony-xperia-kitakami-suzuran.dts
@@ -11,3 +11,10 @@ / {
model = "Sony Xperia Z5 Compact";
compatible = "sony,suzuran-row", "qcom,msm8994";
};
+
+&pm8994_l14 {
+ regulator-min-microvolt = <2000000>;
+ regulator-max-microvolt = <2000000>;
+};
+
+/delete-node/ &pm8994_l19;
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 71d7187eb090..e31c31c2b936 100644
--- a/arch/arm64/boot/dts/qcom/msm8994-sony-xperia-kitakami.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8994-sony-xperia-kitakami.dtsi
@@ -161,59 +161,233 @@ &blsp2_uart2 {
&rpm_requests {
pm8994_regulators: pm8994-regulators {
compatible = "qcom,rpm-pm8994-regulators";
- vdd_l1-supply = <&pm8994_s1>;
- vdd_l2_26_28-supply = <&pm8994_s3>;
- vdd_l3_11-supply = <&pm8994_s3>;
- vdd_l4_27_31-supply = <&pm8994_s3>;
- vdd_l5_7-supply = <&pm8994_s3>;
- vdd_l6_12_32-supply = <&pm8994_s5>;
- vdd_l8_16_30-supply = <&vreg_vph_pwr>;
- vdd_l9_10_18_22-supply = <&vreg_vph_pwr>;
- vdd_l13_19_23_24-supply = <&vreg_vph_pwr>;
- vdd_l14_15-supply = <&pm8994_s5>;
- vdd_l17_29-supply = <&vreg_vph_pwr>;
- vdd_l20_21-supply = <&vreg_vph_pwr>;
- vdd_l25-supply = <&pm8994_s5>;
- vdd_lvs1_2 = <&pm8994_s4>;
-
- pm8994_s1: s1 {};
- pm8994_s2: s2 {};
- pm8994_s3: s3 {};
- pm8994_s4: s4 {};
- pm8994_s5: s5 {};
- pm8994_s6: s6 {};
- pm8994_s7: s7 {};
-
- pm8994_l1: l1 {};
- pm8994_l2: l2 {};
- pm8994_l3: l3 {};
- pm8994_l4: l4 {};
- pm8994_l6: l6 {};
- pm8994_l8: l8 {};
- pm8994_l9: l9 {};
- pm8994_l10: l10 {};
- pm8994_l11: l11 {};
- pm8994_l12: l12 {};
- pm8994_l13: l13 {};
- pm8994_l14: l14 {};
- pm8994_l15: l15 {};
- pm8994_l16: l16 {};
- pm8994_l17: l17 {};
- pm8994_l18: l18 {};
- pm8994_l19: l19 {};
- pm8994_l20: l20 {};
- pm8994_l21: l21 {};
- pm8994_l22: l22 {};
- pm8994_l23: l23 {};
- pm8994_l24: l24 {};
- pm8994_l25: l25 {};
- pm8994_l26: l26 {};
- pm8994_l27: l27 {};
- pm8994_l28: l28 {};
- pm8994_l29: l29 {};
- pm8994_l30: l30 {};
- pm8994_l31: l31 {};
- pm8994_l32: l32 {};
+
+ vdd_s1-supply = <&vph_pwr>;
+ vdd_s2-supply = <&vph_pwr>;
+ vdd_s3-supply = <&vph_pwr>;
+ vdd_s4-supply = <&vph_pwr>;
+ vdd_s5-supply = <&vph_pwr>;
+ vdd_s6-supply = <&vph_pwr>;
+ vdd_s7-supply = <&vph_pwr>;
+ vdd_s8-supply = <&vph_pwr>;
+ vdd_s9-supply = <&vph_pwr>;
+ vdd_s10-supply = <&vph_pwr>;
+ vdd_s11-supply = <&vph_pwr>;
+ vdd_s12-supply = <&vph_pwr>;
+ vdd_l1-supply = <&pmi8994_s1>;
+ vdd_l2_l26_l28-supply = <&pm8994_s3>;
+ vdd_l3_l11-supply = <&pm8994_s3>;
+ vdd_l4_l27_l31-supply = <&pm8994_s3>;
+ vdd_l5_l7-supply = <&pm8994_s5>;
+ vdd_l6_l12_l32-supply = <&pm8994_s5>;
+ vdd_l8_l16_l30-supply = <&vph_pwr>;
+ vdd_l9_l10_l18_l22-supply = <&pmi8994_bby>;
+ vdd_l13_l19_l23_l24-supply = <&pmi8994_bby>;
+ vdd_l14_l15-supply = <&pm8994_s5>;
+ vdd_l17_l29-supply = <&pmi8994_bby>;
+ vdd_l20_l21-supply = <&pmi8994_bby>;
+ vdd_l25-supply = <&pm8994_s3>;
+ vdd_lvs1_lvs2-supply = <&pm8994_s4>;
+
+ /* S1, S2, S6 and S12 are managed by RPMPD */
+
+ pm8994_s3: s3 {
+ regulator-min-microvolt = <1300000>;
+ regulator-max-microvolt = <1300000>;
+ };
+
+ pm8994_s4: s4 {
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <1800000>;
+ regulator-allow-set-load;
+ regulator-always-on;
+ regulator-system-load = <325000>;
+ };
+
+ pm8994_s5: s5 {
+ regulator-min-microvolt = <2150000>;
+ regulator-max-microvolt = <2150000>;
+ };
+
+ pm8994_s7: s7 {
+ regulator-min-microvolt = <1000000>;
+ regulator-max-microvolt = <1000000>;
+ };
+
+ /*
+ * S8 - SPMI-managed VDD_APC0
+ * S9, S10 and S11 (the main one) - SPMI-managed VDD_APC1
+ */
+
+ pm8994_l1: l1 {
+ regulator-min-microvolt = <1000000>;
+ regulator-max-microvolt = <1000000>;
+ };
+
+ pm8994_l2: l2 {
+ regulator-min-microvolt = <1250000>;
+ regulator-max-microvolt = <1250000>;
+ regulator-allow-set-load;
+ regulator-system-load = <10000>;
+ };
+
+ pm8994_l3: l3 {
+ regulator-min-microvolt = <1100000>;
+ regulator-max-microvolt = <1100000>;
+ };
+
+ pm8994_l4: l4 {
+ regulator-min-microvolt = <1225000>;
+ regulator-max-microvolt = <1225000>;
+ };
+
+ /* L5 is inaccessible from RPM */
+
+ pm8994_l6: l6 {
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <1800000>;
+ };
+
+ /* L7 is inaccessible from RPM */
+
+ pm8994_l8: l8 {
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <1800000>;
+ };
+
+ pm8994_l9: l9 {
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <1800000>;
+ };
+
+ pm8994_l10: l10 {
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <1800000>;
+ };
+
+ pm8994_l11: l11 {
+ regulator-min-microvolt = <1200000>;
+ regulator-max-microvolt = <1200000>;
+ };
+
+ pm8994_l12: l12 {
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <1800000>;
+ regulator-allow-set-load;
+ regulator-system-load = <10000>;
+ };
+
+ pm8994_l13: l13 {
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <2950000>;
+ };
+
+ pm8994_l14: l14 {
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <1800000>;
+ regulator-allow-set-load;
+ regulator-system-load = <10000>;
+ };
+
+ pm8994_l15: l15 {
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <1800000>;
+ };
+
+ pm8994_l16: l16 {
+ regulator-min-microvolt = <2700000>;
+ regulator-max-microvolt = <2700000>;
+ };
+
+ pm8994_l17: l17 {
+ regulator-min-microvolt = <2200000>;
+ regulator-max-microvolt = <2200000>;
+ };
+
+ pm8994_l18: l18 {
+ regulator-min-microvolt = <2850000>;
+ regulator-max-microvolt = <2850000>;
+ regulator-always-on;
+ };
+
+ pm8994_l19: l19 {
+ regulator-min-microvolt = <2850000>;
+ regulator-max-microvolt = <2850000>;
+ };
+
+ pm8994_l20: l20 {
+ regulator-min-microvolt = <2950000>;
+ regulator-max-microvolt = <2950000>;
+ regulator-always-on;
+ regulator-boot-on;
+ regulator-allow-set-load;
+ regulator-system-load = <570000>;
+ };
+
+ pm8994_l21: l21 {
+ regulator-min-microvolt = <2950000>;
+ regulator-max-microvolt = <2950000>;
+ regulator-always-on;
+ };
+
+ pm8994_l22: l22 {
+ regulator-min-microvolt = <3000000>;
+ regulator-max-microvolt = <3000000>;
+ };
+
+ pm8994_l23: l23 {
+ regulator-min-microvolt = <2800000>;
+ regulator-max-microvolt = <2800000>;
+ };
+
+ pm8994_l24: l24 {
+ regulator-min-microvolt = <3075000>;
+ regulator-max-microvolt = <3150000>;
+ };
+
+ pm8994_l25: l25 {
+ regulator-min-microvolt = <1000000>;
+ regulator-max-microvolt = <1000000>;
+ };
+
+ pm8994_l26: l26 {
+ regulator-min-microvolt = <987500>;
+ regulator-max-microvolt = <987500>;
+ };
+
+ pm8994_l27: l27 {
+ regulator-min-microvolt = <1200000>;
+ regulator-max-microvolt = <1200000>;
+ };
+
+ pm8994_l28: l28 {
+ regulator-min-microvolt = <1000000>;
+ regulator-max-microvolt = <1000000>;
+ regulator-allow-set-load;
+ regulator-system-load = <10000>;
+ };
+
+ pm8994_l29: l29 {
+ regulator-min-microvolt = <2700000>;
+ regulator-max-microvolt = <2700000>;
+ };
+
+ pm8994_l30: l30 {
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <1800000>;
+ };
+
+ pm8994_l31: l31 {
+ regulator-min-microvolt = <1200000>;
+ regulator-max-microvolt = <1200000>;
+ regulator-allow-set-load;
+ regulator-system-load = <10000>;
+ };
+
+ pm8994_l32: l32 {
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <1800000>;
+ };
pm8994_lvs1: lvs1 {};
pm8994_lvs2: lvs2 {};
@@ -222,22 +396,34 @@ pm8994_regulators: pm8994-regulators {
pmi8994_regulators: pmi8994-regulators {
compatible = "qcom,rpm-pmi8994-regulators";
- pmi8994_s1: s1 {};
- pmi8994_s2: s2 {};
- pmi8994_s3: s3 {};
- pmi8994_bby: boost-bypass {};
+ vdd_s1-supply = <&vph_pwr>;
+ vdd_bst_byp-supply = <&vph_pwr>;
+
+ pmi8994_s1: s1 {
+ regulator-min-microvolt = <1025000>;
+ regulator-max-microvolt = <1025000>;
+ };
+
+ /* S2 & S3 - VDD_GFX */
+
+ pmi8994_bby: boost-bypass {
+ regulator-min-microvolt = <3150000>;
+ regulator-max-microvolt = <3600000>;
+ };
};
};
&sdhc1 {
- /* There is an issue with the eMMC causing permanent
+ /*
+ * There is an issue with the eMMC causing permanent
* damage to the card if a quirk isn't addressed.
* Until it's fixed, disable the MMC so as not to brick
* devices.
*/
status = "disabled";
- /* Downstream pushes 2.95V to the sdhci device,
+ /*
+ * Downstream pushes 2.95V to the sdhci device,
* but upstream driver REALLY wants to make vmmc 1.8v
* cause of the hs400-1_8v mode. MMC works fine without
* that regulator, so let's not use it for now.
--
2.29.2
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 06/11] arm64: dts: qcom: msm8994-kitakami: Add Synaptics RMI touchscreen
2021-01-18 16:24 [PATCH 01/11] arm64: dts: qcom: Add support for remaining Sony Kitakami boards Konrad Dybcio
` (3 preceding siblings ...)
2021-01-18 16:24 ` [PATCH 05/11] arm64: dts: qcom: msm/apq8994-kitakami: Add regulator config Konrad Dybcio
@ 2021-01-18 16:24 ` Konrad Dybcio
2021-01-18 16:24 ` [PATCH 07/11] arm64: dts: qcom: msm8994-kitakami: Add uSD card support Konrad Dybcio
` (5 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Konrad Dybcio @ 2021-01-18 16:24 UTC (permalink / raw)
To: phone-devel
Cc: ~postmarketos/upstreaming, Konrad Dybcio, Andy Gross,
Bjorn Andersson, Rob Herring, linux-arm-msm, devicetree,
linux-kernel
All Kitakami phones use Synaptics RMI4 touchscreens
attached to the same i2c bus. Configure and enable it.
Signed-off-by: Konrad Dybcio <konrad.dybcio@somainline.org>
---
.../msm8994-sony-xperia-kitakami-karin.dts | 2 +
.../qcom/msm8994-sony-xperia-kitakami.dtsi | 45 ++++++++++++++++++-
2 files changed, 46 insertions(+), 1 deletion(-)
diff --git a/arch/arm64/boot/dts/qcom/msm8994-sony-xperia-kitakami-karin.dts b/arch/arm64/boot/dts/qcom/msm8994-sony-xperia-kitakami-karin.dts
index 743a2a076552..4dcf42eafb3a 100644
--- a/arch/arm64/boot/dts/qcom/msm8994-sony-xperia-kitakami-karin.dts
+++ b/arch/arm64/boot/dts/qcom/msm8994-sony-xperia-kitakami-karin.dts
@@ -41,3 +41,5 @@ &pm8994_l25 {
};
/delete-node/ &pm8994_l32;
+/* Z4 tablets use a different touchscreen. */
+/delete-node/ &touchscreen;
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 e31c31c2b936..33af174b78ab 100644
--- a/arch/arm64/boot/dts/qcom/msm8994-sony-xperia-kitakami.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8994-sony-xperia-kitakami.dtsi
@@ -147,7 +147,34 @@ &blsp_i2c5 {
&blsp_i2c6 {
status = "okay";
- /* Synaptics touchscreen */
+ touchscreen: rmi4-i2c-dev@2c {
+ compatible = "syna,rmi4-i2c";
+ reg = <0x2c>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ interrupt-parent = <&tlmm>;
+ interrupts = <42 IRQ_TYPE_EDGE_FALLING>;
+
+ pinctrl-names = "default";
+ pinctrl-0 = <&ts_int_active &ts_reset_active>;
+
+ vdd-supply = <&pm8994_l22>;
+ vio-supply = <&pm8994_s4>;
+
+ syna,reset-delay-ms = <220>;
+ syna,startup-delay-ms = <220>;
+
+ rmi4-f01@1 {
+ reg = <0x01>;
+ syna,nosleep-mode = <1>;
+ };
+
+ rmi4-f11@11 {
+ reg = <0x11>;
+ syna,sensor-type = <1>;
+ };
+ };
};
&blsp1_uart2 {
@@ -433,3 +460,19 @@ &sdhc1 {
* vqmmc-supply = <&pm8994_s4>;
*/
};
+
+&tlmm {
+ ts_int_active: ts-int-active {
+ pins = "gpio42";
+ drive-strength = <2>;
+ bias-disable;
+ input-enable;
+ };
+
+ ts_reset_active: ts-reset-active {
+ pins = "gpio109";
+ drive-strength = <2>;
+ bias-disable;
+ output-low;
+ };
+};
--
2.29.2
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 07/11] arm64: dts: qcom: msm8994-kitakami: Add uSD card support
2021-01-18 16:24 [PATCH 01/11] arm64: dts: qcom: Add support for remaining Sony Kitakami boards Konrad Dybcio
` (4 preceding siblings ...)
2021-01-18 16:24 ` [PATCH 06/11] arm64: dts: qcom: msm8994-kitakami: Add Synaptics RMI touchscreen Konrad Dybcio
@ 2021-01-18 16:24 ` Konrad Dybcio
2021-01-18 16:24 ` [PATCH 08/11] arm64: dts: qcom: msm8994-kitakami: Add VDD_GFX regulator Konrad Dybcio
` (4 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Konrad Dybcio @ 2021-01-18 16:24 UTC (permalink / raw)
To: phone-devel
Cc: ~postmarketos/upstreaming, Konrad Dybcio, Andy Gross,
Bjorn Andersson, Rob Herring, linux-arm-msm, devicetree,
linux-kernel
Assign regulators and enable regulator-set-load on
VMMC so as to provide sufficient power.
Signed-off-by: Konrad Dybcio <konrad.dybcio@somainline.org>
---
.../boot/dts/qcom/msm8994-sony-xperia-kitakami.dtsi | 10 ++++++++++
1 file changed, 10 insertions(+)
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 33af174b78ab..26b54f360fc3 100644
--- a/arch/arm64/boot/dts/qcom/msm8994-sony-xperia-kitakami.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8994-sony-xperia-kitakami.dtsi
@@ -355,6 +355,8 @@ pm8994_l21: l21 {
regulator-min-microvolt = <2950000>;
regulator-max-microvolt = <2950000>;
regulator-always-on;
+ regulator-allow-set-load;
+ regulator-system-load = <800000>;
};
pm8994_l22: l22 {
@@ -461,6 +463,14 @@ &sdhc1 {
*/
};
+&sdhc2 {
+ status = "okay";
+
+ cd-gpios = <&tlmm 100 0>;
+ vmmc-supply = <&pm8994_l21>;
+ vqmmc-supply = <&pm8994_l13>;
+};
+
&tlmm {
ts_int_active: ts-int-active {
pins = "gpio42";
--
2.29.2
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 08/11] arm64: dts: qcom: msm8994-kitakami: Add VDD_GFX regulator
2021-01-18 16:24 [PATCH 01/11] arm64: dts: qcom: Add support for remaining Sony Kitakami boards Konrad Dybcio
` (5 preceding siblings ...)
2021-01-18 16:24 ` [PATCH 07/11] arm64: dts: qcom: msm8994-kitakami: Add uSD card support Konrad Dybcio
@ 2021-01-18 16:24 ` Konrad Dybcio
2021-01-18 16:24 ` [PATCH 09/11] arm64: dts: qcom: msm8994: Fix BLSP2_UART2 node Konrad Dybcio
` (3 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Konrad Dybcio @ 2021-01-18 16:24 UTC (permalink / raw)
To: phone-devel
Cc: ~postmarketos/upstreaming, Konrad Dybcio, Andy Gross,
Bjorn Andersson, Rob Herring, linux-arm-msm, devicetree,
linux-kernel
This is required for the GPU to function.
Signed-off-by: Konrad Dybcio <konrad.dybcio@somainline.org>
---
.../dts/qcom/msm8994-sony-xperia-kitakami.dtsi | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
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 26b54f360fc3..05155859cf6a 100644
--- a/arch/arm64/boot/dts/qcom/msm8994-sony-xperia-kitakami.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8994-sony-xperia-kitakami.dtsi
@@ -185,6 +185,24 @@ &blsp2_uart2 {
status = "okay";
};
+&pmi8994_spmi_regulators {
+ /*
+ * Yeah, this one *is* managed by RPMPD, but also needs
+ * to be hacked up as a-o due to the GPU device only accepting a single
+ * power domain.. which still isn't enough and forces us to bind
+ * OXILI_CX and OXILI_GX together!
+ */
+ vdd_gfx: s2@1700 {
+ reg = <0x1700 0x100>;
+ regulator-name = "VDD_GFX";
+ regulator-min-microvolt = <980000>;
+ regulator-max-microvolt = <980000>;
+
+ /* hack until we rig up the gpu consumer */
+ regulator-always-on;
+ };
+};
+
&rpm_requests {
pm8994_regulators: pm8994-regulators {
compatible = "qcom,rpm-pm8994-regulators";
--
2.29.2
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 09/11] arm64: dts: qcom: msm8994: Fix BLSP2_UART2 node
2021-01-18 16:24 [PATCH 01/11] arm64: dts: qcom: Add support for remaining Sony Kitakami boards Konrad Dybcio
` (6 preceding siblings ...)
2021-01-18 16:24 ` [PATCH 08/11] arm64: dts: qcom: msm8994-kitakami: Add VDD_GFX regulator Konrad Dybcio
@ 2021-01-18 16:24 ` Konrad Dybcio
2021-01-18 16:24 ` [PATCH 10/11] arm64: dts: qcom: msm8994/8994-kitakami: Fix up the memory map Konrad Dybcio
` (2 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Konrad Dybcio @ 2021-01-18 16:24 UTC (permalink / raw)
To: phone-devel
Cc: ~postmarketos/upstreaming, Konrad Dybcio, Andy Gross,
Bjorn Andersson, Rob Herring, linux-arm-msm, devicetree,
linux-kernel
Fix up the node to make the peripheral functional.
Signed-off-by: Konrad Dybcio <konrad.dybcio@somainline.org>
---
arch/arm64/boot/dts/qcom/msm8994.dtsi | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/msm8994.dtsi b/arch/arm64/boot/dts/qcom/msm8994.dtsi
index f7e6423db8d4..3dfa74085f10 100644
--- a/arch/arm64/boot/dts/qcom/msm8994.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8994.dtsi
@@ -493,7 +493,7 @@ blsp_i2c6: i2c@f9928000 {
blsp2_uart2: serial@f995e000 {
compatible = "qcom,msm-uartdm-v1.4", "qcom,msm-uartdm";
reg = <0xf995e000 0x1000>;
- interrupts = <GIC_SPI 146 IRQ_TYPE_EDGE_FALLING>;
+ interrupts = <GIC_SPI 114 IRQ_TYPE_LEVEL_HIGH>;
clock-names = "core", "iface";
clocks = <&gcc GCC_BLSP2_UART2_APPS_CLK>,
<&gcc GCC_BLSP2_AHB_CLK>;
@@ -588,16 +588,18 @@ blsp1_uart2_sleep: blsp1-uart2-sleep {
blsp2_uart2_default: blsp2-uart2-default {
function = "blsp_uart8";
- pins = "gpio45", "gpio46";
- drive-strength = <2>;
+ pins = "gpio45", "gpio46",
+ "gpio47", "gpio48";
+ drive-strength = <16>;
bias-disable;
};
blsp2_uart2_sleep: blsp2-uart2-sleep {
function = "gpio";
- pins = "gpio45", "gpio46";
+ pins = "gpio45", "gpio46",
+ "gpio47", "gpio48";
drive-strength = <2>;
- bias-pull-down;
+ bias-disable;
};
i2c1_default: i2c1-default {
--
2.29.2
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 10/11] arm64: dts: qcom: msm8994/8994-kitakami: Fix up the memory map
2021-01-18 16:24 [PATCH 01/11] arm64: dts: qcom: Add support for remaining Sony Kitakami boards Konrad Dybcio
` (7 preceding siblings ...)
2021-01-18 16:24 ` [PATCH 09/11] arm64: dts: qcom: msm8994: Fix BLSP2_UART2 node Konrad Dybcio
@ 2021-01-18 16:24 ` Konrad Dybcio
2021-01-18 16:24 ` [PATCH 11/11] arm64: dts: qcom: msm8994-kitakami: Add missing email in the copyright Konrad Dybcio
2021-01-25 18:50 ` [PATCH 01/11] arm64: dts: qcom: Add support for remaining Sony Kitakami boards patchwork-bot+linux-arm-msm
10 siblings, 0 replies; 12+ messages in thread
From: Konrad Dybcio @ 2021-01-18 16:24 UTC (permalink / raw)
To: phone-devel
Cc: ~postmarketos/upstreaming, Konrad Dybcio, Andy Gross,
Bjorn Andersson, Rob Herring, linux-arm-msm, devicetree,
linux-kernel
The previous map was wrong. Fix it up.
Signed-off-by: Konrad Dybcio <konrad.dybcio@somainline.org>
---
.../qcom/msm8994-sony-xperia-kitakami.dtsi | 45 +++++++------------
arch/arm64/boot/dts/qcom/msm8994.dtsi | 45 ++++++++++++++++++-
2 files changed, 60 insertions(+), 30 deletions(-)
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 05155859cf6a..e962fc5f8b1b 100644
--- a/arch/arm64/boot/dts/qcom/msm8994-sony-xperia-kitakami.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8994-sony-xperia-kitakami.dtsi
@@ -72,47 +72,23 @@ button@3 {
};
reserved-memory {
- #address-cells = <2>;
- #size-cells = <2>;
- ranges;
-
/* This is for getting crash logs using Android downstream kernels */
ramoops@1fe00000 {
compatible = "ramoops";
- reg = <0x0 0x1fe00000 0x0 0x200000>;
+ reg = <0 0x1fe00000 0 0x200000>;
console-size = <0x100000>;
record-size = <0x10000>;
ftrace-size = <0x10000>;
pmsg-size = <0x80000>;
};
- continuous_splash: framebuffer@3401000{
- reg = <0x0 0x3401000 0x0 0x2200000>;
- no-map;
- };
-
- dfps_data_mem: dfps_data_mem@3400000 {
- reg = <0x0 0x3400000 0x0 0x1000>;
- no-map;
- };
-
- peripheral_region: peripheral_region@7400000 {
- reg = <0x0 0x7400000 0x0 0x1c00000>;
- no-map;
- };
-
- modem_region: modem_region@9000000 {
- reg = <0x0 0x9000000 0x0 0x5a00000>;
- no-map;
- };
-
- tzapp: modem_region@ea00000 {
- reg = <0x0 0xea00000 0x0 0x1900000>;
+ fb_region: fb_region@40000000 {
+ reg = <0 0x40000000 0 0x1000000>;
no-map;
};
- fb_region: fb_region@40000000 {
- reg = <0x00 0x40000000 0x00 0x1000000>;
+ tzapp: memory@c7800000 {
+ reg = <0 0xc7800000 0 0x1900000>;
no-map;
};
};
@@ -185,6 +161,17 @@ &blsp2_uart2 {
status = "okay";
};
+/*
+ * Kitakami bootloader only turns cont_splash on when it detects
+ * specific downstream MDSS/backlight nodes in the active DTB.
+ * One way to use that framebuffer is to load a secondary instance of
+ * LK with the downstream DTB appended and then, only from there, load
+ * mainline Linux.
+ */
+&cont_splash_mem {
+ reg = <0 0x3401000 0 0x2200000>;
+};
+
&pmi8994_spmi_regulators {
/*
* Yeah, this one *is* managed by RPMPD, but also needs
diff --git a/arch/arm64/boot/dts/qcom/msm8994.dtsi b/arch/arm64/boot/dts/qcom/msm8994.dtsi
index 3dfa74085f10..7ff1dfaddd79 100644
--- a/arch/arm64/boot/dts/qcom/msm8994.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8994.dtsi
@@ -169,8 +169,51 @@ reserved-memory {
#size-cells = <2>;
ranges;
+ dfps_data_mem: dfps_data_mem@3400000 {
+ reg = <0 0x03400000 0 0x1000>;
+ no-map;
+ };
+
+ cont_splash_mem: memory@3800000 {
+ reg = <0 0x03800000 0 0x2400000>;
+ no-map;
+ };
+
smem_mem: smem_region@6a00000 {
- reg = <0x0 0x6a00000 0x0 0x200000>;
+ reg = <0 0x06a00000 0 0x200000>;
+ no-map;
+ };
+
+ mpss_mem: memory@7000000 {
+ reg = <0 0x07000000 0 0x5a00000>;
+ no-map;
+ };
+
+ peripheral_region: memory@ca00000 {
+ reg = <0 0x0ca00000 0 0x1f00000>;
+ no-map;
+ };
+
+ rmtfs_mem: memory@c6400000 {
+ compatible = "qcom,rmtfs-mem";
+ reg = <0 0xc6400000 0 0x180000>;
+ no-map;
+
+ qcom,client-id = <1>;
+ };
+
+ mba_mem: memory@c6700000 {
+ reg = <0 0xc6700000 0 0x100000>;
+ no-map;
+ };
+
+ audio_mem: memory@c7000000 {
+ reg = <0 0xc7000000 0 0x800000>;
+ no-map;
+ };
+
+ adsp_mem: memory@c9400000 {
+ reg = <0 0xc9400000 0 0x3f00000>;
no-map;
};
};
--
2.29.2
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 11/11] arm64: dts: qcom: msm8994-kitakami: Add missing email in the copyright
2021-01-18 16:24 [PATCH 01/11] arm64: dts: qcom: Add support for remaining Sony Kitakami boards Konrad Dybcio
` (8 preceding siblings ...)
2021-01-18 16:24 ` [PATCH 10/11] arm64: dts: qcom: msm8994/8994-kitakami: Fix up the memory map Konrad Dybcio
@ 2021-01-18 16:24 ` Konrad Dybcio
2021-01-25 18:50 ` [PATCH 01/11] arm64: dts: qcom: Add support for remaining Sony Kitakami boards patchwork-bot+linux-arm-msm
10 siblings, 0 replies; 12+ messages in thread
From: Konrad Dybcio @ 2021-01-18 16:24 UTC (permalink / raw)
To: phone-devel
Cc: ~postmarketos/upstreaming, Konrad Dybcio, Andy Gross,
Bjorn Andersson, Rob Herring, linux-arm-msm, devicetree,
linux-kernel
I forgot to do this the first time around.
Signed-off-by: Konrad Dybcio <konrad.dybcio@somainline.org>
---
.../arm64/boot/dts/qcom/msm8994-sony-xperia-kitakami-sumire.dts | 2 +-
arch/arm64/boot/dts/qcom/msm8994-sony-xperia-kitakami.dtsi | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/msm8994-sony-xperia-kitakami-sumire.dts b/arch/arm64/boot/dts/qcom/msm8994-sony-xperia-kitakami-sumire.dts
index 868a2c9d6496..d3ba9867a369 100644
--- a/arch/arm64/boot/dts/qcom/msm8994-sony-xperia-kitakami-sumire.dts
+++ b/arch/arm64/boot/dts/qcom/msm8994-sony-xperia-kitakami-sumire.dts
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: BSD-3-Clause
/*
- * Copyright (c) 2020, Konrad Dybcio
+ * Copyright (c) 2020, Konrad Dybcio <konrad.dybcio@somainline.org>
*/
/dts-v1/;
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 e962fc5f8b1b..586d866188d7 100644
--- a/arch/arm64/boot/dts/qcom/msm8994-sony-xperia-kitakami.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8994-sony-xperia-kitakami.dtsi
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: BSD-3-Clause
/*
- * Copyright (c) 2020, Konrad Dybcio
+ * Copyright (c) 2020, Konrad Dybcio <konrad.dybcio@somainline.org>
*/
#include "msm8994.dtsi"
--
2.29.2
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [PATCH 01/11] arm64: dts: qcom: Add support for remaining Sony Kitakami boards
2021-01-18 16:24 [PATCH 01/11] arm64: dts: qcom: Add support for remaining Sony Kitakami boards Konrad Dybcio
` (9 preceding siblings ...)
2021-01-18 16:24 ` [PATCH 11/11] arm64: dts: qcom: msm8994-kitakami: Add missing email in the copyright Konrad Dybcio
@ 2021-01-25 18:50 ` patchwork-bot+linux-arm-msm
10 siblings, 0 replies; 12+ messages in thread
From: patchwork-bot+linux-arm-msm @ 2021-01-25 18:50 UTC (permalink / raw)
To: Konrad Dybcio; +Cc: linux-arm-msm
Hello:
This series was applied to qcom/linux.git (refs/heads/for-next):
On Mon, 18 Jan 2021 17:24:21 +0100 you wrote:
> This patch adds support for the following Xperias:
>
> * Z3+ [aka Z4 in some regions] (Ivy)
> * Z4 Tablet (Karin)
> * Z4 Tablet Wi-Fi (Karin_windy) [APQ8094]
> * Z5 Compact (Suzuran)
> * Z5 Premium (Satsuki)
>
> [...]
Here is the summary with links:
- [01/11] arm64: dts: qcom: Add support for remaining Sony Kitakami boards
https://git.kernel.org/qcom/c/72b312411de7
- [02/11] arm64: dts: qcom: msm8992-bullhead: Update regulator config
https://git.kernel.org/qcom/c/1628dfe5f67e
- [03/11] arm64: dts: qcom: msm8992-libra: Update regulator config
https://git.kernel.org/qcom/c/31d9dbd2ae36
- [04/11] arm64: dts: qcom: msm8992/4: Rename vreg_vph_pwr to vph_pwr
https://git.kernel.org/qcom/c/53364cfcaa7d
- [05/11] arm64: dts: qcom: msm/apq8994-kitakami: Add regulator config
https://git.kernel.org/qcom/c/676b61b4790a
- [06/11] arm64: dts: qcom: msm8994-kitakami: Add Synaptics RMI touchscreen
https://git.kernel.org/qcom/c/e8528157b7f0
- [07/11] arm64: dts: qcom: msm8994-kitakami: Add uSD card support
https://git.kernel.org/qcom/c/ab8e4a853731
- [08/11] arm64: dts: qcom: msm8994-kitakami: Add VDD_GFX regulator
https://git.kernel.org/qcom/c/e9783584c9b7
- [09/11] arm64: dts: qcom: msm8994: Fix BLSP2_UART2 node
https://git.kernel.org/qcom/c/a046032c37c0
- [10/11] arm64: dts: qcom: msm8994/8994-kitakami: Fix up the memory map
https://git.kernel.org/qcom/c/74d6d0a14583
- [11/11] arm64: dts: qcom: msm8994-kitakami: Add missing email in the copyright
https://git.kernel.org/qcom/c/54b1511e4f31
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 12+ messages in thread