From patchwork Mon Dec 28 12:43:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 352696 Delivered-To: patch@linaro.org Received: by 2002:a02:85a7:0:0:0:0:0 with SMTP id d36csp9814412jai; Mon, 28 Dec 2020 07:07:15 -0800 (PST) X-Google-Smtp-Source: ABdhPJzZM+APL8UDRw9T1A0OVSdjR75R14BSaUQbPj3VPAxyBilA6kmgF1Baz751PiB1+GVI8BAZ X-Received: by 2002:a05:6402:388:: with SMTP id o8mr42505063edv.359.1609168034923; Mon, 28 Dec 2020 07:07:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1609168034; cv=none; d=google.com; s=arc-20160816; b=OuvStyDLnDWTrzZXZUfNlIBfqSd2vc5dIPCA1V0BWde5uieFmf57aBJQjXAivMXoIO wmWuPklPSVjR/8tvsqbgXHFZSwprKawQSx/1/Z4gbYobPEr76MUL31uB7adymC2lFbwK +wCHkh15zRu9SGznzuKp0PeetoVCG8IVcEP7V89N7hyC3yy50f7+6Ws6thtIDhOd5hjn pEWm1/BXVJf1jaQ5rdd675riwWPDfGcuSUwvo16rSeGDbcJq+6WmY3YfI561saBkOgZ2 BbS40S0ljsoRC5TsVKba0AdWD/cf788CaLfk1XMYfiwfeqcH8En0a/tF+nLlym77C9mZ AKPQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=h4UjIvOoWGBdfzFWtHZ7S7yp7sL3PlhW0pV8qNY1x04=; b=qfJRe5JWYq+SeI6aswacqLGxro+fu4iIZkrTJ4SxTAl47cd+8Lk/dSkYf6Bf+MqD3P UcF/7pyR+hhypC2Fm1ejscWuxMPJUP1WNRtNRuk9YgQ9ei/W0R5AfFMgzmPP9frxD3RP c1siEf1GMHgZq51f9IhK+PRull3oqdUXt8JyNRmjEE6jgDI10Km2KcPf5JaszAw8njdB /FCdzRJFH2sVgzdZsE9ePYfSD61unUKlaLyMUOVujmoVdQ1NugtzoXt9/R4af8a+f7oL PHLRfWQzTyvW26OLjwiHytTR1q0UM0Lep4PPxK0WX6B+99lSb7gRx05NJXjHzAGg/coM zh0A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=BpaVTNyF; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id 29si21143901edw.398.2020.12.28.07.07.14; Mon, 28 Dec 2020 07:07:14 -0800 (PST) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=BpaVTNyF; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2439219AbgL1ONF (ORCPT + 14 others); Mon, 28 Dec 2020 09:13:05 -0500 Received: from mail.kernel.org ([198.145.29.99]:45648 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2439259AbgL1OLD (ORCPT ); Mon, 28 Dec 2020 09:11:03 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id B1432207B6; Mon, 28 Dec 2020 14:10:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1609164622; bh=w+JspG33Y9P17KIQ2DqBwKdz0hex3HC8iOGwrKsGLA4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BpaVTNyFd/tnmAs2on/cL2+renxNpYMbATdhXF4LmKloH6H4Z1jCY5YlCIEkpcdv8 viRrzy+2MKrKjwzkkXvUNRrFbXHVSZH0K+xgSydpzkAqdSPGdtK7CFt9lxpOV1x9cL 34uFXRdXxRk5vcz7MW5H44A/PJYqOw7m2iVAH728= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Steev Klimaszewski , Bjorn Andersson , Sasha Levin Subject: [PATCH 5.10 238/717] arm64: dts: qcom: c630: Polish i2c-hid devices Date: Mon, 28 Dec 2020 13:43:56 +0100 Message-Id: <20201228125032.398166454@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201228125020.963311703@linuxfoundation.org> References: <20201228125020.963311703@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Bjorn Andersson [ Upstream commit 11d0e4f281565ef757479764ce7fd8d35eeb01b0 ] 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. Tested-by: Steev Klimaszewski Fixes: 44acee207844 ("arm64: dts: qcom: Add Lenovo Yoga C630") Link: https://lore.kernel.org/r/20201130165924.319708-1-bjorn.andersson@linaro.org Signed-off-by: Bjorn Andersson Signed-off-by: Sasha Levin --- .../boot/dts/qcom/sdm850-lenovo-yoga-c630.dts | 31 +++++++++++-------- 1 file changed, 18 insertions(+), 13 deletions(-) -- 2.27.0 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 d03ca31907466..60c6ab8162e21 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 @@ 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 @@ 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 @@ status = "okay"; clock-frequency = <400000>; - hid@5c { + ecsh: hid@5c { compatible = "hid-over-i2c"; reg = <0x5c>; hid-descr-addr = <0x1>; @@ -312,7 +317,7 @@ 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 @@ &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 @@ drive-strength = <2>; }; - i2c6_hid_active: i2c6-hid-active { + i2c5_hid_active: i2c5-hid-active { pins = <125>; function = "gpio"; @@ -444,7 +449,7 @@ drive-strength = <2>; }; - i2c12_hid_active: i2c12-hid-active { + i2c11_hid_active: i2c11-hid-active { pins = <92>; function = "gpio";