From patchwork Tue Jun 23 18:08:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 11621359 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7C0851731 for ; Tue, 23 Jun 2020 18:09:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5BB1E2078A for ; Tue, 23 Jun 2020 18:09:23 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="rmYzdO7O" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733178AbgFWSIp (ORCPT ); Tue, 23 Jun 2020 14:08:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60170 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732549AbgFWSIm (ORCPT ); Tue, 23 Jun 2020 14:08:42 -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 5B3B8C061573; Tue, 23 Jun 2020 11:08:41 -0700 (PDT) Received: by mail-wr1-x443.google.com with SMTP id o11so13793934wrv.9; Tue, 23 Jun 2020 11:08:41 -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=bmuqJ4buTrZEnhQ3OwlLnys6fUl+viCTck1AnKYO5ok=; b=rmYzdO7OYq8VSY73XgUoty5FL5YDKiP4p4z37fZM/eE4+AwDh6+vsvkFJbY0AH8NtO A8oWX/hZNEMJznlNSATUsszAsF+1YdgGxyi7fxoNYabRcxxDrwQO47R86Att5QVajQaF QdzAFU3hN9qAw1MhAWe2M5d+TGd6kuidj2Xn2Vuinx+KCLBrKBV/Zqq1RQ5fm0hzlSJP LQEniNhn+LLj0oAB1BJj+XWF/P2qOp1KY3CENTrRHiIw4GSDeSXNs4ampdzUF8vykApc A+7VsZgU4gkCOe5nHOqGJYoX3FFvegQfbMq3ANT6UX+SdtZlyZ6qUEdoOHJzBvfycMYN TLzg== 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=bmuqJ4buTrZEnhQ3OwlLnys6fUl+viCTck1AnKYO5ok=; b=PQIqSDqWnpqe4HjZaCPvgIDewxEivwGNjHfTS0UxeleUo0QF7sHhyqggqwWFrkPXsg nW96RhFLk3gs10GS2+Z/2nozYOVlpzmUlQSTerRSGqycKx98AwX8dNQMjzp5s2ZuOhPt 4D7wnfvLmlRGdLJlnEz5jXcXrvSkburR4J2ZyZuNitla42y5TeIqOds6dKotBd9/84x3 +bEM3LGCyy6Jm5I9kv3XpSEie4s+tn5nggr/uOuhw/SXpKBFdtZE2FMl1tmrZeId2ThE fT4jr4YHWyf3CUGzz3fMtt+p+IPhr4s9ow6pygi3sJClDE189OpiJ1vMIYelyaJt4YOy KjrA== X-Gm-Message-State: AOAM530FFTnzISnYv0CiamjX3LKK+CSu0HYB4HDh+MX2QJFODZ8TB7Hr oyfG+LLEqHPzOchpINEaOKc= X-Google-Smtp-Source: ABdhPJw8B34q2i4XM4XyV5NH8sz3t/6oK3BIxKzCOZmgBRjJsLkNvqxANMutYqjJR1LHwjuNQEcCUg== X-Received: by 2002:a5d:4d0d:: with SMTP id z13mr28035139wrt.220.1592935720081; Tue, 23 Jun 2020 11:08:40 -0700 (PDT) Received: from localhost.localdomain (abag196.neoplus.adsl.tpnet.pl. [83.6.170.196]) by smtp.googlemail.com with ESMTPSA id c16sm4719529wml.45.2020.06.23.11.08.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Jun 2020 11:08:39 -0700 (PDT) From: Konrad Dybcio To: skrzynka@konradybcio.pl Cc: Konrad Dybcio , Andy Gross , Bjorn Andersson , Rob Herring , Amit Kucheria , Zhang Rui , Daniel Lezcano , Rajendra Nayak , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org Subject: [PATCH 1/8] soc: qcom: rpmpd: Add SDM660 power-domains Date: Tue, 23 Jun 2020 20:08:25 +0200 Message-Id: <20200623180832.254163-2-konradybcio@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200623180832.254163-1-konradybcio@gmail.com> References: <20200623180832.254163-1-konradybcio@gmail.com> MIME-Version: 1.0 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org Add the shared cx/mx and sensor sub-system's cx and mx power-domains found on SDM660. Signed-off-by: Konrad Dybcio --- .../devicetree/bindings/power/qcom,rpmpd.yaml | 1 + drivers/soc/qcom/rpmpd.c | 33 +++++++++++++++++++ include/dt-bindings/power/qcom-rpmpd.h | 12 +++++++ 3 files changed, 46 insertions(+) diff --git a/Documentation/devicetree/bindings/power/qcom,rpmpd.yaml b/Documentation/devicetree/bindings/power/qcom,rpmpd.yaml index 8058955fb3b9..45ec2439ff51 100644 --- a/Documentation/devicetree/bindings/power/qcom,rpmpd.yaml +++ b/Documentation/devicetree/bindings/power/qcom,rpmpd.yaml @@ -20,6 +20,7 @@ properties: - qcom,msm8996-rpmpd - qcom,msm8998-rpmpd - qcom,qcs404-rpmpd + - qcom,sdm660-rpmpd - qcom,sc7180-rpmhpd - qcom,sdm845-rpmhpd - qcom,sm8150-rpmhpd diff --git a/drivers/soc/qcom/rpmpd.c b/drivers/soc/qcom/rpmpd.c index f2168e4259b2..d54a84dd83a8 100644 --- a/drivers/soc/qcom/rpmpd.c +++ b/drivers/soc/qcom/rpmpd.c @@ -220,11 +220,44 @@ static const struct rpmpd_desc qcs404_desc = { .max_state = RPM_SMD_LEVEL_BINNING, }; +/* sdm660 RPM Power domains */ +DEFINE_RPMPD_PAIR(sdm660, vddcx, vddcx_ao, RWCX, LEVEL, 0); +DEFINE_RPMPD_VFL(sdm660, vddcx_vfl, RWCX, 0); + +DEFINE_RPMPD_PAIR(sdm660, vddmx, vddmx_ao, RWMX, LEVEL, 0); +DEFINE_RPMPD_VFL(sdm660, vddmx_vfl, RWMX, 0); + +DEFINE_RPMPD_LEVEL(sdm660, vdd_ssccx, RWSC, 0); +DEFINE_RPMPD_VFL(sdm660, vdd_ssccx_vfl, RWSC, 0); + +DEFINE_RPMPD_LEVEL(sdm660, vdd_sscmx, RWSM, 0); +DEFINE_RPMPD_VFL(sdm660, vdd_sscmx_vfl, RWSM, 0); + +static struct rpmpd *sdm660_rpmpds[] = { + [SDM660_VDDCX] = &sdm660_vddcx, + [SDM660_VDDCX_AO] = &sdm660_vddcx_ao, + [SDM660_VDDCX_VFL] = &sdm660_vddcx_vfl, + [SDM660_VDDMX] = &sdm660_vddmx, + [SDM660_VDDMX_AO] = &sdm660_vddmx_ao, + [SDM660_VDDMX_VFL] = &sdm660_vddmx_vfl, + [SDM660_SSCCX] = &sdm660_vdd_ssccx, + [SDM660_SSCCX_VFL] = &sdm660_vdd_ssccx_vfl, + [SDM660_SSCMX] = &sdm660_vdd_sscmx, + [SDM660_SSCMX_VFL] = &sdm660_vdd_sscmx_vfl, +}; + +static const struct rpmpd_desc sdm660_desc = { + .rpmpds = sdm660_rpmpds, + .num_pds = ARRAY_SIZE(sdm660_rpmpds), + .max_state = RPM_SMD_LEVEL_TURBO, +}; + static const struct of_device_id rpmpd_match_table[] = { { .compatible = "qcom,msm8976-rpmpd", .data = &msm8976_desc }, { .compatible = "qcom,msm8996-rpmpd", .data = &msm8996_desc }, { .compatible = "qcom,msm8998-rpmpd", .data = &msm8998_desc }, { .compatible = "qcom,qcs404-rpmpd", .data = &qcs404_desc }, + { .compatible = "qcom,sdm660-rpmpd", .data = &sdm660_desc }, { } }; MODULE_DEVICE_TABLE(of, rpmpd_match_table); diff --git a/include/dt-bindings/power/qcom-rpmpd.h b/include/dt-bindings/power/qcom-rpmpd.h index dc146e44228b..c5a2ddef6b4b 100644 --- a/include/dt-bindings/power/qcom-rpmpd.h +++ b/include/dt-bindings/power/qcom-rpmpd.h @@ -101,6 +101,18 @@ #define QCS404_LPIMX 5 #define QCS404_LPIMX_VFL 6 +/* SDM660 Power Domains */ +#define SDM660_VDDCX 0 +#define SDM660_VDDCX_AO 1 +#define SDM660_VDDCX_VFL 2 +#define SDM660_VDDMX 3 +#define SDM660_VDDMX_AO 4 +#define SDM660_VDDMX_VFL 5 +#define SDM660_SSCCX 6 +#define SDM660_SSCCX_VFL 7 +#define SDM660_SSCMX 8 +#define SDM660_SSCMX_VFL 9 + /* RPM SMD Power Domain performance levels */ #define RPM_SMD_LEVEL_RETENTION 16 #define RPM_SMD_LEVEL_RETENTION_PLUS 32 From patchwork Tue Jun 23 18:08:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 11621331 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id ABD2A6C1 for ; Tue, 23 Jun 2020 18:08:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 88DE92078C for ; Tue, 23 Jun 2020 18:08:45 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="gw4tvqYy" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733165AbgFWSIo (ORCPT ); Tue, 23 Jun 2020 14:08:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60178 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732973AbgFWSIn (ORCPT ); Tue, 23 Jun 2020 14:08:43 -0400 Received: from mail-wr1-x442.google.com (mail-wr1-x442.google.com [IPv6:2a00:1450:4864:20::442]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 76FE4C061755; Tue, 23 Jun 2020 11:08:43 -0700 (PDT) Received: by mail-wr1-x442.google.com with SMTP id r12so4192348wrj.13; Tue, 23 Jun 2020 11:08:43 -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=wmk06+uHMYStxINkbw/YmMFydULrtqnVnBZmXZdaYkU=; b=gw4tvqYyWuEvNESNYG3QCDqaQ0LpAJi9MJQxZQgwm/xprtH3C8rrXykG/dGPiKKRWE ZZA4YTnFkNrVTzSoci6jBuV6mtipIPVf0SdCAttl6VZHk40Tr7DbJpqhc1zFn5v93v0s cHK5fqxdKbeuPxn+06PHWCZik72DvPCu6gLL2+IPuIOrNoDYwB4QVws4VsXaQXARXbAX HGdA1Xd+FsM5e+xHJH6JoLq9QZnQXe6iEEy6xwG54tgzEHq/80DkXkdU5TjWuGwppfnz ysYL8ZPGIO19wLkiXnnlbJDslMgCZ54OpVfax1gDXEtpuAEI4GzC3gG4NfwbQegVhWEi hNlg== 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=wmk06+uHMYStxINkbw/YmMFydULrtqnVnBZmXZdaYkU=; b=grnCY/G4hfwiRiZaiSesg4qKnyPy5lXCo94zc/Qt6lfJc+KgBP2dCKLE+MP4XdWX8G NkmLLbbp6NqducZmSeGU7Ork2taSuTOQnHtRFc+oH+Headl6SvoTFI8e11iPmCgtKxcO z2jIiEezbmdNIYypconIruN7DuV+FlIFPu4pn2udUbNpCRpFSS1UjjN/bYjYaHl5KLv6 GRrqf2qIDltrYe5e1wTlhr+1liiarBKIidiWoryRGYdxmrA2J8I4AWF4/bgFjcNg0Ax+ oLscc90wU2LpwaAgEq5wIFFoCWedrHs5kLA0UWjBI1TzHzfpQITg9frG6PN606OgQ2PG orbA== X-Gm-Message-State: AOAM532/GK0BXNCsdSuC9Zn9KHrjlSybo8f3zhsPm6FXpdJNlzENI1M8 oB+XpDy1NWlSwKNE9ThsRdg= X-Google-Smtp-Source: ABdhPJyTfs0KGdP7wzNf0RdFp0ndR475lqXCS5YjNCYCXDjIsT7+XPkpIDeGVqTT//m53ZeIIrWcBA== X-Received: by 2002:adf:e545:: with SMTP id z5mr25716968wrm.89.1592935722251; Tue, 23 Jun 2020 11:08:42 -0700 (PDT) Received: from localhost.localdomain (abag196.neoplus.adsl.tpnet.pl. [83.6.170.196]) by smtp.googlemail.com with ESMTPSA id c16sm4719529wml.45.2020.06.23.11.08.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Jun 2020 11:08:41 -0700 (PDT) From: Konrad Dybcio To: skrzynka@konradybcio.pl Cc: Konrad Dybcio , Andy Gross , Bjorn Andersson , Rob Herring , Amit Kucheria , Zhang Rui , Daniel Lezcano , Rajendra Nayak , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org Subject: [PATCH 2/8] arm64: dts: qcom: sdm630: Add RPM power domains support Date: Tue, 23 Jun 2020 20:08:26 +0200 Message-Id: <20200623180832.254163-3-konradybcio@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200623180832.254163-1-konradybcio@gmail.com> References: <20200623180832.254163-1-konradybcio@gmail.com> MIME-Version: 1.0 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org Add the rpmpd node on the sdm630 and define the available levels. Signed-off-by: Konrad Dybcio --- arch/arm64/boot/dts/qcom/sdm630.dtsi | 46 ++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sdm630.dtsi b/arch/arm64/boot/dts/qcom/sdm630.dtsi index 88efe8200c80..ea85f28032d2 100644 --- a/arch/arm64/boot/dts/qcom/sdm630.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm630.dtsi @@ -428,6 +428,52 @@ rpmcc: clock-controller { compatible = "qcom,rpmcc-sdm660", "qcom,rpmcc"; #clock-cells = <1>; }; + + rpmpd: power-controller { + compatible = "qcom,sdm660-rpmpd"; + #power-domain-cells = <1>; + operating-points-v2 = <&rpmpd_opp_table>; + + rpmpd_opp_table: opp-table { + compatible = "operating-points-v2"; + + rpmpd_opp_ret: opp1 { + opp-level = <16>; + }; + + rpmpd_opp_ret_plus: opp2 { + opp-level = <32>; + }; + + rpmpd_opp_min_svs: opp3 { + opp-level = <48>; + }; + + rpmpd_opp_low_svs: opp4 { + opp-level = <64>; + }; + + rpmpd_opp_svs: opp5 { + opp-level = <128>; + }; + + rpmpd_opp_svs_plus: opp6 { + opp-level = <192>; + }; + + rpmpd_opp_nom: opp7 { + opp-level = <256>; + }; + + rpmpd_opp_nom_plus: opp8 { + opp-level = <320>; + }; + + rpmpd_opp_turbo: opp9 { + opp-level = <384>; + }; + }; + }; }; }; From patchwork Tue Jun 23 18:08:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 11621355 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BD0E56C1 for ; Tue, 23 Jun 2020 18:09:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A2E09207D0 for ; Tue, 23 Jun 2020 18:09:22 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="qlW0UT0I" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733125AbgFWSJQ (ORCPT ); Tue, 23 Jun 2020 14:09:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60186 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733214AbgFWSIq (ORCPT ); Tue, 23 Jun 2020 14:08:46 -0400 Received: from mail-wm1-x336.google.com (mail-wm1-x336.google.com [IPv6:2a00:1450:4864:20::336]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 97359C061573; Tue, 23 Jun 2020 11:08:45 -0700 (PDT) Received: by mail-wm1-x336.google.com with SMTP id l17so3824532wmj.0; Tue, 23 Jun 2020 11:08:45 -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=J8OcL2igjAskSXad9xrzVVWdlH7GJvm1mWz0l8/dfzA=; b=qlW0UT0INRLFF+18UA4WegQJDYUTYkGa2on8OgajVSza/LdEv0MWiQLmjbiZXiychi MZ0XwkY/FFJkgJXCubN2Lcmn8lrhgmBmyErSPqFD7telVRgLXQFHBSRNwGi4oepLFl1F oZH9WgVeI0xsT78HliB0EhzAp3l6NzZDOnIFl+iSQzBkjuZMpxyZn1YRb7o31c1W+yHJ TO1FzUfCQyz5YSOQ5AQyvPpyyxbfP3qLwX96ZMOWezf88JTykzysuhRYxsiqtkK0bfOL Z+SuRnEwSSD1bPcJ1UzE3Oxbt8/Z3fhj7NAe9Lq7Q4LLXlfgnWFGfQ3aazEiMpRcpurX qq0A== 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=J8OcL2igjAskSXad9xrzVVWdlH7GJvm1mWz0l8/dfzA=; b=hte+FF7NIXcplGxu1F3+0w6pdRq2AZCJ7yhdtnu1gt66++gZUo8MgND81pC3ZVqZnu C1B1zfW8KijG57WbkfoVsbL6oFSwni7UXPqU4d/PHQHd+c9Gyu5/OLWC96Jb7MgDIvmt drcSkZf0oMwT7yhxNejzo6p0W7HoJvooVGeV11en8XuKT0RpEJINmhIHe0m2gSPZ7V3D hBfi+eGiCBXr9xnAp1pkUoSSJ50vj5Na+/ztYMOjA21Ormj+GCmEPyIbjt2Gkh0czwYo tcF0uX+H/gv0jdj2d9xC0YsTQDQEHj1SZ+2p4rMAl/AMprufaT1d+DSTaxKYk+mPJEQT 2gdw== X-Gm-Message-State: AOAM532OMm2ar+fEE1x6urQcrxESdrvIk8xKJPu9URv69Sx2LvuZNkSb 71iLOUhXHGYUnMkS5wFwvR4= X-Google-Smtp-Source: ABdhPJwXRXk7kAY+Swq+1CCO+mVVjQWtgirNw0i03TSNku0/pz4e3x4VGJtYXemKG951DrgLzVPTrw== X-Received: by 2002:a1c:96ce:: with SMTP id y197mr26789007wmd.55.1592935724369; Tue, 23 Jun 2020 11:08:44 -0700 (PDT) Received: from localhost.localdomain (abag196.neoplus.adsl.tpnet.pl. [83.6.170.196]) by smtp.googlemail.com with ESMTPSA id c16sm4719529wml.45.2020.06.23.11.08.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Jun 2020 11:08:44 -0700 (PDT) From: Konrad Dybcio To: skrzynka@konradybcio.pl Cc: Konrad Dybcio , Andy Gross , Bjorn Andersson , Rob Herring , Amit Kucheria , Zhang Rui , Daniel Lezcano , Rajendra Nayak , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org Subject: [PATCH 3/8] arm64: dts: qcom: sdm630: Add tsens node Date: Tue, 23 Jun 2020 20:08:27 +0200 Message-Id: <20200623180832.254163-4-konradybcio@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200623180832.254163-1-konradybcio@gmail.com> References: <20200623180832.254163-1-konradybcio@gmail.com> MIME-Version: 1.0 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org Enable tsens on this SoC using tsens-v2 driver. Signed-off-by: Konrad Dybcio --- .../devicetree/bindings/thermal/qcom-tsens.yaml | 1 + arch/arm64/boot/dts/qcom/sdm630.dtsi | 11 +++++++++++ 2 files changed, 12 insertions(+) diff --git a/Documentation/devicetree/bindings/thermal/qcom-tsens.yaml b/Documentation/devicetree/bindings/thermal/qcom-tsens.yaml index d7be931b42d2..d89d5acd6e2a 100644 --- a/Documentation/devicetree/bindings/thermal/qcom-tsens.yaml +++ b/Documentation/devicetree/bindings/thermal/qcom-tsens.yaml @@ -39,6 +39,7 @@ properties: - qcom,msm8996-tsens - qcom,msm8998-tsens - qcom,sc7180-tsens + - qcom,sdm630-tsens - qcom,sdm845-tsens - const: qcom,tsens-v2 diff --git a/arch/arm64/boot/dts/qcom/sdm630.dtsi b/arch/arm64/boot/dts/qcom/sdm630.dtsi index ea85f28032d2..92bf4ae6a590 100644 --- a/arch/arm64/boot/dts/qcom/sdm630.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm630.dtsi @@ -566,6 +566,17 @@ anoc2_smmu: iommu@16c0000 { ; }; + tsens: thermal-sensor@10ae000 { + compatible = "qcom,sdm630-tsens", "qcom,tsens-v2"; + reg = <0x010ae000 0x1000>, /* TM */ + <0x010ad000 0x1000>; /* SROT */ + #qcom,sensors = <12>; + interrupts = , + ; + interrupt-names = "uplow", "critical"; + #thermal-sensor-cells = <1>; + }; + tcsr_mutex_regs: syscon@1f40000 { compatible = "syscon"; reg = <0x01f40000 0x20000>; From patchwork Tue Jun 23 18:08:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 11621333 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7646F14E3 for ; Tue, 23 Jun 2020 18:08:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5E48A2072E for ; Tue, 23 Jun 2020 18:08:50 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Jcx19Hzy" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733245AbgFWSIt (ORCPT ); Tue, 23 Jun 2020 14:08:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60192 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732549AbgFWSIs (ORCPT ); Tue, 23 Jun 2020 14:08:48 -0400 Received: from mail-wm1-x343.google.com (mail-wm1-x343.google.com [IPv6:2a00:1450:4864:20::343]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AB13FC061573; Tue, 23 Jun 2020 11:08:47 -0700 (PDT) Received: by mail-wm1-x343.google.com with SMTP id 22so2962461wmg.1; Tue, 23 Jun 2020 11:08:47 -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=3bxtTT24XCUFSEzo9TJrraJWvnIZVMAljX8QaOMq9yc=; b=Jcx19HzyIeI9OHcm1n3h/bdnMyZhZPsIz9dXVeWTPlkqRHbGjaiwkPQSlbpVHaAq9U CVbyaA965pR0hgK8AsZBvZs7O3cgqmQ+dYfSsH9s54t3Ym4lkh4qRYAHog0MV+dSgt6r D+82qr8AsbQaltWWzUTmTm10mfD5BABAj6MmZuWpz5Np5a9LbBcBpMGK6j59s6aLPfLS DZWrwPND6IqZs8XUFCfEkOVcZMRVVXUcy40J75VdLoMuZQm/vgjD9/zxex4Xf5fAlY/l x00C6YN+E5dP4/G/hsDLdiZKmOM8Qs1DynorU3mSCCx5QXbifidrze8vgMtliSRRqUmp 2MpA== 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=3bxtTT24XCUFSEzo9TJrraJWvnIZVMAljX8QaOMq9yc=; b=uSgKMtCkSfd97hzegaoh5bKjNYKB6iDbwqrIc0cHkCP7oTO5Ddy8SMnYi2GTGx1EQ8 MqRHRw0zdSFwenH/EkQgwcVIXgcv6fz73rHp8AGrp4++mLVdfpPqoRzfRX/zZqWXMqzl 5AMgwMEMGAWXofF+oQ+zIdKeVBs7jFviTgvpIeE4o2jg22CWfUso5XDRpWbxkO30XrAs cPdZURO7lFI16CqsA1HZD6fHdBg1fBoF8L+Fy2tkMlwtCDETU8i6oFC6se0ZycdKPq+S W75hsDd3vJqG1+f/OvvKLuT9DsC9ndHqP6nKWuBNh1oKdrOAjsP0R+J7G9P4VMynCB7w ZC+A== X-Gm-Message-State: AOAM5305ennSJ5VbdhUckHhxyQ+8k4TJXVfcOER3danhO0uBEy9cdfNr Ibn2Vd+wdYfaE4Hlckjtpjs= X-Google-Smtp-Source: ABdhPJxdGyFnxemry6uyd0/iseA2W/X2LRPcYYo/8lFhH9JKSLyNtNM7oIsZIaiTOMX0cylU15YRhg== X-Received: by 2002:a1c:7717:: with SMTP id t23mr19448487wmi.75.1592935726407; Tue, 23 Jun 2020 11:08:46 -0700 (PDT) Received: from localhost.localdomain (abag196.neoplus.adsl.tpnet.pl. [83.6.170.196]) by smtp.googlemail.com with ESMTPSA id c16sm4719529wml.45.2020.06.23.11.08.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Jun 2020 11:08:46 -0700 (PDT) From: Konrad Dybcio To: skrzynka@konradybcio.pl Cc: Konrad Dybcio , Andy Gross , Bjorn Andersson , Rob Herring , Amit Kucheria , Zhang Rui , Daniel Lezcano , Rajendra Nayak , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org Subject: [PATCH 4/8] arm64: dts: qcom: sdm630: nile: Enable BLSP1_UART2 Date: Tue, 23 Jun 2020 20:08:28 +0200 Message-Id: <20200623180832.254163-5-konradybcio@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200623180832.254163-1-konradybcio@gmail.com> References: <20200623180832.254163-1-konradybcio@gmail.com> MIME-Version: 1.0 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org Enable the second UART interface used on this board. Also convert the DT to use phandles instead of addresses to make it coherent with other device trees. Signed-off-by: Konrad Dybcio --- .../dts/qcom/sdm630-sony-xperia-nile.dtsi | 50 ++++++++++--------- 1 file changed, 26 insertions(+), 24 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile.dtsi b/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile.dtsi index 9ba359c848d0..de06fa809488 100644 --- a/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile.dtsi @@ -99,38 +99,40 @@ removed_region@85800000 { no-map; }; }; +}; - soc { - sdhci@c0c4000 { - status = "okay"; +&blsp_i2c1 { + status = "okay"; - mmc-ddr-1_8v; - /* SoMC Nile platform's eMMC doesn't support HS200 mode */ - mmc-hs400-1_8v; - }; + /* Synaptics touchscreen */ +}; - i2c@c175000 { - status = "okay"; +&blsp_i2c2 { + status = "okay"; - /* Synaptics touchscreen */ - }; + /* SMB1351 charger */ +}; - i2c@c176000 { - status = "okay"; +/* I2C3, 4, 5, 7 and 8 are disabled on this board. */ - /* SMB1351 charger */ - }; +&blsp_i2c6 { + status = "okay"; - serial@c1af000 { - status = "okay"; - }; + /* NXP NFC */ +}; - /* I2C3, 4, 5, 7 and 8 are disabled on this board. */ +&blsp1_uart2 { + status = "okay"; +}; - i2c@c1b6000 { - status = "okay"; +&blsp2_uart1 { + status = "okay"; +}; - /* NXP NFC */ - }; - }; +&sdhc_1 { + status = "okay"; + + mmc-ddr-1_8v; + /* SoMC Nile platform's eMMC doesn't support HS200 mode */ + mmc-hs400-1_8v; }; From patchwork Tue Jun 23 18:08:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 11621349 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 03655161F for ; Tue, 23 Jun 2020 18:09:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DCE732081A for ; Tue, 23 Jun 2020 18:09:12 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Dh2KPp6d" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732549AbgFWSIw (ORCPT ); Tue, 23 Jun 2020 14:08:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60200 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733250AbgFWSIu (ORCPT ); Tue, 23 Jun 2020 14:08:50 -0400 Received: from mail-wm1-x343.google.com (mail-wm1-x343.google.com [IPv6:2a00:1450:4864:20::343]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BF54CC061573; Tue, 23 Jun 2020 11:08:49 -0700 (PDT) Received: by mail-wm1-x343.google.com with SMTP id j18so3815708wmi.3; Tue, 23 Jun 2020 11:08:49 -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=SbSS6Q7ih4Cl9fLtFlG7XnZcbimVHNnRw1LIqkjYrvc=; b=Dh2KPp6dWusUM2ed5XBU4NsjAVmtV9V9mgObKv4pnPlyVn1u4kZ0AbYWWjE3b0grG7 fYHnQYvxBwkAt8LEKW+ZVCDQGLcwWJp9KvLDTcIPN0cu87o4xCxJy+5kbU9T6YHv+0Ac b7O1/RXuU7//rTqEpM2PZJYJH38twNqZWtaBDbLtWFkm5wmhP/Kk1A5yRSrhRe5kwTVW OKcYyZMv2VWEfTtnYYXSJHVJqgRjzBsLtBFtcLsR2TdjliOWNHMg8AfFf8HGr62PHV74 wn5uO3BBQ+ekt4dFfJd/rPNhWmRLbQkEHTUvLzzD2vLuaTE5aERT1NmiZJHAFKl24cxD NHMw== 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=SbSS6Q7ih4Cl9fLtFlG7XnZcbimVHNnRw1LIqkjYrvc=; b=BpQ7SFQ4s2BW1OZN+E+McV9OxCg3pBLeavXP3HGQ6c7GGR8nFBp8KOxf+OivvWf/MJ Rk3LcWgbyR0GIhIukiKWf1ivaHIrWD0lx4AHCOqYNIsMUvRnS1Pp4izpPpXvnhlB4/6U xbShBLrK+Jh8WmCWJp8TMj8IuDNhm/fspl3dOn9AUgaSZz3VKpz7FZ1Qvre1j3UosrIP A6cKaEGBcxz8GWlYOx2MTHkiJL2HoZ5Seaj3+H27qgI5VrWwGD5KqUwhEjOynkXmbyaX TJ9cFXAPvpPYFWfnkYRH9PAcZEmQHWUiwjA68H8s6YiImgXxiS/AA8LXRHBCPB9lc2Fb w2Ng== X-Gm-Message-State: AOAM531YH5yeHK1IiX2f+WQZ5mMKTo3c4Uh1oJUjZkIXlPfkz98BnRjI e3i+YPUe5y3D9VZ0RPEQCII= X-Google-Smtp-Source: ABdhPJyeRdw/97iNmtdCxvCJTdk4jETW/ttvMyIxkChAIxc17cUSyavRu3Uve54U+pI5thqu376b2g== X-Received: by 2002:a1c:790c:: with SMTP id l12mr2880386wme.50.1592935728558; Tue, 23 Jun 2020 11:08:48 -0700 (PDT) Received: from localhost.localdomain (abag196.neoplus.adsl.tpnet.pl. [83.6.170.196]) by smtp.googlemail.com with ESMTPSA id c16sm4719529wml.45.2020.06.23.11.08.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Jun 2020 11:08:48 -0700 (PDT) From: Konrad Dybcio To: skrzynka@konradybcio.pl Cc: Konrad Dybcio , Andy Gross , Bjorn Andersson , Rob Herring , Amit Kucheria , Zhang Rui , Daniel Lezcano , Rajendra Nayak , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org Subject: [PATCH 5/8] arm64: dts: qcom: sdm630: Fix the pinctrl node Date: Tue, 23 Jun 2020 20:08:29 +0200 Message-Id: <20200623180832.254163-6-konradybcio@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200623180832.254163-1-konradybcio@gmail.com> References: <20200623180832.254163-1-konradybcio@gmail.com> MIME-Version: 1.0 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org Previously present pinctrl node didn't show problems, but I have in fact misconfigured it. Fix it to actually enable the use of GPIOs. Signed-off-by: Konrad Dybcio --- arch/arm64/boot/dts/qcom/sdm630.dtsi | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sdm630.dtsi b/arch/arm64/boot/dts/qcom/sdm630.dtsi index 92bf4ae6a590..25c18edcb1fa 100644 --- a/arch/arm64/boot/dts/qcom/sdm630.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm630.dtsi @@ -582,14 +582,18 @@ tcsr_mutex_regs: syscon@1f40000 { reg = <0x01f40000 0x20000>; }; - tlmm: pinctrl@3000000 { + tlmm: pinctrl@3100000 { compatible = "qcom,sdm630-pinctrl"; - reg = <0x03000000 0xc00000>; + reg = <0x03100000 0x400000>, + <0x03500000 0x400000>, + <0x03900000 0x400000>; + reg-names = "south", "center", "north"; interrupts = ; gpio-controller; - #gpio-cells = <0x2>; + gpio-ranges = <&tlmm 0 0 114>; + #gpio-cells = <2>; interrupt-controller; - #interrupt-cells = <0x2>; + #interrupt-cells = <2>; blsp1_uart1_default: blsp1-uart1-default { pins = "gpio0", "gpio1", "gpio2", "gpio3"; From patchwork Tue Jun 23 18:08:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 11621343 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 15DBC14E3 for ; Tue, 23 Jun 2020 18:09:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F25612081A for ; Tue, 23 Jun 2020 18:09:10 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="tMkrHARn" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733290AbgFWSI4 (ORCPT ); Tue, 23 Jun 2020 14:08:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60206 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733263AbgFWSIw (ORCPT ); Tue, 23 Jun 2020 14:08:52 -0400 Received: from mail-wr1-x442.google.com (mail-wr1-x442.google.com [IPv6:2a00:1450:4864:20::442]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DE838C061573; Tue, 23 Jun 2020 11:08:51 -0700 (PDT) Received: by mail-wr1-x442.google.com with SMTP id r12so4192722wrj.13; Tue, 23 Jun 2020 11:08:51 -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=RbtJkgou2Sv/07rr10hS93WNcruB7HSmdvjivA4sw00=; b=tMkrHARnKddaR8UWmDyAwYMPricXhySA3mGhJUZ3G3FuHVEwjhIzoesy13LjwWZvqM bi9s/Tg3wTza6ZLqpBtG67kI+R4T08H+h8stHDXyppCbD3WhxKPuQ/rk3VPkL1EdBQRH 3VXQtW9/qjpggV7euvaA4Ivafkm4fj4IfwZI6W0ugpakUUlpBMgpII/zjmEw0C9P+ROu rgzMOZLlEyDTDfYYgzFFr6iDsH1mGBL/MV73e2GSXCrTZfYKv3K4IwV4MHXTlMC8prBC wRl+lN6QQygDatcXUzvLMKHJnbKol/r7fVJyWpda4C278LJ8HzQPbe/soBzuBHtjpZwK 58YA== 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=RbtJkgou2Sv/07rr10hS93WNcruB7HSmdvjivA4sw00=; b=h1WX9K111pCODiGH+OOEKpw0uD5Q7XOV5grU9xtyHORTvRuDj0JacQd5zY6RPPOT+m 8roJsLHlt1NSxA4qYciTBHoTqOelNVOiFYMTqcFAz9Ro6cd5S9xV2SlgVcizZKxCdP0z iHUpP3wH0RI0CCe7imdQGFdejzoWGdO2Dxj/fBZWmXZlcJmzVTMJb3ydPF9ThZfE6dWL q1EkMg60W93stVrEffkPB+eXJcnvjgiy1Z0Tt2VPsqWy6/Nc5+nTyxBDipXlSTtptCFG 7pdu+sVNGhfU3zIr7sa4AxQyoqTzLGD3VNN9VuoB1ty70UOMRyoj69jml0efdrWxU0EL yEUw== X-Gm-Message-State: AOAM531yCp/4dzHO8UcUj8LeRPoBEqNR3VPspw6g5rS3WXSEWtVV80uF paak9gXKz2QqaoeKZY74Hxs= X-Google-Smtp-Source: ABdhPJwIHeaLsKMAC3sndH10ckS+doecfyDBJU/fW+EBqHQRwhH06Gkx8/ImQUF019F2EkLutD/hqw== X-Received: by 2002:adf:e2c9:: with SMTP id d9mr26392727wrj.227.1592935730692; Tue, 23 Jun 2020 11:08:50 -0700 (PDT) Received: from localhost.localdomain (abag196.neoplus.adsl.tpnet.pl. [83.6.170.196]) by smtp.googlemail.com with ESMTPSA id c16sm4719529wml.45.2020.06.23.11.08.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Jun 2020 11:08:50 -0700 (PDT) From: Konrad Dybcio To: skrzynka@konradybcio.pl Cc: Konrad Dybcio , Andy Gross , Bjorn Andersson , Rob Herring , Amit Kucheria , Zhang Rui , Daniel Lezcano , Rajendra Nayak , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org Subject: [PATCH 6/8] arm64: dts: qcom: sdm630: nile: Reserve disabled GPIOs Date: Tue, 23 Jun 2020 20:08:30 +0200 Message-Id: <20200623180832.254163-7-konradybcio@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200623180832.254163-1-konradybcio@gmail.com> References: <20200623180832.254163-1-konradybcio@gmail.com> MIME-Version: 1.0 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org Both Nile and Ganges platforms have gpios 8-11 disabled. Without this, the kernel will not boot when the pinctrl driver is present. Signed-off-by: Konrad Dybcio --- arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile.dtsi | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile.dtsi b/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile.dtsi index de06fa809488..9fe800d547cb 100644 --- a/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile.dtsi @@ -136,3 +136,7 @@ &sdhc_1 { /* SoMC Nile platform's eMMC doesn't support HS200 mode */ mmc-hs400-1_8v; }; + +&tlmm { + gpio-reserved-ranges = <8 4>; +}; From patchwork Tue Jun 23 18:08:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 11621335 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CACEF6C1 for ; Tue, 23 Jun 2020 18:08:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id ADCA22078A for ; Tue, 23 Jun 2020 18:08:57 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ZjiZFdgv" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732913AbgFWSI4 (ORCPT ); Tue, 23 Jun 2020 14:08:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60214 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733284AbgFWSIy (ORCPT ); Tue, 23 Jun 2020 14:08:54 -0400 Received: from mail-wr1-x441.google.com (mail-wr1-x441.google.com [IPv6:2a00:1450:4864:20::441]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 28DCDC061755; Tue, 23 Jun 2020 11:08:54 -0700 (PDT) Received: by mail-wr1-x441.google.com with SMTP id l10so21516976wrr.10; Tue, 23 Jun 2020 11:08:54 -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=NJb/Qt78Z8DfdEW8Q4k8rLkSQZ59o11xf0Ra8vOTaoA=; b=ZjiZFdgv6Mlt7tW9bGMwcXe5JCCDkexXud8ofkREEEYmcu6QkHtaIBBz/x1Tvqwq1t OqRM1XWKnQQQABGjV6x0jVASO+DEzhoxD5/PH8FiTC7w6GklsbDxPNb7IfHzysNgExr3 S/BawsNvDrzCeZWkEhOdL0BlpPpTbOWnIbjq+5FtuQIdsueEZSKPZ58vLOrhpqy0PWc2 NZaWzOvCCKXwcS9cydX16CxWjxm73C0phsAvXQgIQtFgT47M79uvx1Qthb/tVkmiC99/ 46WY2LfQIkBchQY3IEJ+IUzHOAJar8PKyKF/TnilhXq/ID+YQGaT+fgXEX5/5BWnoR9T Ee7w== 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=NJb/Qt78Z8DfdEW8Q4k8rLkSQZ59o11xf0Ra8vOTaoA=; b=Y6Ka1t/klpAVmSXCOGzcmcmxP6mvxA4BuAl713yWFzkbUntlkRzralaAo08wjakVJr MY7z7UDuZWW4NOATQ/6T9kcWKn8fqSZtOVS0slpl4rJC/1uy4nf/kSURNyf+MyUtiz9t 3pPr0lDhSZ05Fe/QK9zd2g5FH9L0/ep14vj7OCkmpQSlQrRIZmYRf/T58Jk1nEMhIyz1 o8dJmGvhFXq6+brao9OXccmDqbnM4YvJLlevndutS5enrU6OD1NtCPODdWysEL2862hq k+cAx844jFJVe277Vurvs3mpt9vLtU4NdO6CRYsLyPzYfUJAp9y4kb48QSm1RD1OGfMX 3mTA== X-Gm-Message-State: AOAM530c0qOjGdMHGb708So+npmZKJqBizl9BkJ4MxN3yZz6QT9iSYs3 o+d9/0oG6lHbOOL3bR6qBio= X-Google-Smtp-Source: ABdhPJwKbNHj7fxZw6W0flIpjCg5w0QrmDUyVyAjAgJ5owo2FB2xcMGrmJigdwLxPwfrCF8PiCLs8g== X-Received: by 2002:adf:ed87:: with SMTP id c7mr1772034wro.422.1592935732911; Tue, 23 Jun 2020 11:08:52 -0700 (PDT) Received: from localhost.localdomain (abag196.neoplus.adsl.tpnet.pl. [83.6.170.196]) by smtp.googlemail.com with ESMTPSA id c16sm4719529wml.45.2020.06.23.11.08.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Jun 2020 11:08:52 -0700 (PDT) From: Konrad Dybcio To: skrzynka@konradybcio.pl Cc: Konrad Dybcio , Andy Gross , Bjorn Andersson , Rob Herring , Amit Kucheria , Zhang Rui , Daniel Lezcano , Rajendra Nayak , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org Subject: [PATCH 7/8] arm64: dts: qcom: sdm630: nile: Remove Volume Down gpio-key Date: Tue, 23 Jun 2020 20:08:31 +0200 Message-Id: <20200623180832.254163-8-konradybcio@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200623180832.254163-1-konradybcio@gmail.com> References: <20200623180832.254163-1-konradybcio@gmail.com> MIME-Version: 1.0 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org Currently, the driver crashes with tons of gpiochip_irq_unmask+0x30/0x40. Removing the key for now will prevent the kernel from panicking, so that the development can go on. Signed-off-by: Konrad Dybcio --- .../boot/dts/qcom/sdm630-sony-xperia-nile.dtsi | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile.dtsi b/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile.dtsi index 9fe800d547cb..3646890040b3 100644 --- a/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile.dtsi @@ -63,14 +63,11 @@ camera_snapshot { debounce-interval = <15>; }; - vol_down { - label = "Volume Down"; - gpios = <&pm660l_gpios 7 GPIO_ACTIVE_LOW>; - linux,input-type = <1>; - linux,code = ; - gpio-key,wakeup; - debounce-interval = <15>; - }; + /* Nile also uses gpio-keys for + * Volume Down, but currently there's an + * issue with it that has to be resolved. + * Until then, let's not make the kernel panic + */ }; reserved-memory { From patchwork Tue Jun 23 18:08:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 11621339 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 14FE56C1 for ; Tue, 23 Jun 2020 18:09:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F00772078C for ; Tue, 23 Jun 2020 18:08:59 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="jTRxaysy" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733309AbgFWSI6 (ORCPT ); Tue, 23 Jun 2020 14:08:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60220 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733304AbgFWSI5 (ORCPT ); Tue, 23 Jun 2020 14:08:57 -0400 Received: from mail-wm1-x343.google.com (mail-wm1-x343.google.com [IPv6:2a00:1450:4864:20::343]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 580E3C061573; Tue, 23 Jun 2020 11:08:56 -0700 (PDT) Received: by mail-wm1-x343.google.com with SMTP id o8so2065651wmh.4; Tue, 23 Jun 2020 11:08:56 -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=ohValdVxRvvh6aqrpMpmYg4qV2+S9kNyoOWHWloB/ak=; b=jTRxaysyBS8dV09lAA6JLpCZVZm391Lx/XTsiqjQ2xU7Hnbw0P8qTm9sOmTIcLZJPz SGCxXr1HP4TnKP4CCV1E61JzYJz03egvyN05PxkGmbq8oYehVdQAQpgwVzPzBRdxD319 09Na+5NranAcO0JZs5n2ixMgvsoqxSQRBIjKCnVok+mDy/NjlG8MbSSfjmQVREF7gFLd CmPz/oBJku8YQ9ZU4EDsCYYi7CuUIgofLlKejynssRpuHm6+kG05QNcpQf1iyRZ9+50+ tRZFqRhipOQi0+vYEQKr28knAfJu6OmUUkWNoDIc60gmNft09o4UDC916rJ3GOS1aryb 4OIA== 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=ohValdVxRvvh6aqrpMpmYg4qV2+S9kNyoOWHWloB/ak=; b=VDVVI2itWNMS2Lnjjk/ZSeCpNe4lXlUqSalSMNiwr4noxFvDkZvNVE1+wgcYFEtlQX wsTKE7CaUrBAJjSPZLwJS93GI0473zj9qDpLx2aZtwLi0i5syPHJXM+aCWn9BK4LP3Hb eTh4/aSpXGdGMmiRxbTq8ZNcYXqmgxllD5LQXGZ5aflFY0tEA63O2YY8P8iptcCFJkHk fc3Cks8fXISaMiTRub5LAx1LPLwhkn+MPHSwzHZI6+fUd8hB2wMFhSTRXQXW8k0tB7vV 4vEjIg1IGpg0Gq6aMoZOCfvC1EMqFSFBSLbnmvr37RXVg/81noYHZNXO06vGiFGpBU8b OYRQ== X-Gm-Message-State: AOAM5313S1sE0SLuyfwIy5HgCHAr2G+JJ7bX3zUmhA/06W71N2UYASqJ sw+llDwygxcTUU0TeAeiJDw= X-Google-Smtp-Source: ABdhPJzGMfxzv/fIS+kxcuoagxxxwWqFYU0tXuqxrUtS9uBEV0HnzHOIF2Z0EUHh2/p511fDG+BSUw== X-Received: by 2002:a1c:2901:: with SMTP id p1mr26351547wmp.144.1592935735115; Tue, 23 Jun 2020 11:08:55 -0700 (PDT) Received: from localhost.localdomain (abag196.neoplus.adsl.tpnet.pl. [83.6.170.196]) by smtp.googlemail.com with ESMTPSA id c16sm4719529wml.45.2020.06.23.11.08.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Jun 2020 11:08:54 -0700 (PDT) From: Konrad Dybcio To: skrzynka@konradybcio.pl Cc: Konrad Dybcio , Andy Gross , Bjorn Andersson , Rob Herring , Amit Kucheria , Zhang Rui , Daniel Lezcano , Rajendra Nayak , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org Subject: [PATCH 8/8] arm64: dts: qcom: sdm630: ganges: Change addresses to phandles Date: Tue, 23 Jun 2020 20:08:32 +0200 Message-Id: <20200623180832.254163-9-konradybcio@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200623180832.254163-1-konradybcio@gmail.com> References: <20200623180832.254163-1-konradybcio@gmail.com> MIME-Version: 1.0 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org This brings the DT in line with the style used in other device trees. Signed-off-by: Konrad Dybcio --- .../dts/qcom/sdm630-sony-xperia-ganges.dtsi | 22 +++++++------------ 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-ganges.dtsi b/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-ganges.dtsi index cf2e8b5d60e8..12d4d1c25027 100644 --- a/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-ganges.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-ganges.dtsi @@ -13,13 +13,6 @@ #include "sdm630-sony-xperia-nile.dtsi" / { - chosen { - framebuffer@9d400000 { - reg = <0 0x9d400000 0 (2520 * 1080 * 4)>; - height = <2520>; - }; - }; - /* Yes, this is intentional. * Ganges devices only use gpio-keys for * Volume Down, but currently there's an @@ -27,14 +20,15 @@ framebuffer@9d400000 { * Until then, let's not make the kernel panic */ /delete-node/ gpio-keys; +}; - soc { - - i2c@c175000 { - status = "okay"; +&framebuffer0 { + reg = <0 0x9d400000 0 (2520 * 1080 * 4)>; + height = <2520>; +}; - /* Novatek touchscreen */ - }; - }; +&blsp_i2c1 { + status = "okay"; + /* Novatek touchscreen */ };