On 11/30/20 10:59 AM, Bjorn Andersson wrote:
> The numbering of the i2c busses differs from ACPI and a number of typos
> was made in the original patch. Further more the irq flags for the
> various resources was not correct and i2c3 only has one of the two
> client devices active in any one device.
>
> Also label the various devices, for easier comparison with the ACPI
> tables.
>
> Fixes: 44acee207844 ("arm64: dts: qcom: Add Lenovo Yoga C630")
> Signed-off-by: Bjorn Andersson <bjorn.andersson@xxxxxxxxxx>
> ---
> .../boot/dts/qcom/sdm850-lenovo-yoga-c630.dts | 31 +++++++++++--------
> 1 file changed, 18 insertions(+), 13 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts b/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts
> index 047ac9c16874..399aef2a0951 100644
> --- a/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts
> +++ b/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts
> @@ -264,23 +264,28 @@ &i2c3 {
> status = "okay";
> clock-frequency = <400000>;
>
> - hid@15 {
> + tsel: hid@15 {
> compatible = "hid-over-i2c";
> reg = <0x15>;
> hid-descr-addr = <0x1>;
>
> - interrupts-extended = <&tlmm 37 IRQ_TYPE_EDGE_RISING>;
> + interrupts-extended = <&tlmm 37 IRQ_TYPE_LEVEL_HIGH>;
> +
> + pinctrl-names = "default";
> + pinctrl-0 = <&i2c3_hid_active>;
> };
>
> - hid@2c {
> + tsc2: hid@2c {
> compatible = "hid-over-i2c";
> reg = <0x2c>;
> hid-descr-addr = <0x20>;
>
> - interrupts-extended = <&tlmm 37 IRQ_TYPE_EDGE_RISING>;
> + interrupts-extended = <&tlmm 37 IRQ_TYPE_LEVEL_HIGH>;
>
> pinctrl-names = "default";
> - pinctrl-0 = <&i2c2_hid_active>;
> + pinctrl-0 = <&i2c3_hid_active>;
> +
> + status = "disabled";
> };
> };
>
> @@ -288,15 +293,15 @@ &i2c5 {
> status = "okay";
> clock-frequency = <400000>;
>
> - hid@10 {
> + tsc1: hid@10 {
> compatible = "hid-over-i2c";
> reg = <0x10>;
> hid-descr-addr = <0x1>;
>
> - interrupts-extended = <&tlmm 125 IRQ_TYPE_EDGE_FALLING>;
> + interrupts-extended = <&tlmm 125 IRQ_TYPE_LEVEL_LOW>;
>
> pinctrl-names = "default";
> - pinctrl-0 = <&i2c6_hid_active>;
> + pinctrl-0 = <&i2c5_hid_active>;
> };
> };
>
> @@ -304,7 +309,7 @@ &i2c11 {
> status = "okay";
> clock-frequency = <400000>;
>
> - hid@5c {
> + ecsh: hid@5c {
> compatible = "hid-over-i2c";
> reg = <0x5c>;
> hid-descr-addr = <0x1>;
> @@ -312,7 +317,7 @@ hid@5c {
> interrupts-extended = <&tlmm 92 IRQ_TYPE_LEVEL_LOW>;
>
> pinctrl-names = "default";
> - pinctrl-0 = <&i2c12_hid_active>;
> + pinctrl-0 = <&i2c11_hid_active>;
> };
> };
>
> @@ -426,7 +431,7 @@ codec {
> &tlmm {
> gpio-reserved-ranges = <0 4>, <81 4>;
>
> - i2c2_hid_active: i2c2-hid-active {
> + i2c3_hid_active: i2c2-hid-active {
> pins = <37>;
> function = "gpio";
>
> @@ -435,7 +440,7 @@ i2c2_hid_active: i2c2-hid-active {
> drive-strength = <2>;
> };
>
> - i2c6_hid_active: i2c6-hid-active {
> + i2c5_hid_active: i2c5-hid-active {
> pins = <125>;
> function = "gpio";
>
> @@ -444,7 +449,7 @@ i2c6_hid_active: i2c6-hid-active {
> drive-strength = <2>;
> };
>
> - i2c12_hid_active: i2c12-hid-active {
> + i2c11_hid_active: i2c11-hid-active {
> pins = <92>;
> function = "gpio";
>
Tested-by: Steev Klimaszewski <steev@xxxxxxxx>
