From patchwork Sun Mar 24 15:11:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Blumenstingl X-Patchwork-Id: 10867457 X-Patchwork-Delegate: neil.armstrong@linaro.org 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 4E1B01669 for ; Sun, 24 Mar 2019 15:11:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 372E92910B for ; Sun, 24 Mar 2019 15:11:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2ADAA292F4; Sun, 24 Mar 2019 15:11:47 +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=-5.2 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 9A7EA2910B for ; Sun, 24 Mar 2019 15:11:46 +0000 (UTC) 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=9Q0E3Uq5UpCirx0BSKfSVK8hNrDDACOaSY/Y8mKZQSI=; b=penxmZIgGEAs0E SpNcjkwFDJR0PenIuLr1BYNs8X8ZRZYAr0tGOaqrVfeXjE6ahgyuerPIaPlFP3jScnghBsosavVmW wOgHgrsha+7jqdI3id2AKbLdTabVPUP4Qoht7SnOL1+qA7bQvpZW53KQD/S7un/RNbzQ+2SdvQVqp B4LhrIQ82mS9GKfzUOhib6zu5OdylMNP548qLG/4wCDCyF1ccjsP+aRFtR04SjUEYtYj6OIKVDVoh esGhBfqdjgzuBCihgTiYWL+gfjoD04DXeBAUI7UQNd1kKeRuuW4yF2oH+qq2U0zyfaV94GHwJ3z83 A64ZAtCOYdZaiXoiItQA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1h84mn-00039v-CT; Sun, 24 Mar 2019 15:11:45 +0000 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1h84mi-00037l-Ht; Sun, 24 Mar 2019 15:11:44 +0000 Received: by mail-wm1-x342.google.com with SMTP id a184so6400979wma.2; Sun, 24 Mar 2019 08:11:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=vomKsk1OS7A0VQq9nJvd2dYJLMcTA82WAv8bCNnSFlg=; b=eEFLWcKsl05N7+VlQdko/vBjiBdVrHGf9kwzEd21YWRZ0ixHdkIBLqmwkLZlxt4bf6 s7eFkgJo1niS3EQalRIn+K8lwtfIxjUvun2sPtKvacWq5Zu4iL7YBk6kzLg2pCU0NxkQ qu9w9i3EX+y2+bsXgFFhrJNHzA0QrMTWdZNj9WWfn7EV76sCREmWHytVl+W35VNCJJFQ e/QnY2mJL4K6wwsyMwhJlqT6wk6C3Hi5rNp+Smjzo3istVX39u+jzYVpf7GbOY5eFXWC BGjL803y+aZrmfhYb11OoUrs/2m1OrPuhhr0hFFPBDExdSBXd12zl0DafTJM4TnNl49n TyEw== 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=vomKsk1OS7A0VQq9nJvd2dYJLMcTA82WAv8bCNnSFlg=; b=Ww6CxpI4dT1golYE585XFqKF+tYlsKP89uKEZzkv6/BvJkrzNewg5NvWwso8ZYxy3S KOImuDc4bJvGLJT0HmpF1PW2tOxkfqfWB3nRN6K+Qr3hA+yXD1kC+ODYmkRtQOfhZxmq IKNqZOME0T7XBZv+KzbGicTZJwd5rvf/rnexU7+lkOfeuXWtC2m368wr0xnqXIXGcnFK FnHg6o7J/zK3Nqhpu0P3IRIm7HzLR7UaM68NLYibh3vbBZ18ZvMp1n/DetTysgujh0vp eQYmh4ytn6WPEAuZeYPMxSyx/AXQ8Qa0BaS9TWTr6lfg7m6CLYwkVB+8f4fScV6s6yxV Cxvw== X-Gm-Message-State: APjAAAWH/AVGHbF7eVJCYXz2ozLGCDkyJm8dWhskCKlTPWlFyfwtpys3 /x7UBHVVxWu+tswGpn5xUaY= X-Google-Smtp-Source: APXvYqwqr3meWONkkJowfTWsjPUlWlfAFL6LVyBXzt8Ou5EdMVhmx/Y+ScQHXRDhNMquzeFX3x4w+Q== X-Received: by 2002:a1c:4e19:: with SMTP id g25mr9360682wmh.9.1553440296742; Sun, 24 Mar 2019 08:11:36 -0700 (PDT) Received: from blackbox.darklights.net (p200300DCD7399900428D5CFFFEB99DB8.dip0.t-ipconnect.de. [2003:dc:d739:9900:428d:5cff:feb9:9db8]) by smtp.googlemail.com with ESMTPSA id 66sm13697730wmd.3.2019.03.24.08.11.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 24 Mar 2019 08:11:36 -0700 (PDT) From: Martin Blumenstingl To: narmstrong@baylibre.com, jbrunet@baylibre.com, linux-amlogic@lists.infradead.org Subject: [PATCH v2 3/4] clk: meson: meson8b: add support for the GP_PLL clock on Meson8m2 Date: Sun, 24 Mar 2019 16:11:03 +0100 Message-Id: <20190324151104.18397-4-martin.blumenstingl@googlemail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190324151104.18397-1-martin.blumenstingl@googlemail.com> References: <20190324151104.18397-1-martin.blumenstingl@googlemail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190324_081140_650922_7F970F48 X-CRM114-Status: GOOD ( 14.53 ) X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Martin Blumenstingl , devicetree@vger.kernel.org, linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+patchwork-linux-amlogic=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Meson8m2 has a GP_PLL clock (similar to GP0_PLL on GXBB/GXL/GXM) which is used as input for the VPU clocks. The only supported frequency (based on Amlogic's vendor kernel sources) is 364MHz which is achieved using the following parameters: - input: XTAL (24MHz) - M = 182 - N = 3 - OD = 2 ^ 2 Signed-off-by: Martin Blumenstingl Reviewed-by: Neil Armstrong --- drivers/clk/meson/meson8b.c | 62 +++++++++++++++++++++++++++++++++++++ drivers/clk/meson/meson8b.h | 5 ++- 2 files changed, 66 insertions(+), 1 deletion(-) diff --git a/drivers/clk/meson/meson8b.c b/drivers/clk/meson/meson8b.c index c9e6ec67d649..0d08f1ef7af8 100644 --- a/drivers/clk/meson/meson8b.c +++ b/drivers/clk/meson/meson8b.c @@ -1703,6 +1703,64 @@ static struct clk_regmap meson8b_mali = { }, }; +static const struct pll_params_table meson8m2_gp_pll_params_table[] = { + PLL_PARAMS(182, 3), + { /* sentinel */ }, +}; + +static struct clk_regmap meson8m2_gp_pll_dco = { + .data = &(struct meson_clk_pll_data){ + .en = { + .reg_off = HHI_GP_PLL_CNTL, + .shift = 30, + .width = 1, + }, + .m = { + .reg_off = HHI_GP_PLL_CNTL, + .shift = 0, + .width = 9, + }, + .n = { + .reg_off = HHI_GP_PLL_CNTL, + .shift = 9, + .width = 5, + }, + .l = { + .reg_off = HHI_GP_PLL_CNTL, + .shift = 31, + .width = 1, + }, + .rst = { + .reg_off = HHI_GP_PLL_CNTL, + .shift = 29, + .width = 1, + }, + .table = meson8m2_gp_pll_params_table, + }, + .hw.init = &(struct clk_init_data){ + .name = "gp_pll_dco", + .ops = &meson_clk_pll_ops, + .parent_names = (const char *[]){ "xtal" }, + .num_parents = 1, + }, +}; + +static struct clk_regmap meson8m2_gp_pll = { + .data = &(struct clk_regmap_div_data){ + .offset = HHI_GP_PLL_CNTL, + .shift = 16, + .width = 2, + .flags = CLK_DIVIDER_POWER_OF_TWO, + }, + .hw.init = &(struct clk_init_data){ + .name = "gp_pll", + .ops = &clk_regmap_divider_ops, + .parent_names = (const char *[]){ "gp_pll_dco" }, + .num_parents = 1, + .flags = CLK_SET_RATE_PARENT, + }, +}; + /* Everything Else (EE) domain gates */ static MESON_GATE(meson8b_ddr, HHI_GCLK_MPEG0, 0); @@ -2338,6 +2396,8 @@ static struct clk_hw_onecell_data meson8m2_hw_onecell_data = { [CLKID_MALI_1_DIV] = &meson8b_mali_1_div.hw, [CLKID_MALI_1] = &meson8b_mali_1.hw, [CLKID_MALI] = &meson8b_mali.hw, + [CLKID_GP_PLL_DCO] = &meson8m2_gp_pll_dco.hw, + [CLKID_GP_PLL] = &meson8m2_gp_pll.hw, [CLK_NR_CLKS] = NULL, }, .num = CLK_NR_CLKS, @@ -2500,6 +2560,8 @@ static struct clk_regmap *const meson8b_clk_regmaps[] = { &meson8b_mali_1_div, &meson8b_mali_1, &meson8b_mali, + &meson8m2_gp_pll_dco, + &meson8m2_gp_pll, }; static const struct meson8b_clk_reset_line { diff --git a/drivers/clk/meson/meson8b.h b/drivers/clk/meson/meson8b.h index b8c58faeae52..a45f7102c558 100644 --- a/drivers/clk/meson/meson8b.h +++ b/drivers/clk/meson/meson8b.h @@ -19,6 +19,7 @@ * * [0] http://dn.odroid.com/S805/Datasheet/S805_Datasheet%20V0.8%2020150126.pdf */ +#define HHI_GP_PLL_CNTL 0x40 /* 0x10 offset in data sheet */ #define HHI_VIID_CLK_DIV 0x128 /* 0x4a offset in data sheet */ #define HHI_VIID_CLK_CNTL 0x12c /* 0x4b offset in data sheet */ #define HHI_GCLK_MPEG0 0x140 /* 0x50 offset in data sheet */ @@ -146,8 +147,10 @@ #define CLKID_MALI_1_SEL 178 #define CLKID_MALI_1_DIV 179 #define CLKID_MALI_1 180 +#define CLKID_GP_PLL_DCO 181 +#define CLKID_GP_PLL 182 -#define CLK_NR_CLKS 181 +#define CLK_NR_CLKS 183 /* * include the CLKID and RESETID that have