arm64: dts: qcom: sc8280xp: rename qup2_i2c5 to i2c21

In preparation for adding the missing SPI and I2C nodes to
sc8280xp.dtsi, it was decided to rename all of the existing qupX_
uart, spi, and i2c nodes to drop the qupX_ prefix. Let's go ahead
and rename qup2_i2c5 to i2c21. Under the old name, this was the 5th
index under qup2, which starts at index 16.

Note that some nodes are moved in the file by this patch to preserve
the expected sort order in the file. Additionally, the properties
within the pinctrl state node are sorted to match the expected order
that's typically done in other DTs.

Signed-off-by: Brian Masney <bmasney@redhat.com>
Link: https://lore.kernel.org/lkml/20221212182314.1902632-1-bmasney@redhat.com/
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Reviewed-by: Johan Hovold <johan+linaro@kernel.org>
Tested-by: Steev Klimaszewski <steev@kali.org>
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20230103182229.37169-5-bmasney@redhat.com

diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts b/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts
index 19dbc5f16a2af6f10ddbabf792e5b3b47a85fb8f..fbe9980e0c72b1c669888f217681f619dca1f6d7 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts
+++ b/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts
@@ -301,6 +301,43 @@
        status = "okay";
 };
 
+&i2c21 {
+       clock-frequency = <400000>;
+
+       pinctrl-names = "default";
+       pinctrl-0 = <&i2c21_default>;
+
+       status = "okay";
+
+       touchpad@15 {
+               compatible = "hid-over-i2c";
+               reg = <0x15>;
+
+               hid-descr-addr = <0x1>;
+               interrupts-extended = <&tlmm 182 IRQ_TYPE_LEVEL_LOW>;
+               vdd-supply = <&vreg_misc_3p3>;
+
+               pinctrl-names = "default";
+               pinctrl-0 = <&tpad_default>;
+
+               wakeup-source;
+       };
+
+       keyboard@68 {
+               compatible = "hid-over-i2c";
+               reg = <0x68>;
+
+               hid-descr-addr = <0x1>;
+               interrupts-extended = <&tlmm 104 IRQ_TYPE_LEVEL_LOW>;
+               vdd-supply = <&vreg_misc_3p3>;
+
+               pinctrl-names = "default";
+               pinctrl-0 = <&kybd_default>;
+
+               wakeup-source;
+       };
+};
+
 &pcie2a {
        perst-gpios = <&tlmm 143 GPIO_ACTIVE_LOW>;
        wake-gpios = <&tlmm 145 GPIO_ACTIVE_LOW>;
@@ -399,43 +436,6 @@
        status = "okay";
 };
 
-&qup2_i2c5 {
-       clock-frequency = <400000>;
-
-       pinctrl-names = "default";
-       pinctrl-0 = <&qup2_i2c5_default>;
-
-       status = "okay";
-
-       touchpad@15 {
-               compatible = "hid-over-i2c";
-               reg = <0x15>;
-
-               hid-descr-addr = <0x1>;
-               interrupts-extended = <&tlmm 182 IRQ_TYPE_LEVEL_LOW>;
-               vdd-supply = <&vreg_misc_3p3>;
-
-               pinctrl-names = "default";
-               pinctrl-0 = <&tpad_default>;
-
-               wakeup-source;
-       };
-
-       keyboard@68 {
-               compatible = "hid-over-i2c";
-               reg = <0x68>;
-
-               hid-descr-addr = <0x1>;
-               interrupts-extended = <&tlmm 104 IRQ_TYPE_LEVEL_LOW>;
-               vdd-supply = <&vreg_misc_3p3>;
-
-               pinctrl-names = "default";
-               pinctrl-0 = <&kybd_default>;
-
-               wakeup-source;
-       };
-};
-
 &remoteproc_adsp {
        firmware-name = "qcom/sc8280xp/qcadsp8280.mbn";
 
@@ -574,6 +574,13 @@
                bias-disable;
        };
 
