From patchwork Mon Nov 30 16:59:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Andersson X-Patchwork-Id: 335304 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 06EEAC8301C for ; Mon, 30 Nov 2020 17:00:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B4DF520706 for ; Mon, 30 Nov 2020 17:00:46 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="M8OJrSKF" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729110AbgK3RAI (ORCPT ); Mon, 30 Nov 2020 12:00:08 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42862 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729104AbgK3RAH (ORCPT ); Mon, 30 Nov 2020 12:00:07 -0500 Received: from mail-oi1-x242.google.com (mail-oi1-x242.google.com [IPv6:2607:f8b0:4864:20::242]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9D12EC0613D2 for ; Mon, 30 Nov 2020 08:59:26 -0800 (PST) Received: by mail-oi1-x242.google.com with SMTP id f11so14876697oij.6 for ; Mon, 30 Nov 2020 08:59:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=3AKqtsetF/3bygtwtqV3okW03J10w7MYPRsa4Q8rRqs=; b=M8OJrSKFLTX0WFm05MzcEUaLJXf0dqYh6EuXVIKrwU+drTaNU20rM9i5l4y2sSL8U9 bPBnkk6rnUQsXlPpmRcrdPJTcCxN4Rk4oICZ1AXuXzq/NWI1ck/Z2l4+Cqkoeygmzhrb xXs3Xgk2N7dKP63D3/BFT1CZI4b/as0hgskh82Y39mdMxlzWyjihvdEdkrToE0VNmlM9 q/n/uwfc7sqZJ4YumXBcqN6+EQFFSKRZEFUXw/yQQzy1t1J7OSSdDXbW2Zuy1bhfJpu9 fdsSyPzrEu85b7QYrpMvnNdL+1KY/12wIJnbogjEWR3DW/wbYNSr/IDDTP123EwrCG10 gOOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=3AKqtsetF/3bygtwtqV3okW03J10w7MYPRsa4Q8rRqs=; b=Xh6NEu8GPLSB0Pm1FdbN2oJGn5GisG59L+eQdj3O5s6BQpkR59JAiEUr3xa4CrJ3Ht QgigrzpJAUvKjB7zUSDIIGsVJWVk2BEodIKEXyb1X+3fG7TIuepgkHFq7Q///49suAUB vFumd0eS+DP7heK+N8l85Iv5cQ7s4DdvVYlrVDrmX6tnjNqwE2YafW7zW5p3CgBt1C2T PJuYdm0IGgt8Uy6p4B5Q9XctrISJ4fy4t5nVAPhfGdGGy6IwrTtOgGt7x6pcamgKwcBZ RFdtS9cvySHANBSWPnbnRYgRkmpaTRZ99YJ/0npG0KCJlV7xoA1z2iagawqajusRCigA V+3w== X-Gm-Message-State: AOAM531HTi0PYIrGiVoCrfPv4y2ExpqrgpbkvSheq9vISxB5DcG0IjRb Bdr5gpdN+FiX+YU6EJaU8INIoA== X-Google-Smtp-Source: ABdhPJyqdkYHTQphFE5XYHsJ7PiuNzw/fBfr3seAF2MUeljr5LZgUiqKO0VeNttycKzKmnnfAvnXyg== X-Received: by 2002:a54:4f95:: with SMTP id g21mr15365047oiy.61.1606755565905; Mon, 30 Nov 2020 08:59:25 -0800 (PST) Received: from builder.lan (104-57-184-186.lightspeed.austtx.sbcglobal.net. [104.57.184.186]) by smtp.gmail.com with ESMTPSA id n63sm10018180oih.39.2020.11.30.08.59.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Nov 2020 08:59:25 -0800 (PST) From: Bjorn Andersson To: Andy Gross , Bjorn Andersson , Steev Klimaszewski , Shawn Guo Cc: Rob Herring , Vinod Koul , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] arm64: dts: qcom: c630: Polish i2c-hid devices Date: Mon, 30 Nov 2020 10:59:24 -0600 Message-Id: <20201130165924.319708-1-bjorn.andersson@linaro.org> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org 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 --- .../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";