From mboxrd@z Thu Jan  1 00:00:00 1970
From: icenowy@aosc.io
Subject: Re: [linux-sunxi] Re: [PATCH v5] clk: sunxi-ng: support R40 SoC
Date: Sat, 19 Aug 2017 17:13:17 +0800
Message-ID: <459ea29fd5c46cabe6c7c5727ee462e7@aosc.io>
References: <20170815055529.4780-1-icenowy@aosc.io>
 <ba1af994f165b96c096ec03a72836739@aosc.io>
 <CAGb2v645YO-t-5+k2yRsj4_wcJuURic-HY6oD0-mZzOh7--4Ow@mail.gmail.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8;
 format=flowed
Content-Transfer-Encoding: 8bit
Return-path: <linux-clk-owner@vger.kernel.org>
In-Reply-To: <CAGb2v645YO-t-5+k2yRsj4_wcJuURic-HY6oD0-mZzOh7--4Ow@mail.gmail.com>
Sender: linux-clk-owner@vger.kernel.org
To: Chen-Yu Tsai <wens@csie.org>
Cc: Maxime Ripard <maxime.ripard@free-electrons.com>, devicetree <devicetree@vger.kernel.org>, linux-kernel <linux-kernel@vger.kernel.org>, linux-sunxi <linux-sunxi@googlegroups.com>, linux-clk <linux-clk@vger.kernel.org>, linux-arm-kernel <linux-arm-kernel@lists.infradead.org>
List-Id: devicetree@vger.kernel.org

在 2017-08-19 17:11，Chen-Yu Tsai 写道：
> On Tue, Aug 15, 2017 at 4:52 PM,  <icenowy@aosc.io> wrote:
>> 在 2017-08-15 13:55，Icenowy Zheng 写道：
>>> 
>>> Allwinner R40 SoC have a clock controller module in the style of the
>>> SoCs beyond sun6i, however, it's more rich and complex.
>>> 
>>> Add support for it.
>>> 
>>> Signed-off-by: Icenowy Zheng <icenowy@aosc.io>
>>> ---
>>> Changes in v5:
>>> - Added TODO's for PLL constraints.
>>> - Forced OHCI12M mux to 0.
>>> - Changed "adda" clock to "codec" to be consistent with "bus-codec".
>>> - Added several CLK_SET_RATE_{UNGATE,PARENT} flags.
>>> - Added PLL_CPU gate notifier.
>>> Changes in v4:
>>> - Removed usb-ohci-12M mux clocks.
>>> - Removed unused (and not in user manual) adda-4x clock.
>>> - Implemented proper SATA PLL system.
>>> - Renamed MP (Mixed Processor) clock names to drop the extra "DE_".
>>> - Renamed TCONs' clock names to "tcon-lcdX" or "tcon-tvX".
>>> - Added missing RST_DRAM.
>>> - Several clock post/pre-dividers and constraints fixes.
>>> Changes in v3:
>>> - Rebased on current linux-next.
>>> Changes in v2:
>>> - Fixes according to the SoC's user manual.
>>> 
>>>  drivers/clk/sunxi-ng/Kconfig              |    5 +
>>>  drivers/clk/sunxi-ng/Makefile             |    1 +
>>>  drivers/clk/sunxi-ng/ccu-sun8i-r40.c      | 1290
>>> +++++++++++++++++++++++++++++
>>>  drivers/clk/sunxi-ng/ccu-sun8i-r40.h      |   69 ++
>>>  include/dt-bindings/clock/sun8i-r40-ccu.h |  187 +++++
>>>  include/dt-bindings/reset/sun8i-r40-ccu.h |  130 +++
>>>  6 files changed, 1682 insertions(+)
>>>  create mode 100644 drivers/clk/sunxi-ng/ccu-sun8i-r40.c
>>>  create mode 100644 drivers/clk/sunxi-ng/ccu-sun8i-r40.h
>>>  create mode 100644 include/dt-bindings/clock/sun8i-r40-ccu.h
>>>  create mode 100644 include/dt-bindings/reset/sun8i-r40-ccu.h
>>> 
>>> [...]
>>> 
>>> +static void __init sun8i_r40_ccu_setup(struct device_node *node)
>>> +{
>>> +       void __iomem *reg;
>>> +       u32 val;
>>> +
>>> +       reg = of_io_request_and_map(node, 0, 
>>> of_node_full_name(node));
>>> +       if (IS_ERR(reg)) {
>>> +               pr_err("%s: Could not map the clock registers\n",
>>> +                      of_node_full_name(node));
>>> +               return;
>>> +       }
>>> +
>>> +       /* Force the PLL-Audio-1x divider to 4 */
>>> +       val = readl(reg + SUN8I_R40_PLL_AUDIO_REG);
>>> +       val &= ~GENMASK(19, 16);
>>> +       writel(val | (3 << 16), reg + SUN8I_R40_PLL_AUDIO_REG);
>>> +
>>> +       /* Force PLL-MIPI to MIPI mode */
>>> +       val = readl(reg + SUN8I_R40_PLL_MIPI_REG);
>>> +       val &= ~BIT(16);
>>> +       writel(val, reg + SUN8I_R40_PLL_MIPI_REG);
>>> +
>>> +       /* Force OHCI 12M parent to 0 */
> 
> Clarified the comment as
> 
>         Force OHCI 12M parent to 12M divided from 48M
> 
>>> +       val = readl(reg + SUN8I_R40_USB_CLK_REG);
>>> +       val &= ~GENMASK(20, 6);
>> 
>> 
>> Sorry but I think this line should be:
>> 
>> val &= ~GENMASK(25, 20);
>> 
>> I didn't understand GENMASK well...
> 
> Fixed and applied. Thanks!

Thanks!

> 
> ChenYu