From patchwork Sun May 14 19:59:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 9725901 X-Patchwork-Delegate: sboyd@codeaurora.org Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 14EAC601E7 for ; Sun, 14 May 2017 19:59:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 05F3D28469 for ; Sun, 14 May 2017 19:59:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id ED06D28906; Sun, 14 May 2017 19:59:20 +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=-6.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID 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 7BC1A28469 for ; Sun, 14 May 2017 19:59:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759856AbdENT7U (ORCPT ); Sun, 14 May 2017 15:59:20 -0400 Received: from mail-qt0-f195.google.com ([209.85.216.195]:34880 "EHLO mail-qt0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759853AbdENT7P (ORCPT ); Sun, 14 May 2017 15:59:15 -0400 Received: by mail-qt0-f195.google.com with SMTP id r58so13049371qtb.2 for ; Sun, 14 May 2017 12:59:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=ngqsfTs/IC+gruPxuxEQ9Rxqw8tDwpxIswBy7Ws2HZo=; b=Iv5/12qdnRwMIkwro+bFgNbSIvrgTmTpK5d64y2hre/0SHqNMHIEXnGOvxW9QfZA5U 7rBln57wsPzcJVMXB9PM+aoItNlo1GwbGNJF5sb3WuQ9e3/94VqB7iInPctbzByVsy1M oYVkAo+J05QPETDXEWcxydOigRL0IHrh95N5C2F5kwPS+MDRAUXdpzrpKO6h4YNGdzAP DYBk5ZkEi2g2mIpzjJfxpp8PVFhKxoJAX51gVLwULZvArJlcLRhyP292jGrCuTRsNTY8 VKq0CgmfIW0fvwXDoCThC1jVLS69lbSTrYC08/gX6HdNu4RRGTiTzIGOJ1dx3S4lOZo4 TB3w== 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; bh=ngqsfTs/IC+gruPxuxEQ9Rxqw8tDwpxIswBy7Ws2HZo=; b=m7Bn2pmgnYBrQuhWqXxIEcXPx7+NuREdakFwiJHHBjuU/DI/Ow/v49JEyDYQCZyBSN Piw58Lgc6gYaNVYrb8xuIYsnm9SDFGT63R0sGvEPlig2x19HEIn2fhyNRbnVd02TkCJm Z78XsckmWP3qNVUYvPmN01fFHW/0yzHhVwic0hh19X3kWsC2aZ127hrE6hTsYVeQWqth Nh+WLp1JUkWbqqzD1c6VG+SJ8XhKJOg9rAVaZxvfP0yaXzxkm161BlrLCExa0GH4LzQg S87up6CuJC10SnVovw2nmgfsJk69H67JKkYtVwO1gWKVYVRAcX9wcgWHveSN8yaO7IZi PQJw== X-Gm-Message-State: AODbwcDsTp/e4WaHfLmF280o2SgkJBixncRMWtspVj77OFgxGxW/8yyq 5+Lu/poFoUw0qw== X-Received: by 10.200.45.187 with SMTP id p56mr2483350qta.208.1494791954925; Sun, 14 May 2017 12:59:14 -0700 (PDT) Received: from localhost.localdomain ([187.180.181.187]) by smtp.gmail.com with ESMTPSA id t35sm6894918qta.62.2017.05.14.12.59.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 14 May 2017 12:59:14 -0700 (PDT) From: Fabio Estevam To: sboyd@codeaurora.org Cc: shawnguo@kernel.org, kernel@pengutronix.de, linux-clk@vger.kernel.org, stefan@agner.ch, Fabio Estevam Subject: [PATCH] clk: imx7d: Fix the powerdown bit location of PLL DDR Date: Sun, 14 May 2017 16:59:00 -0300 Message-Id: <1494791940-12499-1-git-send-email-festevam@gmail.com> X-Mailer: git-send-email 2.7.4 Sender: linux-clk-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-clk@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Fabio Estevam According to the MX7D Reference Manual the powerdown bit of CCM_ANALOG_PLL_DDRn register is bit 20, so fix it accordingly. Signed-off-by: Fabio Estevam Reviewed-by: Stefan Agner --- drivers/clk/imx/clk-imx7d.c | 2 +- drivers/clk/imx/clk-pllv3.c | 5 +++++ drivers/clk/imx/clk.h | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/clk/imx/clk-imx7d.c b/drivers/clk/imx/clk-imx7d.c index 93b0364..8fa1841 100644 --- a/drivers/clk/imx/clk-imx7d.c +++ b/drivers/clk/imx/clk-imx7d.c @@ -424,7 +424,7 @@ static void __init imx7d_clocks_init(struct device_node *ccm_node) clks[IMX7D_PLL_VIDEO_MAIN_SRC] = imx_clk_mux("pll_video_main_src", base + 0x130, 14, 2, pll_bypass_src_sel, ARRAY_SIZE(pll_bypass_src_sel)); clks[IMX7D_PLL_ARM_MAIN] = imx_clk_pllv3(IMX_PLLV3_SYS, "pll_arm_main", "osc", base + 0x60, 0x7f); - clks[IMX7D_PLL_DRAM_MAIN] = imx_clk_pllv3(IMX_PLLV3_AV, "pll_dram_main", "osc", base + 0x70, 0x7f); + clks[IMX7D_PLL_DRAM_MAIN] = imx_clk_pllv3(IMX_PLLV3_DDR_IMX7, "pll_dram_main", "osc", base + 0x70, 0x7f); clks[IMX7D_PLL_SYS_MAIN] = imx_clk_pllv3(IMX_PLLV3_GENERIC, "pll_sys_main", "osc", base + 0xb0, 0x1); clks[IMX7D_PLL_ENET_MAIN] = imx_clk_pllv3(IMX_PLLV3_ENET_IMX7, "pll_enet_main", "osc", base + 0xe0, 0x0); clks[IMX7D_PLL_AUDIO_MAIN] = imx_clk_pllv3(IMX_PLLV3_AV, "pll_audio_main", "osc", base + 0xf0, 0x7f); diff --git a/drivers/clk/imx/clk-pllv3.c b/drivers/clk/imx/clk-pllv3.c index f109916..fec64b6 100644 --- a/drivers/clk/imx/clk-pllv3.c +++ b/drivers/clk/imx/clk-pllv3.c @@ -25,6 +25,7 @@ #define PLL_VF610_DENOM_OFFSET 0x30 #define BM_PLL_POWER (0x1 << 12) +#define BM_PLL_POWER_IMX7 (0x1 << 20) #define BM_PLL_LOCK (0x1 << 31) #define IMX7_ENET_PLL_POWER (0x1 << 5) @@ -451,6 +452,10 @@ struct clk *imx_clk_pllv3(enum imx_pllv3_type type, const char *name, pll->ref_clock = 500000000; ops = &clk_pllv3_enet_ops; break; + case IMX_PLLV3_DDR_IMX7: + ops = &clk_pllv3_av_ops; + pll->power_bit = BM_PLL_POWER_IMX7; + break; default: ops = &clk_pllv3_ops; } diff --git a/drivers/clk/imx/clk.h b/drivers/clk/imx/clk.h index e1f5e42..d54f072 100644 --- a/drivers/clk/imx/clk.h +++ b/drivers/clk/imx/clk.h @@ -35,6 +35,7 @@ enum imx_pllv3_type { IMX_PLLV3_ENET, IMX_PLLV3_ENET_IMX7, IMX_PLLV3_SYS_VF610, + IMX_PLLV3_DDR_IMX7, }; struct clk *imx_clk_pllv3(enum imx_pllv3_type type, const char *name,