arm64: dts: qcom: msm8998-yoshino: Use actual pin names for pin nodes

With the gpio-line-names in place coming from SONY themselves, we can
now make the pin nodes and their labels to more closely resemble the
actual thing. 4k has been renamed to four_k due to dtc limitations.

Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20230314-topic-yoshino_gpio-v2-2-4cb80e187e38@linaro.org

diff --git a/arch/arm64/boot/dts/qcom/msm8998-sony-xperia-yoshino-maple.dts b/arch/arm64/boot/dts/qcom/msm8998-sony-xperia-yoshino-maple.dts
index 8b6a718..055b6a6 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8998-sony-xperia-yoshino-maple.dts
+++ b/arch/arm64/boot/dts/qcom/msm8998-sony-xperia-yoshino-maple.dts
@@ -22,7 +22,7 @@
                enable-active-high;
                gpio = <&pmi8998_gpios 10 GPIO_ACTIVE_HIGH>;
                pinctrl-names = "default";
-               pinctrl-0 = <&disp_dvdd_en>;
+               pinctrl-0 = <&four_k_disp_dcdc_en>;
        };
 };
 
@@ -60,7 +60,7 @@
                          "SPMI_I2C_SEL",
                          "NC";
 
-       disp_dvdd_en: disp-dvdd-en-active-state {
+       four_k_disp_dcdc_en: 4k-disp-dcdc-en-state {
                pins = "gpio10";
                function = "normal";
                bias-disable;

diff --git a/arch/arm64/boot/dts/qcom/msm8998-sony-xperia-yoshino.dtsi b/arch/arm64/boot/dts/qcom/msm8998-sony-xperia-yoshino.dtsi
index bb1c1e8..8e1c25b 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8998-sony-xperia-yoshino.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8998-sony-xperia-yoshino.dtsi
@@ -21,7 +21,7 @@
        clocks {
                div1_mclk: divclk1 {
                        compatible = "gpio-gate-clock";
-                       pinctrl-0 = <&audio_mclk_pin>;
+                       pinctrl-0 = <&div_clk1>;
                        pinctrl-names = "default";
                        clocks = <&rpmcc RPM_SMD_DIV_CLK1>;
                        #clock-cells = <0>;
@@ -46,7 +46,7 @@
                enable-active-high;
                gpio = <&tlmm 21 GPIO_ACTIVE_HIGH>;
                pinctrl-names = "default";
-               pinctrl-0 = <&cam0_vdig_default>;
+               pinctrl-0 = <&main_cam_pwr_en>;
        };
 
        cam1_vdig_vreg: cam1-vdig {
@@ -56,7 +56,7 @@
                enable-active-high;
                gpio = <&tlmm 25 GPIO_ACTIVE_HIGH>;
                pinctrl-names = "default";
-               pinctrl-0 = <&cam1_vdig_default>;
+               pinctrl-0 = <&chat_cam_pwr_en>;
                vin-supply = <&vreg_s3a_1p35>;
        };
 
@@ -67,7 +67,7 @@
                enable-active-high;
                gpio = <&pmi8998_gpios 1 GPIO_ACTIVE_HIGH>;
                pinctrl-names = "default";
-               pinctrl-0 = <&cam_vio_default>;
+               pinctrl-0 = <&main_cam_pwr_io_en>;
                vin-supply = <&vreg_lvs1a_1p8>;
        };
 
@@ -92,15 +92,14 @@
                id-gpio = <&tlmm 38 GPIO_ACTIVE_HIGH>;
                vbus-gpio = <&tlmm 128 GPIO_ACTIVE_HIGH>;
                pinctrl-names = "default";
-               pinctrl-0 = <&usb_extcon_active &usb_vbus_active>;
+               pinctrl-0 = <&cc_dir_default &usb_detect_en>;
        };
 
        gpio-keys {
                compatible = "gpio-keys";
                label = "Side buttons";
                pinctrl-names = "default";
-               pinctrl-0 = <&vol_down_pin_a>, <&cam_focus_pin_a>,
-                           <&cam_snapshot_pin_a>;
+               pinctrl-0 = <&vol_down_n &focus_n &snapshot_n>;
                button-vol-down {
                        label = "Volume Down";
                        gpios = <&pm8998_gpios 5 GPIO_ACTIVE_LOW>;
@@ -131,7 +130,7 @@
                compatible = "gpio-keys";
                label = "Hall sensors";
                pinctrl-names = "default";
-               pinctrl-0 = <&hall_sensor0_default>;
+               pinctrl-0 = <&acc_cover_open>;
 
                event-hall-sensor0 {
                        label = "Cover Hall Sensor";
@@ -189,7 +188,7 @@
                compatible = "gpio-vibrator";
                enable-gpios = <&pmi8998_gpios 5 GPIO_ACTIVE_HIGH>;
                pinctrl-names = "default";
-               pinctrl-0 = <&vib_default>;
+               pinctrl-0 = <&vib_ldo_en>;
        };
 };
 
@@ -263,7 +262,7 @@
                vdd-supply = <&cam_vio_vreg>;
 
                pinctrl-names = "default";
-               pinctrl-0 = <&tof_int &tof_reset>;
+               pinctrl-0 = <&tof_int_n &tof_reset>;
        };
 };
 