+       i2c21_default: i2c21-default-state {
+               pins = "gpio81", "gpio82";
+               function = "qup21";
+               drive-strength = <16>;
+               bias-disable;
+       };
+
        kybd_default: kybd-default-state {
                disable-pins {
                        pins = "gpio102";
@@ -678,14 +685,6 @@
                drive-strength = <16>;
        };
 
-       qup2_i2c5_default: qup2-i2c5-default-state {
-               pins = "gpio81", "gpio82";
-               function = "qup21";
-
-               bias-disable;
-               drive-strength = <16>;
-       };
-
        tpad_default: tpad-default-state {
                int-n-pins {
                        pins = "gpio182";

diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
index 3f464b2b92ee1f1008648b2312fdf0a8879bd9a9..54e0d902356446764943d1c3ad9d2f662fa72690 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
+++ b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
@@ -413,6 +413,59 @@
        status = "okay";
 };
 
+&i2c21 {
+       clock-frequency = <400000>;
+
+       pinctrl-names = "default";
+       pinctrl-0 = <&i2c21_default>;
+
+       status = "okay";
+
+       touchpad@15 {
+               compatible = "hid-over-i2c";
+               reg = <0x15>;
+
+               hid-descr-addr = <0x1>;
+               interrupts-extended = <&tlmm 182 IRQ_TYPE_LEVEL_LOW>;
+               vdd-supply = <&vreg_misc_3p3>;
+
+               pinctrl-names = "default";
+               pinctrl-0 = <&tpad_default>;
+
+               wakeup-source;
+
+               status = "disabled";
+       };
+
+       touchpad@2c {
+               compatible = "hid-over-i2c";
+               reg = <0x2c>;
+
+               hid-descr-addr = <0x20>;
+               interrupts-extended = <&tlmm 182 IRQ_TYPE_LEVEL_LOW>;
+               vdd-supply = <&vreg_misc_3p3>;
+
+               pinctrl-names = "default";
+               pinctrl-0 = <&tpad_default>;
+
+               wakeup-source;
+       };
+
+       keyboard@68 {
+               compatible = "hid-over-i2c";
+               reg = <0x68>;
+
+               hid-descr-addr = <0x1>;
+               interrupts-extended = <&tlmm 104 IRQ_TYPE_LEVEL_LOW>;
+               vdd-supply = <&vreg_misc_3p3>;
+
+               pinctrl-names = "default";
+               pinctrl-0 = <&kybd_default>;
+
+               wakeup-source;
+       };
+};
+
 &pcie2a {
        perst-gpios = <&tlmm 143 GPIO_ACTIVE_LOW>;
        wake-gpios = <&tlmm 145 GPIO_ACTIVE_LOW>;
@@ -662,59 +715,6 @@
        status = "okay";
 };
 
-&qup2_i2c5 {
-       clock-frequency = <400000>;
-
-       pinctrl-names = "default";
-       pinctrl-0 = <&qup2_i2c5_default>;
-
-       status = "okay";
-
-       touchpad@15 {
-               compatible = "hid-over-i2c";
-               reg = <0x15>;
-
-               hid-descr-addr = <0x1>;
-               interrupts-extended = <&tlmm 182 IRQ_TYPE_LEVEL_LOW>;
-               vdd-supply = <&vreg_misc_3p3>;
-
-               pinctrl-names = "default";
-               pinctrl-0 = <&tpad_default>;
-
-               wakeup-source;
-
-               status = "disabled";
-       };
-
-       touchpad@2c {
-               compatible = "hid-over-i2c";
-               reg = <0x2c>;
-
-               hid-descr-addr = <0x20>;
-               interrupts-extended = <&tlmm 182 IRQ_TYPE_LEVEL_LOW>;
-               vdd-supply = <&vreg_misc_3p3>;
-
-               pinctrl-names = "default";
-               pinctrl-0 = <&tpad_default>;
-
-               wakeup-source;
-       };
-
-       keyboard@68 {
-               compatible = "hid-over-i2c";
-               reg = <0x68>;
-
-               hid-descr-addr = <0x1>;
-               interrupts-extended = <&tlmm 104 IRQ_TYPE_LEVEL_LOW>;
-               vdd-supply = <&vreg_misc_3p3>;
-
-               pinctrl-names = "default";
-               pinctrl-0 = <&kybd_default>;
-
-               wakeup-source;
-       };
-};
-
 &remoteproc_adsp {
        firmware-name = "qcom/sc8280xp/LENOVO/21BX/qcadsp8280.mbn";
 
@@ -989,6 +989,13 @@
                bias-disable;
        };
 
+       i2c21_default: i2c21-default-state {
+               pins = "gpio81", "gpio82";
+               function = "qup21";
+               drive-strength = <16>;
+               bias-disable;
+       };
+
        kybd_default: kybd-default-state {
                disable-pins {
                        pins = "gpio102";
@@ -1092,13 +1099,6 @@
                drive-strength = <16>;
        };
 
-       qup2_i2c5_default: qup2-i2c5-default-state {
-               pins = "gpio81", "gpio82";
-               function = "qup21";
-               bias-disable;
-               drive-strength = <16>;
-       };
-
        spkr_1_sd_n_default: spkr-1-sd-n-default-state {
                perst-n-pins {
                        pins = "gpio178";

diff --git a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
index 29dd60d5a33ddae92716c2063917694d41744aaa..877b3d1c6613e1fe7fafff137f2821ae8437d3f2 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
@@ -840,7 +840,7 @@
                                status = "disabled";
                        };
 
-                       qup2_i2c5: i2c@894000 {
+                       i2c21: i2c@894000 {
                                compatible = "qcom,geni-i2c";
                                reg = <0 0x00894000 0 0x4000>;
                                clock-names = "se";