mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-04-27 05:48:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Brian Masney
2023-01-03 13:22:23 -05:00
committed by Bjorn Andersson
parent 71bc1b4284
commit 6e1569ddfa
3 changed files with 105 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
arch/arm64/boot/dts/qcom/sc8280xp-crd.dts
View File

@@ -301,6 +301,43 @@ &mdss0_dp3_phy {
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 @@ &qup2 {
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 @@ edp_reg_en: edp-reg-en-state {
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 @@ qup0_i2c4_default: qup0-i2c4-default-state {
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";

120
arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
View File

@@ -413,6 +413,59 @@ &mdss0_dp3_phy {
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 @@ &qup2 {
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 @@ hall_int_n_default: hall-int-n-state {
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 @@ qup0_i2c4_default: qup0-i2c4-default-state {
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";

2
arch/arm64/boot/dts/qcom/sc8280xp.dtsi
View File

@@ -840,7 +840,7 @@ uart17: serial@884000 {
status = "disabled";
};
qup2_i2c5: i2c@894000 {
i2c21: i2c@894000 {
compatible = "qcom,geni-i2c";
reg = <0 0x00894000 0 0x4000>;
clock-names = "se";