From patchwork Sun Sep 20 14:48:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Iskren Chernev X-Patchwork-Id: 292747 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=-12.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,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 14DB8C43463 for ; Sun, 20 Sep 2020 14:49:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C984D21D7A for ; Sun, 20 Sep 2020 14:49:34 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Vdjfsc/7" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726360AbgITOtb (ORCPT ); Sun, 20 Sep 2020 10:49:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49498 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726267AbgITOta (ORCPT ); Sun, 20 Sep 2020 10:49:30 -0400 Received: from mail-wr1-x444.google.com (mail-wr1-x444.google.com [IPv6:2a00:1450:4864:20::444]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 93D83C061755; Sun, 20 Sep 2020 07:49:30 -0700 (PDT) Received: by mail-wr1-x444.google.com with SMTP id g4so10157298wrs.5; Sun, 20 Sep 2020 07:49:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=KyigOv+0We+x79PCbFPnfiw4bdpY9tY3JDxDVTtrA7M=; b=Vdjfsc/7P80TGCgg/RLuJ1h8OC850QmJJE059kmeoGiEDX/L7SyuNa/GiPZrH48UA+ vqLEQfW5UvQ7b8hM2LcguAEMeu1gVleuBARvPZBBpVAzUgECPiiv2+TOjzMy/3Lf6PzN UMIXlIJK0HRA1JCrmArGqI+xRIsg6Jzs40yH6Y4KShfKfIBhQt5jv1syji3u+FMrQjTr 4YhNOSIZTqi2RRjK2lI2tOqZnuZkQ0XUaow8/K/pEKnQsZ9+gCut3OsBl9QZ0wRgyzmB iMqocQ/r5ULo7E90bUittsIvfxNGyWx/iti0IqPG+6SxCGBzTtJTcqIfV0k2/5B7eN5t oEYA== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=KyigOv+0We+x79PCbFPnfiw4bdpY9tY3JDxDVTtrA7M=; b=Mv+QLacCF7639SlLUevvMkFBrKCnv2RSPN5UBz+An1EeC+wtoc+1TmqBkUeCl9i+B2 5aqXtEiph13upXoj/yHlvN8laHRmIOEgorlO1vgj67TqcIbnu7+79LdHVjApqL9+F20s qTiKGgYpWLN+KpEXozgQBWWnX6ICwunMT47qVRQxwiVZsiXQbIQVEf56Dti7WhX40eCu i9Fc03inEpB92dXSS89T1O1yCC11cmqvivJsOONK7opJGz/cbLzCchOnBNRVo1EUupkW eCmRzLkbtsFNFa+RGBUix78Wj75CH2sfsuPF1jzcU/h+6cVIW7l0h7WbkObGcaN04BRk 9mIw== X-Gm-Message-State: AOAM5331+sPXDTxJ7VduSsRTZimkqdm+dlxhsDpCeVYwb83vN/YQzm28 GZfWUM3e/lb5mQ5ACZAnbZ8= X-Google-Smtp-Source: ABdhPJwMkFXwfxbpY0hLaNoL95BI4MVfOnZmgvAPwtGcLnbypJut5bwjRfFRadALSYWoku1pHvi+wA== X-Received: by 2002:a5d:4645:: with SMTP id j5mr43850667wrs.388.1600613369348; Sun, 20 Sep 2020 07:49:29 -0700 (PDT) Received: from localhost (178-169-161-196.razgrad.ddns.bulsat.com. [178.169.161.196]) by smtp.gmail.com with ESMTPSA id v17sm17420215wrc.23.2020.09.20.07.49.27 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 20 Sep 2020 07:49:28 -0700 (PDT) From: Iskren Chernev To: Rob Herring Cc: Andy Gross , Bjorn Andersson , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, ~postmarketos/upstreaming@lists.sr.ht, linux-arm-msm@vger.kernel.org, Iskren Chernev Subject: [PATCH RESEND 1/7] ARM: dts: qcom: msm8974-klte: Merge pinctrl nodes Date: Sun, 20 Sep 2020 17:48:53 +0300 Message-Id: <20200920144859.813032-2-iskren.chernev@gmail.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200920144859.813032-1-iskren.chernev@gmail.com> References: <20200920144859.813032-1-iskren.chernev@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org commit cd13c72c1853f219e1f ("ARM: dts: qcom: msm8974-klte: Add max77826 pmic node") and commit 8bf7a360a92cc6b2aebc8 ("ARM: dts: qcom: msm8974-klte: Add sdhci1 node") both added pinctrl node. This patch merges the two nodes. Signed-off-by: Iskren Chernev --- .../boot/dts/qcom-msm8974-samsung-klte.dts | 22 +++++++++---------- 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/arch/arm/boot/dts/qcom-msm8974-samsung-klte.dts b/arch/arm/boot/dts/qcom-msm8974-samsung-klte.dts index d4dc98214225a..9520c6e7910ce 100644 --- a/arch/arm/boot/dts/qcom-msm8974-samsung-klte.dts +++ b/arch/arm/boot/dts/qcom-msm8974-samsung-klte.dts @@ -258,6 +258,16 @@ cmd-data { bias-pull-up; }; }; + + i2c6_pins: i2c6 { + mux { + pins = "gpio29", "gpio30"; + function = "blsp_i2c6"; + + drive-strength = <2>; + bias-disable; + }; + }; }; sdhci@f9824900 { @@ -298,18 +308,6 @@ phy@a { }; }; - pinctrl@fd510000 { - i2c6_pins: i2c6 { - mux { - pins = "gpio29", "gpio30"; - function = "blsp_i2c6"; - - drive-strength = <2>; - bias-disable; - }; - }; - }; - i2c@f9928000 { status = "okay"; From patchwork Sun Sep 20 14:48:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Iskren Chernev X-Patchwork-Id: 250149 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=-12.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,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 087BDC43465 for ; Sun, 20 Sep 2020 14:49:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C0C1823119 for ; Sun, 20 Sep 2020 14:49:56 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Up2aj3nm" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726401AbgITOtz (ORCPT ); Sun, 20 Sep 2020 10:49:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49560 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726267AbgITOtz (ORCPT ); Sun, 20 Sep 2020 10:49:55 -0400 Received: from mail-wr1-x444.google.com (mail-wr1-x444.google.com [IPv6:2a00:1450:4864:20::444]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4D1F6C061755; Sun, 20 Sep 2020 07:49:55 -0700 (PDT) Received: by mail-wr1-x444.google.com with SMTP id w5so10156227wrp.8; Sun, 20 Sep 2020 07:49:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Hei6sj5lGVKAkNipIDZoLNgw3wuVuVHq++DYxzcFE0M=; b=Up2aj3nmEOdOe/bD5Sq7+2cIxB7LAwT8pWsisJaG/NY3NalkggQRU0C5fpjbNbjHOf 3PtHHC2jtIGSLxYdCYwjqJLwe3YkdVUxZHON2er7Q6HGuInXx1V+KphDD2d95NCXBhQ9 UHjhvsoZlyowhD4FOMHyF0TLDNhg/5d8u6ShkxC2BRJpY77GUDpN0ngJlUHqCBXf+RPa ySyNKeJ7/W/zt+Cv8WjPC1ig9bFD6sAi9nV6a4Vdwirgq5H/GqSLU6gAj5qZCxcgVYbt 3lM+8W9YhTfPZpFvDauY8kZ0m+IUS3F98Ha9anieoC9UDLjDob5F789BNUyrF73FADMV jp9w== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=Hei6sj5lGVKAkNipIDZoLNgw3wuVuVHq++DYxzcFE0M=; b=NtMr+Fh8ZNnSVwbkSNmOScJ04dNgA/rCX2ZOeLi7v3+j2RvQtTjSrENqqF7xD9ImIf zUKHy0ZHRRua+yPYGUpdgZvKxB7e/nIcA2TpOWEzPgD4on4RSR789ISBWU5uUA54moON pUgZgrFhA725mEEQzZCcXzOVnyht2ugu+ehpNaI5N9TvOvGAXtUbZ05pRIbZIkHsX50o 6khZNpr7oeLVDbuKJzDZWs/UxlofIBovDc2PVUpdUKBolIcP/GRjoKrHhBg3js2KKcWX hqfN9eX+Jt6Qs+SS9TfxxZC9283xsdA8fRh5o5uUlhhKDEaiN4zhVIj531ClAWGHaHib tZWA== X-Gm-Message-State: AOAM533bwX7kiSKVC3XB5gS9QwBxPYzTwtcklc7/qmoNlX7GBwCb/nfD omp3s1V0ca2pkblU5ilrLm0= X-Google-Smtp-Source: ABdhPJx2cHC/VPuCY1cPyWzXLy1DDrHdj6WWDnW7r+uLOenNchGbDDWQkXsxAL2V/eH39mu5A/zpzQ== X-Received: by 2002:adf:9405:: with SMTP id 5mr24564081wrq.51.1600613393995; Sun, 20 Sep 2020 07:49:53 -0700 (PDT) Received: from localhost (178-169-161-196.razgrad.ddns.bulsat.com. [178.169.161.196]) by smtp.gmail.com with ESMTPSA id c25sm14629877wml.31.2020.09.20.07.49.52 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 20 Sep 2020 07:49:53 -0700 (PDT) From: Iskren Chernev To: Rob Herring Cc: Andy Gross , Bjorn Andersson , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, ~postmarketos/upstreaming@lists.sr.ht, linux-arm-msm@vger.kernel.org, Iskren Chernev Subject: [PATCH RESEND 2/7] ARM: dts: qcom: msm8974-klte: Add support for touchkey Date: Sun, 20 Sep 2020 17:48:54 +0300 Message-Id: <20200920144859.813032-3-iskren.chernev@gmail.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200920144859.813032-1-iskren.chernev@gmail.com> References: <20200920144859.813032-1-iskren.chernev@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Add support for the touchkey found on the Samsung Galaxy S5. The touchkey is responsible for handling the application and back buttons found around the home button. Signed-off-by: Iskren Chernev --- .../boot/dts/qcom-msm8974-samsung-klte.dts | 44 ++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/qcom-msm8974-samsung-klte.dts b/arch/arm/boot/dts/qcom-msm8974-samsung-klte.dts index 9520c6e7910ce..750e2f261139a 100644 --- a/arch/arm/boot/dts/qcom-msm8974-samsung-klte.dts +++ b/arch/arm/boot/dts/qcom-msm8974-samsung-klte.dts @@ -145,7 +145,7 @@ pma8084_l18: l18 { }; pma8084_l19: l19 { - regulator-min-microvolt = <2900000>; + regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; }; @@ -203,6 +203,31 @@ pma8084_l27: l27 { }; }; + i2c-gpio-touchkey { + compatible = "i2c-gpio"; + #address-cells = <1>; + #size-cells = <0>; + sda-gpios = <&msmgpio 95 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; + scl-gpios = <&msmgpio 96 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; + pinctrl-names = "default"; + pinctrl-0 = <&i2c_touchkey_pins>; + + touchkey@20 { + compatible = "cypress,tm2-touchkey"; + reg = <0x20>; + + interrupt-parent = <&pma8084_gpios>; + interrupts = <6 IRQ_TYPE_EDGE_FALLING>; + pinctrl-names = "default"; + pinctrl-0 = <&touchkey_pin>; + + vcc-supply = <&max77826_ldo15>; + vdd-supply = <&pma8084_l19>; + + linux,keycodes = ; + }; + }; + /delete-node/ vreg-boost; }; @@ -268,6 +293,15 @@ mux { bias-disable; }; }; + + i2c_touchkey_pins: i2c-touchkey { + mux { + pins = "gpio95", "gpio96"; + function = "gpio"; + input-enable; + bias-pull-up; + }; + }; }; sdhci@f9824900 { @@ -418,6 +452,14 @@ gpio_keys_pin_a: gpio-keys-active { bias-pull-up; power-source = ; }; + + touchkey_pin: touchkey-int-pin { + pins = "gpio6"; + function = "normal"; + bias-disable; + input-enable; + power-source = ; + }; }; }; }; From patchwork Sun Sep 20 14:48:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Iskren Chernev X-Patchwork-Id: 292746 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=-12.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham 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 0871DC43465 for ; Sun, 20 Sep 2020 14:50:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BF98120866 for ; Sun, 20 Sep 2020 14:50:00 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Uxy5FI6y" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726445AbgITOuA (ORCPT ); Sun, 20 Sep 2020 10:50:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49576 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726267AbgITOt7 (ORCPT ); Sun, 20 Sep 2020 10:49:59 -0400 Received: from mail-wm1-x341.google.com (mail-wm1-x341.google.com [IPv6:2a00:1450:4864:20::341]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 77930C061755; Sun, 20 Sep 2020 07:49:59 -0700 (PDT) Received: by mail-wm1-x341.google.com with SMTP id l15so9925851wmh.1; Sun, 20 Sep 2020 07:49:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Wf/sNUKlRf/ALlFecYdtWbVPMhCjaOaenlGyzJQwOtg=; b=Uxy5FI6yj+nZxHEZUECEtVRHtpbVlA4Jg6LX9FTOQOBYodcckKNyRzMD72pbWd3TAY /O7KO5bxSM177gwvtekWg7S76nGki2oXM22A7pAOFjZwIqlzLbCiHCNuyQvlGVxKVZhI 9wh0LL0Wpq17s7hWKZjrnLFJTEMQj2+ITi6NAR6jOVZGcgH2+gfF0CXBu2qEPmz16JZV rA9gIHRiehyf//d4axn/zDl1HCKkE1IXYp85VppGAC2nhHi6Qs+kNXNUh6OFPxokEUXc XcfExI+OOBQnu7gT96/LgG+wEbicKhaCjt21iidot209+lB74Q5TpuO6FHjgxiG0+re9 zplg== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=Wf/sNUKlRf/ALlFecYdtWbVPMhCjaOaenlGyzJQwOtg=; b=LSRX48uw5Bvd3KjSnakAVz6NDUIdbUPo42uxjiTU+JG7/BYmiSbD/IOZ2BCzfbkt0c s2Nb1TH44Rl5MuB6DHv+6ELngka91LtFWTbcUxFG3Sw3xGo+l0C0xji5AEVsYPKc3KJs WakzvZIn6vlppLdh9ev4jGpgsA9VPLnXmtA+fiHOQkyW61dI9n1WCo4AC9vpRPZG0UjN 19tbkyrOcL5vAfAwo4ZASH20ZUQ4qzd69MbNYXp1z7GaZHHD7MGDELbBGiDdcNtdC6c3 vthVct6I7xRlp0luE+73/KRoam7u/NBiteltkndZKGp2yfRzDm8Hp9iIPCS+8KtR+hGS n+eQ== X-Gm-Message-State: AOAM532HSdoIrYNb8HchRxXU/BywdUxQMEly23t08POtHo432euXbVOW RCAI7tEvaOezO6v0K83CuR8= X-Google-Smtp-Source: ABdhPJzG+5YSLkg9krJZtj/pMR4YCiUZ0VzyLOg+3FgNX35aUi9QMEla7B/jtw4rE+8YKVuCmMYQlQ== X-Received: by 2002:a7b:c847:: with SMTP id c7mr26051249wml.149.1600613398189; Sun, 20 Sep 2020 07:49:58 -0700 (PDT) Received: from localhost (178-169-161-196.razgrad.ddns.bulsat.com. [178.169.161.196]) by smtp.gmail.com with ESMTPSA id b84sm15932017wmd.0.2020.09.20.07.49.56 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 20 Sep 2020 07:49:57 -0700 (PDT) From: Iskren Chernev To: Rob Herring Cc: Andy Gross , Bjorn Andersson , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, ~postmarketos/upstreaming@lists.sr.ht, linux-arm-msm@vger.kernel.org, Iskren Chernev Subject: [PATCH RESEND 3/7] ARM: dts: qcom: msm8974-klte: Add support for touchscreen Date: Sun, 20 Sep 2020 17:48:55 +0300 Message-Id: <20200920144859.813032-4-iskren.chernev@gmail.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200920144859.813032-1-iskren.chernev@gmail.com> References: <20200920144859.813032-1-iskren.chernev@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Add support for the touchscreen found on the Samsung Galaxy S5. Signed-off-by: Iskren Chernev --- .../boot/dts/qcom-msm8974-samsung-klte.dts | 54 +++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/arch/arm/boot/dts/qcom-msm8974-samsung-klte.dts b/arch/arm/boot/dts/qcom-msm8974-samsung-klte.dts index 750e2f261139a..085636f182d01 100644 --- a/arch/arm/boot/dts/qcom-msm8974-samsung-klte.dts +++ b/arch/arm/boot/dts/qcom-msm8974-samsung-klte.dts @@ -284,6 +284,16 @@ cmd-data { }; }; + i2c2_pins: i2c2 { + mux { + pins = "gpio6", "gpio7"; + function = "blsp_i2c2"; + + drive-strength = <2>; + bias-disable; + }; + }; + i2c6_pins: i2c6 { mux { pins = "gpio29", "gpio30"; @@ -342,6 +352,42 @@ phy@a { }; }; + i2c@f9924000 { + status = "okay"; + + pinctrl-names = "default"; + pinctrl-0 = <&i2c2_pins>; + + touchscreen@20 { + compatible = "syna,rmi4-i2c"; + reg = <0x20>; + + interrupt-parent = <&pma8084_gpios>; + interrupts = <8 IRQ_TYPE_EDGE_FALLING>; + + vdd-supply = <&max77826_ldo13>; + vio-supply = <&pma8084_lvs2>; + + pinctrl-names = "default"; + pinctrl-0 = <&touch_pin>; + + syna,startup-delay-ms = <100>; + + #address-cells = <1>; + #size-cells = <0>; + + rmi4-f01@1 { + reg = <0x1>; + syna,nosleep-mode = <1>; + }; + + rmi4-f12@12 { + reg = <0x12>; + syna,sensor-type = <1>; + }; + }; + }; + i2c@f9928000 { status = "okay"; @@ -460,6 +506,14 @@ touchkey_pin: touchkey-int-pin { input-enable; power-source = ; }; + + touch_pin: touchscreen-int-pin { + pins = "gpio8"; + function = "normal"; + bias-disable; + input-enable; + power-source = ; + }; }; }; }; From patchwork Sun Sep 20 14:48:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Iskren Chernev X-Patchwork-Id: 250148 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=-12.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,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 7CD45C43465 for ; Sun, 20 Sep 2020 14:50:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4959821D7A for ; Sun, 20 Sep 2020 14:50:05 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="N/wVTkBY" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726470AbgITOuE (ORCPT ); Sun, 20 Sep 2020 10:50:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49588 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726267AbgITOuE (ORCPT ); Sun, 20 Sep 2020 10:50:04 -0400 Received: from mail-wm1-x344.google.com (mail-wm1-x344.google.com [IPv6:2a00:1450:4864:20::344]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 25995C061755; Sun, 20 Sep 2020 07:50:04 -0700 (PDT) Received: by mail-wm1-x344.google.com with SMTP id b79so10045933wmb.4; Sun, 20 Sep 2020 07:50:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=h2wWpICzgnNUz1U0TQzbZBt177gfOvZMnGNmP05J8cY=; b=N/wVTkBYQwtZjNi60vjmgaP1A7JP7SF/XQd8nZtFsowysn1TwIILJ+cEXD/6nDrADq 1v3m1+m67JIWMiU9DqSrkwWQS3TEe2T/JHeSdJd580zen3W5Ar2uThhBdF89cBxD2m6j lX2UTYzu2uGR6LkETLuN3sOw0qh4wSWqdsRTCIkzuPEOwTY/2UiLVzh7vWQy0DsHri9c 18sAJQxt2iD+Eznl3yHVUxNPwNRmME17VxoKN6h/CSU0F4tfEZKHsrdAVNhwxA0YnlUa oJuBYTX0YqrLigO8hUxbjcEN0/+VR7rh94RexZdQ1xafN3jEDaLb09aS9S9g1JgMBI0A fbSQ== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=h2wWpICzgnNUz1U0TQzbZBt177gfOvZMnGNmP05J8cY=; b=Bga2ZcUq+zrG4WngowrRKqFzGtKAFtDik9l9OhEKvQKPIMADp4e3v1ASWRa8rLileP O1aA9FbJ8gNrW+XSy2Nh5qJLhSCqSi2yLE02RCqH4SIsT4nb8FCZRYj4cL7o615z/KlP zE10Xv4L7pRaOi6NxjmKegd3AIDCr7PmxpbUIpgb5d1mWFr2+G8GXWFMIr8Friy48aST NOGLM8iqQUJkQWFXGRHD91J72UYsWf3NFyCI9OB1R3Utr9SUD9IKRuoWb46TIX6ZhKbr UXrpsOuJGuaZi/iscSmcNKl0pRc5wg67s9eZ2yad+GT+kgGiL2vG74I/bzHJm/PPHXk0 Nz9Q== X-Gm-Message-State: AOAM532YVHluPJWuYiWJ5+u28N4vrDPDsogn4o/+IK2Z0KFPFPk9HCKR 7ouCGefV96UlRegbBI/4+DY= X-Google-Smtp-Source: ABdhPJxUuiEpxPZ8JuzC8LXtmeIjEbHzKB52yyYj3bRnVGXtKxynRR7X0jEFu4M+jkRds9uWuGN0Bg== X-Received: by 2002:a1c:152:: with SMTP id 79mr25588950wmb.90.1600613402896; Sun, 20 Sep 2020 07:50:02 -0700 (PDT) Received: from localhost (178-169-161-196.razgrad.ddns.bulsat.com. [178.169.161.196]) by smtp.gmail.com with ESMTPSA id g8sm14090878wmd.12.2020.09.20.07.50.01 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 20 Sep 2020 07:50:02 -0700 (PDT) From: Iskren Chernev To: Rob Herring Cc: Andy Gross , Bjorn Andersson , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, ~postmarketos/upstreaming@lists.sr.ht, linux-arm-msm@vger.kernel.org, Iskren Chernev Subject: [PATCH RESEND 4/7] ARM: dts: qcom: msm8974-klte: Add support for led Date: Sun, 20 Sep 2020 17:48:56 +0300 Message-Id: <20200920144859.813032-5-iskren.chernev@gmail.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200920144859.813032-1-iskren.chernev@gmail.com> References: <20200920144859.813032-1-iskren.chernev@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org The klte uses a Panasonic AN30259A LED controller for it's indicator led. Signed-off-by: Iskren Chernev --- .../boot/dts/qcom-msm8974-samsung-klte.dts | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/arch/arm/boot/dts/qcom-msm8974-samsung-klte.dts b/arch/arm/boot/dts/qcom-msm8974-samsung-klte.dts index 085636f182d01..7b398da9b75ed 100644 --- a/arch/arm/boot/dts/qcom-msm8974-samsung-klte.dts +++ b/arch/arm/boot/dts/qcom-msm8974-samsung-klte.dts @@ -4,6 +4,7 @@ #include #include #include +#include / { model = "Samsung Galaxy S5"; @@ -228,6 +229,44 @@ touchkey@20 { }; }; + i2c-gpio-led { + compatible = "i2c-gpio"; + #address-cells = <1>; + #size-cells = <0>; + scl-gpios = <&msmgpio 121 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; + sda-gpios = <&msmgpio 120 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; + pinctrl-names = "default"; + pinctrl-0 = <&i2c_led_pins>; + + i2c-gpio,delay-us = <2>; + + led-controller@30 { + compatible = "panasonic,an30259a"; + reg = <0x30>; + + #address-cells = <1>; + #size-cells = <0>; + + led@1 { + reg = <1>; + function = LED_FUNCTION_STATUS; + color = ; + }; + + led@2 { + reg = <2>; + function = LED_FUNCTION_STATUS; + color = ; + }; + + led@3 { + reg = <3>; + function = LED_FUNCTION_STATUS; + color = ; + }; + }; + }; + /delete-node/ vreg-boost; }; @@ -312,6 +351,15 @@ mux { bias-pull-up; }; }; + + i2c_led_pins: i2c-led { + mux { + pins = "gpio120", "gpio121"; + function = "gpio"; + input-enable; + bias-pull-down; + }; + }; }; sdhci@f9824900 { From patchwork Sun Sep 20 14:48:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Iskren Chernev X-Patchwork-Id: 292745 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=-12.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,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 E7217C43465 for ; Sun, 20 Sep 2020 14:50:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B519D235FA for ; Sun, 20 Sep 2020 14:50:15 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="plDb+g35" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726484AbgITOuL (ORCPT ); Sun, 20 Sep 2020 10:50:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49606 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726267AbgITOuL (ORCPT ); Sun, 20 Sep 2020 10:50:11 -0400 Received: from mail-wm1-x344.google.com (mail-wm1-x344.google.com [IPv6:2a00:1450:4864:20::344]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CB6B8C061755; Sun, 20 Sep 2020 07:50:09 -0700 (PDT) Received: by mail-wm1-x344.google.com with SMTP id l9so10054977wme.3; Sun, 20 Sep 2020 07:50:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=WZSvMlo2aCMi+j1f6z52wVET/s5K9zz3xW+5LPlJtd8=; b=plDb+g35fAY13YMG08mxxFMeHvKtOlWPU2hpQ7JKukN9G+8COKdQ8RFXj9F6sCPH9j +AwujXac41IpD627Y61LVOG8iu3NCFTa+Eg0TS1o+P8l319U4GIGLyj87VqKwmHxZt6u o28hStiqpazLfctl17dUNnZIHY6W8kibWIDRYOwg4cjKqZrKcHxnP1PL3khMqltlDgls NfVnnnAAd88cUbNrsdewJ+VJYTxv5TilPjrnd6FJuSuQoLjKgfJNfWIkqzrt7H77Og3t 8H9csADghRDlDxw5/F54YyN1DcGQN+4MPvJg3tXdoZ1ovU8MJA672C4HAL3hhE9cPlHf URKw== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=WZSvMlo2aCMi+j1f6z52wVET/s5K9zz3xW+5LPlJtd8=; b=Fm5S25uHL6U83QB2PPCgPcT+zScD3TgD4eb5v/HtIw8m9mfULpO5RrYrAIqAEn187y mGU90yNEileq6lIO6djyVsbr71esNxt/YG+boMwOiK2QQ2P+eq2w8B2o1hFkfxtTe3k4 fVauGrkRwZmTrbGYWsIOvka8dD2EaEM5JJhd7Hfo7HKUn3MIQpYmf759z+M9Z7QytJZ6 Hb4OjD5aqKiieOl3YRCRkKfGGDKnNzskxPsuNltQyAfu2pcU19X7Z51NtT2y5e5VswJ2 dztvaZfRKynOLDJcBzXYlYbMpojR/niSVuffVS7lsol0tnaG17zijuKFX+f15N6m45xz 6hew== X-Gm-Message-State: AOAM530xfVffEjHnVcVBDWaTc2CyoZ6Ty1zYljzBEW0FPOAuh86Q7rF/ D/I9mj1MlLsc7qwrXVdSw7M= X-Google-Smtp-Source: ABdhPJykbVX6jzB5wIsNbTqNWTCqHpDnAxDB5SrF+UN4hYaq7PhtCkZKhxSryMzEmbKx5c9AXFMkHw== X-Received: by 2002:a1c:488:: with SMTP id 130mr19334218wme.164.1600613408522; Sun, 20 Sep 2020 07:50:08 -0700 (PDT) Received: from localhost (178-169-161-196.razgrad.ddns.bulsat.com. [178.169.161.196]) by smtp.gmail.com with ESMTPSA id m18sm15867228wrx.58.2020.09.20.07.50.06 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 20 Sep 2020 07:50:07 -0700 (PDT) From: Iskren Chernev To: Rob Herring Cc: Andy Gross , Bjorn Andersson , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, ~postmarketos/upstreaming@lists.sr.ht, linux-arm-msm@vger.kernel.org, Iskren Chernev Subject: [PATCH RESEND 5/7] ARM: dts: qcom: msm8974-klte: Add gpio expander chip Date: Sun, 20 Sep 2020 17:48:57 +0300 Message-Id: <20200920144859.813032-6-iskren.chernev@gmail.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200920144859.813032-1-iskren.chernev@gmail.com> References: <20200920144859.813032-1-iskren.chernev@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org The Samsung Galaxy S5 has a GPIO Expander chip, the PCAL6416A with 16 ports on a i2c bus. These pins are used for WiFi, NFC, IR among other things. Signed-off-by: Iskren Chernev --- .../boot/dts/qcom-msm8974-samsung-klte.dts | 29 +++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/qcom-msm8974-samsung-klte.dts b/arch/arm/boot/dts/qcom-msm8974-samsung-klte.dts index 7b398da9b75ed..29099b83b231d 100644 --- a/arch/arm/boot/dts/qcom-msm8974-samsung-klte.dts +++ b/arch/arm/boot/dts/qcom-msm8974-samsung-klte.dts @@ -236,10 +236,25 @@ i2c-gpio-led { scl-gpios = <&msmgpio 121 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; sda-gpios = <&msmgpio 120 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; pinctrl-names = "default"; - pinctrl-0 = <&i2c_led_pins>; + pinctrl-0 = <&i2c_led_gpioex_pins>; i2c-gpio,delay-us = <2>; + gpio_expander: gpio@20 { + compatible = "nxp,pcal6416"; + reg = <0x20>; + + gpio-controller; + #gpio-cells = <2>; + + vcc-supply = <&pma8084_s4>; + + pinctrl-names = "default"; + pinctrl-0 = <&gpioex_pin>; + + reset-gpios = <&msmgpio 145 GPIO_ACTIVE_LOW>; + }; + led-controller@30 { compatible = "panasonic,an30259a"; reg = <0x30>; @@ -352,7 +367,7 @@ mux { }; }; - i2c_led_pins: i2c-led { + i2c_led_gpioex_pins: i2c-led-gpioex { mux { pins = "gpio120", "gpio121"; function = "gpio"; @@ -360,6 +375,16 @@ mux { bias-pull-down; }; }; + + gpioex_pin: gpioex { + res { + pins = "gpio145"; + function = "gpio"; + + bias-pull-up; + drive-strength = <2>; + }; + }; }; sdhci@f9824900 { From patchwork Sun Sep 20 14:48:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Iskren Chernev X-Patchwork-Id: 250147 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=-17.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, 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 0174EC43466 for ; Sun, 20 Sep 2020 14:50:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B964321D7A for ; Sun, 20 Sep 2020 14:50:20 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="R8BlIVOw" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726501AbgITOuQ (ORCPT ); Sun, 20 Sep 2020 10:50:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49622 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726267AbgITOuQ (ORCPT ); Sun, 20 Sep 2020 10:50:16 -0400 Received: from mail-wr1-x443.google.com (mail-wr1-x443.google.com [IPv6:2a00:1450:4864:20::443]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 43F4FC061755; Sun, 20 Sep 2020 07:50:16 -0700 (PDT) Received: by mail-wr1-x443.google.com with SMTP id j2so10166135wrx.7; Sun, 20 Sep 2020 07:50:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Z/2uZ0pYs4z9cwjMhZc9o0Cxd7UZbdq55pRW4iZm16k=; b=R8BlIVOwsRdTH/sWcOXMzXJiav8nqd9EN21VdAk+Z2gdueMSiv9OWlxvkGOgnr2TlA VYFygauUaEUleThyTmm9JxVmkjKotBFsvY1fvxSujl9m9ubnZfw0L7UVuneTblcPqe5p 6pVEkpXOEOIW4Ub9IknqxSGIeU6GuCOIzSIL5EOABSIvN3dPgtH9lYLdv3EU7knxzhA9 Um0aTZu0O4IOQNrWhbmM9YKB78vylh6FdRvTnR/38yF2GOUYdp3RY/fei2Zka/1PV8CI 1cnuHMRjJBJthENU3JF++kzvv92LzGSe+PhRGbXUXuJ4jiRXIPpjRPktoUIOYG3g9jiX 2NVQ== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=Z/2uZ0pYs4z9cwjMhZc9o0Cxd7UZbdq55pRW4iZm16k=; b=hXgTE+LqOAUVzUllAzZmU/65VwPGY52thKg0iffVsgeHldyYbP+ar7RQac9KlsVIsm Gia1e3GiDuTmfRdGpp+R5jvdjOhodzFbSN6kC+fkIpDERFx7MYyGnS48KdaurdGHhFue mZAmOQ4O6AYLFOrAyquUKUVNMU22yPXIfkGos6JJwQnhtgs4XsptIHUtIbZvTUMHlURB gVkRoLf04FpGgfW18GFb5GBbOCD/OMDqss3jYg2nepgxdu+OZw9Gbjj1K+wSmImsMK7Z s8k+uYvCOHAZkRBrs1Psr96bX3t8vDJzgUXHdKRh/O9gAaIT9ysQ6aivJhlbYxiOg5QO iFyQ== X-Gm-Message-State: AOAM530Npsg+7g2fgolyzE9F74cvYm4veS9a0iWqrBsyEw9BmIfofUhq ajrkxs/LBgiXkTanIitZsXE= X-Google-Smtp-Source: ABdhPJzvpLai1gcqedwDYq06Zg4QTcRUOP/B04URAbVdVic+ZBM84Dbwj4jOcthzgdAE6tRMlceJmA== X-Received: by 2002:a5d:40c4:: with SMTP id b4mr45060837wrq.151.1600613415003; Sun, 20 Sep 2020 07:50:15 -0700 (PDT) Received: from localhost (178-169-161-196.razgrad.ddns.bulsat.com. [178.169.161.196]) by smtp.gmail.com with ESMTPSA id q15sm15411842wrr.8.2020.09.20.07.50.13 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 20 Sep 2020 07:50:14 -0700 (PDT) From: Iskren Chernev To: Rob Herring Cc: Andy Gross , Bjorn Andersson , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, ~postmarketos/upstreaming@lists.sr.ht, linux-arm-msm@vger.kernel.org, Iskren Chernev Subject: [PATCH RESEND 6/7] ARM: dts: qcom: msm8974-klte: Add support for wifi Date: Sun, 20 Sep 2020 17:48:58 +0300 Message-Id: <20200920144859.813032-7-iskren.chernev@gmail.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200920144859.813032-1-iskren.chernev@gmail.com> References: <20200920144859.813032-1-iskren.chernev@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org The Samsung Galaxy S5 (klte), uses a Broadcom 4354 Chip connected on the SDIO bus. The chip also requires a corresponding firmware + txt file[1]. [1] https://gitlab.com/postmarketOS/pmaports/-/blob/master/firmware/firmware-samsung-klte/APKBUILD Signed-off-by: Iskren Chernev --- .../boot/dts/qcom-msm8974-samsung-klte.dts | 74 +++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/arch/arm/boot/dts/qcom-msm8974-samsung-klte.dts b/arch/arm/boot/dts/qcom-msm8974-samsung-klte.dts index 29099b83b231d..989447beb4319 100644 --- a/arch/arm/boot/dts/qcom-msm8974-samsung-klte.dts +++ b/arch/arm/boot/dts/qcom-msm8974-samsung-klte.dts @@ -282,6 +282,17 @@ led@3 { }; }; + vreg_wlan: wlan-regulator { + compatible = "regulator-fixed"; + + regulator-name = "wl-reg"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + + gpio = <&gpio_expander 8 GPIO_ACTIVE_HIGH>; + enable-active-high; + }; + /delete-node/ vreg-boost; }; @@ -338,6 +349,20 @@ cmd-data { }; }; + sdhc3_pin_a: sdhc3-pin-active { + clk { + pins = "sdc2_clk"; + drive-strength = <6>; + bias-disable; + }; + + cmd-data { + pins = "sdc2_cmd", "sdc2_data"; + drive-strength = <6>; + bias-pull-up; + }; + }; + i2c2_pins: i2c2 { mux { pins = "gpio6", "gpio7"; @@ -385,6 +410,16 @@ res { drive-strength = <2>; }; }; + + wifi_pin: wifi { + int { + pins = "gpio92"; + function = "gpio"; + + input-enable; + bias-pull-down; + }; + }; }; sdhci@f9824900 { @@ -400,6 +435,36 @@ sdhci@f9824900 { pinctrl-0 = <&sdhc1_pin_a>; }; + sdhci@f98a4900 { + status = "okay"; + + #address-cells = <1>; + #size-cells = <0>; + + max-frequency = <100000000>; + + pinctrl-names = "default"; + pinctrl-0 = <&sdhc3_pin_a>; + + vmmc-supply = <&vreg_wlan>; + vqmmc-supply = <&pma8084_s4>; + + bus-width = <4>; + non-removable; + + wifi@1 { + reg = <1>; + compatible = "brcm,bcm4329-fmac"; + + interrupt-parent = <&msmgpio>; + interrupts = <92 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "host-wake"; + + pinctrl-names = "default"; + pinctrl-0 = <&wlan_sleep_clk_pin &wifi_pin>; + }; + }; + usb@f9a55000 { status = "ok"; @@ -587,6 +652,15 @@ touch_pin: touchscreen-int-pin { input-enable; power-source = ; }; + + wlan_sleep_clk_pin: wlan-sleep-clk-pin { + pins = "gpio16"; + function = "func2"; + + output-high; + power-source = ; + qcom,drive-strength = ; + }; }; }; }; From patchwork Sun Sep 20 14:48:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Iskren Chernev X-Patchwork-Id: 292744 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=-12.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,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 42B1CC43463 for ; Sun, 20 Sep 2020 14:50:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 06E472220C for ; Sun, 20 Sep 2020 14:50:25 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="tvQ5lupA" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726526AbgITOuV (ORCPT ); Sun, 20 Sep 2020 10:50:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49634 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726267AbgITOuT (ORCPT ); Sun, 20 Sep 2020 10:50:19 -0400 Received: from mail-wm1-x342.google.com (mail-wm1-x342.google.com [IPv6:2a00:1450:4864:20::342]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8927BC061755; Sun, 20 Sep 2020 07:50:19 -0700 (PDT) Received: by mail-wm1-x342.google.com with SMTP id l15so9926204wmh.1; Sun, 20 Sep 2020 07:50:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=SteKMBpmBrguVd23I5meuDfrBnRPfbmSgXwQWs0dPQM=; b=tvQ5lupA7UglXX89heGIad1LEEh8JvWmpB6SnN/WFOKmPhkdXpu243oNWa/FmzVzso fMHhv+e/PSE9VKuQYHuv5j/Q7oiCD9u0/q/wJKBTTfMWtHYXciVVo7Cz7aGiZX4bu6Gq 2L7jLR/oBk1aGgl4bo6wTVgkid5QwDmCCydqJ3AHuG+arslEMn8q0X9RH7QjxE11HQR2 cCr1XYUKLRZkXTL4mekIfh3AXNe5H6jXCoboLqFI9w7Jy1wWiGngntXvd8i+XR1e+zYC Mbnj+2Ounm6/s7Wu9DK74Ue1oL2T38TVXME1xtThscKDhv8bEs/3axwTXWCnPClksZxA iGWA== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=SteKMBpmBrguVd23I5meuDfrBnRPfbmSgXwQWs0dPQM=; b=s4albZ3TaYk6aqDdjTyjVnFsiHXDeTmkgZeuk2CgFJ2Rbt6oJI5wjHC4KV1ktJ3igD NnKsiN4xeGjCgPNXJdi7wZdh3zQwEhO+xQqMv6ejU1J0gXh1bftbjV5hFj7NRYs5GJBh Sb/pfkMaFhIAY43+pME2Ze6rcw+FGbioOWEP0rw1VxptueHjfImm0rooW56elfHdGK8e MTpi+5y+HmZbnu7ubfvGeC3+1snIoCiPqQN2Oirrs1czmdgqV97r9F/HDWDfbwgj2J1I R88PTHcJ5846D6GJFO9I8E0yMhu2Q47Adsy7Un6s9NGBartyVf3G/6Tk7xQri8Au9ctC 7aHA== X-Gm-Message-State: AOAM532RIqCsqITVIFJYzZNQdEKiqJ1asxTWwgEX9wKNXVMvaI/Pj42B FB4DWRDotEISG8eSeCv0lHkvHlAUpyCx8fKK X-Google-Smtp-Source: ABdhPJxlRO8KW5JdN4Ie/Lh6Cx9T0AbI9tJVN6s2v+EhCFUxWJvy9Exom5byY1PBmuSuDrcVPIR0HA== X-Received: by 2002:a05:600c:21cd:: with SMTP id x13mr25626226wmj.63.1600613418253; Sun, 20 Sep 2020 07:50:18 -0700 (PDT) Received: from localhost (178-169-161-196.razgrad.ddns.bulsat.com. [178.169.161.196]) by smtp.gmail.com with ESMTPSA id w15sm14985282wro.46.2020.09.20.07.50.16 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 20 Sep 2020 07:50:17 -0700 (PDT) From: Iskren Chernev To: Rob Herring Cc: Andy Gross , Bjorn Andersson , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, ~postmarketos/upstreaming@lists.sr.ht, linux-arm-msm@vger.kernel.org, Iskren Chernev Subject: [PATCH RESEND 7/7] ARM: dts: qcom: msm8974-klte: Add support for SD card Date: Sun, 20 Sep 2020 17:48:59 +0300 Message-Id: <20200920144859.813032-8-iskren.chernev@gmail.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200920144859.813032-1-iskren.chernev@gmail.com> References: <20200920144859.813032-1-iskren.chernev@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org The Samsung Galaxy S5 (klte), has 3 SDHCI nodes used for internal storage, WiFi, external SD card slot. The external SD card slot is similar to the internal storage. Signed-off-by: Iskren Chernev --- .../boot/dts/qcom-msm8974-samsung-klte.dts | 44 ++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/qcom-msm8974-samsung-klte.dts b/arch/arm/boot/dts/qcom-msm8974-samsung-klte.dts index 989447beb4319..b0899107f3ced 100644 --- a/arch/arm/boot/dts/qcom-msm8974-samsung-klte.dts +++ b/arch/arm/boot/dts/qcom-msm8974-samsung-klte.dts @@ -12,6 +12,8 @@ / { aliases { serial0 = &blsp1_uart1; + sdhc1 = &sdhc_1; /* SDC1 eMMC slot */ + sdhc2 = &sdhc_2; /* SDC2 SD card slot */ }; chosen { @@ -161,6 +163,9 @@ pma8084_l20: l20 { pma8084_l21: l21 { regulator-min-microvolt = <2950000>; regulator-max-microvolt = <2950000>; + + regulator-allow-set-load; + regulator-system-load = <200000>; }; pma8084_l22: l22 { @@ -349,6 +354,24 @@ cmd-data { }; }; + sdhc2_pin_a: sdhc2-pin-active { + clk-cmd-data { + pins = "gpio35", "gpio36", "gpio37", "gpio38", + "gpio39", "gpio40"; + function = "sdc3"; + drive-strength = <8>; + bias-disable; + }; + }; + + sdhc2_cd_pin: sdhc2-cd { + pins = "gpio62"; + function = "gpio"; + + drive-strength = <2>; + bias-disable; + }; + sdhc3_pin_a: sdhc3-pin-active { clk { pins = "sdc2_clk"; @@ -422,7 +445,7 @@ int { }; }; - sdhci@f9824900 { + sdhc_1: sdhci@f9824900 { status = "ok"; vmmc-supply = <&pma8084_l20>; @@ -435,6 +458,25 @@ sdhci@f9824900 { pinctrl-0 = <&sdhc1_pin_a>; }; + sdhc_2: sdhci@f9864900 { + status = "ok"; + + max-frequency = <100000000>; + + vmmc-supply = <&pma8084_l21>; + vqmmc-supply = <&pma8084_l13>; + + bus-width = <4>; + + /* cd-gpio is intentionally disabled. If enabled, an SD card + * present during boot is not initialized correctly. Without + * cd-gpios the driver resorts to polling, so hotplug works. + */ + pinctrl-names = "default"; + pinctrl-0 = <&sdhc2_pin_a /* &sdhc2_cd_pin */>; + // cd-gpios = <&msmgpio 62 GPIO_ACTIVE_LOW>; + }; + sdhci@f98a4900 { status = "okay";