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 <krzysztof.kozlowski@linaro.org>
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20220908081050.29751-3-krzysztof.kozlowski@linaro.org

diff --git a/arch/arm64/boot/dts/qcom/msm8996-xiaomi-common.dtsi b/arch/arm64/boot/dts/qcom/msm8996-xiaomi-common.dtsi
index ef9a8aa9c2b9fbda8c816c2f80de2774a018130e..77819186086ac54c722abfc5ac4a857da94fb1b4 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8996-xiaomi-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8996-xiaomi-common.dtsi
@@ -651,15 +651,13 @@
 };
 
 &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 bc8ebf10be9c00336122065485942991f16737ae..79be5fb1295b0858fc6d25dd79de594d483ab6f7 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8996-xiaomi-scorpio.dts
+++ b/arch/arm64/boot/dts/qcom/msm8996-xiaomi-scorpio.dts
@@ -279,15 +279,13 @@
                "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;
        };
 };