From patchwork Thu Feb 21 06:44:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Andersson X-Patchwork-Id: 10823193 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C76E91399 for ; Thu, 21 Feb 2019 06:44:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B5F432E2DB for ; Thu, 21 Feb 2019 06:44:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A9FD92FE87; Thu, 21 Feb 2019 06:44:33 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 950672E2DB for ; Thu, 21 Feb 2019 06:44:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726712AbfBUGoO (ORCPT ); Thu, 21 Feb 2019 01:44:14 -0500 Received: from mail-pl1-f193.google.com ([209.85.214.193]:35721 "EHLO mail-pl1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726706AbfBUGoN (ORCPT ); Thu, 21 Feb 2019 01:44:13 -0500 Received: by mail-pl1-f193.google.com with SMTP id p19so2436693plo.2 for ; Wed, 20 Feb 2019 22:44:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=QetkU8HkeLHZ7CDP8UqLFrIsq3JOZpxLPjU3HCJfceo=; b=ybWJeU6Mu2zhZx5fivSPY6ji/N+2+BKh+V0cdC41h+EDcyPkv5PNd1OgarL1qnrctK z8jx/Kz7FrTP4qFDcBzxqWN92wKJTbzRLBfmfvfk5RQ644Tv/GVhSRH2jvYKwFSenNPk VAjURrSghxrrGowOJEKsBOXa/vPRtn/aVG5lp7tXmqXZ/fX2RUqlbtIO2sJMvuIGjwjN 6fp+0SkVZ/jM/Tzjdxwz/EqCvqf9OJ5fOyARmbFt4BD36TQgsAn4LS+VzhPs9j6A6aCX 7XYkZO9z9ai1OxGyiOCb9dk9ejziGnTuqJZVa6kAnvAOE2EvuqTlnn7XSwHbdcWcJ539 XNGQ== 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; bh=QetkU8HkeLHZ7CDP8UqLFrIsq3JOZpxLPjU3HCJfceo=; b=nDLEJ8AR88+9HUKFoMO9AaQl08bfKRL+H/QFZd7B8ZOUOYx4jaqhj2nw+pRqmXutdg kf4IZbC5PwXWDd6PXv7lfxrfW2Dd0gYZd+unxEmmMva0KZZXuEaPm1g8zYzmLvSTQikA 9v7NPkLGBqtIjUcuCHBERJ+7mtDWWEmkW8BuSsg9NY3nver5cqWDtGNWinaa4c3FMpsc JGLnnVLBubYs0+1AkFFJha3OkVUUa9fOvu77DfhxPuLROU32CO+z8cZ5lARKnM1cRb3Z GuYiITnYy6ZIXy/4eDiqbQo/zTGcv4oIVaAOyI44e3B1XPfME6UkkQsfbfhCke6+9WXS f2Dg== X-Gm-Message-State: AHQUAubsR8Aqpb4IXNIdkI/pgak/saauKJ9/Qk8Q/4bGy7S2GBidsTru +BYKM4sFWMzjECOX68I/l/AHyQ== X-Google-Smtp-Source: AHgI3IZMhNG6aQm6Q74VYB/dIGK03U4rwVLSw9isjhdaxkDsHk6U8huaLgAKVvAGoA7v2dCCbxmRjA== X-Received: by 2002:a17:902:8348:: with SMTP id z8mr19400212pln.151.1550731453196; Wed, 20 Feb 2019 22:44:13 -0800 (PST) Received: from localhost.localdomain (104-188-17-28.lightspeed.sndgca.sbcglobal.net. [104.188.17.28]) by smtp.gmail.com with ESMTPSA id b4sm22777892pgq.57.2019.02.20.22.44.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 20 Feb 2019 22:44:12 -0800 (PST) From: Bjorn Andersson To: Andy Gross , David Brown , Rajendra Nayak Cc: Rob Herring , Mark Rutland , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/3] soc: qcom: rpmpd: Modify corner defining macros Date: Wed, 20 Feb 2019 22:44:32 -0800 Message-Id: <20190221064434.2760-2-bjorn.andersson@linaro.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20190221064434.2760-1-bjorn.andersson@linaro.org> References: <20190221064434.2760-1-bjorn.andersson@linaro.org> Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP QCS404 uses individual resource type magic for each power-domain, so adjust the macros slightly to make them reusable for this. Signed-off-by: Bjorn Andersson --- drivers/soc/qcom/rpmpd.c | 34 ++++++++++++++-------------------- 1 file changed, 14 insertions(+), 20 deletions(-) diff --git a/drivers/soc/qcom/rpmpd.c b/drivers/soc/qcom/rpmpd.c index 005326050c23..74b2f001b9c6 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,12 +27,12 @@ #define MAX_RPMPD_STATE 6 -#define DEFINE_RPMPD_CORNER_SMPA(_platform, _name, _active, r_id) \ +#define DEFINE_RPMPD_CORNER_PAIR(_platform, _name, _active, r_type, 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, \ }; \ @@ -40,33 +40,27 @@ .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, \ } -#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; @@ -94,12 +88,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_CORNER_PAIR(msm8996, vddcx, vddcx_ao, SMPA, 1); +DEFINE_RPMPD_CORNER_PAIR(msm8996, vddmx, vddmx_ao, SMPA, 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,