From patchwork Sun Mar 24 17:50:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sibi Sankar X-Patchwork-Id: 161008 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp3077098jan; Sun, 24 Mar 2019 10:50:40 -0700 (PDT) X-Google-Smtp-Source: APXvYqzuSBhqozKcY9PYVRQfSyGdcLUfCKUg6H6KLoNnYpDrg4lVNX1fgLBNkEuC/1NpB8aL2eWh X-Received: by 2002:aa7:8201:: with SMTP id k1mr20056908pfi.53.1553449840804; Sun, 24 Mar 2019 10:50:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553449840; cv=none; d=google.com; s=arc-20160816; b=OuF2x9xgb4eyDfoa2lkaNrHlzPLH2DRB1CZvGqdDdXAs4SooAHkemy1md/tHeGGpet t3pytb25KEryqZxlKShC0KnlZULz9cnYNKCkOCyltQMhN2xBDD9cKCYqgInz3+owM8W4 nxZoH47JjHgrFzeHtVjeYHkPS97V8+RDOKIilnv+9gAXTdhE4gs1jPJH+IPrZCS+Qsis TLYeUKsde7oChm8cD8/GN2/GDoVIHW/KzXgYSjFiqY/uBkPVXUYCM/H3LJTKt+t3gX9T /d9YKsCxfuXhKMmD6eTwMzjFAUAQUvZh/h9WKIsd/KF8IVLdWnUg4lvFV2aBL6v3YjIj X5jQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dmarc-filter:dkim-signature:dkim-signature; bh=FJTNRitsnX0HM6KoW0pd0o0YfE7SRihvXx11hgHG8wM=; b=Cf1SwuLroyOkladKFWALiR5XyIdTH4OXBDt0sZIK089cTufI/nMpPc8PCJcGLHMVPo blzD6NpNl0VdTrUG0H4KXvTu/sR40ve/DzpLFwxNl7s6wF9nVdkPCpdT2rPxBw1GAZGv 9GeKzP4yh9uMFAdESK+Ru5riHt5g4P9M3a8sjyzyZlXI59obEt41ERJS3nBLHDX7wXfv KChtwZgeN7dnjaqtq7WqluTZ9o7bNoFVKMlK9KrFdIw/Uja0AEoPu/rgH1CKchZXmAeT csyao9+EwLDAMYbqFlWzPU9GGP3vD3iHNQ2E8a6z2j7QnqyS8Oj5X21WEfbfMcViuRwf I0WA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@codeaurora.org header.s=default header.b="TyNR/2zs"; dkim=pass header.i=@codeaurora.org header.s=default header.b=KbVN6HFy; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q13si11696300pll.175.2019.03.24.10.50.40; Sun, 24 Mar 2019 10:50:40 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@codeaurora.org header.s=default header.b="TyNR/2zs"; dkim=pass header.i=@codeaurora.org header.s=default header.b=KbVN6HFy; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728916AbfCXRuj (ORCPT + 31 others); Sun, 24 Mar 2019 13:50:39 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:32864 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728786AbfCXRug (ORCPT ); Sun, 24 Mar 2019 13:50:36 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id BCBB360E7A; Sun, 24 Mar 2019 17:50:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1553449835; bh=qr39210eGihRglgr1o3bC7EcFPdX/QT22CumomBzkHQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TyNR/2zs5dWvJQyJdUoPc+lADWrdcylqeZkaQr9CvMU7a8eedkbVOWKWcPAxqb7uf Zilnu/fCk5McvT9weE9VCwrFHN643imNKD+0m2FY7cMAYF0+ZwlEXWrqYkU543zeNd 5pmiKwCtWGue7fOw6tTqbLVxz05ibQRpNZf2kP00= X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on pdx-caf-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=ALL_TRUSTED,BAYES_00, DKIM_INVALID, DKIM_SIGNED autolearn=no autolearn_force=no version=3.4.0 Received: from blr-ubuntu-87.qualcomm.com (blr-bdr-fw-01_globalnat_allzones-outside.qualcomm.com [103.229.18.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: sibis@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id D61E26118F; Sun, 24 Mar 2019 17:50:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1553449833; bh=qr39210eGihRglgr1o3bC7EcFPdX/QT22CumomBzkHQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KbVN6HFyIT/u3UnaIek4fYTa94K1+8C2uthq5gKMyvacykLiB+q4vCugU2W3pAjxW mGCAt7TZthFOF0WW1/PN0opbWnLZ+j4nwfNpC460vv8xGLn9aIA//KoTfrncBX740h b3o+TAbVA8m6G+CM6HOGlzrr0jGlH8ZZGR2dQv+U= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org D61E26118F Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=sibis@codeaurora.org From: Sibi Sankar To: bjorn.andersson@linaro.org, robh+dt@kernel.org, andy.gross@linaro.org, rnayak@codeaurora.org Cc: david.brown@linaro.org, mark.rutland@arm.com, linux-kernel@vger.kernel.org, linux-arm-msm-owner@vger.kernel.org, devicetree@vger.kernel.org, Sibi Sankar Subject: [PATCH v2 3/9] soc: qcom: rpmpd: Modify corner defining macros Date: Sun, 24 Mar 2019 23:20:01 +0530 Message-Id: <20190324175007.29040-4-sibis@codeaurora.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190324175007.29040-1-sibis@codeaurora.org> References: <20190324175007.29040-1-sibis@codeaurora.org> MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Bjorn Andersson QCS404 uses individual resource type magic for each power-domain, so adjust the macros slightly to make them reusable for this. [sibi: Extend rpmpd corner pair to a generic rpmpd pair] Signed-off-by: Bjorn Andersson Signed-off-by: Sibi Sankar --- drivers/soc/qcom/rpmpd.c | 39 +++++++++++++++++---------------------- 1 file changed, 17 insertions(+), 22 deletions(-) -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project diff --git a/drivers/soc/qcom/rpmpd.c b/drivers/soc/qcom/rpmpd.c index 71fdfafad2ea..17cd59d1ac3b 100644 --- a/drivers/soc/qcom/rpmpd.c +++ b/drivers/soc/qcom/rpmpd.c @@ -17,8 +17,8 @@ #define domain_to_rpmpd(domain) container_of(domain, struct rpmpd, pd) /* Resource types */ -#define RPMPD_SMPA 0x61706d73 -#define RPMPD_LDOA 0x616f646c +#define RPMPD_SMPA 0x61706d73 /* smpa */ +#define RPMPD_LDOA 0x616f646c /* ldoa */ /* Operation Keys */ #define KEY_CORNER 0x6e726f63 /* corn */ @@ -27,46 +27,41 @@ #define MAX_RPMPD_STATE 6 -#define DEFINE_RPMPD_CORNER_SMPA(_platform, _name, _active, r_id) \ +#define DEFINE_RPMPD_PAIR(_platform, _name, _active, r_type, r_key, \ + r_id) \ static struct rpmpd _platform##_##_active; \ static struct rpmpd _platform##_##_name = { \ .pd = { .name = #_name, }, \ .peer = &_platform##_##_active, \ - .res_type = RPMPD_SMPA, \ + .res_type = RPMPD_##r_type, \ .res_id = r_id, \ - .key = KEY_CORNER, \ + .key = KEY_##r_key, \ }; \ static struct rpmpd _platform##_##_active = { \ .pd = { .name = #_active, }, \ .peer = &_platform##_##_name, \ .active_only = true, \ - .res_type = RPMPD_SMPA, \ + .res_type = RPMPD_##r_type, \ .res_id = r_id, \ - .key = KEY_CORNER, \ + .key = KEY_##r_key, \ } -#define DEFINE_RPMPD_CORNER_LDOA(_platform, _name, r_id) \ +#define DEFINE_RPMPD_CORNER(_platform, _name, r_type, r_id) \ static struct rpmpd _platform##_##_name = { \ .pd = { .name = #_name, }, \ - .res_type = RPMPD_LDOA, \ + .res_type = RPMPD_##r_type, \ .res_id = r_id, \ .key = KEY_CORNER, \ } -#define DEFINE_RPMPD_VFC(_platform, _name, r_id, r_type) \ +#define DEFINE_RPMPD_VFC(_platform, _name, r_type, r_id) \ static struct rpmpd _platform##_##_name = { \ .pd = { .name = #_name, }, \ - .res_type = r_type, \ + .res_type = RPMPD_##r_type, \ .res_id = r_id, \ .key = KEY_FLOOR_CORNER, \ } -#define DEFINE_RPMPD_VFC_SMPA(_platform, _name, r_id) \ - DEFINE_RPMPD_VFC(_platform, _name, r_id, RPMPD_SMPA) - -#define DEFINE_RPMPD_VFC_LDOA(_platform, _name, r_id) \ - DEFINE_RPMPD_VFC(_platform, _name, r_id, RPMPD_LDOA) - struct rpmpd_req { __le32 key; __le32 nbytes; @@ -96,12 +91,12 @@ struct rpmpd_desc { static DEFINE_MUTEX(rpmpd_lock); /* msm8996 RPM Power domains */ -DEFINE_RPMPD_CORNER_SMPA(msm8996, vddcx, vddcx_ao, 1); -DEFINE_RPMPD_CORNER_SMPA(msm8996, vddmx, vddmx_ao, 2); -DEFINE_RPMPD_CORNER_LDOA(msm8996, vddsscx, 26); +DEFINE_RPMPD_PAIR(msm8996, vddcx, vddcx_ao, SMPA, CORNER, 1); +DEFINE_RPMPD_PAIR(msm8996, vddmx, vddmx_ao, SMPA, CORNER, 2); +DEFINE_RPMPD_CORNER(msm8996, vddsscx, LDOA, 26); -DEFINE_RPMPD_VFC_SMPA(msm8996, vddcx_vfc, 1); -DEFINE_RPMPD_VFC_LDOA(msm8996, vddsscx_vfc, 26); +DEFINE_RPMPD_VFC(msm8996, vddcx_vfc, SMPA, 1); +DEFINE_RPMPD_VFC(msm8996, vddsscx_vfc, LDOA, 26); static struct rpmpd *msm8996_rpmpds[] = { [MSM8996_VDDCX] = &msm8996_vddcx, From patchwork Sun Mar 24 17:50:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sibi Sankar X-Patchwork-Id: 161009 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp3077159jan; Sun, 24 Mar 2019 10:50:46 -0700 (PDT) X-Google-Smtp-Source: APXvYqyU9JRki3H4KJDAUIoWgki5s/zDt3PC7iJ2CHuK4ytqMmIavtReRm8AOT0Pl71RxuJzYn88 X-Received: by 2002:a17:902:e113:: with SMTP id cc19mr21523879plb.179.1553449846441; Sun, 24 Mar 2019 10:50:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553449846; cv=none; d=google.com; s=arc-20160816; b=y/wMmKRbAdGCr0fu7gPTLGbiRv3KBxTKJ5xZ4hGTkZbd5yEkK2DdO0qv04+u1u442F baOjdzzZjYreJ+u+Zo3EWbMW67ZlWfAr4ucFk2IQTf9BPwO+Ho/HQ1quXs78fgX8TsGu XX8fZPC2how3GY+hXdLW0/QSJhFxT677hwP4Vkcr7P5KCtktyFSlVfYojKQhS2/WY7ho JXFpsLRvlC7VR6Ts2UZFCAaUSDqRtHZ2cXbw5bF1eNp9fDzhoOyHB6HY/rsN/VrDW/Xs UOzFUFlvSOSZG5NUSYtKgrAihp57ShYeqrJB2ajBH4u4vkna2fmWasYibxrt1tOxwbzs O5Sg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dmarc-filter:dkim-signature:dkim-signature; bh=8MO5zarwtvJiUJTcprVF1TDYmLBxk3U8owrmBHCzhTY=; b=Qf1e1Hd3LFtEGgfYfjFOPZ9iOPnx/xW6jFHZIjikd8wbQO7sZ2FdE9+Me7X3n0Qyjp FnhcRcw4AaHFMGkg7jRh3msgMj/EGWOT3pS9d2N7weryCmXR5j9ofKzj/bqsuRYFuBW8 snoKB1U0Rp8O05LhhtCQ0t8YtuRorTp0n3ZqmdMBKOcUd6MhlSY8X8IwuEp3CRbfooij 1IC+R/BA1WzHY62hccRXK3lBrrKxnrSwLyXPvxAlKRC2zrTldoEsVykq3b76bOt6YFBr VmxFXvWGcOl5B90hygjupcKNUqwdu64M0VyRn9Oq0ouJL93sWOwh7keDzvEgOWpzWcoJ zjNQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@codeaurora.org header.s=default header.b=K+co88FO; dkim=pass header.i=@codeaurora.org header.s=default header.b=TmN47Fuu; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id m6si11347800pgq.24.2019.03.24.10.50.46; Sun, 24 Mar 2019 10:50:46 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@codeaurora.org header.s=default header.b=K+co88FO; dkim=pass header.i=@codeaurora.org header.s=default header.b=TmN47Fuu; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729009AbfCXRuo (ORCPT + 31 others); Sun, 24 Mar 2019 13:50:44 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:33094 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728786AbfCXRum (ORCPT ); Sun, 24 Mar 2019 13:50:42 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 159FE60A50; Sun, 24 Mar 2019 17:50:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1553449841; bh=HTtqx1r7AvuQIdnV8MaddJPAHr0YL/FwP6UpT2JaUzg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=K+co88FOY7k6nv1bgJknAUc3cS0A2/k7AqmxVT5pflz98Bvkq3PbD5d2gqJYsoj4d lviQzUOPfSZQjQfaNW3CkR8KCzbFdJee5aDESyL8rdZZwVoeyOAEMX3vUR9cV56UKD +rQCMir4pOIv2BY0iR+/Jtuv9/w8p8Jno7wZzX+0= X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on pdx-caf-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=ALL_TRUSTED,BAYES_00, DKIM_INVALID, DKIM_SIGNED autolearn=no autolearn_force=no version=3.4.0 Received: from blr-ubuntu-87.qualcomm.com (blr-bdr-fw-01_globalnat_allzones-outside.qualcomm.com [103.229.18.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: sibis@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 4291460A50; Sun, 24 Mar 2019 17:50:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1553449838; bh=HTtqx1r7AvuQIdnV8MaddJPAHr0YL/FwP6UpT2JaUzg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TmN47FuuoaQAp/BV/xKM3GWjiiXhbebGstcMJs9WQfv+22LgvUMFdp4uf8ahRSpiU hUBdFARDI+/p3uHBANSoBeCR9VlHWzWBaVBY48gAsgDkJSYps07ZFGCVJrGZtiu+iF bzNr/fiBGpbVznTU8iuvJwlNyhhqdDlfdqdzl8QU= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 4291460A50 Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=sibis@codeaurora.org From: Sibi Sankar To: bjorn.andersson@linaro.org, robh+dt@kernel.org, andy.gross@linaro.org, rnayak@codeaurora.org Cc: david.brown@linaro.org, mark.rutland@arm.com, linux-kernel@vger.kernel.org, linux-arm-msm-owner@vger.kernel.org, devicetree@vger.kernel.org, Sibi Sankar Subject: [PATCH v2 4/9] dt-bindings: power: Add rpm power domain bindings for qcs404 Date: Sun, 24 Mar 2019 23:20:02 +0530 Message-Id: <20190324175007.29040-5-sibis@codeaurora.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190324175007.29040-1-sibis@codeaurora.org> References: <20190324175007.29040-1-sibis@codeaurora.org> MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Bjorn Andersson Add RPM Power domain bindings for the qcs404 family of SoC [sibis: Add supported rpmpd states for qcs404] Signed-off-by: Sibi Sankar Signed-off-by: Bjorn Andersson --- .../devicetree/bindings/power/qcom,rpmpd.txt | 1 + include/dt-bindings/power/qcom-rpmpd.h | 22 +++++++++++++++++++ 2 files changed, 23 insertions(+) -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project diff --git a/Documentation/devicetree/bindings/power/qcom,rpmpd.txt b/Documentation/devicetree/bindings/power/qcom,rpmpd.txt index 980e5413d18f..172ccf940c5c 100644 --- a/Documentation/devicetree/bindings/power/qcom,rpmpd.txt +++ b/Documentation/devicetree/bindings/power/qcom,rpmpd.txt @@ -6,6 +6,7 @@ which then translates it into a corresponding voltage on a rail Required Properties: - compatible: Should be one of the following * qcom,msm8996-rpmpd: RPM Power domain for the msm8996 family of SoC + * qcom,qcs404-rpmpd: RPM Power domain for the qcs404 family of SoC * qcom,sdm845-rpmhpd: RPMh Power domain for the sdm845 family of SoC - #power-domain-cells: number of cells in Power domain specifier must be 1. diff --git a/include/dt-bindings/power/qcom-rpmpd.h b/include/dt-bindings/power/qcom-rpmpd.h index 87d9c6611682..450378662944 100644 --- a/include/dt-bindings/power/qcom-rpmpd.h +++ b/include/dt-bindings/power/qcom-rpmpd.h @@ -36,4 +36,26 @@ #define MSM8996_VDDSSCX 5 #define MSM8996_VDDSSCX_VFC 6 +/* QCS404 Power Domains */ +#define QCS404_VDDMX 0 +#define QCS404_VDDMX_AO 1 +#define QCS404_VDDMX_VFL 2 +#define QCS404_LPICX 3 +#define QCS404_LPICX_VFL 4 +#define QCS404_LPIMX 5 +#define QCS404_LPIMX_VFL 6 + +/* RPM SMD Power Domain performance levels */ +#define RPM_SMD_LEVEL_RETENTION 16 +#define RPM_SMD_LEVEL_RETENTION_PLUS 32 +#define RPM_SMD_LEVEL_MIN_SVS 48 +#define RPM_SMD_LEVEL_LOW_SVS 64 +#define RPM_SMD_LEVEL_SVS 128 +#define RPM_SMD_LEVEL_SVS_PLUS 192 +#define RPM_SMD_LEVEL_NOM 256 +#define RPM_SMD_LEVEL_NOM_PLUS 320 +#define RPM_SMD_LEVEL_TURBO 384 +#define RPM_SMD_LEVEL_TURBO_NO_CPR 416 +#define RPM_SMD_LEVEL_BINNING 512 + #endif From patchwork Sun Mar 24 17:50:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sibi Sankar X-Patchwork-Id: 161010 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp3077232jan; Sun, 24 Mar 2019 10:50:52 -0700 (PDT) X-Google-Smtp-Source: APXvYqxI78ZpvsWSvf83ruFpfRtw77bEGtqYMknSq+juSioiol3oNecjF1Akx4bL2WyFAlnpTtDQ X-Received: by 2002:a63:c34a:: with SMTP id e10mr19247177pgd.194.1553449852627; Sun, 24 Mar 2019 10:50:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553449852; cv=none; d=google.com; s=arc-20160816; b=qwlDyZ35+cKe+FmV7qRhAKrMzqaRkzF4VKKYOTT0Ct9MWWtyx+K+T5ab4PK7HoaDC0 4RB5umRzBbHjU6lrtICDGN8wiIhT+J0z7f+GjRvQBTB3nKScVNxczx4WfdO/T0cZhjLS nMWWDlPxP8qNp6I0O4vnkK4pF8qhH/S5jiYlF42kWyxHRFFMs/kvEilR5dTT858MXxS2 viY3CTUzme5rhV5S1v/mN2aYJi83UzXeDhVO65cxgyUTpsI7XExxvUs60Dzp+UO7w1g3 An8Qto0+qHDPWOP1s2ogaucrSqlJmTLdX7E1JahJXk61YwxF2IRJudJ2GPIDsDJJ7xbS oo0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dmarc-filter:dkim-signature:dkim-signature; bh=mRjv+16HdCpqb3yG2LCQ25v9/Yrib9qhoyHm0VRXcDo=; b=VrqixezKISJsr55eVwfaKf1vYbm2Oj/mJnjT9yYYuwGJk02wCiPN787fxAg9WJUehJ ejs2zRTu1qjDp9ojqEs3lLx3PcyAdoo2u2bdoanmf85exCb8X/2dvCFntdy4CZdtqif7 FvEHJI2UOlPm37lVTJV1ZllpKnQkjCBtWBx7jLJhNnKXBiiniKb0ThG3ZmoDgfzZNBGg zOKcY+lj0e0+83k3QKNsiq1C/L2LIzSzFzec3B8yVU8HPCuNgAEn12hzlD7xaqkeGr6t KYZx4abtNPSQIv8uIKgBJ9uhvpFeIUvsKvvY3k6CNe4UmDAvDrI6tAoLQHwsMp2o5tWP +YTg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@codeaurora.org header.s=default header.b=WBitlWAr; dkim=pass header.i=@codeaurora.org header.s=default header.b=hP5XGLBP; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p17si12129748plo.223.2019.03.24.10.50.52; Sun, 24 Mar 2019 10:50:52 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@codeaurora.org header.s=default header.b=WBitlWAr; dkim=pass header.i=@codeaurora.org header.s=default header.b=hP5XGLBP; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729023AbfCXRuu (ORCPT + 31 others); Sun, 24 Mar 2019 13:50:50 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:33586 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728786AbfCXRut (ORCPT ); Sun, 24 Mar 2019 13:50:49 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 3901B613A3; Sun, 24 Mar 2019 17:50:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1553449847; bh=9W0IggPXot0Vux2ZxT5xrL/qNr9EWYJgcf/z9qBH6TA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WBitlWArmddAbIymxyfNnfXcE4CINuKoAjHTmu9idVkSjCR116VaZATgZ1v63SLMq FVs/g9UkRoHRZotYT7hwbgOVxW93TGP2zo6E8gLfiBuox5khMtDHchV7J/1kMFJ3rZ JX70+5UL7vm8NZvXonYBd7IHiXrpVDXR5gCqMQ48= X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on pdx-caf-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=ALL_TRUSTED,BAYES_00, DKIM_INVALID, DKIM_SIGNED autolearn=no autolearn_force=no version=3.4.0 Received: from blr-ubuntu-87.qualcomm.com (blr-bdr-fw-01_globalnat_allzones-outside.qualcomm.com [103.229.18.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: sibis@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id A9EEB60A43; Sun, 24 Mar 2019 17:50:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1553449842; bh=9W0IggPXot0Vux2ZxT5xrL/qNr9EWYJgcf/z9qBH6TA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hP5XGLBPGFV3YyFSHLkbWumxYbuUaP9oXhSCcjcB9S0VFCTIAMJWbEUR+PdL18ATN FxCRhFV6tWbu78RyMugL3wGUKqJu9moPVn9lvkiDD6cOhlHZKQYneXfhuklcGwR/nJ wgqFojLgGME1Nd6DeKtp3D8PdB6u6kI7qLFVU1EI= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org A9EEB60A43 Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=sibis@codeaurora.org From: Sibi Sankar To: bjorn.andersson@linaro.org, robh+dt@kernel.org, andy.gross@linaro.org, rnayak@codeaurora.org Cc: david.brown@linaro.org, mark.rutland@arm.com, linux-kernel@vger.kernel.org, linux-arm-msm-owner@vger.kernel.org, devicetree@vger.kernel.org, Sibi Sankar Subject: [PATCH v2 5/9] soc: qcom: rpmpd: Add QCS404 power-domains Date: Sun, 24 Mar 2019 23:20:03 +0530 Message-Id: <20190324175007.29040-6-sibis@codeaurora.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190324175007.29040-1-sibis@codeaurora.org> References: <20190324175007.29040-1-sibis@codeaurora.org> MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Bjorn Andersson Add the shared cx/mx and the low-power-island's cx and mx power-domains found on QCS404. [sibi: Fixup corner/vfc with vlfl/vfl] Signed-off-by: Bjorn Andersson Signed-off-by: Sibi Sankar --- drivers/soc/qcom/rpmpd.c | 48 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project diff --git a/drivers/soc/qcom/rpmpd.c b/drivers/soc/qcom/rpmpd.c index 17cd59d1ac3b..60a305e9d429 100644 --- a/drivers/soc/qcom/rpmpd.c +++ b/drivers/soc/qcom/rpmpd.c @@ -19,11 +19,16 @@ /* Resource types */ #define RPMPD_SMPA 0x61706d73 /* smpa */ #define RPMPD_LDOA 0x616f646c /* ldoa */ +#define RPMPD_RWMX 0x786d7772 /* rwmx */ +#define RPMPD_RWLC 0x636c7772 /* rwlc */ +#define RPMPD_RWLM 0x6d6c7772 /* rwlm */ /* Operation Keys */ #define KEY_CORNER 0x6e726f63 /* corn */ #define KEY_ENABLE 0x6e657773 /* swen */ #define KEY_FLOOR_CORNER 0x636676 /* vfc */ +#define KEY_FLOOR_LEVEL 0x6c6676 /* vfl */ +#define KEY_LEVEL 0x6c766c76 /* vlvl */ #define MAX_RPMPD_STATE 6 @@ -54,6 +59,14 @@ .key = KEY_CORNER, \ } +#define DEFINE_RPMPD_LEVEL(_platform, _name, r_type, r_id) \ + static struct rpmpd _platform##_##_name = { \ + .pd = { .name = #_name, }, \ + .res_type = RPMPD_##r_type, \ + .res_id = r_id, \ + .key = KEY_LEVEL, \ + } + #define DEFINE_RPMPD_VFC(_platform, _name, r_type, r_id) \ static struct rpmpd _platform##_##_name = { \ .pd = { .name = #_name, }, \ @@ -62,6 +75,14 @@ .key = KEY_FLOOR_CORNER, \ } +#define DEFINE_RPMPD_VFL(_platform, _name, r_type, r_id) \ + static struct rpmpd _platform##_##_name = { \ + .pd = { .name = #_name, }, \ + .res_type = RPMPD_##r_type, \ + .res_id = r_id, \ + .key = KEY_FLOOR_LEVEL, \ + } + struct rpmpd_req { __le32 key; __le32 nbytes; @@ -114,8 +135,35 @@ static const struct rpmpd_desc msm8996_desc = { .max_state = MAX_RPMPD_STATE, }; +/* qcs404 RPM Power domains */ +DEFINE_RPMPD_PAIR(qcs404, vddmx, vddmx_ao, RWMX, LEVEL, 0); +DEFINE_RPMPD_VFL(qcs404, vddmx_vfl, RWMX, 0); + +DEFINE_RPMPD_LEVEL(qcs404, vdd_lpicx, RWLC, 0); +DEFINE_RPMPD_VFL(qcs404, vdd_lpicx_vfl, RWLC, 0); + +DEFINE_RPMPD_LEVEL(qcs404, vdd_lpimx, RWLM, 0); +DEFINE_RPMPD_VFL(qcs404, vdd_lpimx_vfl, RWLM, 0); + +static struct rpmpd *qcs404_rpmpds[] = { + [QCS404_VDDMX] = &qcs404_vddmx, + [QCS404_VDDMX_AO] = &qcs404_vddmx_ao, + [QCS404_VDDMX_VFL] = &qcs404_vddmx_vfl, + [QCS404_LPICX] = &qcs404_vdd_lpicx, + [QCS404_LPICX_VFL] = &qcs404_vdd_lpicx_vfl, + [QCS404_LPIMX] = &qcs404_vdd_lpimx, + [QCS404_LPIMX_VFL] = &qcs404_vdd_lpimx_vfl, +}; + +static const struct rpmpd_desc qcs404_desc = { + .rpmpds = qcs404_rpmpds, + .num_pds = ARRAY_SIZE(qcs404_rpmpds), + .max_state = RPM_SMD_LEVEL_BINNING, +}; + static const struct of_device_id rpmpd_match_table[] = { { .compatible = "qcom,msm8996-rpmpd", .data = &msm8996_desc }, + { .compatible = "qcom,qcs404-rpmpd", .data = &qcs404_desc }, { } }; From patchwork Sun Mar 24 17:50:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sibi Sankar X-Patchwork-Id: 161011 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp3077262jan; Sun, 24 Mar 2019 10:50:55 -0700 (PDT) X-Google-Smtp-Source: APXvYqyebPqz1Orrv9vt+vpKlkAkeoweUdsZuC9bsh8hV54jAd8PEqxC6bVne7FfExcNdr6BnBY8 X-Received: by 2002:a62:4e8e:: with SMTP id c136mr20145910pfb.254.1553449855422; Sun, 24 Mar 2019 10:50:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553449855; cv=none; d=google.com; s=arc-20160816; b=mObKbUL6PTE0J3Ta/IiHN+BHewopStA8mdSAnm+WkH+gCezs4azK2B0qArMVplzEvh XgRUg6YUSgKyDK6fLNCVdgKXXuOKbemN7R8c1cpq6GcADogCWvXtMScNl6qtmgEHSXaa CDU6niES5v7i7Kfoe2E3X7L1ak6uppQmNOxe5kRr7MGLUKiSm2g6raeP36NUxT52uZWk QRQdNRNeDmRDCWz4YsHHpVJDLbeBXJryWSRsSlLfV43T1NgAKb6ELK5eSqI6W1E7ArHr 9WnSHvSX9st7bES5jCW1iD2vE4w34v57tcJoj31M0fZIcoKYoR/Tg6V9b/s6PtNqk02s cFIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dmarc-filter:dkim-signature:dkim-signature; bh=3VwMteyBeLrua4CU24ki1g90eFNXkxe1VY9IWRo7wP8=; b=MXQeZ806xvBpcThJlA1oKnfHWC0SoRIJwm3mpuQBvCtcWlH/mWKpeAySctKLUg0nZ8 6YU5txeBXuCGxhG/eXOzZf4maxkVO0oj3F6Vz7H8c8s5rMB2UDFUIKC31Z+d2U+ARmQb xtI36224q6ead4i2W4tFViAEHYq/mrCxskrepaTPsIiX4pVuWi88a38euJODDuOCAYdt 4uNmFLwij2ZbMr0z3EljbK7qxATFaVFraeC9WHcFACVG24q7dpzmpI4TniLc5xleibU9 rnHTNxhxr3bNCsRVyWZJ0OWbpW37uhpHkFmJE4sbmd+MQp3o8MlyfJd0YKH2rZrPmtJ4 BFeg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@codeaurora.org header.s=default header.b=a649tuZ2; dkim=pass header.i=@codeaurora.org header.s=default header.b=HfIVjqgB; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p17si12129748plo.223.2019.03.24.10.50.55; Sun, 24 Mar 2019 10:50:55 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@codeaurora.org header.s=default header.b=a649tuZ2; dkim=pass header.i=@codeaurora.org header.s=default header.b=HfIVjqgB; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729050AbfCXRuy (ORCPT + 31 others); Sun, 24 Mar 2019 13:50:54 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:34038 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728786AbfCXRuw (ORCPT ); Sun, 24 Mar 2019 13:50:52 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 0586C61197; Sun, 24 Mar 2019 17:50:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1553449851; bh=4BACrC0Iqo1K4AZpeKDqVibh769lMf+q91owVxJqY/E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=a649tuZ2OrVXhS3Uzkgcqdqnv1zHF4jLlotb7s3WWlG/taQHe58k5e8+ANjQs5kcW LySFJCvX4iM+OH/679MVb0zWHDYQZBNrusoFeCjgqBzWPdNSHrW3qzX4Eo6JYk9dmV 023B9H7Mq8ftDGW4BBnjUrT1WYceZFczArbyJXj0= X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on pdx-caf-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=ALL_TRUSTED,BAYES_00, DKIM_INVALID, DKIM_SIGNED autolearn=no autolearn_force=no version=3.4.0 Received: from blr-ubuntu-87.qualcomm.com (blr-bdr-fw-01_globalnat_allzones-outside.qualcomm.com [103.229.18.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: sibis@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id BEA7C61231; Sun, 24 Mar 2019 17:50:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1553449847; bh=4BACrC0Iqo1K4AZpeKDqVibh769lMf+q91owVxJqY/E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HfIVjqgBhtiakYbxDcvU8sW9cgengKwZ54MPrV1Pw3GKrbbJ2WvSniSZOVQW1e4WK vgJQ7VcjJ6clgsLut4nqnjsiysc0tX36cnvuemFK1xLZIHka+dFoHDcMyodGzOQrUD oodUTqDLVhfEDQvGEqPO61P7l3BuVEiK9v/ecJQk= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org BEA7C61231 Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=sibis@codeaurora.org From: Sibi Sankar To: bjorn.andersson@linaro.org, robh+dt@kernel.org, andy.gross@linaro.org, rnayak@codeaurora.org Cc: david.brown@linaro.org, mark.rutland@arm.com, linux-kernel@vger.kernel.org, linux-arm-msm-owner@vger.kernel.org, devicetree@vger.kernel.org, Sibi Sankar Subject: [PATCH v2 6/9] arm64: dts: qcom: qcs404: Add rpmpd node Date: Sun, 24 Mar 2019 23:20:04 +0530 Message-Id: <20190324175007.29040-7-sibis@codeaurora.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190324175007.29040-1-sibis@codeaurora.org> References: <20190324175007.29040-1-sibis@codeaurora.org> MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Bjorn Andersson Add the rpmpd node on the qcs404 and define the available levels. [sibis: fixup available levels] Signed-off-by: Bjorn Andersson Signed-off-by: Sibi Sankar --- arch/arm64/boot/dts/qcom/qcs404.dtsi | 55 ++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project diff --git a/arch/arm64/boot/dts/qcom/qcs404.dtsi b/arch/arm64/boot/dts/qcom/qcs404.dtsi index e8fd26633d57..a7d46647c416 100644 --- a/arch/arm64/boot/dts/qcom/qcs404.dtsi +++ b/arch/arm64/boot/dts/qcom/qcs404.dtsi @@ -4,6 +4,7 @@ #include #include #include +#include / { interrupt-parent = <&intc>; @@ -230,6 +231,60 @@ compatible = "qcom,rpmcc-qcs404"; #clock-cells = <1>; }; + + rpmpd: power-controller { + compatible = "qcom,qcs404-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 = ; + }; + + rpmpd_opp_ret_plus: opp2 { + opp-level = ; + }; + + rpmpd_opp_min_svs: opp3 { + opp-level = ; + }; + + rpmpd_opp_low_svs: opp4 { + opp-level = ; + }; + + rpmhpd_opp_svs: opp5 { + opp-level = ; + }; + + rpmhpd_opp_svs_plus: opp6 { + opp-level = ; + }; + + rpmhpd_opp_nom: opp7 { + opp-level = ; + }; + + rpmhpd_opp_nom_plus: opp8 { + opp-level = ; + }; + + rpmhpd_opp_turbo: opp9 { + opp-level = ; + }; + + rpmhpd_opp_turbo_no_cpr: opp10 { + opp-level = ; + }; + + rpmhpd_opp_turbo_plus: opp11 { + opp-level = ; + }; + }; + }; }; };