From patchwork Wed Nov 4 09:40:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Claudiu Beznea X-Patchwork-Id: 11880079 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=-12.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,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 40CD1C2D0A3 for ; Wed, 4 Nov 2020 09:42:38 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (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 A560820679 for ; Wed, 4 Nov 2020 09:42:37 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="clziJCkF"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=microchip.com header.i=@microchip.com header.b="IiyP6tIs" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A560820679 Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=microchip.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+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=merlin.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=M+E/T/w19Z1/kNxSb9ENWboGFfYfUjs7ljxO2T/+Pl4=; b=clziJCkFXNytJyT5ejgpvBRkI XmCdHSsw9nJ6GDtYlCN42HI+hXqtpfIa/BfFDXenH6aOF63QZsAaPgaOyT6pwa7HxgUe46R6Jc+2Z e2aR3FoJU4mu/B8rbODC6T5h7dLQ53CXFOgyRHbWZmupxTH5mMxxzE0iOFADBk50n3O3Y7IMbLcnw gjyahlgKEwM4xRJ2H2ZxusL9nQoc1ueZNd7SzHoQkUQsfrka00m1+bArghkvn2tUVUNN7DHVcA0Fl EtcoKu7/iyfwkJMtQHcWDV89qEOICa/LCkob9JfokDfrxkBDkY8dg9L4poDGmfFnlnctK5GUqDrmt RDA9Zy+AA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kaFI6-0002c6-08; Wed, 04 Nov 2020 09:41:18 +0000 Received: from esa1.microchip.iphmx.com ([68.232.147.91]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kaFHj-0002Tv-Uq for linux-arm-kernel@lists.infradead.org; Wed, 04 Nov 2020 09:40:58 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1604482855; x=1636018855; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=FTnpt332R5NLvCQFqroGbAzktlAA+XgpwzFNaC+ewTk=; b=IiyP6tIs8LRwLCmMxlGG5Se36xxX1S5fXDw+CW+AJU/itsztvX9mZujO pPPnCMEGgi71n5k//rm0hB5e6Wm3L6UvE2VDSw2sFvR1CADlWyL5ALzBW sS3SY0O07P5oAO90btjzWC2KWpOPRyZe0NWEzX0Lt0CWagr/K3quVdvKG IR5SePyrC98xRyBEukPEUoLg7K/13gXDBV1GFaDKuuWVbbbPS/MJ9ogBw m6PLQPlYOAM+eLfFWE9YywglksYa4bGjNjde8JrLU9gtmfo3cVkg6W7hX 47I1NrTj6J5TsO3yR9dlWQ6cgU36ieyeQhFO1a3EL2+Ylauhdx7rAJ59N Q==; IronPort-SDR: 4WsZQFbql3yw6035MST7ldq15zB5TODG0I/nSHQPw+SmShSTfETls8hiqR0L2/NlHZVpAA6nH1 bqpU8OmdW1XvmbZqkbPLiHQwQzFPKZEXSuKdX/GpVzXETRd6mbydl59o+OLUkmaJleCVKwXBOQ QrIJRNA0OevkZX9hm15FaW4TTB6zhdaM+AtkeiS8TIzNUkEWqAXbhFYPx/OsFeo1+HZ3Me3EmA B8Yry4tc3my6f90pYImXut9XAtcKmWOZVe+srIZqjchwyKj8eLeu1fpmt/ie+PasgCWqGVWWBp 1hE= X-IronPort-AV: E=Sophos;i="5.77,450,1596524400"; d="scan'208";a="102141446" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa1.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 04 Nov 2020 02:40:54 -0700 Received: from chn-vm-ex02.mchp-main.com (10.10.85.144) by chn-vm-ex01.mchp-main.com (10.10.85.143) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1979.3; Wed, 4 Nov 2020 02:40:54 -0700 Received: from m18063-ThinkPad-T460p.microchip.com (10.10.115.15) by chn-vm-ex02.mchp-main.com (10.10.85.144) with Microsoft SMTP Server id 15.1.1979.3 via Frontend Transport; Wed, 4 Nov 2020 02:40:49 -0700 From: Claudiu Beznea To: , , , , , Subject: [PATCH 8/8] clk: at91: sama7g5: register cpu clock Date: Wed, 4 Nov 2020 11:40:02 +0200 Message-ID: <1604482802-1647-9-git-send-email-claudiu.beznea@microchip.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1604482802-1647-1-git-send-email-claudiu.beznea@microchip.com> References: <1604482802-1647-1-git-send-email-claudiu.beznea@microchip.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201104_044056_264912_F14F3930 X-CRM114-Status: GOOD ( 13.54 ) 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: devicetree@vger.kernel.org, Claudiu Beznea , linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Register CPU clock as being the master clock prescaler. This would be used by DVFS. The block diagram of SAMA7G5's PMC contains also a divider between master clock prescaler and CPU (PMC_CPU_RATIO.RATIO) but the frequencies supported by SAMA7G5 could be directly received from CPUPLL + master clock prescaler and the extra divider would do no work in case it would be enabled. Signed-off-by: Claudiu Beznea --- drivers/clk/at91/sama7g5.c | 13 ++++++------- include/dt-bindings/clock/at91.h | 1 + 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/clk/at91/sama7g5.c b/drivers/clk/at91/sama7g5.c index d38766c6fc8c..b712dd273a0b 100644 --- a/drivers/clk/at91/sama7g5.c +++ b/drivers/clk/at91/sama7g5.c @@ -852,7 +852,7 @@ static void __init sama7g5_pmc_setup(struct device_node *np) if (IS_ERR(regmap)) return; - sama7g5_pmc = pmc_data_allocate(PMC_ETHPLL + 1, + sama7g5_pmc = pmc_data_allocate(PMC_CPU + 1, nck(sama7g5_systemck), nck(sama7g5_periphck), nck(sama7g5_gck), 8); @@ -929,18 +929,17 @@ static void __init sama7g5_pmc_setup(struct device_node *np) } } - parent_names[0] = md_slck_name; - parent_names[1] = "mainck"; - parent_names[2] = "cpupll_divpmcck"; - parent_names[3] = "syspll_divpmcck"; - hw = at91_clk_register_master_pres(regmap, "mck0_pres", 4, parent_names, + parent_names[0] = "cpupll_divpmcck"; + hw = at91_clk_register_master_pres(regmap, "cpuck", 1, parent_names, &mck0_layout, &mck0_characteristics, &pmc_mck0_lock, CLK_SET_RATE_PARENT, 0); if (IS_ERR(hw)) goto err_free; - hw = at91_clk_register_master_div(regmap, "mck0_div", "mck0_pres", + sama7g5_pmc->chws[PMC_CPU] = hw; + + hw = at91_clk_register_master_div(regmap, "mck0", "cpuck", &mck0_layout, &mck0_characteristics, &pmc_mck0_lock, 0); if (IS_ERR(hw)) diff --git a/include/dt-bindings/clock/at91.h b/include/dt-bindings/clock/at91.h index fab313f62e8f..98e1b2ab6403 100644 --- a/include/dt-bindings/clock/at91.h +++ b/include/dt-bindings/clock/at91.h @@ -34,6 +34,7 @@ #define PMC_AUDIOPMCPLL (PMC_MAIN + 6) #define PMC_AUDIOIOPLL (PMC_MAIN + 7) #define PMC_ETHPLL (PMC_MAIN + 8) +#define PMC_CPU (PMC_MAIN + 9) #ifndef AT91_PMC_MOSCS #define AT91_PMC_MOSCS 0 /* MOSCS Flag */