From: Xing Zheng <zhengxing@rock-chips.com>
To: Doug Anderson <dianders@chromium.org>,
Brian Norris <briannorris@chromium.org>
Cc: Michael Turquette <mturquette@baylibre.com>,
Stephen Boyd <sboyd@codeaurora.org>,
linux-clk <linux-clk@vger.kernel.org>,
Heiko Stuebner <heiko@sntech.de>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"linux-arm-kernel@lists.infradead.org"
<linux-arm-kernel@lists.infradead.org>,
"open list:ARM/Rockchip SoC..."
<linux-rockchip@lists.infradead.org>,
Brian Norris <computersforpeace@gmail.com>
Subject: Re: [PATCH 2/2] clk: rockchip: fix incorrect parent for rk3399's {c,g}pll_aclk_perihp_src
Date: Mon, 1 Aug 2016 18:08:10 +0800 [thread overview]
Message-ID: <579F1F8A.8030704@rock-chips.com> (raw)
In-Reply-To: <CAD=FV=Wda=kXYf4MnjXsW6g8sPAAEv7JO1ZoGXOnJW=aL0yv-w@mail.gmail.com>
Hi Doug,
It is so sorry that our IC folks re-correct these bits, they need
to be recovered like these:
----
In the definition of CRU_CLKGATE_CON5:
bit 1 - shows aclk_perihp_cpll_src_en
bit 0 - shows aclk_perihp_gpll_src_en
----
And the new TRM will be updated.
FYI.
Thanks.
On 2016年05月16日 23:49, Doug Anderson wrote:
> Hi,
>
> On Fri, May 13, 2016 at 8:36 PM, Xing Zheng <zhengxing@rock-chips.com> wrote:
>> Hi Doug,
>>
>>
>> On 2016年05月14日 04:10, Doug Anderson wrote:
>>> Hi,
>>>
>>> On Fri, May 13, 2016 at 11:42 AM, Brian Norris <briannorris@chromium.org>
>>> wrote:
>>>> From: Xing Zheng <zhengxing@rock-chips.com>
>>>>
>>>> There was a typo, swapping 'c' <--> 'g'.
>>>>
>>>> Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
>>>> Signed-off-by: Brian Norris <briannorris@chromium.org>
>>>> ---
>>>> drivers/clk/rockchip/clk-rk3399.c | 4 ++--
>>>> 1 file changed, 2 insertions(+), 2 deletions(-)
>>>>
>>>> diff --git a/drivers/clk/rockchip/clk-rk3399.c
>>>> b/drivers/clk/rockchip/clk-rk3399.c
>>>> index 145756c4f3c8..9f86bfef70f7 100644
>>>> --- a/drivers/clk/rockchip/clk-rk3399.c
>>>> +++ b/drivers/clk/rockchip/clk-rk3399.c
>>>> @@ -832,9 +832,9 @@ static struct rockchip_clk_branch
>>>> rk3399_clk_branches[] __initdata = {
>>>> RK3399_CLKGATE_CON(13), 1, GFLAGS),
>>>>
>>>> /* perihp */
>>>> - GATE(0, "cpll_aclk_perihp_src", "gpll", CLK_IGNORE_UNUSED,
>>>> + GATE(0, "cpll_aclk_perihp_src", "cpll", CLK_IGNORE_UNUSED,
>>>> RK3399_CLKGATE_CON(5), 0, GFLAGS),
>>>> - GATE(0, "gpll_aclk_perihp_src", "cpll", CLK_IGNORE_UNUSED,
>>>> + GATE(0, "gpll_aclk_perihp_src", "gpll", CLK_IGNORE_UNUSED,
>>>> RK3399_CLKGATE_CON(5), 1, GFLAGS),
>>>> COMPOSITE(ACLK_PERIHP, "aclk_perihp", mux_aclk_perihp_p,
>>>> CLK_IGNORE_UNUSED,
>>>> RK3399_CLKSEL_CON(14), 7, 1, MFLAGS, 0, 5,
>>>> DFLAGS,
>>> Definitely there was a bug since this table itself was inconsistent.
>>> ...and I _think_ this fix is correct, but I'll note that the TRM has
>>> more inconsistency here.
>>>
>>> In the big clock table 'CRU Clock Architecture Diagram', I see:
>>> CLK 4 is CPLL
>>> CLK 5 is GPLL
>>> CLK 125 is aclk_perihp_cpll_src and has 4 (CPLL) as source, with
>>> g5[0] as the bit
>>> CLK 126 is aclk_perihp_gpll_src and has 5 (GPLL) as source, with
>>> g5[1] as the bit
>>>
>>> In the definition of CRU_CLKGATE_CON5:
>>> bit 0 shows aclk_perihp_gpll_src_en
>>> bit 1 shows aclk_perihp_cpll_src_en
>>>
>>>
>>> Thus the table shows CPLL as gate5[0] and GPLL as gate5[1]. The
>>> register definition shows the opposite. I'll tend to believe the
>>> table over the register definition, but I figured I'd bring it up
>>> anyway.
>>>
>>>
>>> Xing Zheng: can you confirm that the table is correct and ask
>>> documentation folks to fix the register definition for
>>> CRU_CLKGATE_CON5?
>> Yes, previously, our IC & DOC partner confirmed that the definition of
>> CRU_CLKGATE_CON5 should be:
>> bit 0 shows aclk_perihp_cpll_src_en
>> bit 1 shows aclk_perihp_gpll_src_en
>>
>> Sorry to the incorrect register definition, we will fix them and review the
>> TRM again.
> Great!
>
> Since we now have extra confirmation that Brian's patch is indeed correct:
>
> Reviewed-by: Douglas Anderson <dianders@chromium.org>
>
>
>
--
- Xing Zheng
next prev parent reply other threads:[~2016-08-01 10:09 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-13 18:42 [PATCH 1/2] clk: rockchip: mark rk3399 GIC clocks as critical Brian Norris
2016-05-13 18:42 ` [PATCH 2/2] clk: rockchip: fix incorrect parent for rk3399's {c,g}pll_aclk_perihp_src Brian Norris
2016-05-13 20:10 ` Doug Anderson
2016-05-14 3:36 ` Xing Zheng
2016-05-16 15:49 ` Doug Anderson
2016-08-01 10:08 ` Xing Zheng [this message]
2016-05-13 19:43 ` [PATCH 1/2] clk: rockchip: mark rk3399 GIC clocks as critical Doug Anderson
2016-05-17 21:10 ` Heiko Stuebner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=579F1F8A.8030704@rock-chips.com \
--to=zhengxing@rock-chips.com \
--cc=briannorris@chromium.org \
--cc=computersforpeace@gmail.com \
--cc=dianders@chromium.org \
--cc=heiko@sntech.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-clk@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=mturquette@baylibre.com \
--cc=sboyd@codeaurora.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).