Re: [PATCH v7 0/7] clk: meson-axg: Add AO Cloclk and Reset driver

Jerome Brunet
2018-04-27T09:59:22Z

On Fri, 2018-04-27 at 17:31 +0800, Yixun Lan wrote:
> hi Jerome:
>
>
> On 04/27/18 17:20, Jerome Brunet wrote:
> > On Thu, 2018-04-26 at 16:44 +0800, Yixun Lan wrote:
> > > This patch try to add AO clock and Reset driver for Amlogic's
> > > Meson-AXG SoC.
> > > Please note that patch 7 need to wait for the DTS changes[3] merged
> > > into mainline first, otherwise it will break the serial console.
> > >
> > > patch 2: factor the common code into a dedicated file
> > > patch 3-5: add the aoclk driver for AXG SoC
> > > patch 6-7: drop unnecessary clock flags
> > >
> > > changes since v6 at [7]:
> > > - fix over 80 chars chechpatch error
> > > - add Philip's Ack on patch 5
> > > - drop extra end of newline
> > >
> > > changes since v5 at [6]:
> > > - drop unnecessary header files
> > > - add 'axg_aoclk' prefix to clk driver, make them more consistent
> > > - add missing end new line..
> > >
> > > changes since v4 at [5]:
> > > - fix return err
> > > - introduce CONFIG_COMMON_CLK_MESON_AO
> > > - format/style minor fix
> > >
> > > changes since v3 at [4]:
> > > - add 'const' contraint to the read-only data
> > > - switch to devm_of_clk_add_hw_provider API
> > > - check return value of devm_reset_controller_register
> > >
> > > changes since v2 at [2]:
> > > - rework meson_aoclkc_probe() which leverage the of_match_data
> > > - merge patch 5-6 into this series
> > > - seperate DTS patch, will send to Kevin Hilman independently
> > >
> > > changes since v1 at [0]:
> > > - rebase to clk-meson's branch 'next/drivers' [1]
> > > - fix license, update to BSD-3-Clause
> > > - drop un-used include header file
> > >
> > > [0] https://lkml.kernel.org/r/20180209070026.193879-1-yixun.lan@amlogic.com
> > > [1] git://github.com/BayLibre/clk-meson.git branch: next-drivers
> > > [2] https://lkml.kernel.org/r/20180323143816.200573-1-yixun.lan@amlogic.com
> > > [3] https://lkml.kernel.org/r/20180326081809.49493-4-yixun.lan@amlogic.com
> > > [4] https://lkml.kernel.org/r/20180328025050.221585-1-yixun.lan@amlogic.com
> > > [5] https://lkml.kernel.org/r/20180408031938.153474-1-yixun.lan@amlogic.com
> > > [6] https://lkml.kernel.org/r/20180409143749.71197-1-yixun.lan@amlogic.com
> > > [7] https://lkml.kernel.org/r/20180419135426.155794-1-yixun.lan@amlogic.com
> >
> > Yixun,
> >
> > Your series looks mostly Ok to me, apart from the problem reported by Philipp.
> >
> > However, once applied, if the clkc ao controller is enabled, both gxl and axg
> > fail to complete the boot. Could you please explain how this was tested ??
> >
>
> isn't this caused by the patch 7?
> [PATCH v7 7/7] clk: meson: drop CLK_IGNORE_UNUSED flag
>
>
> you need to also apply this DT patch which I've sent[1]:
> [PATCH v3 3/3] ARM64: dts: meson: fix clock source of the pclk for UART_AO
>
> could you exclude the patch 7 for now until Kevin merged the DT part?
>
> [1] https://lkml.kernel.org/r/20180328030130.240336-4-yixun.lan@amlogic.com

Looks to be the problem indeed. But it is still an issue with how your patchset
in organized.

I can't merge this until Kevin merges the patch above, which he can't merge
until there is the clkc_ao support in axg, which is given by this series.

1# You should remove the axg part of the patch above. Kevin will be able to
merge it w/o any dependencies. (BTW, the patch is broken for axg because 1) you
did not include the dt-binding header for the clkc_ao in axg and 2) the clkc_ao
does not exist at this stage)
2# I can then safely merge this series - w/o breaking gxbb and gxl.
3# Finally you'll have to make a DT change for the axg, enabling the clkc_ao and
changes the uart clocks at the same time.

>
>
> > Not merging it until we get to the bottom of this.
> >
> > >
> > >
> > > Qiufang Dai (1):
> > > clk: meson-axg: Add AO Clock and Reset controller driver
> > >
> > > Yixun Lan (6):
> > > clk: meson: migrate to devm_of_clk_add_hw_provider API
> > > clk: meson: aoclk: refactor common code into dedicated file
> > > dt-bindings: clock: axg-aoclkc: New binding for Meson-AXG SoC
> > > dt-bindings: clock: reset: Add AXG AO Clock and Reset Bindings
> > > clk: meson: drop CLK_SET_RATE_PARENT flag
> > > clk: meson: drop CLK_IGNORE_UNUSED flag
> > >
> > > .../bindings/clock/amlogic,gxbb-aoclkc.txt | 1 +
> > > drivers/clk/meson/Kconfig | 8 +
> > > drivers/clk/meson/Makefile | 3 +-
> > > drivers/clk/meson/axg-aoclk.c | 163 ++++++++++++++++++
> > > drivers/clk/meson/axg-aoclk.h | 29 ++++
> > > drivers/clk/meson/gxbb-aoclk.c | 95 ++++------
> > > drivers/clk/meson/gxbb-aoclk.h | 5 +
> > > drivers/clk/meson/meson-aoclk.c | 81 +++++++++
> > > drivers/clk/meson/meson-aoclk.h | 34 ++++
> > > include/dt-bindings/clock/axg-aoclkc.h | 26 +++
> > > include/dt-bindings/reset/axg-aoclkc.h | 20 +++
> > > 11 files changed, 401 insertions(+), 64 deletions(-)
> > > create mode 100644 drivers/clk/meson/axg-aoclk.c
> > > create mode 100644 drivers/clk/meson/axg-aoclk.h
> > > create mode 100644 drivers/clk/meson/meson-aoclk.c
> > > create mode 100644 drivers/clk/meson/meson-aoclk.h
> > > create mode 100644 include/dt-bindings/clock/axg-aoclkc.h
> > > create mode 100644 include/dt-bindings/reset/axg-aoclkc.h
> > >
> >
> > .
> >
>
>