From patchwork Thu Feb 4 15:01:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan O'Donoghue X-Patchwork-Id: 12067735 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 88C99C433DB for ; Thu, 4 Feb 2021 16:27:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4B3A664F42 for ; Thu, 4 Feb 2021 16:27:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237980AbhBDQ1T (ORCPT ); Thu, 4 Feb 2021 11:27:19 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60998 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236811AbhBDPBr (ORCPT ); Thu, 4 Feb 2021 10:01:47 -0500 Received: from mail-wm1-x32d.google.com (mail-wm1-x32d.google.com [IPv6:2a00:1450:4864:20::32d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 93409C061797 for ; Thu, 4 Feb 2021 07:00:07 -0800 (PST) Received: by mail-wm1-x32d.google.com with SMTP id l12so3406144wmq.2 for ; Thu, 04 Feb 2021 07:00:07 -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 :mime-version:content-transfer-encoding; bh=2V2m5rFMMubWGXq76HAlBgLUJ0bO/2ibl98uXVHvBnk=; b=Vr6z69kNemvb4ISPZBfKLFUvl7Qwz9RTvkne0fGh90hcug60aw+RJQuYrgq9ZovLXn 1kFySmYTQ0+lRYNFTX7UIKMOrjVFJKNHye498apgZBy7sloGZAHkkX36IiUxQ2szXOIY QQrfxwI1cdOBne1unSBK4yk02VwFGPUIDL7nu3Yg17lgu2WPIc/MNnVnsJFGuz9wNeT4 PDSXbxo9y7TLzZbrJ4m+qTzkrf8UCdbvk/49z75iLn6u8MZp/EqiKEvC7rmB5J7V/57q CM1LiL67on67xfLp3BSdLHuZNMv9ETOO+T1dp/5ykfQi/W/RSceGwH2xtT7ONRhIs0Wm N3eQ== 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=2V2m5rFMMubWGXq76HAlBgLUJ0bO/2ibl98uXVHvBnk=; b=K6+XEvfULeJN2E9puq1FLAgQxhHFnpjJw41MopX0mgQTG/zJlnQRrDLkInrr6oDqge dG1w5g8qcpSYCbmBV5YKnFbJslSFL9D3EV407OpPtKsOX6H/CafJ4snm9aabtZwOhwU4 xlTGOF6A2OITGiWFyIlP+6oZAoFxyFGioc2twKoHhbGrB46pLN0EDL9W4yqyxZ+ClRMy DMiXRPI7tewzOSTH1POiJnwKJDgs5rdV19mDZiBNTCBW1uF2PIBSTc4YKRznYrEFTobP D77hSCzs+wfkAKiHK3GmD4wM60RrI348ytthA4y65s5Y12jp48Aj/Nqjqj39ORLgakWN u2ww== X-Gm-Message-State: AOAM5314BUZ4U71XRJVx1VeLi7erkrTwgUApJ/gsK5OAQ8n7yNbmVXE9 yBpeX2jX9XHn85pzo3ckIi8Mm6ubs2H1UQ== X-Google-Smtp-Source: ABdhPJySjxV1EgJQJ74M32YnITdnmrBITFlqYSxQ32+AwO33LuKPe8/3Im3vp2sh77jSlmWetIvHUw== X-Received: by 2002:a1c:a957:: with SMTP id s84mr7753547wme.166.1612450805830; Thu, 04 Feb 2021 07:00:05 -0800 (PST) Received: from sagittarius-a.chello.ie (188-141-3-169.dynamic.upc.ie. [188.141.3.169]) by smtp.gmail.com with ESMTPSA id c11sm8312664wrs.28.2021.02.04.07.00.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Feb 2021 07:00:05 -0800 (PST) From: Bryan O'Donoghue To: linux-clk@vger.kernel.org, linux-arm-msm@vger.kernel.org, mturquette@baylibre.com, sboyd@kernel.org, bjorn.andersson@linaro.org, robh+dt@kernel.org, agross@kernel.org Cc: bryan.odonoghue@linaro.org, jonathan@marek.ca, dikshita@codeaurora.org, dmitry.baryshkov@linaro.org, stanimir.varbanov@linaro.org Subject: [PATCH v2 1/4] dt-bindings: clock: Add missing SM8250 videoc clock indices Date: Thu, 4 Feb 2021 15:01:17 +0000 Message-Id: <20210204150120.1521959-2-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210204150120.1521959-1-bryan.odonoghue@linaro.org> References: <20210204150120.1521959-1-bryan.odonoghue@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-clk@vger.kernel.org Two indexes need to be added to videocc-sm8250.h for venus to function properly. Rather than adding the missing indexes when used we add them separately here to keep checkpatch.pl happy. Signed-off-by: Bryan O'Donoghue Reviewed-by: Dmitry Baryshkov Tested-by: Dmitry Baryshkov --- include/dt-bindings/clock/qcom,videocc-sm8250.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/dt-bindings/clock/qcom,videocc-sm8250.h b/include/dt-bindings/clock/qcom,videocc-sm8250.h index 2b2b3867af25..8d321ac3b1fa 100644 --- a/include/dt-bindings/clock/qcom,videocc-sm8250.h +++ b/include/dt-bindings/clock/qcom,videocc-sm8250.h @@ -16,6 +16,8 @@ #define VIDEO_CC_MVS1C_DIV2_DIV_CLK_SRC 6 #define VIDEO_CC_PLL0 7 #define VIDEO_CC_PLL1 8 +#define VIDEO_CC_MVS0_DIV_CLK_SRC 9 +#define VIDEO_CC_MVS0_CLK 10 /* VIDEO_CC resets */ #define VIDEO_CC_CVP_INTERFACE_BCR 0 From patchwork Thu Feb 4 15:01:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan O'Donoghue X-Patchwork-Id: 12067733 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=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 8C8D2C433DB for ; Thu, 4 Feb 2021 16:27:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 423B564F4E for ; Thu, 4 Feb 2021 16:27:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237108AbhBDQ1I (ORCPT ); Thu, 4 Feb 2021 11:27:08 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32790 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237021AbhBDPBx (ORCPT ); Thu, 4 Feb 2021 10:01:53 -0500 Received: from mail-wm1-x335.google.com (mail-wm1-x335.google.com [IPv6:2a00:1450:4864:20::335]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E8ED6C0617A9 for ; Thu, 4 Feb 2021 07:00:09 -0800 (PST) Received: by mail-wm1-x335.google.com with SMTP id l12so3406271wmq.2 for ; Thu, 04 Feb 2021 07:00:09 -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 :mime-version:content-transfer-encoding; bh=28ZBg6HWPIrbV+zPYpH6RT+vX30g3C029HWLCzM+KTU=; b=XWA5TX5+90UYIeU2L4Yh0RIg5dicSIysZDGFObgurM7Qg8TtAxHLu6+dVm6fuZe/yB vkkCL7eVcibRvIxWReLLiI2IRMyoBTbqD7dCAGX2nXyv4qxGpByDDuDMRtsde558Ofjp CgYYKy/TDNel3ky9fYEC/CQaG3w64Jvof0PngGMWLZynWfcqXjrcCOIKYghhiqEQjcia PIrKZ4b/zT6SAffkKK9axbeBfZ+zczdI25VYPmlojGWE0gbWdDOwxuJcgXY94L9qddsE fXBky95IfqYf04JQXFptbJ5crBnfNKcS6P+tVGozRPP+Q9yGmzDd6kH2Q7helJnQrBNe i5YA== 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=28ZBg6HWPIrbV+zPYpH6RT+vX30g3C029HWLCzM+KTU=; b=rXbflqOw/TPpkaGuwbXLpgcuJwwRV/HdR7za4v+dVVCjcMC0+RzoLy9NrLnjXn6b0i S+DWMy+aZu9hatOjflxmJLeBd94rVZUfcPJ9d1dXgOdxvTFB5indEa0DZaHCG0tsLM7e c98EgnRnBkMLI09Shd3PRJOHjndXsH8ke5swavDyspT3SC4xzZ72mie7V4lpPgJ87JPg hEJcx0vZO3R7IkpL2FU7VdI6lv76w3k+teWfSyG+Dj8SSOetiA5ixMQ7nN1rX5MJB0vh LTU6kBrRBpGNgLhBqctCr5CUwjLuDO7Sz2fh2+mlpYuAFFwRUkreZRzjG7xj5BswOtG1 Ghhg== X-Gm-Message-State: AOAM530xUadyRf6t1OP8R95BlcsQ5XZ5YFflK8kmXET3IshaSBT29pDa 7zdo9e1+psACxMwnQe8rHHjnIx45JqysOg== X-Google-Smtp-Source: ABdhPJx9ATUPuwuSSUJqvX8E9gV9HDrCv8XsS345fMtp3A0gI98Iv3W3T3VGOy7ldfM7pQXm7HAnKw== X-Received: by 2002:a05:600c:20c6:: with SMTP id y6mr7799946wmm.97.1612450808290; Thu, 04 Feb 2021 07:00:08 -0800 (PST) Received: from sagittarius-a.chello.ie (188-141-3-169.dynamic.upc.ie. [188.141.3.169]) by smtp.gmail.com with ESMTPSA id c11sm8312664wrs.28.2021.02.04.07.00.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Feb 2021 07:00:07 -0800 (PST) From: Bryan O'Donoghue To: linux-clk@vger.kernel.org, linux-arm-msm@vger.kernel.org, mturquette@baylibre.com, sboyd@kernel.org, bjorn.andersson@linaro.org, robh+dt@kernel.org, agross@kernel.org Cc: bryan.odonoghue@linaro.org, jonathan@marek.ca, dikshita@codeaurora.org, dmitry.baryshkov@linaro.org, stanimir.varbanov@linaro.org Subject: [PATCH v2 2/4] clk: qcom: videocc: Add sm8250 VIDEO_CC_MVS0_DIV_CLK_SRC Date: Thu, 4 Feb 2021 15:01:18 +0000 Message-Id: <20210204150120.1521959-3-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210204150120.1521959-1-bryan.odonoghue@linaro.org> References: <20210204150120.1521959-1-bryan.odonoghue@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-clk@vger.kernel.org This patch adds the missing video_cc_mvs0_div_clk_src entry to videocc-sm8250 replicating in upstream the explicit entry for this clock in downstream. Signed-off-by: Bryan O'Donoghue Reviewed-by: Dmitry Baryshkov Tested-by: Dmitry Baryshkov --- drivers/clk/qcom/videocc-sm8250.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/drivers/clk/qcom/videocc-sm8250.c b/drivers/clk/qcom/videocc-sm8250.c index 2797c61f5938..cc84963ced40 100644 --- a/drivers/clk/qcom/videocc-sm8250.c +++ b/drivers/clk/qcom/videocc-sm8250.c @@ -169,6 +169,21 @@ static struct clk_regmap_div video_cc_mvs0c_div2_div_clk_src = { }, }; +static struct clk_regmap_div video_cc_mvs0_div_clk_src = { + .reg = 0xd54, + .shift = 0, + .width = 2, + .clkr.hw.init = &(struct clk_init_data) { + .name = "video_cc_mvs0_div_clk_src", + .parent_data = &(const struct clk_parent_data){ + .hw = &video_cc_mvs0_clk_src.clkr.hw, + }, + .num_parents = 1, + .flags = CLK_SET_RATE_PARENT, + .ops = &clk_regmap_div_ro_ops, + }, +}; + static struct clk_regmap_div video_cc_mvs1c_div2_div_clk_src = { .reg = 0xcf4, .shift = 0, @@ -276,6 +291,7 @@ static struct gdsc mvs1_gdsc = { static struct clk_regmap *video_cc_sm8250_clocks[] = { [VIDEO_CC_MVS0_CLK_SRC] = &video_cc_mvs0_clk_src.clkr, + [VIDEO_CC_MVS0_DIV_CLK_SRC] = &video_cc_mvs0_div_clk_src.clkr, [VIDEO_CC_MVS0C_CLK] = &video_cc_mvs0c_clk.clkr, [VIDEO_CC_MVS0C_DIV2_DIV_CLK_SRC] = &video_cc_mvs0c_div2_div_clk_src.clkr, [VIDEO_CC_MVS1_CLK_SRC] = &video_cc_mvs1_clk_src.clkr, From patchwork Thu Feb 4 15:01:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan O'Donoghue X-Patchwork-Id: 12067731 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=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 7E2C3C433E0 for ; Thu, 4 Feb 2021 16:27:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4DAE164F4E for ; Thu, 4 Feb 2021 16:27:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237023AbhBDQ07 (ORCPT ); Thu, 4 Feb 2021 11:26:59 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33010 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237004AbhBDPCy (ORCPT ); Thu, 4 Feb 2021 10:02:54 -0500 Received: from mail-wr1-x431.google.com (mail-wr1-x431.google.com [IPv6:2a00:1450:4864:20::431]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 18976C0617AB for ; Thu, 4 Feb 2021 07:00:12 -0800 (PST) Received: by mail-wr1-x431.google.com with SMTP id u14so3894746wri.3 for ; Thu, 04 Feb 2021 07:00:12 -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 :mime-version:content-transfer-encoding; bh=g/PBuY8B4LXNYC34z8jQVbK8y5NFUz4tvBI8DdIY53A=; b=M9BCIDzcktZjQecTpiVhGDYOkUGUHa/rmdy2ilwUXyNji5zUInq9f2kxQO3n8NumnJ Pnh5bwYj8Q/5dVQvWkY/0WG7hWPm+xDy4yrfTAo7YCH/8xvVd9Ejf40bKqR39jqq/uwr pd87GC5wyEme21xX0DANlh3sZOi1r+NS+B1OMfP8ovTZhXr/t8bXBKpJqCApO9ws3tp3 KsZAmItJUURxLox3vo9QtxiU/1jc6E6w1F7jHw7N0IutFc0Zd7ZsbEHXI63YahVyTuqs bUS6joHC9mEVmozx+aetuQBV/adxpvt9oqGsxHhXVz4oaZ1JCuS8HWV/r7y5pq2Q6fDo b4IA== 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=g/PBuY8B4LXNYC34z8jQVbK8y5NFUz4tvBI8DdIY53A=; b=OZxduDAmHI3BSpkBgAod3IDcW6rlw5OMe5JFqA0s7pa9q6K7JEarWeSsG+lhR0afIj uYSWKcZiIS2a4ABDiZ7o5QBofGXavZBpD78zflHqIbeW3MqhjMbnU79YZJLPxF4nd43N sdozT8+4LqhSUi7GlS2HGwECe13u/Ks5yP3C7cb4fybrf2k9mXw8J/aIM4NnsrfnAEBl t0oFE1ZpR6TLXyfCRIukHKyK4+b6HcmOOlkkG8Ryd2iC79wmriTLjcW1f/p6gYCsrhOh YbJaGlQwM9t/u1weMReCpo6TUhMsD0wMGK/etvM+rXSvRzFZhrAA9xsPXR22VA8a4t+w QDrQ== X-Gm-Message-State: AOAM531gHR+6jHBpezlODPhV3826hIJBqcg1x2HlFCXH3VaLTZJ90xPw WCvHSX+Gpwg2ohcmAxyUj0QD/uotntGdoA== X-Google-Smtp-Source: ABdhPJyANz9+onWs56zbNEa8fiYd8RlFkVZ7GbhoMud5mHLN3TMDIvOySStd+OGB1xGnTX47kyFTuw== X-Received: by 2002:a5d:44cc:: with SMTP id z12mr9703806wrr.7.1612450810456; Thu, 04 Feb 2021 07:00:10 -0800 (PST) Received: from sagittarius-a.chello.ie (188-141-3-169.dynamic.upc.ie. [188.141.3.169]) by smtp.gmail.com with ESMTPSA id c11sm8312664wrs.28.2021.02.04.07.00.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Feb 2021 07:00:09 -0800 (PST) From: Bryan O'Donoghue To: linux-clk@vger.kernel.org, linux-arm-msm@vger.kernel.org, mturquette@baylibre.com, sboyd@kernel.org, bjorn.andersson@linaro.org, robh+dt@kernel.org, agross@kernel.org Cc: bryan.odonoghue@linaro.org, jonathan@marek.ca, dikshita@codeaurora.org, dmitry.baryshkov@linaro.org, stanimir.varbanov@linaro.org Subject: [PATCH v2 3/4] clk: qcom: videocc: Add sm8250 VIDEO_CC_MVS0_CLK Date: Thu, 4 Feb 2021 15:01:19 +0000 Message-Id: <20210204150120.1521959-4-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210204150120.1521959-1-bryan.odonoghue@linaro.org> References: <20210204150120.1521959-1-bryan.odonoghue@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-clk@vger.kernel.org This patch adds the missing video_cc_mvs0_clk entry to videocc-sm8250 replicating in upstream the explicit entry for this clock in downstream. Signed-off-by: Bryan O'Donoghue Reviewed-by: Dmitry Baryshkov Tested-by: Dmitry Baryshkov --- drivers/clk/qcom/videocc-sm8250.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/drivers/clk/qcom/videocc-sm8250.c b/drivers/clk/qcom/videocc-sm8250.c index cc84963ced40..3ade240bd49c 100644 --- a/drivers/clk/qcom/videocc-sm8250.c +++ b/drivers/clk/qcom/videocc-sm8250.c @@ -217,6 +217,24 @@ static struct clk_branch video_cc_mvs0c_clk = { }, }; +static struct clk_branch video_cc_mvs0_clk = { + .halt_reg = 0xd34, + .halt_check = BRANCH_HALT_VOTED, + .clkr = { + .enable_reg = 0xd34, + .enable_mask = BIT(0), + .hw.init = &(struct clk_init_data){ + .name = "video_cc_mvs0_clk", + .parent_data = &(const struct clk_parent_data){ + .hw = &video_cc_mvs0_div_clk_src.clkr.hw, + }, + .num_parents = 1, + .flags = CLK_SET_RATE_PARENT, + .ops = &clk_branch2_ops, + }, + }, +}; + static struct clk_branch video_cc_mvs1_div2_clk = { .halt_reg = 0xdf4, .halt_check = BRANCH_HALT_VOTED, @@ -290,6 +308,7 @@ static struct gdsc mvs1_gdsc = { }; static struct clk_regmap *video_cc_sm8250_clocks[] = { + [VIDEO_CC_MVS0_CLK] = &video_cc_mvs0_clk.clkr, [VIDEO_CC_MVS0_CLK_SRC] = &video_cc_mvs0_clk_src.clkr, [VIDEO_CC_MVS0_DIV_CLK_SRC] = &video_cc_mvs0_div_clk_src.clkr, [VIDEO_CC_MVS0C_CLK] = &video_cc_mvs0c_clk.clkr, From patchwork Thu Feb 4 15:01:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan O'Donoghue X-Patchwork-Id: 12067521 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8DC6CC433E0 for ; Thu, 4 Feb 2021 15:04:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6000F64E02 for ; Thu, 4 Feb 2021 15:04:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237074AbhBDPD3 (ORCPT ); Thu, 4 Feb 2021 10:03:29 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33028 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237011AbhBDPC6 (ORCPT ); Thu, 4 Feb 2021 10:02:58 -0500 Received: from mail-wr1-x42a.google.com (mail-wr1-x42a.google.com [IPv6:2a00:1450:4864:20::42a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 185D5C06121C for ; Thu, 4 Feb 2021 07:00:14 -0800 (PST) Received: by mail-wr1-x42a.google.com with SMTP id c12so3846082wrc.7 for ; Thu, 04 Feb 2021 07:00:14 -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 :mime-version:content-transfer-encoding; bh=nc9gnI1H6fzB+6K5saFm3Jx2SbTp7zcViLcj0vH0QAE=; b=xBjDITC5+tezp6ASj1W9SEEL71cDN31GmI49V3hP97Rkk6ld15hKRtJKVVAPCVz0RS frD+50Kq8BJmGeSUuzcO/DBk+Wu0xBCBMLZBDlXz+YABc2vTATvWxndg0Ok3M9cze3du 29bAsbA805/uqhI35bvccRBTyEjm4L72ZetX4YTE8Z2sBLUNdzBLO1pMn4HHLn7oiV0Y xw2eYDCFrjr7duA+Nh7lIOLkEt9lScz8dxnwARKiZeMLa0M5/NDPYSGMSrWRBGhKVESj N3NEkDPJ3jU8+A6bmhUZHqb9ddeDbAZ24nrlBUokDAwiNtyDB2nN891sbpmwq2lLZlTa 4kxw== 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=nc9gnI1H6fzB+6K5saFm3Jx2SbTp7zcViLcj0vH0QAE=; b=f0bYosQnnD4q5GBeVaJnTNUMxnB0UihKphHy8csOwgZgsopXzr/gQbuLUiOmDk72J6 c+nXz47x/txTv0EFMKEKf0SCkopOc/o0rw0bGdfgeYuqxzPSDRONCTrc+YxslUCPOtnV BBzMhRmgEhptVJ3JGWQSlhaSSBRbnqtiHFh3IHxnUKKt+XIoYbC1dH6C2hmqmPS72rqF TCHugMtcyDudqtqo1NlOW9kTqul/I8OEtJQ4S8th86Gj/hYO+TPR93IavJvul6wc7+uV Tw4mUNCLFPamjMff59F2S6L1LxHyIH7tSmF1SHyG01Miho6zCU2TP9bjlNL0ewme7wEr ozDA== X-Gm-Message-State: AOAM532QGvKWaw4Z4w58f3FvIgXpd+QoKwOgjtQuG7/ilifawHhRJSoy /GqC/TV4DRoUiYqBVlr3AcsicEJgQYJ0bA== X-Google-Smtp-Source: ABdhPJyKcEmxw1PwIBgjDPjRNrIOrtemhNiOF5VcPU6CotGo8z9YXhwc1/u4P6Sf/bYE34OlFCnruA== X-Received: by 2002:a5d:60c2:: with SMTP id x2mr10252537wrt.248.1612450812483; Thu, 04 Feb 2021 07:00:12 -0800 (PST) Received: from sagittarius-a.chello.ie (188-141-3-169.dynamic.upc.ie. [188.141.3.169]) by smtp.gmail.com with ESMTPSA id c11sm8312664wrs.28.2021.02.04.07.00.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Feb 2021 07:00:11 -0800 (PST) From: Bryan O'Donoghue To: linux-clk@vger.kernel.org, linux-arm-msm@vger.kernel.org, mturquette@baylibre.com, sboyd@kernel.org, bjorn.andersson@linaro.org, robh+dt@kernel.org, agross@kernel.org Cc: bryan.odonoghue@linaro.org, jonathan@marek.ca, dikshita@codeaurora.org, dmitry.baryshkov@linaro.org, stanimir.varbanov@linaro.org Subject: [PATCH v2 4/4] clk: qcom: videocc: Add gdsc mmcx-reg supply hook Date: Thu, 4 Feb 2021 15:01:20 +0000 Message-Id: <20210204150120.1521959-5-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210204150120.1521959-1-bryan.odonoghue@linaro.org> References: <20210204150120.1521959-1-bryan.odonoghue@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-clk@vger.kernel.org This commit adds a regulator supply hook to mmcx-reg missing from - mvs0c_gdsc - mvs1c_gdsc - mvs0_gdsc - mvs1_gdsc Signed-off-by: Bryan O'Donoghue Reviewed-by: Dmitry Baryshkov Tested-by: Dmitry Baryshkov --- drivers/clk/qcom/videocc-sm8250.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/clk/qcom/videocc-sm8250.c b/drivers/clk/qcom/videocc-sm8250.c index 3ade240bd49c..b0efadc19634 100644 --- a/drivers/clk/qcom/videocc-sm8250.c +++ b/drivers/clk/qcom/videocc-sm8250.c @@ -278,6 +278,7 @@ static struct gdsc mvs0c_gdsc = { }, .flags = 0, .pwrsts = PWRSTS_OFF_ON, + .supply = "mmcx", }; static struct gdsc mvs1c_gdsc = { @@ -287,6 +288,7 @@ static struct gdsc mvs1c_gdsc = { }, .flags = 0, .pwrsts = PWRSTS_OFF_ON, + .supply = "mmcx", }; static struct gdsc mvs0_gdsc = { @@ -296,6 +298,7 @@ static struct gdsc mvs0_gdsc = { }, .flags = HW_CTRL, .pwrsts = PWRSTS_OFF_ON, + .supply = "mmcx", }; static struct gdsc mvs1_gdsc = { @@ -305,6 +308,7 @@ static struct gdsc mvs1_gdsc = { }, .flags = HW_CTRL, .pwrsts = PWRSTS_OFF_ON, + .supply = "mmcx", }; static struct clk_regmap *video_cc_sm8250_clocks[] = {