From patchwork Fri Mar 11 12:01:10 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Caesar Wang X-Patchwork-Id: 8565151 Return-Path: X-Original-To: patchwork-linux-rockchip@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 1789AC0553 for ; Fri, 11 Mar 2016 12:01:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DBCD420154 for ; Fri, 11 Mar 2016 12:01:57 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7D06220259 for ; Fri, 11 Mar 2016 12:01:55 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1aeLlQ-0005hz-Kq; Fri, 11 Mar 2016 12:01:52 +0000 Received: from mail-pa0-x242.google.com ([2607:f8b0:400e:c03::242]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1aeLlF-0005a2-IF; Fri, 11 Mar 2016 12:01:45 +0000 Received: by mail-pa0-x242.google.com with SMTP id 1so8167947pal.3; Fri, 11 Mar 2016 04:01:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=subject:to:references:cc:from:message-id:date:user-agent :mime-version:in-reply-to:content-transfer-encoding; bh=l+iA0L1fJK64v2W79m3sEdiFtaZt/bgndrKOsnhsoSk=; b=FDiU9D8yMlNi8reHZPKuV4Bgda2BxhEn+PKAQupCKDyuyfxFUed+w5KMKN1AJ0I3ix SWub8AgaYvyJeTMgzKZ0WqVaQZYLw9i5LdpJLDiDJXGPGhUIM/2VPz6bb6KXFzeXVG2R Cvz7CTsEOX2SUyouWpA2tSCP9MtAe/OMjz0zNGSRORg1bPex7xJPVtsXhqTBzl7TUVaA IiLqcoqTb6EHBXq1OiRSq0s7dNcmdTguVlnU/+M+kMgAq47agOqZ8AT05Lwts1XBHWWV 1LrScvy+U/SYgQKHX2xuCQ/1v7Toz8UmUPq+d/JMlTzPiEc4+hpb9ecUlYRr1FKoDy8e e8Aw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:subject:to:references:cc:from:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=l+iA0L1fJK64v2W79m3sEdiFtaZt/bgndrKOsnhsoSk=; b=eKUIf8Ah/SCGkRzhkTo3NrNEtKwJFPLEIGCfEr7UyvIch8fFpRbfqA1UHSMCqjVoi6 +HYmIQ4SVjvDkcUq2NG7ZUwS5byR++c7iSGlhY+ffJ0ouE5Vm1ah/mg8xMSuDPRAetho PleukGZ3Pa+AgydT+4DZ94CrFQNm1NBv5O3CpeYxjuelGkXVVK+p3Cj3Gr8dPO2+yOwb ijbpQiMPrAC8g6RkFINTnLoPHQfDWOTop21p0wZEjZKqDZroDvLYciYpDDfBjH5IESRo XzhlJ2/unqFlOdCNOFvppdFqgppbgIegMJR2w+aszMQacU4i1ilLBOwfTL4qoygz00fk TknA== X-Gm-Message-State: AD7BkJJFwdvJBYTx/lIhKMSHHRJXk1PPli4FWHjYidX4GRlXeYIurMS6ZlU7gQ2jVTUtYQ== X-Received: by 10.66.63.104 with SMTP id f8mr14366179pas.109.1457697680594; Fri, 11 Mar 2016 04:01:20 -0800 (PST) Received: from [172.16.21.151] ([58.22.7.114]) by smtp.gmail.com with ESMTPSA id r88sm12561926pfi.9.2016.03.11.04.01.12 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 11 Mar 2016 04:01:19 -0800 (PST) Subject: Re: [PATCH 5/6] clk: rockchip: rk3036: fix and add node id for emac clock To: =?UTF-8?Q?Heiko_St=c3=bcbner?= References: <1457693731-6966-1-git-send-email-wxt@rock-chips.com> <1457693731-6966-6-git-send-email-wxt@rock-chips.com> <2005499.uduk6By3kM@diego> From: Caesar Wang Message-ID: <56E2B386.7060107@gmail.com> Date: Fri, 11 Mar 2016 20:01:10 +0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.4.0 MIME-Version: 1.0 In-Reply-To: <2005499.uduk6By3kM@diego> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160311_040141_662008_BF803303 X-CRM114-Status: GOOD ( 24.24 ) X-Spam-Score: -2.7 (--) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , devicetree@vger.kernel.org, Pawel Moll , zhengxing , Ian Campbell , Michael Turquette , keescook@google.com, Stephen Boyd , linux-kernel@vger.kernel.org, "David S. Miller" , linux-rockchip@lists.infradead.org, Rob Herring , leozwang@google.com, Kumar Gala , linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Caesar Wang Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Hi Heiko, The link [0] need a bit changes if we want the emac to be happy work. -RK2928_CLKSEL_CON(21), 0, 2, MFLAGS, 4, 5, DFLAGS), +RK2928_CLKSEL_CON(21), 0, 2, MFLAGS, 9, 5, DFLAGS), I will need resend the series patches with your change in link[0], OK? Since the Mr.rebot just notice the build error, I will check and resend with your emac changing. ? 2016?03?11? 19:15, Heiko Stübner ??: > Hi Caesar, > > Am Freitag, 11. März 2016, 18:55:30 schrieb Caesar Wang: >> From: zhengxing >> >> In the emac driver, we need to refer HCLK_MAC since there are >> only 3PLLs (APLL/GPLL/DPLL) on the rk3036, most clocks are under the >> GPLL, and it is unable to provide the accurate rate for mac_ref which >> need to 50MHz probability, we should let it under the DPLL and are >> able to set the freq which integer multiples of 50MHz, so we add these >> emac node for reference. >> >> Signed-off-by: Xing Zheng >> Signed-off-by: Caesar Wang > I think I mentioned it somewhere before, but I'd like to do this > differently, like in [0]. > > That should work in a similar way and at least in my tests the reported > clock rate seems to be correct. As I said as well I haven't been able to > make the emac detect a link on my kylin boards, so it would be cool > if you could test if this different approach works in practice as well. I fetch your branch patches, it doesn't work for me. c467a5f clk: rockchip: associate SCLK_MAC_PLL and disable reparenting on rk3036 ae7ed09 clk: rockchip: add clock-id for rk3036 emac pll source clock f876a7e clk: rockchip: associate the rk3036 HCLK_EMAC clock-id 5093371 clk: rockchip: add node-id for rk3036 emac hclk f44eeee Revert "clk: rockchip: rk3036: fix and add node id for emac clock" .. It works if the patch c467a5f clk: rockchip: associate SCLK_MAC_PLL and disable reparenting on rk3036 to change as following > > > Thanks > Heiko > > ------ 8< --------- > From e83a8b19dbf95c40d2c908727c342fbc6b167ea1 Mon Sep 17 00:00:00 2001 > From: Heiko Stuebner > Date: Fri, 19 Feb 2016 21:31:43 +0100 > Subject: [PATCH] clk: rockchip: associate SCLK_MAC_PLL and disable reparenting > on rk3036 > > The emac needs constant and very specific rate but the possible PLL-sources > are very limited, so we expect the PLL source to be set manually on per > board and don't want it to get changed in an automatic way later. > So add the necessary clock-id and disable reparenting on set_rate calls. > > Signed-off-by: Heiko Stuebner > --- > drivers/clk/rockchip/clk-rk3036.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/clk/rockchip/clk-rk3036.c b/drivers/clk/rockchip/clk-rk3036.c > index 3c742bf..0084c57 100644 > --- a/drivers/clk/rockchip/clk-rk3036.c > +++ b/drivers/clk/rockchip/clk-rk3036.c > @@ -348,7 +348,7 @@ static struct rockchip_clk_branch rk3036_clk_branches[] __initdata = { > RK2928_CLKSEL_CON(16), 0, 2, MFLAGS, 2, 5, DFLAGS, > RK2928_CLKGATE_CON(10), 5, GFLAGS), > > - COMPOSITE_NOGATE(0, "mac_pll_src", mux_pll_src_3plls_p, 0, > + COMPOSITE_NOGATE(SCLK_MACPLL, "mac_pll_src", mux_pll_src_3plls_p, CLK_SET_RATE_NO_REPARENT, > RK2928_CLKSEL_CON(21), 0, 2, MFLAGS, 4, 5, DFLAGS), -RK2928_CLKSEL_CON(21), 0, 2, MFLAGS, 4, 5, DFLAGS), +RK2928_CLKSEL_CON(21), 0, 2, MFLAGS, 9, 5, DFLAGS), > MUX(SCLK_MACREF, "mac_clk_ref", mux_mac_p, CLK_SET_RATE_PARENT, > RK2928_CLKSEL_CON(21), 3, 1, MFLAGS), > > ------ 8< --------- > > > [0] https://github.com/mmind/linux-rockchip/commit/e83a8b19dbf95c40d2c908727c342fbc6b167ea1 > > >> --- >> >> drivers/clk/rockchip/clk-rk3036.c | 9 ++++++--- >> include/dt-bindings/clock/rk3036-cru.h | 2 ++ >> 2 files changed, 8 insertions(+), 3 deletions(-) >> >> diff --git a/drivers/clk/rockchip/clk-rk3036.c >> b/drivers/clk/rockchip/clk-rk3036.c index 0703c8f..27c35fa 100644 >> --- a/drivers/clk/rockchip/clk-rk3036.c >> +++ b/drivers/clk/rockchip/clk-rk3036.c >> @@ -348,8 +348,11 @@ static struct rockchip_clk_branch rk3036_clk_branches[] >> __initdata = { RK2928_CLKSEL_CON(16), 0, 2, MFLAGS, 2, 5, DFLAGS, >> RK2928_CLKGATE_CON(10), 5, GFLAGS), >> >> - COMPOSITE_NOGATE(0, "mac_pll_src", mux_pll_src_3plls_p, 0, >> - RK2928_CLKSEL_CON(21), 0, 2, MFLAGS, 9, 5, DFLAGS), >> + MUX(SCLK_MACPLL, "mac_pll_pre", mux_pll_src_3plls_p, 0, >> + RK2928_CLKSEL_CON(21), 0, 2, MFLAGS), >> + DIV(0, "mac_pll_src", "mac_pll_pre", 0, >> + RK2928_CLKSEL_CON(21), 9, 5, DFLAGS), >> + >> MUX(SCLK_MACREF, "mac_clk_ref", mux_mac_p, CLK_SET_RATE_PARENT, >> RK2928_CLKSEL_CON(21), 3, 1, MFLAGS), >> >> @@ -408,7 +411,7 @@ static struct rockchip_clk_branch rk3036_clk_branches[] >> __initdata = { GATE(HCLK_OTG1, "hclk_otg1", "hclk_peri", CLK_IGNORE_UNUSED, >> RK2928_CLKGATE_CON(7), 3, GFLAGS), GATE(HCLK_I2S, "hclk_i2s", "hclk_peri", >> 0, RK2928_CLKGATE_CON(7), 2, GFLAGS), GATE(0, "hclk_sfc", "hclk_peri", >> CLK_IGNORE_UNUSED, RK2928_CLKGATE_CON(3), 14, GFLAGS), - GATE(0, >> "hclk_mac", "hclk_peri", CLK_IGNORE_UNUSED, RK2928_CLKGATE_CON(3), 15, >> GFLAGS), + GATE(HCLK_MAC, "hclk_mac", "hclk_peri", 0, >> RK2928_CLKGATE_CON(3), 5, GFLAGS), >> >> /* pclk_peri gates */ >> GATE(0, "pclk_peri_matrix", "pclk_peri", CLK_IGNORE_UNUSED, >> RK2928_CLKGATE_CON(4), 1, GFLAGS), diff --git >> a/include/dt-bindings/clock/rk3036-cru.h >> b/include/dt-bindings/clock/rk3036-cru.h index ebc7a7b..de44109 100644 >> --- a/include/dt-bindings/clock/rk3036-cru.h >> +++ b/include/dt-bindings/clock/rk3036-cru.h >> @@ -54,6 +54,7 @@ >> #define SCLK_PVTM_VIDEO 125 >> #define SCLK_MAC 151 >> #define SCLK_MACREF 152 >> +#define SCLK_MACPLL 153 >> #define SCLK_SFC 160 >> >> /* aclk gates */ >> @@ -92,6 +93,7 @@ >> #define HCLK_SDMMC 456 >> #define HCLK_SDIO 457 >> #define HCLK_EMMC 459 >> +#define HCLK_MAC 460 >> #define HCLK_I2S 462 >> #define HCLK_LCDC 465 >> #define HCLK_ROM 467 > > _______________________________________________ > Linux-rockchip mailing list > Linux-rockchip@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-rockchip --- a/drivers/clk/rockchip/clk-rk3036.c +++ b/drivers/clk/rockchip/clk-rk3036.c @@ -348,8 +348,8 @@ static struct rockchip_clk_branch rk3036_clk_branches[] __initdata = { RK2928_CLKSEL_CON(16), 0, 2, MFLAGS, 2, 5, DFLAGS, RK2928_CLKGATE_CON(10), 5, GFLAGS), - COMPOSITE_NOGATE(0, "mac_pll_src", mux_pll_src_3plls_p, 0, - RK2928_CLKSEL_CON(21), 0, 2, MFLAGS, 9, 5, DFLAGS), + COMPOSITE_NOGATE(SCLK_MACPLL, "mac_pll_src", mux_pll_src_3plls_p, CLK_SET_RATE_NO_REPARENT, + RK2928_CLKSEL_CON(21), 0, 2, MFLAGS, 9, 5, DFLAGS),