From mboxrd@z Thu Jan 1 00:00:00 1970 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=-9.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MIME_BASE64_TEXT,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY, 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 E1CE5C43603 for ; Wed, 18 Dec 2019 08:31:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B2CF920717 for ; Wed, 18 Dec 2019 08:31:20 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="pKdmXfGO" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726725AbfLRIbT (ORCPT ); Wed, 18 Dec 2019 03:31:19 -0500 Received: from mailgw01.mediatek.com ([210.61.82.183]:9891 "EHLO mailgw01.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1726756AbfLRIbL (ORCPT ); Wed, 18 Dec 2019 03:31:11 -0500 X-UUID: 4c5cd72a24894d94973932ff14ee86d8-20191218 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=L0E1r9L0K/BbvQN8uwQYPArtgYpiqPSnwzJeOXZJ3ZI=; b=pKdmXfGOdWz/Mfc3iGi22PdULqHIz2Kt9u8CvjCC3ZQmdBleKHVpL2X4/ytXUDUFu2OIB5QF9kKIR3TfXsWZKt089m1x0OnxHDQSVjfu3vd0sMltD1dnsKNnkVRcx2vZNmNCucu6qVxgTvrjM5K+/Lv1EwezFY+M1kBcjyhbcL8=; X-UUID: 4c5cd72a24894d94973932ff14ee86d8-20191218 Received: from mtkcas06.mediatek.inc [(172.21.101.30)] by mailgw01.mediatek.com (envelope-from ) (Cellopoint E-mail Firewall v4.1.10 Build 0809 with TLS) with ESMTP id 1067388180; Wed, 18 Dec 2019 16:30:59 +0800 Received: from mtkcas07.mediatek.inc (172.21.101.84) by mtkmbs02n1.mediatek.inc (172.21.101.77) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Wed, 18 Dec 2019 16:30:25 +0800 Received: from mtksdccf07.mediatek.inc (172.21.84.99) by mtkcas07.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1395.4 via Frontend Transport; Wed, 18 Dec 2019 16:30:29 +0800 From: Weiyi Lu To: Nicolas Boichat , Matthias Brugger , Rob Herring , Sascha Hauer CC: James Liao , Fan Chen , , , , , Weiyi Lu Subject: [PATCH v10 03/12] soc: mediatek: Add basic_clk_name to scp_power_data Date: Wed, 18 Dec 2019 16:30:39 +0800 Message-ID: <1576657848-14711-4-git-send-email-weiyi.lu@mediatek.com> X-Mailer: git-send-email 1.8.1.1.dirty In-Reply-To: <1576657848-14711-1-git-send-email-weiyi.lu@mediatek.com> References: <1576657848-14711-1-git-send-email-weiyi.lu@mediatek.com> MIME-Version: 1.0 Content-Type: text/plain X-MTK: N Content-Transfer-Encoding: base64 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org VHJ5IHRvIHN0b3AgZXh0ZW5kaW5nIHRoZSBjbGtfaWQgb3IgY2xrX25hbWVzIGlmIHRoZXJlIGFy ZQ0KbW9yZSBhbmQgbW9yZSBuZXcgQkFTSUMgY2xvY2tzLiBUbyBnZXQgaXRzIG93biBjbG9ja3Mg YnkgdGhlDQpiYXNpY19jbGtfbmFtZSBvZiBlYWNoIHBvd2VyIGRvbWFpbi4NCg0KU2lnbmVkLW9m Zi1ieTogV2VpeWkgTHUgPHdlaXlpLmx1QG1lZGlhdGVrLmNvbT4NCi0tLQ0KIGRyaXZlcnMvc29j L21lZGlhdGVrL210ay1zY3BzeXMuYyB8IDI5ICsrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0t DQogMSBmaWxlIGNoYW5nZWQsIDIxIGluc2VydGlvbnMoKyksIDggZGVsZXRpb25zKC0pDQoNCmRp ZmYgLS1naXQgYS9kcml2ZXJzL3NvYy9tZWRpYXRlay9tdGstc2Nwc3lzLmMgYi9kcml2ZXJzL3Nv Yy9tZWRpYXRlay9tdGstc2Nwc3lzLmMNCmluZGV4IGY2NjlkMzcuLjkzNDMyNzcgMTAwNjQ0DQot LS0gYS9kcml2ZXJzL3NvYy9tZWRpYXRlay9tdGstc2Nwc3lzLmMNCisrKyBiL2RyaXZlcnMvc29j L21lZGlhdGVrL210ay1zY3BzeXMuYw0KQEAgLTExNyw2ICsxMTcsOCBAQCBlbnVtIGNsa19pZCB7 DQogICogQHNyYW1fcGRuX2Fja19iaXRzOiBUaGUgbWFzayBmb3Igc3JhbSBwb3dlciBjb250cm9s IGFja2VkIGJpdHMuDQogICogQGJ1c19wcm90X21hc2s6IFRoZSBtYXNrIGZvciBzaW5nbGUgc3Rl cCBidXMgcHJvdGVjdGlvbi4NCiAgKiBAY2xrX2lkOiBUaGUgYmFzaWMgY2xvY2tzIHJlcXVpcmVk IGJ5IHRoaXMgcG93ZXIgZG9tYWluLg0KKyAqIEBiYXNpY19jbGtfbmFtZTogcHJvdmlkZSB0aGUg c2FtZSBwdXJwb3NlIHdpdGggZmllbGQgImNsa19pZCINCisgKiAgICAgICAgICAgICAgICBieSBk ZWNsYXJpbmcgYmFzaWMgY2xvY2sgcHJlZml4IG5hbWUgcmF0aGVyIHRoYW4gY2xrX2lkLg0KICAq IEBjYXBzOiBUaGUgZmxhZyBmb3IgYWN0aXZlIHdha2UtdXAgYWN0aW9uLg0KICAqLw0KIHN0cnVj dCBzY3BfZG9tYWluX2RhdGEgew0KQEAgLTEyNyw2ICsxMjksNyBAQCBzdHJ1Y3Qgc2NwX2RvbWFp bl9kYXRhIHsNCiAJdTMyIHNyYW1fcGRuX2Fja19iaXRzOw0KIAl1MzIgYnVzX3Byb3RfbWFzazsN CiAJZW51bSBjbGtfaWQgY2xrX2lkW01BWF9DTEtTXTsNCisJY29uc3QgY2hhciAqYmFzaWNfY2xr X25hbWVbTUFYX0NMS1NdOw0KIAl1OCBjYXBzOw0KIH07DQogDQpAQCAtNDkzLDE2ICs0OTYsMjYg QEAgc3RhdGljIHN0cnVjdCBzY3AgKmluaXRfc2NwKHN0cnVjdCBwbGF0Zm9ybV9kZXZpY2UgKnBk ZXYsDQogDQogCQlzY3BkLT5kYXRhID0gZGF0YTsNCiANCi0JCWZvciAoaiA9IDA7IGogPCBNQVhf Q0xLUyAmJiBkYXRhLT5jbGtfaWRbal07IGorKykgew0KLQkJCXN0cnVjdCBjbGsgKmMgPSBjbGtb ZGF0YS0+Y2xrX2lkW2pdXTsNCisJCWlmIChkYXRhLT5jbGtfaWRbMF0pIHsNCisJCQlXQVJOX09O KGRhdGEtPmJhc2ljX2Nsa19uYW1lWzBdKTsNCiANCi0JCQlpZiAoSVNfRVJSKGMpKSB7DQotCQkJ CWRldl9lcnIoJnBkZXYtPmRldiwgIiVzOiBjbGsgdW5hdmFpbGFibGVcbiIsDQotCQkJCQlkYXRh LT5uYW1lKTsNCi0JCQkJcmV0dXJuIEVSUl9DQVNUKGMpOw0KLQkJCX0NCisJCQlmb3IgKGogPSAw OyBqIDwgTUFYX0NMS1MgJiYgZGF0YS0+Y2xrX2lkW2pdOyBqKyspIHsNCisJCQkJc3RydWN0IGNs ayAqYyA9IGNsa1tkYXRhLT5jbGtfaWRbal1dOw0KKw0KKwkJCQlpZiAoSVNfRVJSKGMpKSB7DQor CQkJCQlkZXZfZXJyKCZwZGV2LT5kZXYsDQorCQkJCQkJIiVzOiBjbGsgdW5hdmFpbGFibGVcbiIs DQorCQkJCQkJZGF0YS0+bmFtZSk7DQorCQkJCQlyZXR1cm4gRVJSX0NBU1QoYyk7DQorCQkJCX0N CiANCi0JCQlzY3BkLT5jbGtbal0gPSBjOw0KKwkJCQlzY3BkLT5jbGtbal0gPSBjOw0KKwkJCX0N CisJCX0gZWxzZSBpZiAoZGF0YS0+YmFzaWNfY2xrX25hbWVbMF0pIHsNCisJCQlmb3IgKGogPSAw OyBqIDwgTUFYX0NMS1MgJiYNCisJCQkJCWRhdGEtPmJhc2ljX2Nsa19uYW1lW2pdOyBqKyspDQor CQkJCXNjcGQtPmNsa1tqXSA9IGRldm1fY2xrX2dldCgmcGRldi0+ZGV2LA0KKwkJCQkJCWRhdGEt PmJhc2ljX2Nsa19uYW1lW2pdKTsNCiAJCX0NCiANCiAJCWdlbnBkLT5uYW1lID0gZGF0YS0+bmFt ZTsNCi0tIA0KMS44LjEuMS5kaXJ0eQ0K From mboxrd@z Thu Jan 1 00:00:00 1970 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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY,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 3BFC3C43603 for ; Wed, 18 Dec 2019 08:42:40 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 016E921D7D for ; Wed, 18 Dec 2019 08:42:40 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="rwq+hbie"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="pKdmXfGO" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 016E921D7D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=mediatek.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=MkO2ij12+1BFsS6/Q84QTI8797zhISsbzLLqPCRyi9c=; b=rwq+hbie6EF0Aq 9dGp2Log6QFCFiBJctZ9hFMgl/Xsc0SDzhMc7BICX8SIaC3eLNh0mC22sKTYNL0MQAz0O1Ot/g2Sg qwylnmSKHXIJOiIHTYRY/1OvwP0FaURjq7QeSGrptfczMC3C1w4oGbhlH4q6POR2UzVcdjJsMhpre FpNAkQ9bsazbM7ZxjWk5ClCXAm03e2dKrmFnPbRmJkiqrxeRs4YkxE5lIDq3ob/YQo52YDSfNtJ2a j9PxWMSscIkv4Y1WRPxNp6ULXp7AtnJ3/ZvgW/AeOMqbcTP/MuOvqGZu7bPxF5t9HpoaFOX1uxSyo sTVf4mFe45rluDsQKt6w==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1ihUul-0005XP-9M; Wed, 18 Dec 2019 08:42:39 +0000 Received: from mailgw02.mediatek.com ([216.200.240.185]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1ihUtH-0004DR-0c; Wed, 18 Dec 2019 08:41:09 +0000 X-UUID: 8a18763a8f2c4e7a9abf8b000a315fd1-20191218 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=L0E1r9L0K/BbvQN8uwQYPArtgYpiqPSnwzJeOXZJ3ZI=; b=pKdmXfGOdWz/Mfc3iGi22PdULqHIz2Kt9u8CvjCC3ZQmdBleKHVpL2X4/ytXUDUFu2OIB5QF9kKIR3TfXsWZKt089m1x0OnxHDQSVjfu3vd0sMltD1dnsKNnkVRcx2vZNmNCucu6qVxgTvrjM5K+/Lv1EwezFY+M1kBcjyhbcL8=; X-UUID: 8a18763a8f2c4e7a9abf8b000a315fd1-20191218 Received: from mtkcas66.mediatek.inc [(172.29.193.44)] by mailgw02.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLS) with ESMTP id 1337698632; Wed, 18 Dec 2019 00:41:00 -0800 Received: from MTKMBS02N1.mediatek.inc (172.21.101.77) by MTKMBS62N1.mediatek.inc (172.29.193.41) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Wed, 18 Dec 2019 00:31:19 -0800 Received: from mtkcas07.mediatek.inc (172.21.101.84) by mtkmbs02n1.mediatek.inc (172.21.101.77) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Wed, 18 Dec 2019 16:30:25 +0800 Received: from mtksdccf07.mediatek.inc (172.21.84.99) by mtkcas07.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1395.4 via Frontend Transport; Wed, 18 Dec 2019 16:30:29 +0800 From: Weiyi Lu To: Nicolas Boichat , Matthias Brugger , Rob Herring , Sascha Hauer Subject: [PATCH v10 03/12] soc: mediatek: Add basic_clk_name to scp_power_data Date: Wed, 18 Dec 2019 16:30:39 +0800 Message-ID: <1576657848-14711-4-git-send-email-weiyi.lu@mediatek.com> X-Mailer: git-send-email 1.8.1.1.dirty In-Reply-To: <1576657848-14711-1-git-send-email-weiyi.lu@mediatek.com> References: <1576657848-14711-1-git-send-email-weiyi.lu@mediatek.com> MIME-Version: 1.0 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191218_004107_098129_E88B0B17 X-CRM114-Status: GOOD ( 11.20 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: James Liao , Weiyi Lu , srv_heupstream@mediatek.com, linux-kernel@vger.kernel.org, Fan Chen , linux-mediatek@lists.infradead.org, linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org Try to stop extending the clk_id or clk_names if there are more and more new BASIC clocks. To get its own clocks by the basic_clk_name of each power domain. Signed-off-by: Weiyi Lu --- drivers/soc/mediatek/mtk-scpsys.c | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/drivers/soc/mediatek/mtk-scpsys.c b/drivers/soc/mediatek/mtk-scpsys.c index f669d37..9343277 100644 --- a/drivers/soc/mediatek/mtk-scpsys.c +++ b/drivers/soc/mediatek/mtk-scpsys.c @@ -117,6 +117,8 @@ enum clk_id { * @sram_pdn_ack_bits: The mask for sram power control acked bits. * @bus_prot_mask: The mask for single step bus protection. * @clk_id: The basic clocks required by this power domain. + * @basic_clk_name: provide the same purpose with field "clk_id" + * by declaring basic clock prefix name rather than clk_id. * @caps: The flag for active wake-up action. */ struct scp_domain_data { @@ -127,6 +129,7 @@ struct scp_domain_data { u32 sram_pdn_ack_bits; u32 bus_prot_mask; enum clk_id clk_id[MAX_CLKS]; + const char *basic_clk_name[MAX_CLKS]; u8 caps; }; @@ -493,16 +496,26 @@ static struct scp *init_scp(struct platform_device *pdev, scpd->data = data; - for (j = 0; j < MAX_CLKS && data->clk_id[j]; j++) { - struct clk *c = clk[data->clk_id[j]]; + if (data->clk_id[0]) { + WARN_ON(data->basic_clk_name[0]); - if (IS_ERR(c)) { - dev_err(&pdev->dev, "%s: clk unavailable\n", - data->name); - return ERR_CAST(c); - } + for (j = 0; j < MAX_CLKS && data->clk_id[j]; j++) { + struct clk *c = clk[data->clk_id[j]]; + + if (IS_ERR(c)) { + dev_err(&pdev->dev, + "%s: clk unavailable\n", + data->name); + return ERR_CAST(c); + } - scpd->clk[j] = c; + scpd->clk[j] = c; + } + } else if (data->basic_clk_name[0]) { + for (j = 0; j < MAX_CLKS && + data->basic_clk_name[j]; j++) + scpd->clk[j] = devm_clk_get(&pdev->dev, + data->basic_clk_name[j]); } genpd->name = data->name; -- 1.8.1.1.dirty _______________________________________________ Linux-mediatek mailing list Linux-mediatek@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-mediatek From mboxrd@z Thu Jan 1 00:00:00 1970 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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY,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 715F7C43603 for ; Wed, 18 Dec 2019 08:42:49 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3F66921D7D for ; Wed, 18 Dec 2019 08:42:49 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="M6Z49jrP"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="pKdmXfGO" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3F66921D7D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=mediatek.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=4EbDSrWAonjuhHZvPTmb3DXYMnNAQb8hGzerlkW0OJA=; b=M6Z49jrP8ydZVs Jb1BG91sv4nY2IrbdgSuZ8sahhgbtN+o4bq6kSnA5WcSqvaRQPvCLrcYwMubLE8NSvPjTto+i0ks9 IiDaF0kUbgc8+XGyX+TYoLRQeQnu9gY8E4nq0dX6b+1PokmlIcHgfoLRr/vb9V69eAZ96TrNrQLtL RG9+H/R3BPrcnAHu2QMBqb02WGRHRZhZkPstBeMIU6bBDal00bDKAg6aGGqR4qiOvNSfnRi5gfdqk M5U8EbKEmybmVOMpoU1YHotTviAH0KdkBINZxwLL4h7hH7hkmEik8waKQga6dyimCELDxW+EmY2Ac M4HI7z2nSWwtXx4NLrtg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1ihUuu-0005eC-EB; Wed, 18 Dec 2019 08:42:48 +0000 Received: from mailgw02.mediatek.com ([216.200.240.185]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1ihUtH-0004DR-0c; Wed, 18 Dec 2019 08:41:09 +0000 X-UUID: 8a18763a8f2c4e7a9abf8b000a315fd1-20191218 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=L0E1r9L0K/BbvQN8uwQYPArtgYpiqPSnwzJeOXZJ3ZI=; b=pKdmXfGOdWz/Mfc3iGi22PdULqHIz2Kt9u8CvjCC3ZQmdBleKHVpL2X4/ytXUDUFu2OIB5QF9kKIR3TfXsWZKt089m1x0OnxHDQSVjfu3vd0sMltD1dnsKNnkVRcx2vZNmNCucu6qVxgTvrjM5K+/Lv1EwezFY+M1kBcjyhbcL8=; X-UUID: 8a18763a8f2c4e7a9abf8b000a315fd1-20191218 Received: from mtkcas66.mediatek.inc [(172.29.193.44)] by mailgw02.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLS) with ESMTP id 1337698632; Wed, 18 Dec 2019 00:41:00 -0800 Received: from MTKMBS02N1.mediatek.inc (172.21.101.77) by MTKMBS62N1.mediatek.inc (172.29.193.41) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Wed, 18 Dec 2019 00:31:19 -0800 Received: from mtkcas07.mediatek.inc (172.21.101.84) by mtkmbs02n1.mediatek.inc (172.21.101.77) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Wed, 18 Dec 2019 16:30:25 +0800 Received: from mtksdccf07.mediatek.inc (172.21.84.99) by mtkcas07.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1395.4 via Frontend Transport; Wed, 18 Dec 2019 16:30:29 +0800 From: Weiyi Lu To: Nicolas Boichat , Matthias Brugger , Rob Herring , Sascha Hauer Subject: [PATCH v10 03/12] soc: mediatek: Add basic_clk_name to scp_power_data Date: Wed, 18 Dec 2019 16:30:39 +0800 Message-ID: <1576657848-14711-4-git-send-email-weiyi.lu@mediatek.com> X-Mailer: git-send-email 1.8.1.1.dirty In-Reply-To: <1576657848-14711-1-git-send-email-weiyi.lu@mediatek.com> References: <1576657848-14711-1-git-send-email-weiyi.lu@mediatek.com> MIME-Version: 1.0 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191218_004107_098129_E88B0B17 X-CRM114-Status: GOOD ( 11.20 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: James Liao , Weiyi Lu , srv_heupstream@mediatek.com, linux-kernel@vger.kernel.org, Fan Chen , linux-mediatek@lists.infradead.org, linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org Try to stop extending the clk_id or clk_names if there are more and more new BASIC clocks. To get its own clocks by the basic_clk_name of each power domain. Signed-off-by: Weiyi Lu --- drivers/soc/mediatek/mtk-scpsys.c | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/drivers/soc/mediatek/mtk-scpsys.c b/drivers/soc/mediatek/mtk-scpsys.c index f669d37..9343277 100644 --- a/drivers/soc/mediatek/mtk-scpsys.c +++ b/drivers/soc/mediatek/mtk-scpsys.c @@ -117,6 +117,8 @@ enum clk_id { * @sram_pdn_ack_bits: The mask for sram power control acked bits. * @bus_prot_mask: The mask for single step bus protection. * @clk_id: The basic clocks required by this power domain. + * @basic_clk_name: provide the same purpose with field "clk_id" + * by declaring basic clock prefix name rather than clk_id. * @caps: The flag for active wake-up action. */ struct scp_domain_data { @@ -127,6 +129,7 @@ struct scp_domain_data { u32 sram_pdn_ack_bits; u32 bus_prot_mask; enum clk_id clk_id[MAX_CLKS]; + const char *basic_clk_name[MAX_CLKS]; u8 caps; }; @@ -493,16 +496,26 @@ static struct scp *init_scp(struct platform_device *pdev, scpd->data = data; - for (j = 0; j < MAX_CLKS && data->clk_id[j]; j++) { - struct clk *c = clk[data->clk_id[j]]; + if (data->clk_id[0]) { + WARN_ON(data->basic_clk_name[0]); - if (IS_ERR(c)) { - dev_err(&pdev->dev, "%s: clk unavailable\n", - data->name); - return ERR_CAST(c); - } + for (j = 0; j < MAX_CLKS && data->clk_id[j]; j++) { + struct clk *c = clk[data->clk_id[j]]; + + if (IS_ERR(c)) { + dev_err(&pdev->dev, + "%s: clk unavailable\n", + data->name); + return ERR_CAST(c); + } - scpd->clk[j] = c; + scpd->clk[j] = c; + } + } else if (data->basic_clk_name[0]) { + for (j = 0; j < MAX_CLKS && + data->basic_clk_name[j]; j++) + scpd->clk[j] = devm_clk_get(&pdev->dev, + data->basic_clk_name[j]); } genpd->name = data->name; -- 1.8.1.1.dirty _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel