From patchwork Mon Dec 28 12:47:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 352653 Delivered-To: patch@linaro.org Received: by 2002:a02:85a7:0:0:0:0:0 with SMTP id d36csp9757934jai; Mon, 28 Dec 2020 05:46:43 -0800 (PST) X-Google-Smtp-Source: ABdhPJwsRmTHRooVzW2Jsa9NXPFLy4P6vxjORqHDQ0m8UYrpfmY84sUFlrjKUC+msOFVOKFIAl4M X-Received: by 2002:a17:906:a951:: with SMTP id hh17mr29583610ejb.388.1609163203155; Mon, 28 Dec 2020 05:46:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1609163203; cv=none; d=google.com; s=arc-20160816; b=VlXG6MQXocEtg8GU8u2TfUYVXotmgLqWik9ZY6hDtNi3z8QAEOsmFleIdKWQ++hzQ2 JA2k+SsLP6YEvulULYjdUHpNLK3GXGuwhWeMWQXsyBLpnpv1EOHs4Q9iShRqKtSvdt3J 3u5oeW9ElHKTYni7l08TsD20iRkJJtfLHF2Jo+BaLgWBGsxakc4ls29aPKcFpRFKT247 z6Cseo6gttFs3QOaAfg3HQVbsuaG5LH6G7eLSIqpLsVgRZm8V1bUQPd2yArdVQJ0pskg Z5feom6ayHrmCZXIMSbntyWaSduXsyHLcw+huPgDv9/TtG80f3qLJhfzXEiehWJ+zFVW NUFQ== 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=spjZV9EUYz/23edgSDWP4eZwm5qJ4r3SQ0m6DNTUlKQ=; b=CJ0ePHP8+STGDD63/HAuq1FvARwiu5FLImEP+Vk1a6dvAvX3NWAEkDL/jlRzDO+lhR 1liJec3mxOKJfZJqKPEmxX+m6diL47ycTE5NHpKAX+rXBGpTFbKraDxGeV9uZREaOLDS bpwcl2a6w2+/78BkT3ElTaT1xv/uOf+1rJ3vMmR4aLkBGrqsy+LCktykPgxCwssRChMI y0QF6bqcWZdKY/VaeaWvl4fLWrCVO/ic2lRi3NVtwasmXdj2rTs9C6YsZ5rhreTTRx3j fCV1+jYPX3wQHLV6JozH76WvgqL7tAZ6NVkk0fbk6NKRocXMRQ63C52E4tsGJEZUIsOi BIXQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Zc62AZlw; 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 z3si20294500eda.136.2020.12.28.05.46.42; Mon, 28 Dec 2020 05:46:43 -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=Zc62AZlw; 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 S2405168AbgL1Nqj (ORCPT + 14 others); Mon, 28 Dec 2020 08:46:39 -0500 Received: from mail.kernel.org ([198.145.29.99]:46702 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2404993AbgL1NqC (ORCPT ); Mon, 28 Dec 2020 08:46:02 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 03D0E205CB; Mon, 28 Dec 2020 13:45:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1609163146; bh=ZMz1VaCoNoltprG8mhf06g9t/TJKHaD2DDu0AwVhxso=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Zc62AZlwcud0hvvfKX4q7yIayYn5MW+u+3BHFRja+CFA992JUTWF1l8HbOWINQ2HR ZEC+t2RsrcUIFxEMgOk1m8Q3JI38pM6PjtISs0Q2hNxMpRy4347I6DlRs63+0lIUXy hhAC1H9Ukug0LOBcXGBzQkmkLQF3MsPUNNJXNVeQ= 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.4 187/453] arm64: dts: qcom: c630: Polish i2c-hid devices Date: Mon, 28 Dec 2020 13:47:03 +0100 Message-Id: <20201228124946.209170540@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201228124937.240114599@linuxfoundation.org> References: <20201228124937.240114599@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 ded120d3aef58..f539b3655f6b9 100644 --- a/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts +++ b/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts @@ -244,23 +244,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"; }; }; @@ -268,15 +273,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>; }; }; @@ -284,7 +289,7 @@ status = "okay"; clock-frequency = <400000>; - hid@5c { + ecsh: hid@5c { compatible = "hid-over-i2c"; reg = <0x5c>; hid-descr-addr = <0x1>; @@ -292,7 +297,7 @@ interrupts-extended = <&tlmm 92 IRQ_TYPE_LEVEL_LOW>; pinctrl-names = "default"; - pinctrl-0 = <&i2c12_hid_active>; + pinctrl-0 = <&i2c11_hid_active>; }; }; @@ -335,7 +340,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"; @@ -344,7 +349,7 @@ drive-strength = <2>; }; - i2c6_hid_active: i2c6-hid-active { + i2c5_hid_active: i2c5-hid-active { pins = <125>; function = "gpio"; @@ -353,7 +358,7 @@ drive-strength = <2>; }; - i2c12_hid_active: i2c12-hid-active { + i2c11_hid_active: i2c11-hid-active { pins = <92>; function = "gpio";