@@ -338,7 +337,7 @@
                          "OPTION_2 (DISALLOWED)",
                          "PM_SLB (DISALLOWED)";
 
-       vol_down_pin_a: vol-down-active-state {
+       vol_down_n: vol-down-n-state {
                pins = "gpio5";
                function = PMIC_GPIO_FUNC_NORMAL;
                bias-pull-up;
@@ -346,7 +345,7 @@
                qcom,drive-strength = <PMIC_GPIO_STRENGTH_NO>;
        };
 
-       cam_focus_pin_a: cam-focus-btn-active-state {
+       focus_n: focus-n-state {
                pins = "gpio7";
                function = PMIC_GPIO_FUNC_NORMAL;
                bias-pull-up;
@@ -354,7 +353,7 @@
                qcom,drive-strength = <PMIC_GPIO_STRENGTH_NO>;
        };
 
-       cam_snapshot_pin_a: cam-snapshot-btn-active-state {
+       snapshot_n: snapshot-n-state {
                pins = "gpio8";
                function = PMIC_GPIO_FUNC_NORMAL;
                bias-pull-up;
@@ -362,7 +361,7 @@
                qcom,drive-strength = <PMIC_GPIO_STRENGTH_NO>;
        };
 
-       audio_mclk_pin: audio-mclk-pin-active-state {
+       div_clk1: div-clk1-state {
                pins = "gpio13";
                function = "func2";
                power-source = <0>;
@@ -385,7 +384,7 @@
                          "SPMI_I2C_SEL",
                          "NC";
 
-       cam_vio_default: cam-vio-active-state {
+       main_cam_pwr_io_en: main-cam-pwr-io-en-state {
                pins = "gpio1";
                function = PMIC_GPIO_FUNC_NORMAL;
                bias-disable;
@@ -395,7 +394,7 @@
                power-source = <1>;
        };
 
-       vib_default: vib-en-state {
+       vib_ldo_en: vib-ldo-en-state {
                pins = "gpio5";
                function = PMIC_GPIO_FUNC_NORMAL;
                bias-disable;
@@ -790,7 +789,7 @@
                          "RFFE1_DATA",
                          "RFFE1_CLK";
 
-       mdp_vsync_n: mdp-vsync-n-state {
+       mdp_vsync_p: mdp-vsync-p-state {
                pins = "gpio10";
                function = "mdp_vsync_a";
                drive-strength = <2>;
@@ -805,14 +804,14 @@
                output-low;
        };
 
-       msm_mclk0_default: msm-mclk0-active-state {
+       cam_mclk0_active: cam-mclk0-active-state {
                pins = "gpio13";
                function = "cam_mclk";
                drive-strength = <2>;
                bias-disable;
        };
 
-       msm_mclk1_default: msm-mclk1-active-state {
+       cam_mclk1_active: cam-mclk1-active-state {
                pins = "gpio14";
                function = "cam_mclk";
                drive-strength = <2>;
@@ -833,14 +832,14 @@
                drive-strength = <2>;
        };
 
-       cam0_vdig_default: cam0-vdig-default-state {
+       main_cam_pwr_en: main-cam-pwr-en-default-state {
                pins = "gpio21";
                function = "gpio";
                bias-disable;
                drive-strength = <2>;
        };
 
-       tof_int: tof-int-state {
+       tof_int_n: tof-int-n-state {
                pins = "gpio22";
                function = "gpio";
                bias-pull-up;
@@ -848,28 +847,28 @@
                input-enable;
        };
 
-       cam1_vdig_default: cam1-vdig-default-state {
+       chat_cam_pwr_en: chat-cam-pwr-en-default-state {
                pins = "gpio25";
                function = "gpio";
                bias-disable;
                drive-strength = <2>;
        };
 
-       usb_extcon_active: usb-extcon-active-state {
-               pins = "gpio38";
+       tof_reset: tof-reset-state {
+               pins = "gpio27";
                function = "gpio";
                bias-disable;
-               drive-strength = <16>;
+               drive-strength = <2>;
        };
 
-       tof_reset: tof-reset-state {
-               pins = "gpio27";
+       cc_dir_default: cc-dir-active-state {
+               pins = "gpio38";
                function = "gpio";
                bias-disable;
-               drive-strength = <2>;
+               drive-strength = <16>;
        };
 
-       hall_sensor0_default: acc-cover-open-state {
+       acc_cover_open: acc-cover-open-state {
                pins = "gpio124";
                function = "gpio";
                bias-disable;
@@ -884,7 +883,7 @@
                bias-pull-up;
        };
 
-       usb_vbus_active: usb-vbus-active-state {
+       usb_detect_en: usb-detect-en-active-state {
                pins = "gpio128";
                function = "gpio";
                bias-disable;