2022-09-08 08:14:21

by Krzysztof Kozlowski

[permalink] [raw]
Subject: [PATCH 1/5] arm64: dts: qcom: pmi8994: add missing MPP compatible fallback

Bindings require usage of generic MPP fallback in compatible:

qcom/apq8094-sony-xperia-kitakami-karin_windy.dtb: pmic@2: mpps@a000:compatible: ['qcom,pmi8994-mpp'] is too short

Signed-off-by: Krzysztof Kozlowski <[email protected]>
---
arch/arm64/boot/dts/qcom/pmi8994.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/qcom/pmi8994.dtsi b/arch/arm64/boot/dts/qcom/pmi8994.dtsi
index 92a139ca4482..a0af91698d49 100644
--- a/arch/arm64/boot/dts/qcom/pmi8994.dtsi
+++ b/arch/arm64/boot/dts/qcom/pmi8994.dtsi
@@ -21,7 +21,7 @@ pmi8994_gpios: gpio@c000 {
};

pmi8994_mpps: mpps@a000 {
- compatible = "qcom,pmi8994-mpp";
+ compatible = "qcom,pmi8994-mpp", "qcom,spmi-mpp";
reg = <0xa000>;
gpio-controller;
gpio-ranges = <&pmi8994_mpps 0 0 4>;
--
2.34.1


2022-09-08 08:14:57

by Krzysztof Kozlowski

[permalink] [raw]
Subject: [PATCH 5/5] arm64: dts: qcom: sa8295p-adp: add missing gpio-ranges in PMIC GPIOs

The Qualcomm PMIC GPIO bindings require gpio-ranges property:

qcom/sa8295p-adp.dtb: pmic@8: gpio@c000: 'gpio-ranges' is a required property

Signed-off-by: Krzysztof Kozlowski <[email protected]>
---
arch/arm64/boot/dts/qcom/sa8295p-adp.dts | 4 ++++
1 file changed, 4 insertions(+)

diff --git a/arch/arm64/boot/dts/qcom/sa8295p-adp.dts b/arch/arm64/boot/dts/qcom/sa8295p-adp.dts
index 98f8420488b6..b608b82dff03 100644
--- a/arch/arm64/boot/dts/qcom/sa8295p-adp.dts
+++ b/arch/arm64/boot/dts/qcom/sa8295p-adp.dts
@@ -186,6 +186,7 @@ pm8450a_gpios: gpio@c000 {
compatible = "qcom,pm8150-gpio", "qcom,spmi-gpio";
reg = <0xc000>;
gpio-controller;
+ gpio-ranges = <&pm8450a_gpios 0 0 10>;
#gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <2>;
@@ -202,6 +203,7 @@ pm8450c_gpios: gpio@c000 {
compatible = "qcom,pm8150-gpio", "qcom,spmi-gpio";
reg = <0xc000>;
gpio-controller;
+ gpio-ranges = <&pm8450c_gpios 0 0 10>;
#gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <2>;
@@ -218,6 +220,7 @@ pm8450e_gpios: gpio@c000 {
compatible = "qcom,pm8150-gpio", "qcom,spmi-gpio";
reg = <0xc000>;
gpio-controller;
+ gpio-ranges = <&pm8450e_gpios 0 0 10>;
#gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <2>;
@@ -234,6 +237,7 @@ pm8450g_gpios: gpio@c000 {
compatible = "qcom,pm8150-gpio", "qcom,spmi-gpio";
reg = <0xc000>;
gpio-controller;
+ gpio-ranges = <&pm8450g_gpios 0 0 10>;
#gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <2>;
--
2.34.1

2022-09-08 08:25:18

by Krzysztof Kozlowski

[permalink] [raw]
Subject: [PATCH 4/5] arm64: dts: qcom: sa8295p-adp: add fallback compatible to PMIC GPIOs

Bindings require all PMIC GPIO nodes to have two compatibles - specific
followed by SPMI or SSBI fallback:

qcom/sa8295p-adp.dtb: pmic@8: gpio@c000:compatible: ['qcom,pm8150-gpio'] is too short

Signed-off-by: Krzysztof Kozlowski <[email protected]>
---
arch/arm64/boot/dts/qcom/sa8295p-adp.dts | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/arm64/boot/dts/qcom/sa8295p-adp.dts b/arch/arm64/boot/dts/qcom/sa8295p-adp.dts
index ca5f5ad32ce5..98f8420488b6 100644
--- a/arch/arm64/boot/dts/qcom/sa8295p-adp.dts
+++ b/arch/arm64/boot/dts/qcom/sa8295p-adp.dts
@@ -183,7 +183,7 @@ pm8450a: pmic@0 {
#size-cells = <0>;

pm8450a_gpios: gpio@c000 {
- compatible = "qcom,pm8150-gpio";
+ compatible = "qcom,pm8150-gpio", "qcom,spmi-gpio";
reg = <0xc000>;
gpio-controller;
#gpio-cells = <2>;
@@ -199,7 +199,7 @@ pm8450c: pmic@4 {
#size-cells = <0>;

pm8450c_gpios: gpio@c000 {
- compatible = "qcom,pm8150-gpio";
+ compatible = "qcom,pm8150-gpio", "qcom,spmi-gpio";
reg = <0xc000>;
gpio-controller;
#gpio-cells = <2>;
@@ -215,7 +215,7 @@ pm8450e: pmic@8 {
#size-cells = <0>;

pm8450e_gpios: gpio@c000 {
- compatible = "qcom,pm8150-gpio";
+ compatible = "qcom,pm8150-gpio", "qcom,spmi-gpio";
reg = <0xc000>;
gpio-controller;
#gpio-cells = <2>;
@@ -231,7 +231,7 @@ pm8450g: pmic@c {
#size-cells = <0>;

pm8450g_gpios: gpio@c000 {
- compatible = "qcom,pm8150-gpio";
+ compatible = "qcom,pm8150-gpio", "qcom,spmi-gpio";
reg = <0xc000>;
gpio-controller;
#gpio-cells = <2>;
--
2.34.1

2022-09-08 08:51:44

by Krzysztof Kozlowski

[permalink] [raw]
Subject: [PATCH 2/5] arm64: dts: qcom: msm8994-msft-lumia-octagon: align resin node name with bindings

Bindings expect resin node to be named "resin":

qcom/msm8992-msft-lumia-octagon-talkman.dtb: pmic@0: pon@800: Unevaluated properties are not allowed ('volwnkey' was unexpected)

Signed-off-by: Krzysztof Kozlowski <[email protected]>
---
arch/arm64/boot/dts/qcom/msm8994-msft-lumia-octagon.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/qcom/msm8994-msft-lumia-octagon.dtsi b/arch/arm64/boot/dts/qcom/msm8994-msft-lumia-octagon.dtsi
index cc45873a820c..d8d732ec1b73 100644
--- a/arch/arm64/boot/dts/qcom/msm8994-msft-lumia-octagon.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8994-msft-lumia-octagon.dtsi
@@ -499,7 +499,7 @@ pwrkey {
linux,code = <KEY_POWER>;
};

- volwnkey {
+ resin {
compatible = "qcom,pm8941-resin";
interrupts = <0 8 1 IRQ_TYPE_EDGE_BOTH>;
debounce = <15625>;
--
2.34.1

2022-09-08 09:17:37

by Krzysztof Kozlowski

[permalink] [raw]
Subject: [PATCH 3/5] arm64: dts: qcom: msm8996-xiaomi: align PMIC GPIO pin configuration with DT schema

Bindings expect PMIC GPIO pin configuration nodes to be named with
'-state' suffix:

qcom/msm8996-xiaomi-scorpio.dtb: pmic@0: gpio@c000: 'irled-default', 'keypad-default' do not match any of the regexes: '-state$', 'pinctrl-[0-9]+'

Drop also additional indentation via "pinconf" to make the code a bit
smaller.

Signed-off-by: Krzysztof Kozlowski <[email protected]>
---
.../boot/dts/qcom/msm8996-xiaomi-common.dtsi | 16 +++++++---------
.../boot/dts/qcom/msm8996-xiaomi-scorpio.dts | 16 +++++++---------
2 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/arch/arm64/boot/dts/qcom/msm8996-xiaomi-common.dtsi b/arch/arm64/boot/dts/qcom/msm8996-xiaomi-common.dtsi
index 6d6e0fb4d270..78a1977d0593 100644
--- a/arch/arm64/boot/dts/qcom/msm8996-xiaomi-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8996-xiaomi-common.dtsi
@@ -651,15 +651,13 @@ vdd_gfx: s2 {
};

&pm8994_gpios {
- irled_default: irled-default {
- pinconf {
- pins = "gpio5";
- function = PMIC_GPIO_FUNC_FUNC1;
- output-low;
- qcom,drive-strength = <PMIC_GPIO_STRENGTH_HIGH>;
- power-source = <PM8994_GPIO_S4>;
- bias-disable;
- };
+ irled_default: irled-default-state {
+ pins = "gpio5";
+ function = PMIC_GPIO_FUNC_FUNC1;
+ output-low;
+ qcom,drive-strength = <PMIC_GPIO_STRENGTH_HIGH>;
+ power-source = <PM8994_GPIO_S4>;
+ bias-disable;
};

wlan_en_default: wlan-en-state {
diff --git a/arch/arm64/boot/dts/qcom/msm8996-xiaomi-scorpio.dts b/arch/arm64/boot/dts/qcom/msm8996-xiaomi-scorpio.dts
index d287fa77e45a..895050831267 100644
--- a/arch/arm64/boot/dts/qcom/msm8996-xiaomi-scorpio.dts
+++ b/arch/arm64/boot/dts/qcom/msm8996-xiaomi-scorpio.dts
@@ -278,15 +278,13 @@ &pm8994_gpios {
"UIM_BATT_ALARM", /* GPIO_21 */
"NC"; /* GPIO_22 */

- keypad_default: keypad-default {
- pinconf {
- pins = "gpio7", "gpio10";
- function = PMIC_GPIO_FUNC_FUNC1;
- output-low;
- qcom,drive-strength = <PMIC_GPIO_STRENGTH_LOW>;
- power-source = <PM8994_GPIO_S4>;
- bias-disable;
- };
+ keypad_default: keypad-default-state {
+ pins = "gpio7", "gpio10";
+ function = PMIC_GPIO_FUNC_FUNC1;
+ output-low;
+ qcom,drive-strength = <PMIC_GPIO_STRENGTH_LOW>;
+ power-source = <PM8994_GPIO_S4>;
+ bias-disable;
};
};

--
2.34.1

2022-09-15 03:59:07

by Bjorn Andersson

[permalink] [raw]
Subject: Re: (subset) [PATCH 1/5] arm64: dts: qcom: pmi8994: add missing MPP compatible fallback

On Thu, 8 Sep 2022 10:10:46 +0200, Krzysztof Kozlowski wrote:
> Bindings require usage of generic MPP fallback in compatible:
>
> qcom/apq8094-sony-xperia-kitakami-karin_windy.dtb: pmic@2: mpps@a000:compatible: ['qcom,pmi8994-mpp'] is too short
>
>

Applied, thanks!

[1/5] arm64: dts: qcom: pmi8994: add missing MPP compatible fallback
commit: 8cd012f75178c4dffe8df692aa991e829286a8d4
[2/5] arm64: dts: qcom: msm8994-msft-lumia-octagon: align resin node name with bindings
commit: 308ff92e77aa2febec9b81b6917ebb0f38da8cb5
[3/5] arm64: dts: qcom: msm8996-xiaomi: align PMIC GPIO pin configuration with DT schema
commit: b94d7c1fc7c6ac4e2ce83e9fc6a84fc3034b631c
[4/5] arm64: dts: qcom: sa8295p-adp: add fallback compatible to PMIC GPIOs
commit: afa774bc17e607ef98cc660657cf5208a39591a2
[5/5] arm64: dts: qcom: sa8295p-adp: add missing gpio-ranges in PMIC GPIOs
commit: aa510b0c1fa34338babbde366b2c98b9b39aa282

Best regards,
--
Bjorn Andersson <[email protected]>