* [PATCH v4 0/3] Allwinner R40 CCU driver
@ 2017-08-12 12:43 Icenowy Zheng
2017-08-12 12:43 ` [PATCH v4 1/3] clk: sunxi-ng: div: Add support for fixed post-divider Icenowy Zheng
` (2 more replies)
0 siblings, 3 replies; 12+ messages in thread
From: Icenowy Zheng @ 2017-08-12 12:43 UTC (permalink / raw)
To: linux-arm-kernel
Allwinner R40 has a CCU like other CCUs after A31, however as it contains
many peripherals (especially SATA), the CCU is complicated.
This patchset adds support for it.
Patch 1 is from Priit's A10/A20 CCU patchset, which is needed for
pll-periph0-sata (like the pll-periph-sata on A10/A20).
Patch 2 adds postdiv support for NKM type clock, which is needed for
pll-sata (with a postdiv of 6).
Patch 3 is the main patch, which adds the support for R40 CCU.
Icenowy Zheng (2):
clk: sunxi-ng: nkm: add support for fixed post-divider
clk: sunxi-ng: support R40 SoC
Priit Laes (1):
clk: sunxi-ng: div: Add support for fixed post-divider
drivers/clk/sunxi-ng/Kconfig | 5 +
drivers/clk/sunxi-ng/Makefile | 1 +
drivers/clk/sunxi-ng/ccu-sun8i-r40.c | 1240 +++++++++++++++++++++++++++++
drivers/clk/sunxi-ng/ccu-sun8i-r40.h | 69 ++
drivers/clk/sunxi-ng/ccu_div.c | 22 +-
drivers/clk/sunxi-ng/ccu_div.h | 3 +-
drivers/clk/sunxi-ng/ccu_nkm.c | 22 +-
drivers/clk/sunxi-ng/ccu_nkm.h | 2 +
include/dt-bindings/clock/sun8i-r40-ccu.h | 187 +++++
include/dt-bindings/reset/sun8i-r40-ccu.h | 130 +++
10 files changed, 1674 insertions(+), 7 deletions(-)
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
--
2.13.0
^ permalink raw reply [flat|nested] 12+ messages in thread* [PATCH v4 1/3] clk: sunxi-ng: div: Add support for fixed post-divider 2017-08-12 12:43 [PATCH v4 0/3] Allwinner R40 CCU driver Icenowy Zheng @ 2017-08-12 12:43 ` Icenowy Zheng 2017-08-12 12:49 ` icenowy at aosc.io 2017-08-13 2:50 ` icenowy at aosc.io 2017-08-12 12:43 ` [PATCH v4 2/3] clk: sunxi-ng: nkm: add " Icenowy Zheng 2017-08-12 12:43 ` [PATCH v4 3/3] clk: sunxi-ng: support R40 SoC Icenowy Zheng 2 siblings, 2 replies; 12+ messages in thread From: Icenowy Zheng @ 2017-08-12 12:43 UTC (permalink / raw) To: linux-arm-kernel From: Priit Laes <plaes@plaes.org> SATA clock on sun4i/sun7i is of type (parent) / M / 6 where 6 is fixed post-divider. Signed-off-by: Priit Laes <plaes@plaes.org> --- It's based on the patch in v6 of the A10/A20 CCU patchset, but with ccu_div_round_rate fixed. drivers/clk/sunxi-ng/ccu_div.c | 22 +++++++++++++++++++--- drivers/clk/sunxi-ng/ccu_div.h | 3 ++- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/drivers/clk/sunxi-ng/ccu_div.c b/drivers/clk/sunxi-ng/ccu_div.c index c0e5c10d0091..baa3cf96507b 100644 --- a/drivers/clk/sunxi-ng/ccu_div.c +++ b/drivers/clk/sunxi-ng/ccu_div.c @@ -21,10 +21,18 @@ static unsigned long ccu_div_round_rate(struct ccu_mux_internal *mux, { struct ccu_div *cd = data; - return divider_round_rate_parent(&cd->common.hw, parent, + if (cd->common.features & CCU_FEATURE_FIXED_POSTDIV) + rate *= cd->fixed_post_div; + + rate = divider_round_rate_parent(&cd->common.hw, parent, rate, parent_rate, cd->div.table, cd->div.width, cd->div.flags); + + if (cd->common.features & CCU_FEATURE_FIXED_POSTDIV) + rate /= cd->fixed_post_div; + + return rate; } static void ccu_div_disable(struct clk_hw *hw) @@ -62,8 +70,13 @@ static unsigned long ccu_div_recalc_rate(struct clk_hw *hw, parent_rate = ccu_mux_helper_apply_prediv(&cd->common, &cd->mux, -1, parent_rate); - return divider_recalc_rate(hw, parent_rate, val, cd->div.table, - cd->div.flags); + val = divider_recalc_rate(hw, parent_rate, val, cd->div.table, + cd->div.flags); + + if (cd->common.features & CCU_FEATURE_FIXED_POSTDIV) + val /= cd->fixed_post_div; + + return val; } static int ccu_div_determine_rate(struct clk_hw *hw, @@ -86,6 +99,9 @@ static int ccu_div_set_rate(struct clk_hw *hw, unsigned long rate, parent_rate = ccu_mux_helper_apply_prediv(&cd->common, &cd->mux, -1, parent_rate); + if (cd->common.features & CCU_FEATURE_FIXED_POSTDIV) + rate *= cd->fixed_post_div; + val = divider_get_val(rate, parent_rate, cd->div.table, cd->div.width, cd->div.flags); diff --git a/drivers/clk/sunxi-ng/ccu_div.h b/drivers/clk/sunxi-ng/ccu_div.h index 08d074451204..f3a5028dcd14 100644 --- a/drivers/clk/sunxi-ng/ccu_div.h +++ b/drivers/clk/sunxi-ng/ccu_div.h @@ -86,9 +86,10 @@ struct ccu_div_internal { struct ccu_div { u32 enable; - struct ccu_div_internal div; + struct ccu_div_internal div; struct ccu_mux_internal mux; struct ccu_common common; + unsigned int fixed_post_div; }; #define SUNXI_CCU_DIV_TABLE_WITH_GATE(_struct, _name, _parent, _reg, \ -- 2.13.0 ^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH v4 1/3] clk: sunxi-ng: div: Add support for fixed post-divider 2017-08-12 12:43 ` [PATCH v4 1/3] clk: sunxi-ng: div: Add support for fixed post-divider Icenowy Zheng @ 2017-08-12 12:49 ` icenowy at aosc.io 2017-08-13 2:50 ` icenowy at aosc.io 1 sibling, 0 replies; 12+ messages in thread From: icenowy at aosc.io @ 2017-08-12 12:49 UTC (permalink / raw) To: linux-arm-kernel ? 2017-08-12 20:43?Icenowy Zheng ??? > From: Priit Laes <plaes@plaes.org> > > SATA clock on sun4i/sun7i is of type (parent) / M / 6 where > 6 is fixed post-divider. > > Signed-off-by: Priit Laes <plaes@plaes.org> Oh sorry, it misses my SoB. > --- > It's based on the patch in v6 of the A10/A20 CCU patchset, but with > ccu_div_round_rate fixed. > > drivers/clk/sunxi-ng/ccu_div.c | 22 +++++++++++++++++++--- > drivers/clk/sunxi-ng/ccu_div.h | 3 ++- > 2 files changed, 21 insertions(+), 4 deletions(-) > > diff --git a/drivers/clk/sunxi-ng/ccu_div.c > b/drivers/clk/sunxi-ng/ccu_div.c > index c0e5c10d0091..baa3cf96507b 100644 > --- a/drivers/clk/sunxi-ng/ccu_div.c > +++ b/drivers/clk/sunxi-ng/ccu_div.c > @@ -21,10 +21,18 @@ static unsigned long ccu_div_round_rate(struct > ccu_mux_internal *mux, > { > struct ccu_div *cd = data; > > - return divider_round_rate_parent(&cd->common.hw, parent, > + if (cd->common.features & CCU_FEATURE_FIXED_POSTDIV) > + rate *= cd->fixed_post_div; > + > + rate = divider_round_rate_parent(&cd->common.hw, parent, > rate, parent_rate, > cd->div.table, cd->div.width, > cd->div.flags); > + > + if (cd->common.features & CCU_FEATURE_FIXED_POSTDIV) > + rate /= cd->fixed_post_div; > + > + return rate; > } > > static void ccu_div_disable(struct clk_hw *hw) > @@ -62,8 +70,13 @@ static unsigned long ccu_div_recalc_rate(struct > clk_hw *hw, > parent_rate = ccu_mux_helper_apply_prediv(&cd->common, &cd->mux, -1, > parent_rate); > > - return divider_recalc_rate(hw, parent_rate, val, cd->div.table, > - cd->div.flags); > + val = divider_recalc_rate(hw, parent_rate, val, cd->div.table, > + cd->div.flags); > + > + if (cd->common.features & CCU_FEATURE_FIXED_POSTDIV) > + val /= cd->fixed_post_div; > + > + return val; > } > > static int ccu_div_determine_rate(struct clk_hw *hw, > @@ -86,6 +99,9 @@ static int ccu_div_set_rate(struct clk_hw *hw, > unsigned long rate, > parent_rate = ccu_mux_helper_apply_prediv(&cd->common, &cd->mux, -1, > parent_rate); > > + if (cd->common.features & CCU_FEATURE_FIXED_POSTDIV) > + rate *= cd->fixed_post_div; > + > val = divider_get_val(rate, parent_rate, cd->div.table, > cd->div.width, > cd->div.flags); > > diff --git a/drivers/clk/sunxi-ng/ccu_div.h > b/drivers/clk/sunxi-ng/ccu_div.h > index 08d074451204..f3a5028dcd14 100644 > --- a/drivers/clk/sunxi-ng/ccu_div.h > +++ b/drivers/clk/sunxi-ng/ccu_div.h > @@ -86,9 +86,10 @@ struct ccu_div_internal { > struct ccu_div { > u32 enable; > > - struct ccu_div_internal div; > + struct ccu_div_internal div; > struct ccu_mux_internal mux; > struct ccu_common common; > + unsigned int fixed_post_div; > }; > > #define SUNXI_CCU_DIV_TABLE_WITH_GATE(_struct, _name, _parent, _reg, \ ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH v4 1/3] clk: sunxi-ng: div: Add support for fixed post-divider 2017-08-12 12:43 ` [PATCH v4 1/3] clk: sunxi-ng: div: Add support for fixed post-divider Icenowy Zheng 2017-08-12 12:49 ` icenowy at aosc.io @ 2017-08-13 2:50 ` icenowy at aosc.io 2017-08-14 14:37 ` [linux-sunxi] " Chen-Yu Tsai 1 sibling, 1 reply; 12+ messages in thread From: icenowy at aosc.io @ 2017-08-13 2:50 UTC (permalink / raw) To: linux-arm-kernel ? 2017-08-12 20:43?Icenowy Zheng ??? > From: Priit Laes <plaes@plaes.org> > > SATA clock on sun4i/sun7i is of type (parent) / M / 6 where > 6 is fixed post-divider. > > Signed-off-by: Priit Laes <plaes@plaes.org> Signed-off-by: Icenowy Zheng <icenowy@aosc.io> > --- > It's based on the patch in v6 of the A10/A20 CCU patchset, but with > ccu_div_round_rate fixed. > > drivers/clk/sunxi-ng/ccu_div.c | 22 +++++++++++++++++++--- > drivers/clk/sunxi-ng/ccu_div.h | 3 ++- > 2 files changed, 21 insertions(+), 4 deletions(-) > > diff --git a/drivers/clk/sunxi-ng/ccu_div.c > b/drivers/clk/sunxi-ng/ccu_div.c > index c0e5c10d0091..baa3cf96507b 100644 > --- a/drivers/clk/sunxi-ng/ccu_div.c > +++ b/drivers/clk/sunxi-ng/ccu_div.c > @@ -21,10 +21,18 @@ static unsigned long ccu_div_round_rate(struct > ccu_mux_internal *mux, > { > struct ccu_div *cd = data; > > - return divider_round_rate_parent(&cd->common.hw, parent, > + if (cd->common.features & CCU_FEATURE_FIXED_POSTDIV) > + rate *= cd->fixed_post_div; > + > + rate = divider_round_rate_parent(&cd->common.hw, parent, > rate, parent_rate, > cd->div.table, cd->div.width, > cd->div.flags); > + > + if (cd->common.features & CCU_FEATURE_FIXED_POSTDIV) > + rate /= cd->fixed_post_div; > + > + return rate; > } > > static void ccu_div_disable(struct clk_hw *hw) > @@ -62,8 +70,13 @@ static unsigned long ccu_div_recalc_rate(struct > clk_hw *hw, > parent_rate = ccu_mux_helper_apply_prediv(&cd->common, &cd->mux, -1, > parent_rate); > > - return divider_recalc_rate(hw, parent_rate, val, cd->div.table, > - cd->div.flags); > + val = divider_recalc_rate(hw, parent_rate, val, cd->div.table, > + cd->div.flags); > + > + if (cd->common.features & CCU_FEATURE_FIXED_POSTDIV) > + val /= cd->fixed_post_div; > + > + return val; > } > > static int ccu_div_determine_rate(struct clk_hw *hw, > @@ -86,6 +99,9 @@ static int ccu_div_set_rate(struct clk_hw *hw, > unsigned long rate, > parent_rate = ccu_mux_helper_apply_prediv(&cd->common, &cd->mux, -1, > parent_rate); > > + if (cd->common.features & CCU_FEATURE_FIXED_POSTDIV) > + rate *= cd->fixed_post_div; > + > val = divider_get_val(rate, parent_rate, cd->div.table, > cd->div.width, > cd->div.flags); > > diff --git a/drivers/clk/sunxi-ng/ccu_div.h > b/drivers/clk/sunxi-ng/ccu_div.h > index 08d074451204..f3a5028dcd14 100644 > --- a/drivers/clk/sunxi-ng/ccu_div.h > +++ b/drivers/clk/sunxi-ng/ccu_div.h > @@ -86,9 +86,10 @@ struct ccu_div_internal { > struct ccu_div { > u32 enable; > > - struct ccu_div_internal div; > + struct ccu_div_internal div; > struct ccu_mux_internal mux; > struct ccu_common common; > + unsigned int fixed_post_div; > }; > > #define SUNXI_CCU_DIV_TABLE_WITH_GATE(_struct, _name, _parent, _reg, \ ^ permalink raw reply [flat|nested] 12+ messages in thread
* [linux-sunxi] Re: [PATCH v4 1/3] clk: sunxi-ng: div: Add support for fixed post-divider 2017-08-13 2:50 ` icenowy at aosc.io @ 2017-08-14 14:37 ` Chen-Yu Tsai 0 siblings, 0 replies; 12+ messages in thread From: Chen-Yu Tsai @ 2017-08-14 14:37 UTC (permalink / raw) To: linux-arm-kernel On Sun, Aug 13, 2017 at 10:50 AM, <icenowy@aosc.io> wrote: > ? 2017-08-12 20:43?Icenowy Zheng ??? >> >> From: Priit Laes <plaes@plaes.org> >> >> SATA clock on sun4i/sun7i is of type (parent) / M / 6 where >> 6 is fixed post-divider. >> >> Signed-off-by: Priit Laes <plaes@plaes.org> > > > Signed-off-by: Icenowy Zheng <icenowy@aosc.io> Applied, thanks. ChenYu ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH v4 2/3] clk: sunxi-ng: nkm: add support for fixed post-divider 2017-08-12 12:43 [PATCH v4 0/3] Allwinner R40 CCU driver Icenowy Zheng 2017-08-12 12:43 ` [PATCH v4 1/3] clk: sunxi-ng: div: Add support for fixed post-divider Icenowy Zheng @ 2017-08-12 12:43 ` Icenowy Zheng 2017-08-14 14:46 ` [linux-sunxi] " Chen-Yu Tsai 2017-08-12 12:43 ` [PATCH v4 3/3] clk: sunxi-ng: support R40 SoC Icenowy Zheng 2 siblings, 1 reply; 12+ messages in thread From: Icenowy Zheng @ 2017-08-12 12:43 UTC (permalink / raw) To: linux-arm-kernel SATA PLL on Allwinner R40 is of type (parent) * N * K / M / 6 where 6 is the fixed post-divider. Add post-divider support for NKM type clock. Signed-off-by: Icenowy Zheng <icenowy@aosc.io> --- drivers/clk/sunxi-ng/ccu_nkm.c | 22 +++++++++++++++++++--- drivers/clk/sunxi-ng/ccu_nkm.h | 2 ++ 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/drivers/clk/sunxi-ng/ccu_nkm.c b/drivers/clk/sunxi-ng/ccu_nkm.c index 44b16dc8fea6..ce7f03737ad5 100644 --- a/drivers/clk/sunxi-ng/ccu_nkm.c +++ b/drivers/clk/sunxi-ng/ccu_nkm.c @@ -75,7 +75,7 @@ static unsigned long ccu_nkm_recalc_rate(struct clk_hw *hw, unsigned long parent_rate) { struct ccu_nkm *nkm = hw_to_ccu_nkm(hw); - unsigned long n, m, k; + unsigned long n, m, k, rate; u32 reg; reg = readl(nkm->common.base + nkm->common.reg); @@ -98,7 +98,12 @@ static unsigned long ccu_nkm_recalc_rate(struct clk_hw *hw, if (!m) m++; - return parent_rate * n * k / m; + rate = parent_rate * n * k / m; + + if (nkm->common.features & CCU_FEATURE_FIXED_POSTDIV) + rate /= nkm->fixed_post_div; + + return rate; } static unsigned long ccu_nkm_round_rate(struct ccu_mux_internal *mux, @@ -117,9 +122,17 @@ static unsigned long ccu_nkm_round_rate(struct ccu_mux_internal *mux, _nkm.min_m = 1; _nkm.max_m = nkm->m.max ?: 1 << nkm->m.width; + if (nkm->common.features & CCU_FEATURE_FIXED_POSTDIV) + rate *= nkm->fixed_post_div; + ccu_nkm_find_best(*parent_rate, rate, &_nkm); - return *parent_rate * _nkm.n * _nkm.k / _nkm.m; + rate = *parent_rate * _nkm.n * _nkm.k / _nkm.m; + + if (nkm->common.features & CCU_FEATURE_FIXED_POSTDIV) + rate /= nkm->fixed_post_div; + + return rate; } static int ccu_nkm_determine_rate(struct clk_hw *hw, @@ -139,6 +152,9 @@ static int ccu_nkm_set_rate(struct clk_hw *hw, unsigned long rate, unsigned long flags; u32 reg; + if (nkm->common.features & CCU_FEATURE_FIXED_POSTDIV) + rate /= nkm->fixed_post_div; + _nkm.min_n = nkm->n.min ?: 1; _nkm.max_n = nkm->n.max ?: 1 << nkm->n.width; _nkm.min_k = nkm->k.min ?: 1; diff --git a/drivers/clk/sunxi-ng/ccu_nkm.h b/drivers/clk/sunxi-ng/ccu_nkm.h index 34580894f4d1..cc6efb70a102 100644 --- a/drivers/clk/sunxi-ng/ccu_nkm.h +++ b/drivers/clk/sunxi-ng/ccu_nkm.h @@ -34,6 +34,8 @@ struct ccu_nkm { struct ccu_div_internal m; struct ccu_mux_internal mux; + unsigned int fixed_post_div; + struct ccu_common common; }; -- 2.13.0 ^ permalink raw reply related [flat|nested] 12+ messages in thread
* [linux-sunxi] [PATCH v4 2/3] clk: sunxi-ng: nkm: add support for fixed post-divider 2017-08-12 12:43 ` [PATCH v4 2/3] clk: sunxi-ng: nkm: add " Icenowy Zheng @ 2017-08-14 14:46 ` Chen-Yu Tsai 0 siblings, 0 replies; 12+ messages in thread From: Chen-Yu Tsai @ 2017-08-14 14:46 UTC (permalink / raw) To: linux-arm-kernel On Sat, Aug 12, 2017 at 8:43 PM, Icenowy Zheng <icenowy@aosc.io> wrote: > SATA PLL on Allwinner R40 is of type (parent) * N * K / M / 6 where 6 is > the fixed post-divider. > > Add post-divider support for NKM type clock. > > Signed-off-by: Icenowy Zheng <icenowy@aosc.io> > --- > drivers/clk/sunxi-ng/ccu_nkm.c | 22 +++++++++++++++++++--- > drivers/clk/sunxi-ng/ccu_nkm.h | 2 ++ > 2 files changed, 21 insertions(+), 3 deletions(-) > > diff --git a/drivers/clk/sunxi-ng/ccu_nkm.c b/drivers/clk/sunxi-ng/ccu_nkm.c > index 44b16dc8fea6..ce7f03737ad5 100644 > --- a/drivers/clk/sunxi-ng/ccu_nkm.c > +++ b/drivers/clk/sunxi-ng/ccu_nkm.c [...] > @@ -139,6 +152,9 @@ static int ccu_nkm_set_rate(struct clk_hw *hw, unsigned long rate, > unsigned long flags; > u32 reg; > > + if (nkm->common.features & CCU_FEATURE_FIXED_POSTDIV) > + rate /= nkm->fixed_post_div; This should be rate *= nkm->fixed_post_div; Fixed and applied. ChenYu > + > _nkm.min_n = nkm->n.min ?: 1; > _nkm.max_n = nkm->n.max ?: 1 << nkm->n.width; > _nkm.min_k = nkm->k.min ?: 1; [...] ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH v4 3/3] clk: sunxi-ng: support R40 SoC 2017-08-12 12:43 [PATCH v4 0/3] Allwinner R40 CCU driver Icenowy Zheng 2017-08-12 12:43 ` [PATCH v4 1/3] clk: sunxi-ng: div: Add support for fixed post-divider Icenowy Zheng 2017-08-12 12:43 ` [PATCH v4 2/3] clk: sunxi-ng: nkm: add " Icenowy Zheng @ 2017-08-12 12:43 ` Icenowy Zheng 2017-08-14 16:12 ` Chen-Yu Tsai 2 siblings, 1 reply; 12+ messages in thread From: Icenowy Zheng @ 2017-08-12 12:43 UTC (permalink / raw) To: linux-arm-kernel 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 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 | 1240 +++++++++++++++++++++++++++++ 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, 1632 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 diff --git a/drivers/clk/sunxi-ng/Kconfig b/drivers/clk/sunxi-ng/Kconfig index 7342928c35cd..7a360737fe3c 100644 --- a/drivers/clk/sunxi-ng/Kconfig +++ b/drivers/clk/sunxi-ng/Kconfig @@ -48,6 +48,11 @@ config SUN8I_V3S_CCU config SUN8I_DE2_CCU bool "Support for the Allwinner SoCs DE2 CCU" +config SUN8I_R40_CCU + bool "Support for the Allwinner R40 CCU" + default MACH_SUN8I + depends on MACH_SUN8I || COMPILE_TEST + config SUN9I_A80_CCU bool "Support for the Allwinner A80 CCU" default MACH_SUN9I diff --git a/drivers/clk/sunxi-ng/Makefile b/drivers/clk/sunxi-ng/Makefile index 45a5910379a5..b1267fe68a8f 100644 --- a/drivers/clk/sunxi-ng/Makefile +++ b/drivers/clk/sunxi-ng/Makefile @@ -29,6 +29,7 @@ obj-$(CONFIG_SUN8I_H3_CCU) += ccu-sun8i-h3.o obj-$(CONFIG_SUN8I_V3S_CCU) += ccu-sun8i-v3s.o obj-$(CONFIG_SUN8I_DE2_CCU) += ccu-sun8i-de2.o obj-$(CONFIG_SUN8I_R_CCU) += ccu-sun8i-r.o +obj-$(CONFIG_SUN8I_R40_CCU) += ccu-sun8i-r40.o obj-$(CONFIG_SUN9I_A80_CCU) += ccu-sun9i-a80.o obj-$(CONFIG_SUN9I_A80_CCU) += ccu-sun9i-a80-de.o obj-$(CONFIG_SUN9I_A80_CCU) += ccu-sun9i-a80-usb.o diff --git a/drivers/clk/sunxi-ng/ccu-sun8i-r40.c b/drivers/clk/sunxi-ng/ccu-sun8i-r40.c new file mode 100644 index 000000000000..9dc6ad419f9a --- /dev/null +++ b/drivers/clk/sunxi-ng/ccu-sun8i-r40.c @@ -0,0 +1,1240 @@ +/* + * Copyright (c) 2017 Icenowy Zheng <icenowy@aosc.io> + * + * This software is licensed under the terms of the GNU General Public + * License version 2, as published by the Free Software Foundation, and + * may be copied, distributed, and modified under those terms. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include <linux/clk-provider.h> +#include <linux/of_address.h> + +#include "ccu_common.h" +#include "ccu_reset.h" + +#include "ccu_div.h" +#include "ccu_gate.h" +#include "ccu_mp.h" +#include "ccu_mult.h" +#include "ccu_nk.h" +#include "ccu_nkm.h" +#include "ccu_nkmp.h" +#include "ccu_nm.h" +#include "ccu_phase.h" + +#include "ccu-sun8i-r40.h" + +static struct ccu_nkmp pll_cpu_clk = { + .enable = BIT(31), + .lock = BIT(28), + .n = _SUNXI_CCU_MULT(8, 5), + .k = _SUNXI_CCU_MULT(4, 2), + .m = _SUNXI_CCU_DIV(0, 2), + .p = _SUNXI_CCU_DIV_MAX(16, 2, 4), + .common = { + .reg = 0x000, + .hw.init = CLK_HW_INIT("pll-cpu", + "osc24M", + &ccu_nkmp_ops, + 0), + }, +}; + +/* + * The Audio PLL is supposed to have 4 outputs: 3 fixed factors from + * the base (2x, 4x and 8x), and one variable divider (the one true + * pll audio). + * + * We don't have any need for the variable divider for now, so we just + * hardcode it to match with the clock names + */ +#define SUN8I_R40_PLL_AUDIO_REG 0x008 + +static SUNXI_CCU_NM_WITH_GATE_LOCK(pll_audio_base_clk, "pll-audio-base", + "osc24M", 0x008, + 8, 7, /* N */ + 0, 5, /* M */ + BIT(31), /* gate */ + BIT(28), /* lock */ + 0); + +static SUNXI_CCU_NM_WITH_FRAC_GATE_LOCK(pll_video0_clk, "pll-video0", + "osc24M", 0x0010, + 8, 7, /* N */ + 0, 4, /* M */ + BIT(24), /* frac enable */ + BIT(25), /* frac select */ + 270000000, /* frac rate 0 */ + 297000000, /* frac rate 1 */ + BIT(31), /* gate */ + BIT(28), /* lock */ + 0); + +static SUNXI_CCU_NM_WITH_FRAC_GATE_LOCK(pll_ve_clk, "pll-ve", + "osc24M", 0x0018, + 8, 7, /* N */ + 0, 4, /* M */ + BIT(24), /* frac enable */ + BIT(25), /* frac select */ + 270000000, /* frac rate 0 */ + 297000000, /* frac rate 1 */ + BIT(31), /* gate */ + BIT(28), /* lock */ + 0); + +static SUNXI_CCU_NKM_WITH_GATE_LOCK(pll_ddr0_clk, "pll-ddr0", + "osc24M", 0x020, + 8, 5, /* N */ + 4, 2, /* K */ + 0, 2, /* M */ + BIT(31), /* gate */ + BIT(28), /* lock */ + 0); + +static struct ccu_nk pll_periph0_clk = { + .enable = BIT(31), + .lock = BIT(28), + .n = _SUNXI_CCU_MULT(8, 5), + .k = _SUNXI_CCU_MULT(4, 2), + .fixed_post_div = 2, + .common = { + .reg = 0x028, + .features = CCU_FEATURE_FIXED_POSTDIV, + .hw.init = CLK_HW_INIT("pll-periph0", "osc24M", + &ccu_nk_ops, 0), + }, +}; + +static struct ccu_div pll_periph0_sata_clk = { + .enable = BIT(24), + .div = _SUNXI_CCU_DIV(0, 2), + /* + * The formula of pll-periph0 (1x) is 24MHz*N*K/2, and the formula + * of pll-periph0-sata is 24MHz*N*K/M/6, so the postdiv here is + * 6/2 = 3. + */ + .fixed_post_div = 3, + .common = { + .reg = 0x028, + .features = CCU_FEATURE_FIXED_POSTDIV, + .hw.init = CLK_HW_INIT("pll-periph0-sata", + "pll-periph0", + &ccu_div_ops, 0), + }, +}; + +static struct ccu_nk pll_periph1_clk = { + .enable = BIT(31), + .lock = BIT(28), + .n = _SUNXI_CCU_MULT(8, 5), + .k = _SUNXI_CCU_MULT(4, 2), + .fixed_post_div = 2, + .common = { + .reg = 0x02c, + .features = CCU_FEATURE_FIXED_POSTDIV, + .hw.init = CLK_HW_INIT("pll-periph1", "osc24M", + &ccu_nk_ops, 0), + }, +}; + +static SUNXI_CCU_NM_WITH_FRAC_GATE_LOCK(pll_video1_clk, "pll-video1", + "osc24M", 0x030, + 8, 7, /* N */ + 0, 4, /* M */ + BIT(24), /* frac enable */ + BIT(25), /* frac select */ + 270000000, /* frac rate 0 */ + 297000000, /* frac rate 1 */ + BIT(31), /* gate */ + BIT(28), /* lock */ + 0); + +static struct ccu_nkm pll_sata_clk = { + .enable = BIT(31), + .lock = BIT(28), + .n = _SUNXI_CCU_MULT(8, 5), + .k = _SUNXI_CCU_MULT(4, 2), + .m = _SUNXI_CCU_DIV(0, 2), + .fixed_post_div = 6, + .common = { + .reg = 0x034, + .features = CCU_FEATURE_FIXED_POSTDIV, + .hw.init = CLK_HW_INIT("pll-sata", "osc24M", + &ccu_nkm_ops, 0), + }, +}; + +static const char * const pll_sata_out_parents[] = { "pll-sata", + "pll-periph0-sata" }; +static SUNXI_CCU_MUX_WITH_GATE(pll_sata_out_clk, "pll-sata-out", + pll_sata_out_parents, 0x034, + 30, 1, /* mux */ + BIT(14), /* gate */ + 0); + +static SUNXI_CCU_NM_WITH_FRAC_GATE_LOCK(pll_gpu_clk, "pll-gpu", + "osc24M", 0x038, + 8, 7, /* N */ + 0, 4, /* M */ + BIT(24), /* frac enable */ + BIT(25), /* frac select */ + 270000000, /* frac rate 0 */ + 297000000, /* frac rate 1 */ + BIT(31), /* gate */ + BIT(28), /* lock */ + 0); + +/* + * The MIPI PLL has 2 modes: "MIPI" and "HDMI". + * + * The MIPI mode is a standard NKM-style clock. The HDMI mode is an + * integer / fractional clock with switchable multipliers and dividers. + * This is not supported here. We hardcode the PLL to MIPI mode. + */ +#define SUN8I_R40_PLL_MIPI_REG 0x040 + +static const char * const pll_mipi_parents[] = { "pll-video0" }; +static SUNXI_CCU_NKM_WITH_MUX_GATE_LOCK(pll_mipi_clk, "pll-mipi", + pll_mipi_parents, 0x040, + 8, 4, /* N */ + 4, 2, /* K */ + 0, 4, /* M */ + 21, 1, /* mux */ + BIT(31) | BIT(23) | BIT(22), /* gate */ + BIT(28), /* lock */ + CLK_SET_RATE_UNGATE); + +static SUNXI_CCU_NM_WITH_FRAC_GATE_LOCK(pll_de_clk, "pll-de", + "osc24M", 0x0048, + 8, 7, /* N */ + 0, 4, /* M */ + BIT(24), /* frac enable */ + BIT(25), /* frac select */ + 270000000, /* frac rate 0 */ + 297000000, /* frac rate 1 */ + BIT(31), /* gate */ + BIT(28), /* lock */ + 0); + +static SUNXI_CCU_NM_WITH_GATE_LOCK(pll_ddr1_clk, "pll-ddr1", + "osc24M", 0x04c, + 8, 7, /* N */ + 0, 2, /* M */ + BIT(31), /* gate */ + BIT(28), /* lock */ + CLK_SET_RATE_UNGATE); + +static const char * const cpu_parents[] = { "osc32k", "osc24M", + "pll-cpu", "pll-cpu" }; +static SUNXI_CCU_MUX(cpu_clk, "cpu", cpu_parents, + 0x050, 16, 2, CLK_IS_CRITICAL); + +static SUNXI_CCU_M(axi_clk, "axi", "cpu", 0x050, 0, 2, 0); + +static const char * const ahb1_parents[] = { "osc32k", "osc24M", + "axi", "pll-periph0" }; +static const struct ccu_mux_var_prediv ahb1_predivs[] = { + { .index = 3, .shift = 6, .width = 2 }, +}; +static struct ccu_div ahb1_clk = { + .div = _SUNXI_CCU_DIV_FLAGS(4, 2, CLK_DIVIDER_POWER_OF_TWO), + + .mux = { + .shift = 12, + .width = 2, + + .var_predivs = ahb1_predivs, + .n_var_predivs = ARRAY_SIZE(ahb1_predivs), + }, + + .common = { + .reg = 0x054, + .features = CCU_FEATURE_VARIABLE_PREDIV, + .hw.init = CLK_HW_INIT_PARENTS("ahb1", + ahb1_parents, + &ccu_div_ops, + 0), + }, +}; + +static struct clk_div_table apb1_div_table[] = { + { .val = 0, .div = 2 }, + { .val = 1, .div = 2 }, + { .val = 2, .div = 4 }, + { .val = 3, .div = 8 }, + { /* Sentinel */ }, +}; +static SUNXI_CCU_DIV_TABLE(apb1_clk, "apb1", "ahb1", + 0x054, 8, 2, apb1_div_table, 0); + +static const char * const apb2_parents[] = { "osc32k", "osc24M", + "pll-periph0-2x", + "pll-periph0-2x" }; +static SUNXI_CCU_MP_WITH_MUX(apb2_clk, "apb2", apb2_parents, 0x058, + 0, 5, /* M */ + 16, 2, /* P */ + 24, 2, /* mux */ + 0); + +static SUNXI_CCU_GATE(bus_mipi_dsi_clk, "bus-mipi-dsi", "ahb1", + 0x060, BIT(1), 0); +static SUNXI_CCU_GATE(bus_ce_clk, "bus-ce", "ahb1", + 0x060, BIT(5), 0); +static SUNXI_CCU_GATE(bus_dma_clk, "bus-dma", "ahb1", + 0x060, BIT(6), 0); +static SUNXI_CCU_GATE(bus_mmc0_clk, "bus-mmc0", "ahb1", + 0x060, BIT(8), 0); +static SUNXI_CCU_GATE(bus_mmc1_clk, "bus-mmc1", "ahb1", + 0x060, BIT(9), 0); +static SUNXI_CCU_GATE(bus_mmc2_clk, "bus-mmc2", "ahb1", + 0x060, BIT(10), 0); +static SUNXI_CCU_GATE(bus_mmc3_clk, "bus-mmc3", "ahb1", + 0x060, BIT(11), 0); +static SUNXI_CCU_GATE(bus_nand_clk, "bus-nand", "ahb1", + 0x060, BIT(13), 0); +static SUNXI_CCU_GATE(bus_dram_clk, "bus-dram", "ahb1", + 0x060, BIT(14), 0); +static SUNXI_CCU_GATE(bus_emac_clk, "bus-emac", "ahb1", + 0x060, BIT(17), 0); +static SUNXI_CCU_GATE(bus_ts_clk, "bus-ts", "ahb1", + 0x060, BIT(18), 0); +static SUNXI_CCU_GATE(bus_hstimer_clk, "bus-hstimer", "ahb1", + 0x060, BIT(19), 0); +static SUNXI_CCU_GATE(bus_spi0_clk, "bus-spi0", "ahb1", + 0x060, BIT(20), 0); +static SUNXI_CCU_GATE(bus_spi1_clk, "bus-spi1", "ahb1", + 0x060, BIT(21), 0); +static SUNXI_CCU_GATE(bus_spi2_clk, "bus-spi2", "ahb1", + 0x060, BIT(22), 0); +static SUNXI_CCU_GATE(bus_spi3_clk, "bus-spi3", "ahb1", + 0x060, BIT(23), 0); +static SUNXI_CCU_GATE(bus_sata_clk, "bus-sata", "ahb1", + 0x060, BIT(24), 0); +static SUNXI_CCU_GATE(bus_otg_clk, "bus-otg", "ahb1", + 0x060, BIT(25), 0); +static SUNXI_CCU_GATE(bus_ehci0_clk, "bus-ehci0", "ahb1", + 0x060, BIT(26), 0); +static SUNXI_CCU_GATE(bus_ehci1_clk, "bus-ehci1", "ahb1", + 0x060, BIT(27), 0); +static SUNXI_CCU_GATE(bus_ehci2_clk, "bus-ehci2", "ahb1", + 0x060, BIT(28), 0); +static SUNXI_CCU_GATE(bus_ohci0_clk, "bus-ohci0", "ahb1", + 0x060, BIT(29), 0); +static SUNXI_CCU_GATE(bus_ohci1_clk, "bus-ohci1", "ahb1", + 0x060, BIT(30), 0); +static SUNXI_CCU_GATE(bus_ohci2_clk, "bus-ohci2", "ahb1", + 0x060, BIT(31), 0); + +static SUNXI_CCU_GATE(bus_ve_clk, "bus-ve", "ahb1", + 0x064, BIT(0), 0); +static SUNXI_CCU_GATE(bus_mp_clk, "bus-mp", "ahb1", + 0x064, BIT(2), 0); +static SUNXI_CCU_GATE(bus_deinterlace_clk, "bus-deinterlace", "ahb1", + 0x064, BIT(5), 0); +static SUNXI_CCU_GATE(bus_csi0_clk, "bus-csi0", "ahb1", + 0x064, BIT(8), 0); +static SUNXI_CCU_GATE(bus_csi1_clk, "bus-csi1", "ahb1", + 0x064, BIT(9), 0); +static SUNXI_CCU_GATE(bus_hdmi0_clk, "bus-hdmi0", "ahb1", + 0x064, BIT(10), 0); +static SUNXI_CCU_GATE(bus_hdmi1_clk, "bus-hdmi1", "ahb1", + 0x064, BIT(11), 0); +static SUNXI_CCU_GATE(bus_de_clk, "bus-de", "ahb1", + 0x064, BIT(12), 0); +static SUNXI_CCU_GATE(bus_tve0_clk, "bus-tve0", "ahb1", + 0x064, BIT(13), 0); +static SUNXI_CCU_GATE(bus_tve1_clk, "bus-tve1", "ahb1", + 0x064, BIT(14), 0); +static SUNXI_CCU_GATE(bus_tve_top_clk, "bus-tve-top", "ahb1", + 0x064, BIT(15), 0); +static SUNXI_CCU_GATE(bus_gmac_clk, "bus-gmac", "ahb1", + 0x064, BIT(17), 0); +static SUNXI_CCU_GATE(bus_gpu_clk, "bus-gpu", "ahb1", + 0x064, BIT(20), 0); +static SUNXI_CCU_GATE(bus_tvd0_clk, "bus-tvd0", "ahb1", + 0x064, BIT(21), 0); +static SUNXI_CCU_GATE(bus_tvd1_clk, "bus-tvd1", "ahb1", + 0x064, BIT(22), 0); +static SUNXI_CCU_GATE(bus_tvd2_clk, "bus-tvd2", "ahb1", + 0x064, BIT(23), 0); +static SUNXI_CCU_GATE(bus_tvd3_clk, "bus-tvd3", "ahb1", + 0x064, BIT(24), 0); +static SUNXI_CCU_GATE(bus_tvd_top_clk, "bus-tvd-top", "ahb1", + 0x064, BIT(25), 0); +static SUNXI_CCU_GATE(bus_tcon_lcd0_clk, "bus-tcon-lcd0", "ahb1", + 0x064, BIT(26), 0); +static SUNXI_CCU_GATE(bus_tcon_lcd1_clk, "bus-tcon-lcd1", "ahb1", + 0x064, BIT(27), 0); +static SUNXI_CCU_GATE(bus_tcon_tv0_clk, "bus-tcon-tv0", "ahb1", + 0x064, BIT(28), 0); +static SUNXI_CCU_GATE(bus_tcon_tv1_clk, "bus-tcon-tv1", "ahb1", + 0x064, BIT(29), 0); +static SUNXI_CCU_GATE(bus_tcon_top_clk, "bus-tcon-top", "ahb1", + 0x064, BIT(30), 0); + +static SUNXI_CCU_GATE(bus_codec_clk, "bus-codec", "apb1", + 0x068, BIT(0), 0); +static SUNXI_CCU_GATE(bus_spdif_clk, "bus-spdif", "apb1", + 0x068, BIT(1), 0); +static SUNXI_CCU_GATE(bus_ac97_clk, "bus-ac97", "apb1", + 0x068, BIT(2), 0); +static SUNXI_CCU_GATE(bus_pio_clk, "bus-pio", "apb1", + 0x068, BIT(5), 0); +static SUNXI_CCU_GATE(bus_ir0_clk, "bus-ir0", "apb1", + 0x068, BIT(6), 0); +static SUNXI_CCU_GATE(bus_ir1_clk, "bus-ir1", "apb1", + 0x068, BIT(7), 0); +static SUNXI_CCU_GATE(bus_ths_clk, "bus-ths", "apb1", + 0x068, BIT(8), 0); +static SUNXI_CCU_GATE(bus_keypad_clk, "bus-keypad", "apb1", + 0x068, BIT(10), 0); +static SUNXI_CCU_GATE(bus_i2s0_clk, "bus-i2s0", "apb1", + 0x068, BIT(12), 0); +static SUNXI_CCU_GATE(bus_i2s1_clk, "bus-i2s1", "apb1", + 0x068, BIT(13), 0); +static SUNXI_CCU_GATE(bus_i2s2_clk, "bus-i2s2", "apb1", + 0x068, BIT(14), 0); + +static SUNXI_CCU_GATE(bus_i2c0_clk, "bus-i2c0", "apb2", + 0x06c, BIT(0), 0); +static SUNXI_CCU_GATE(bus_i2c1_clk, "bus-i2c1", "apb2", + 0x06c, BIT(1), 0); +static SUNXI_CCU_GATE(bus_i2c2_clk, "bus-i2c2", "apb2", + 0x06c, BIT(2), 0); +static SUNXI_CCU_GATE(bus_i2c3_clk, "bus-i2c3", "apb2", + 0x06c, BIT(3), 0); +/* + * In datasheet here's "Reserved", however the gate exists in BSP soucre + * code. + */ +static SUNXI_CCU_GATE(bus_can_clk, "bus-can", "apb2", + 0x06c, BIT(4), 0); +static SUNXI_CCU_GATE(bus_scr_clk, "bus-scr", "apb2", + 0x06c, BIT(5), 0); +static SUNXI_CCU_GATE(bus_ps20_clk, "bus-ps20", "apb2", + 0x06c, BIT(6), 0); +static SUNXI_CCU_GATE(bus_ps21_clk, "bus-ps21", "apb2", + 0x06c, BIT(7), 0); +static SUNXI_CCU_GATE(bus_i2c4_clk, "bus-i2c4", "apb2", + 0x06c, BIT(15), 0); +static SUNXI_CCU_GATE(bus_uart0_clk, "bus-uart0", "apb2", + 0x06c, BIT(16), 0); +static SUNXI_CCU_GATE(bus_uart1_clk, "bus-uart1", "apb2", + 0x06c, BIT(17), 0); +static SUNXI_CCU_GATE(bus_uart2_clk, "bus-uart2", "apb2", + 0x06c, BIT(18), 0); +static SUNXI_CCU_GATE(bus_uart3_clk, "bus-uart3", "apb2", + 0x06c, BIT(19), 0); +static SUNXI_CCU_GATE(bus_uart4_clk, "bus-uart4", "apb2", + 0x06c, BIT(20), 0); +static SUNXI_CCU_GATE(bus_uart5_clk, "bus-uart5", "apb2", + 0x06c, BIT(21), 0); +static SUNXI_CCU_GATE(bus_uart6_clk, "bus-uart6", "apb2", + 0x06c, BIT(22), 0); +static SUNXI_CCU_GATE(bus_uart7_clk, "bus-uart7", "apb2", + 0x06c, BIT(23), 0); + +static SUNXI_CCU_GATE(bus_dbg_clk, "bus-dbg", "ahb1", + 0x070, BIT(7), 0); + +static struct clk_div_table ths_div_table[] = { + { .val = 0, .div = 1 }, + { .val = 1, .div = 2 }, + { .val = 2, .div = 4 }, + { .val = 3, .div = 8 }, +}; +static const char * const ths_parents[] = { "osc24M" }; +static struct ccu_div ths_clk = { + .enable = BIT(31), + .div = _SUNXI_CCU_DIV_TABLE(0, 2, ths_div_table), + .mux = _SUNXI_CCU_MUX(24, 2), + .common = { + .reg = 0x074, + .hw.init = CLK_HW_INIT_PARENTS("ths", + ths_parents, + &ccu_div_ops, + 0), + }, +}; + +static const char * const mod0_default_parents[] = { "osc24M", "pll-periph0", + "pll-periph1" }; +static SUNXI_CCU_MP_WITH_MUX_GATE(nand_clk, "nand", mod0_default_parents, 0x080, + 0, 4, /* M */ + 16, 2, /* P */ + 24, 2, /* mux */ + BIT(31), /* gate */ + 0); + +static SUNXI_CCU_MP_WITH_MUX_GATE(mmc0_clk, "mmc0", mod0_default_parents, 0x088, + 0, 4, /* M */ + 16, 2, /* P */ + 24, 2, /* mux */ + BIT(31), /* gate */ + 0); + +static SUNXI_CCU_MP_WITH_MUX_GATE(mmc1_clk, "mmc1", mod0_default_parents, 0x08c, + 0, 4, /* M */ + 16, 2, /* P */ + 24, 2, /* mux */ + BIT(31), /* gate */ + 0); + +static SUNXI_CCU_MP_WITH_MUX_GATE(mmc2_clk, "mmc2", mod0_default_parents, 0x090, + 0, 4, /* M */ + 16, 2, /* P */ + 24, 2, /* mux */ + BIT(31), /* gate */ + 0); + +static SUNXI_CCU_MP_WITH_MUX_GATE(mmc3_clk, "mmc3", mod0_default_parents, 0x094, + 0, 4, /* M */ + 16, 2, /* P */ + 24, 2, /* mux */ + BIT(31), /* gate */ + 0); + +static const char * const ts_parents[] = { "osc24M", "pll-periph0", }; +static SUNXI_CCU_MP_WITH_MUX_GATE(ts_clk, "ts", ts_parents, 0x098, + 0, 4, /* M */ + 16, 2, /* P */ + 24, 4, /* mux */ + BIT(31), /* gate */ + 0); + +static const char * const ce_parents[] = { "osc24M", "pll-periph0-2x", + "pll-periph1-2x" }; +static SUNXI_CCU_MP_WITH_MUX_GATE(ce_clk, "ce", ce_parents, 0x09c, + 0, 4, /* M */ + 16, 2, /* P */ + 24, 2, /* mux */ + BIT(31), /* gate */ + 0); + +static SUNXI_CCU_MP_WITH_MUX_GATE(spi0_clk, "spi0", mod0_default_parents, 0x0a0, + 0, 4, /* M */ + 16, 2, /* P */ + 24, 2, /* mux */ + BIT(31), /* gate */ + 0); + +static SUNXI_CCU_MP_WITH_MUX_GATE(spi1_clk, "spi1", mod0_default_parents, 0x0a4, + 0, 4, /* M */ + 16, 2, /* P */ + 24, 2, /* mux */ + BIT(31), /* gate */ + 0); + +static SUNXI_CCU_MP_WITH_MUX_GATE(spi2_clk, "spi2", mod0_default_parents, 0x0a8, + 0, 4, /* M */ + 16, 2, /* P */ + 24, 2, /* mux */ + BIT(31), /* gate */ + 0); + +static SUNXI_CCU_MP_WITH_MUX_GATE(spi3_clk, "spi3", mod0_default_parents, 0x0ac, + 0, 4, /* M */ + 16, 2, /* P */ + 24, 2, /* mux */ + BIT(31), /* gate */ + 0); + +static const char * const i2s_parents[] = { "pll-audio-8x", "pll-audio-4x", + "pll-audio-2x", "pll-audio" }; +static SUNXI_CCU_MUX_WITH_GATE(i2s0_clk, "i2s0", i2s_parents, + 0x0b0, 16, 2, BIT(31), CLK_SET_RATE_PARENT); + +static SUNXI_CCU_MUX_WITH_GATE(i2s1_clk, "i2s1", i2s_parents, + 0x0b4, 16, 2, BIT(31), CLK_SET_RATE_PARENT); + +static SUNXI_CCU_MUX_WITH_GATE(i2s2_clk, "i2s2", i2s_parents, + 0x0b8, 16, 2, BIT(31), CLK_SET_RATE_PARENT); + +static SUNXI_CCU_MUX_WITH_GATE(ac97_clk, "ac97", i2s_parents, + 0x0bc, 16, 2, BIT(31), CLK_SET_RATE_PARENT); + +static SUNXI_CCU_MUX_WITH_GATE(spdif_clk, "spdif", i2s_parents, + 0x0c0, 16, 2, BIT(31), CLK_SET_RATE_PARENT); + +static const char * const keypad_parents[] = { "osc24M", "osc32k", }; +static const u8 keypad_table[] = { 0, 2 }; +static struct ccu_mp keypad_clk = { + .enable = BIT(31), + .m = _SUNXI_CCU_DIV(0, 5), + .p = _SUNXI_CCU_DIV(16, 2), + .mux = _SUNXI_CCU_MUX_TABLE(24, 2, keypad_table), + .common = { + .reg = 0x0c4, + .hw.init = CLK_HW_INIT_PARENTS("keypad", + keypad_parents, + &ccu_mp_ops, + 0), + } +}; + +static const char * const sata_parents[] = { "pll-sata-out", "sata-ext" }; +static SUNXI_CCU_MUX_WITH_GATE(sata_clk, "sata", sata_parents, + 0x0c8, 24, 1, BIT(31), CLK_SET_RATE_PARENT); + +static SUNXI_CCU_GATE(usb_phy0_clk, "usb-phy0", "osc24M", + 0x0cc, BIT(8), 0); +static SUNXI_CCU_GATE(usb_phy1_clk, "usb-phy1", "osc24M", + 0x0cc, BIT(9), 0); +static SUNXI_CCU_GATE(usb_phy2_clk, "usb-phy2", "osc24M", + 0x0cc, BIT(10), 0); +static SUNXI_CCU_GATE(usb_ohci0_clk, "usb-ohci0", "osc12M", + 0x0cc, BIT(16), 0); +static SUNXI_CCU_GATE(usb_ohci1_clk, "usb-ohci1", "osc12M", + 0x0cc, BIT(17), 0); +static SUNXI_CCU_GATE(usb_ohci2_clk, "usb-ohci2", "osc12M", + 0x0cc, BIT(18), 0); + +static const char * const ir_parents[] = { "osc24M", "pll-periph0", + "pll-periph1", "osc32k" }; +static SUNXI_CCU_MP_WITH_MUX_GATE(ir0_clk, "ir0", ir_parents, 0x0d0, + 0, 4, /* M */ + 16, 2, /* P */ + 24, 2, /* mux */ + BIT(31), /* gate */ + 0); + +static SUNXI_CCU_MP_WITH_MUX_GATE(ir1_clk, "ir1", ir_parents, 0x0d4, + 0, 4, /* M */ + 16, 2, /* P */ + 24, 2, /* mux */ + BIT(31), /* gate */ + 0); + +static const char * const dram_parents[] = { "pll-ddr0", "pll-ddr1" }; +static SUNXI_CCU_M_WITH_MUX(dram_clk, "dram", dram_parents, + 0x0f4, 0, 2, 20, 2, CLK_IS_CRITICAL); + +static SUNXI_CCU_GATE(dram_ve_clk, "dram-ve", "dram", + 0x100, BIT(0), 0); +static SUNXI_CCU_GATE(dram_csi0_clk, "dram-csi0", "dram", + 0x100, BIT(1), 0); +static SUNXI_CCU_GATE(dram_csi1_clk, "dram-csi1", "dram", + 0x100, BIT(2), 0); +static SUNXI_CCU_GATE(dram_ts_clk, "dram-ts", "dram", + 0x100, BIT(3), 0); +static SUNXI_CCU_GATE(dram_tvd_clk, "dram-tvd", "dram", + 0x100, BIT(4), 0); +static SUNXI_CCU_GATE(dram_mp_clk, "dram-mp", "dram", + 0x100, BIT(5), 0); +static SUNXI_CCU_GATE(dram_deinterlace_clk, "dram-deinterlace", "dram", + 0x100, BIT(6), 0); + +static const char * const de_parents[] = { "pll-periph0-2x", "pll-de" }; +static SUNXI_CCU_M_WITH_MUX_GATE(de_clk, "de", de_parents, + 0x104, 0, 4, 24, 3, BIT(31), 0); +static SUNXI_CCU_M_WITH_MUX_GATE(mp_clk, "mp", de_parents, + 0x108, 0, 4, 24, 3, BIT(31), 0); + +static const char * const tcon_parents[] = { "pll-video0", "pll-video1", + "pll-video0-2x", "pll-video1-2x", + "pll-mipi" }; +static SUNXI_CCU_MUX_WITH_GATE(tcon_lcd0_clk, "tcon-lcd0", tcon_parents, + 0x110, 24, 3, BIT(31), CLK_SET_RATE_PARENT); +static SUNXI_CCU_MUX_WITH_GATE(tcon_lcd1_clk, "tcon-lcd1", tcon_parents, + 0x114, 24, 3, BIT(31), CLK_SET_RATE_PARENT); +static SUNXI_CCU_M_WITH_MUX_GATE(tcon_tv0_clk, "tcon-tv0", tcon_parents, + 0x118, 0, 4, 24, 3, BIT(31), 0); +static SUNXI_CCU_M_WITH_MUX_GATE(tcon_tv1_clk, "tcon-tv1", tcon_parents, + 0x11c, 0, 4, 24, 3, BIT(31), 0); + +static const char * const deinterlace_parents[] = { "pll-periph0", + "pll-periph1" }; +static SUNXI_CCU_M_WITH_MUX_GATE(deinterlace_clk, "deinterlace", + deinterlace_parents, 0x124, 0, 4, 24, 3, + BIT(31), 0); + +static const char * const csi_mclk_parents[] = { "osc24M", "pll-video", + "pll-periph1" }; +static SUNXI_CCU_M_WITH_MUX_GATE(csi1_mclk_clk, "csi1-mclk", csi_mclk_parents, + 0x130, 0, 5, 8, 3, BIT(15), 0); + +static const char * const csi_sclk_parents[] = { "pll-periph0", "pll-periph1" }; +static SUNXI_CCU_M_WITH_MUX_GATE(csi_sclk_clk, "csi-sclk", csi_sclk_parents, + 0x134, 16, 4, 24, 3, BIT(31), 0); + +static SUNXI_CCU_M_WITH_MUX_GATE(csi0_mclk_clk, "csi0-mclk", csi_mclk_parents, + 0x134, 0, 5, 8, 3, BIT(15), 0); + +static SUNXI_CCU_M_WITH_GATE(ve_clk, "ve", "pll-ve", + 0x13c, 16, 3, BIT(31), 0); + +static SUNXI_CCU_GATE(adda_clk, "adda", "pll-audio", + 0x140, BIT(31), CLK_SET_RATE_PARENT); +static SUNXI_CCU_GATE(avs_clk, "avs", "osc24M", + 0x144, BIT(31), 0); + +static const char * const hdmi_parents[] = { "pll-video0", "pll-video1" }; +static SUNXI_CCU_M_WITH_MUX_GATE(hdmi_clk, "hdmi", hdmi_parents, + 0x150, 0, 4, 24, 2, BIT(31), 0); + +static SUNXI_CCU_GATE(hdmi_slow_clk, "hdmi-slow", "osc24M", + 0x154, BIT(31), 0); + +static const char * const mbus_parents[] = { "osc24M", "pll-periph0-2x", + "pll-ddr0" }; +static SUNXI_CCU_MP_WITH_MUX_GATE(mbus_clk, "mbus", mbus_parents, 0x15c, + 0, 4, /* M */ + 16, 2, /* P */ + 24, 2, /* mux */ + BIT(31), /* gate */ + CLK_IS_CRITICAL); + +static const char * const dsi_dphy_parents[] = { "pll-video0", "pll-video1", + "pll-periph0" }; +static SUNXI_CCU_M_WITH_MUX_GATE(dsi_dphy_clk, "dsi-dphy", dsi_dphy_parents, + 0x168, 0, 4, 8, 2, BIT(15), 0); + +static SUNXI_CCU_M_WITH_MUX_GATE(tve0_clk, "tve0", tcon_parents, + 0x180, 0, 4, 24, 3, BIT(31), 0); +static SUNXI_CCU_M_WITH_MUX_GATE(tve1_clk, "tve1", tcon_parents, + 0x184, 0, 4, 24, 3, BIT(31), 0); + +static const char * const tvd_parents[] = { "pll-video0", "pll-video1", + "pll-video0-2x", "pll-video1-2x" }; +static SUNXI_CCU_M_WITH_MUX_GATE(tvd0_clk, "tvd0", tvd_parents, + 0x188, 0, 4, 24, 3, BIT(31), 0); +static SUNXI_CCU_M_WITH_MUX_GATE(tvd1_clk, "tvd1", tvd_parents, + 0x18c, 0, 4, 24, 3, BIT(31), 0); +static SUNXI_CCU_M_WITH_MUX_GATE(tvd2_clk, "tvd2", tvd_parents, + 0x190, 0, 4, 24, 3, BIT(31), 0); +static SUNXI_CCU_M_WITH_MUX_GATE(tvd3_clk, "tvd3", tvd_parents, + 0x194, 0, 4, 24, 3, BIT(31), 0); + +static SUNXI_CCU_M_WITH_GATE(gpu_clk, "gpu", "pll-gpu", + 0x1a0, 0, 3, BIT(31), CLK_SET_RATE_PARENT); + +static const char * const out_parents[] = { "osc24M", "osc32k", "osc24M" }; +static const struct ccu_mux_fixed_prediv out_predivs[] = { + { .index = 0, .div = 750, }, +}; + +static struct ccu_mp outa_clk = { + .enable = BIT(31), + .m = _SUNXI_CCU_DIV(8, 5), + .p = _SUNXI_CCU_DIV(20, 2), + .mux = { + .shift = 24, + .width = 2, + .fixed_predivs = out_predivs, + .n_predivs = ARRAY_SIZE(out_predivs), + }, + .common = { + .reg = 0x1f0, + .features = CCU_FEATURE_FIXED_PREDIV, + .hw.init = CLK_HW_INIT_PARENTS("outa", out_parents, + &ccu_mp_ops, 0), + } +}; + +static struct ccu_mp outb_clk = { + .enable = BIT(31), + .m = _SUNXI_CCU_DIV(8, 5), + .p = _SUNXI_CCU_DIV(20, 2), + .mux = { + .shift = 24, + .width = 2, + .fixed_predivs = out_predivs, + .n_predivs = ARRAY_SIZE(out_predivs), + }, + .common = { + .reg = 0x1f4, + .features = CCU_FEATURE_FIXED_PREDIV, + .hw.init = CLK_HW_INIT_PARENTS("outb", out_parents, + &ccu_mp_ops, 0), + } +}; + +static struct ccu_common *sun8i_r40_ccu_clks[] = { + &pll_cpu_clk.common, + &pll_audio_base_clk.common, + &pll_video0_clk.common, + &pll_ve_clk.common, + &pll_ddr0_clk.common, + &pll_periph0_clk.common, + &pll_periph0_sata_clk.common, + &pll_periph1_clk.common, + &pll_video1_clk.common, + &pll_sata_clk.common, + &pll_sata_out_clk.common, + &pll_gpu_clk.common, + &pll_mipi_clk.common, + &pll_de_clk.common, + &pll_ddr1_clk.common, + &cpu_clk.common, + &axi_clk.common, + &ahb1_clk.common, + &apb1_clk.common, + &apb2_clk.common, + &bus_mipi_dsi_clk.common, + &bus_ce_clk.common, + &bus_dma_clk.common, + &bus_mmc0_clk.common, + &bus_mmc1_clk.common, + &bus_mmc2_clk.common, + &bus_mmc3_clk.common, + &bus_nand_clk.common, + &bus_dram_clk.common, + &bus_emac_clk.common, + &bus_ts_clk.common, + &bus_hstimer_clk.common, + &bus_spi0_clk.common, + &bus_spi1_clk.common, + &bus_spi2_clk.common, + &bus_spi3_clk.common, + &bus_sata_clk.common, + &bus_otg_clk.common, + &bus_ehci0_clk.common, + &bus_ehci1_clk.common, + &bus_ehci2_clk.common, + &bus_ohci0_clk.common, + &bus_ohci1_clk.common, + &bus_ohci2_clk.common, + &bus_ve_clk.common, + &bus_mp_clk.common, + &bus_deinterlace_clk.common, + &bus_csi0_clk.common, + &bus_csi1_clk.common, + &bus_hdmi0_clk.common, + &bus_hdmi1_clk.common, + &bus_de_clk.common, + &bus_tve0_clk.common, + &bus_tve1_clk.common, + &bus_tve_top_clk.common, + &bus_gmac_clk.common, + &bus_gpu_clk.common, + &bus_tvd0_clk.common, + &bus_tvd1_clk.common, + &bus_tvd2_clk.common, + &bus_tvd3_clk.common, + &bus_tvd_top_clk.common, + &bus_tcon_lcd0_clk.common, + &bus_tcon_lcd1_clk.common, + &bus_tcon_tv0_clk.common, + &bus_tcon_tv1_clk.common, + &bus_tcon_top_clk.common, + &bus_codec_clk.common, + &bus_spdif_clk.common, + &bus_ac97_clk.common, + &bus_pio_clk.common, + &bus_ir0_clk.common, + &bus_ir1_clk.common, + &bus_ths_clk.common, + &bus_keypad_clk.common, + &bus_i2s0_clk.common, + &bus_i2s1_clk.common, + &bus_i2s2_clk.common, + &bus_i2c0_clk.common, + &bus_i2c1_clk.common, + &bus_i2c2_clk.common, + &bus_i2c3_clk.common, + &bus_can_clk.common, + &bus_scr_clk.common, + &bus_ps20_clk.common, + &bus_ps21_clk.common, + &bus_i2c4_clk.common, + &bus_uart0_clk.common, + &bus_uart1_clk.common, + &bus_uart2_clk.common, + &bus_uart3_clk.common, + &bus_uart4_clk.common, + &bus_uart5_clk.common, + &bus_uart6_clk.common, + &bus_uart7_clk.common, + &bus_dbg_clk.common, + &ths_clk.common, + &nand_clk.common, + &mmc0_clk.common, + &mmc1_clk.common, + &mmc2_clk.common, + &mmc3_clk.common, + &ts_clk.common, + &ce_clk.common, + &spi0_clk.common, + &spi1_clk.common, + &spi2_clk.common, + &spi3_clk.common, + &i2s0_clk.common, + &i2s1_clk.common, + &i2s2_clk.common, + &ac97_clk.common, + &spdif_clk.common, + &keypad_clk.common, + &sata_clk.common, + &usb_phy0_clk.common, + &usb_phy1_clk.common, + &usb_phy2_clk.common, + &usb_ohci0_clk.common, + &usb_ohci1_clk.common, + &usb_ohci2_clk.common, + &ir0_clk.common, + &ir1_clk.common, + &dram_clk.common, + &dram_ve_clk.common, + &dram_csi0_clk.common, + &dram_csi1_clk.common, + &dram_ts_clk.common, + &dram_tvd_clk.common, + &dram_mp_clk.common, + &dram_deinterlace_clk.common, + &de_clk.common, + &mp_clk.common, + &tcon_lcd0_clk.common, + &tcon_lcd1_clk.common, + &tcon_tv0_clk.common, + &tcon_tv1_clk.common, + &deinterlace_clk.common, + &csi1_mclk_clk.common, + &csi_sclk_clk.common, + &csi0_mclk_clk.common, + &ve_clk.common, + &adda_clk.common, + &avs_clk.common, + &hdmi_clk.common, + &hdmi_slow_clk.common, + &mbus_clk.common, + &dsi_dphy_clk.common, + &tve0_clk.common, + &tve1_clk.common, + &tvd0_clk.common, + &tvd1_clk.common, + &tvd2_clk.common, + &tvd3_clk.common, + &gpu_clk.common, + &outa_clk.common, + &outb_clk.common, +}; + +/* Fixed Factor clocks */ +static CLK_FIXED_FACTOR(osc12M_clk, "osc12M", "osc24M", 2, 1, 0); + +/* We hardcode the divider to 4 for now */ +static CLK_FIXED_FACTOR(pll_audio_clk, "pll-audio", + "pll-audio-base", 4, 1, CLK_SET_RATE_PARENT); +static CLK_FIXED_FACTOR(pll_audio_2x_clk, "pll-audio-2x", + "pll-audio-base", 2, 1, CLK_SET_RATE_PARENT); +static CLK_FIXED_FACTOR(pll_audio_4x_clk, "pll-audio-4x", + "pll-audio-base", 1, 1, CLK_SET_RATE_PARENT); +static CLK_FIXED_FACTOR(pll_audio_8x_clk, "pll-audio-8x", + "pll-audio-base", 1, 2, CLK_SET_RATE_PARENT); +static CLK_FIXED_FACTOR(pll_periph0_2x_clk, "pll-periph0-2x", + "pll-periph0", 1, 2, 0); +static CLK_FIXED_FACTOR(pll_periph1_2x_clk, "pll-periph1-2x", + "pll-periph1", 1, 2, 0); +static CLK_FIXED_FACTOR(pll_video0_2x_clk, "pll-video0-2x", + "pll-video0", 1, 2, 0); +static CLK_FIXED_FACTOR(pll_video1_2x_clk, "pll-video1-2x", + "pll-video1", 1, 2, 0); + +static struct clk_hw_onecell_data sun8i_r40_hw_clks = { + .hws = { + [CLK_OSC_12M] = &osc12M_clk.hw, + [CLK_PLL_CPU] = &pll_cpu_clk.common.hw, + [CLK_PLL_AUDIO_BASE] = &pll_audio_base_clk.common.hw, + [CLK_PLL_AUDIO] = &pll_audio_clk.hw, + [CLK_PLL_AUDIO_2X] = &pll_audio_2x_clk.hw, + [CLK_PLL_AUDIO_4X] = &pll_audio_4x_clk.hw, + [CLK_PLL_AUDIO_8X] = &pll_audio_8x_clk.hw, + [CLK_PLL_VIDEO0] = &pll_video0_clk.common.hw, + [CLK_PLL_VIDEO0_2X] = &pll_video0_2x_clk.hw, + [CLK_PLL_VE] = &pll_ve_clk.common.hw, + [CLK_PLL_DDR0] = &pll_ddr0_clk.common.hw, + [CLK_PLL_PERIPH0] = &pll_periph0_clk.common.hw, + [CLK_PLL_PERIPH0_SATA] = &pll_periph0_sata_clk.common.hw, + [CLK_PLL_PERIPH0_2X] = &pll_periph0_2x_clk.hw, + [CLK_PLL_PERIPH1] = &pll_periph1_clk.common.hw, + [CLK_PLL_PERIPH1_2X] = &pll_periph1_2x_clk.hw, + [CLK_PLL_VIDEO1] = &pll_video1_clk.common.hw, + [CLK_PLL_VIDEO1_2X] = &pll_video1_2x_clk.hw, + [CLK_PLL_SATA] = &pll_sata_clk.common.hw, + [CLK_PLL_SATA_OUT] = &pll_sata_out_clk.common.hw, + [CLK_PLL_GPU] = &pll_gpu_clk.common.hw, + [CLK_PLL_MIPI] = &pll_mipi_clk.common.hw, + [CLK_PLL_DE] = &pll_de_clk.common.hw, + [CLK_PLL_DDR1] = &pll_ddr1_clk.common.hw, + [CLK_CPU] = &cpu_clk.common.hw, + [CLK_AXI] = &axi_clk.common.hw, + [CLK_AHB1] = &ahb1_clk.common.hw, + [CLK_APB1] = &apb1_clk.common.hw, + [CLK_APB2] = &apb2_clk.common.hw, + [CLK_BUS_MIPI_DSI] = &bus_mipi_dsi_clk.common.hw, + [CLK_BUS_CE] = &bus_ce_clk.common.hw, + [CLK_BUS_DMA] = &bus_dma_clk.common.hw, + [CLK_BUS_MMC0] = &bus_mmc0_clk.common.hw, + [CLK_BUS_MMC1] = &bus_mmc1_clk.common.hw, + [CLK_BUS_MMC2] = &bus_mmc2_clk.common.hw, + [CLK_BUS_MMC3] = &bus_mmc3_clk.common.hw, + [CLK_BUS_NAND] = &bus_nand_clk.common.hw, + [CLK_BUS_DRAM] = &bus_dram_clk.common.hw, + [CLK_BUS_EMAC] = &bus_emac_clk.common.hw, + [CLK_BUS_TS] = &bus_ts_clk.common.hw, + [CLK_BUS_HSTIMER] = &bus_hstimer_clk.common.hw, + [CLK_BUS_SPI0] = &bus_spi0_clk.common.hw, + [CLK_BUS_SPI1] = &bus_spi1_clk.common.hw, + [CLK_BUS_SPI2] = &bus_spi2_clk.common.hw, + [CLK_BUS_SPI3] = &bus_spi3_clk.common.hw, + [CLK_BUS_SATA] = &bus_sata_clk.common.hw, + [CLK_BUS_OTG] = &bus_otg_clk.common.hw, + [CLK_BUS_EHCI0] = &bus_ehci0_clk.common.hw, + [CLK_BUS_EHCI1] = &bus_ehci1_clk.common.hw, + [CLK_BUS_EHCI2] = &bus_ehci2_clk.common.hw, + [CLK_BUS_OHCI0] = &bus_ohci0_clk.common.hw, + [CLK_BUS_OHCI1] = &bus_ohci1_clk.common.hw, + [CLK_BUS_OHCI2] = &bus_ohci2_clk.common.hw, + [CLK_BUS_VE] = &bus_ve_clk.common.hw, + [CLK_BUS_MP] = &bus_mp_clk.common.hw, + [CLK_BUS_DEINTERLACE] = &bus_deinterlace_clk.common.hw, + [CLK_BUS_CSI0] = &bus_csi0_clk.common.hw, + [CLK_BUS_CSI1] = &bus_csi1_clk.common.hw, + [CLK_BUS_HDMI0] = &bus_hdmi0_clk.common.hw, + [CLK_BUS_HDMI1] = &bus_hdmi1_clk.common.hw, + [CLK_BUS_DE] = &bus_de_clk.common.hw, + [CLK_BUS_TVE0] = &bus_tve0_clk.common.hw, + [CLK_BUS_TVE1] = &bus_tve1_clk.common.hw, + [CLK_BUS_TVE_TOP] = &bus_tve_top_clk.common.hw, + [CLK_BUS_GMAC] = &bus_gmac_clk.common.hw, + [CLK_BUS_GPU] = &bus_gpu_clk.common.hw, + [CLK_BUS_TVD0] = &bus_tvd0_clk.common.hw, + [CLK_BUS_TVD1] = &bus_tvd1_clk.common.hw, + [CLK_BUS_TVD2] = &bus_tvd2_clk.common.hw, + [CLK_BUS_TVD3] = &bus_tvd3_clk.common.hw, + [CLK_BUS_TVD_TOP] = &bus_tvd_top_clk.common.hw, + [CLK_BUS_TCON_LCD0] = &bus_tcon_lcd0_clk.common.hw, + [CLK_BUS_TCON_LCD1] = &bus_tcon_lcd1_clk.common.hw, + [CLK_BUS_TCON_TV0] = &bus_tcon_tv0_clk.common.hw, + [CLK_BUS_TCON_TV1] = &bus_tcon_tv1_clk.common.hw, + [CLK_BUS_TCON_TOP] = &bus_tcon_top_clk.common.hw, + [CLK_BUS_CODEC] = &bus_codec_clk.common.hw, + [CLK_BUS_SPDIF] = &bus_spdif_clk.common.hw, + [CLK_BUS_AC97] = &bus_ac97_clk.common.hw, + [CLK_BUS_PIO] = &bus_pio_clk.common.hw, + [CLK_BUS_IR0] = &bus_ir0_clk.common.hw, + [CLK_BUS_IR1] = &bus_ir1_clk.common.hw, + [CLK_BUS_THS] = &bus_ths_clk.common.hw, + [CLK_BUS_KEYPAD] = &bus_keypad_clk.common.hw, + [CLK_BUS_I2S0] = &bus_i2s0_clk.common.hw, + [CLK_BUS_I2S1] = &bus_i2s1_clk.common.hw, + [CLK_BUS_I2S2] = &bus_i2s2_clk.common.hw, + [CLK_BUS_I2C0] = &bus_i2c0_clk.common.hw, + [CLK_BUS_I2C1] = &bus_i2c1_clk.common.hw, + [CLK_BUS_I2C2] = &bus_i2c2_clk.common.hw, + [CLK_BUS_I2C3] = &bus_i2c3_clk.common.hw, + [CLK_BUS_CAN] = &bus_can_clk.common.hw, + [CLK_BUS_SCR] = &bus_scr_clk.common.hw, + [CLK_BUS_PS20] = &bus_ps20_clk.common.hw, + [CLK_BUS_PS21] = &bus_ps21_clk.common.hw, + [CLK_BUS_I2C4] = &bus_i2c4_clk.common.hw, + [CLK_BUS_UART0] = &bus_uart0_clk.common.hw, + [CLK_BUS_UART1] = &bus_uart1_clk.common.hw, + [CLK_BUS_UART2] = &bus_uart2_clk.common.hw, + [CLK_BUS_UART3] = &bus_uart3_clk.common.hw, + [CLK_BUS_UART4] = &bus_uart4_clk.common.hw, + [CLK_BUS_UART5] = &bus_uart5_clk.common.hw, + [CLK_BUS_UART6] = &bus_uart6_clk.common.hw, + [CLK_BUS_UART7] = &bus_uart7_clk.common.hw, + [CLK_BUS_DBG] = &bus_dbg_clk.common.hw, + [CLK_THS] = &ths_clk.common.hw, + [CLK_NAND] = &nand_clk.common.hw, + [CLK_MMC0] = &mmc0_clk.common.hw, + [CLK_MMC1] = &mmc1_clk.common.hw, + [CLK_MMC2] = &mmc2_clk.common.hw, + [CLK_MMC3] = &mmc3_clk.common.hw, + [CLK_TS] = &ts_clk.common.hw, + [CLK_CE] = &ce_clk.common.hw, + [CLK_SPI0] = &spi0_clk.common.hw, + [CLK_SPI1] = &spi1_clk.common.hw, + [CLK_SPI2] = &spi2_clk.common.hw, + [CLK_SPI3] = &spi3_clk.common.hw, + [CLK_I2S0] = &i2s0_clk.common.hw, + [CLK_I2S1] = &i2s1_clk.common.hw, + [CLK_I2S2] = &i2s2_clk.common.hw, + [CLK_AC97] = &ac97_clk.common.hw, + [CLK_SPDIF] = &spdif_clk.common.hw, + [CLK_KEYPAD] = &keypad_clk.common.hw, + [CLK_SATA] = &sata_clk.common.hw, + [CLK_USB_PHY0] = &usb_phy0_clk.common.hw, + [CLK_USB_PHY1] = &usb_phy1_clk.common.hw, + [CLK_USB_PHY2] = &usb_phy2_clk.common.hw, + [CLK_USB_OHCI0] = &usb_ohci0_clk.common.hw, + [CLK_USB_OHCI1] = &usb_ohci1_clk.common.hw, + [CLK_USB_OHCI2] = &usb_ohci2_clk.common.hw, + [CLK_IR0] = &ir0_clk.common.hw, + [CLK_IR1] = &ir1_clk.common.hw, + [CLK_DRAM] = &dram_clk.common.hw, + [CLK_DRAM_VE] = &dram_ve_clk.common.hw, + [CLK_DRAM_CSI0] = &dram_csi0_clk.common.hw, + [CLK_DRAM_CSI1] = &dram_csi1_clk.common.hw, + [CLK_DRAM_TS] = &dram_ts_clk.common.hw, + [CLK_DRAM_TVD] = &dram_tvd_clk.common.hw, + [CLK_DRAM_MP] = &dram_mp_clk.common.hw, + [CLK_DRAM_DEINTERLACE] = &dram_deinterlace_clk.common.hw, + [CLK_DE] = &de_clk.common.hw, + [CLK_MP] = &mp_clk.common.hw, + [CLK_TCON_LCD0] = &tcon_lcd0_clk.common.hw, + [CLK_TCON_LCD1] = &tcon_lcd1_clk.common.hw, + [CLK_TCON_TV0] = &tcon_tv0_clk.common.hw, + [CLK_TCON_TV1] = &tcon_tv1_clk.common.hw, + [CLK_DEINTERLACE] = &deinterlace_clk.common.hw, + [CLK_CSI1_MCLK] = &csi1_mclk_clk.common.hw, + [CLK_CSI_SCLK] = &csi_sclk_clk.common.hw, + [CLK_CSI0_MCLK] = &csi0_mclk_clk.common.hw, + [CLK_VE] = &ve_clk.common.hw, + [CLK_ADDA] = &adda_clk.common.hw, + [CLK_AVS] = &avs_clk.common.hw, + [CLK_HDMI] = &hdmi_clk.common.hw, + [CLK_HDMI_SLOW] = &hdmi_slow_clk.common.hw, + [CLK_MBUS] = &mbus_clk.common.hw, + [CLK_DSI_DPHY] = &dsi_dphy_clk.common.hw, + [CLK_TVE0] = &tve0_clk.common.hw, + [CLK_TVE1] = &tve1_clk.common.hw, + [CLK_TVD0] = &tvd0_clk.common.hw, + [CLK_TVD1] = &tvd1_clk.common.hw, + [CLK_TVD2] = &tvd2_clk.common.hw, + [CLK_TVD3] = &tvd3_clk.common.hw, + [CLK_GPU] = &gpu_clk.common.hw, + [CLK_OUTA] = &outa_clk.common.hw, + [CLK_OUTB] = &outb_clk.common.hw, + }, + .num = CLK_NUMBER, +}; + +static struct ccu_reset_map sun8i_r40_ccu_resets[] = { + [RST_USB_PHY0] = { 0x0cc, BIT(0) }, + [RST_USB_PHY1] = { 0x0cc, BIT(1) }, + [RST_USB_PHY2] = { 0x0cc, BIT(2) }, + + [RST_DRAM] = { 0x0f4, BIT(31) }, + [RST_MBUS] = { 0x0fc, BIT(31) }, + + [RST_BUS_MIPI_DSI] = { 0x2c0, BIT(1) }, + [RST_BUS_CE] = { 0x2c0, BIT(5) }, + [RST_BUS_DMA] = { 0x2c0, BIT(6) }, + [RST_BUS_MMC0] = { 0x2c0, BIT(8) }, + [RST_BUS_MMC1] = { 0x2c0, BIT(9) }, + [RST_BUS_MMC2] = { 0x2c0, BIT(10) }, + [RST_BUS_MMC3] = { 0x2c0, BIT(11) }, + [RST_BUS_NAND] = { 0x2c0, BIT(13) }, + [RST_BUS_DRAM] = { 0x2c0, BIT(14) }, + [RST_BUS_EMAC] = { 0x2c0, BIT(17) }, + [RST_BUS_TS] = { 0x2c0, BIT(18) }, + [RST_BUS_HSTIMER] = { 0x2c0, BIT(19) }, + [RST_BUS_SPI0] = { 0x2c0, BIT(20) }, + [RST_BUS_SPI1] = { 0x2c0, BIT(21) }, + [RST_BUS_SPI2] = { 0x2c0, BIT(22) }, + [RST_BUS_SPI3] = { 0x2c0, BIT(23) }, + [RST_BUS_SATA] = { 0x2c0, BIT(24) }, + [RST_BUS_OTG] = { 0x2c0, BIT(25) }, + [RST_BUS_EHCI0] = { 0x2c0, BIT(26) }, + [RST_BUS_EHCI1] = { 0x2c0, BIT(27) }, + [RST_BUS_EHCI2] = { 0x2c0, BIT(28) }, + [RST_BUS_OHCI0] = { 0x2c0, BIT(29) }, + [RST_BUS_OHCI1] = { 0x2c0, BIT(30) }, + [RST_BUS_OHCI2] = { 0x2c0, BIT(31) }, + + [RST_BUS_VE] = { 0x2c4, BIT(0) }, + [RST_BUS_MP] = { 0x2c4, BIT(2) }, + [RST_BUS_DEINTERLACE] = { 0x2c4, BIT(5) }, + [RST_BUS_CSI0] = { 0x2c4, BIT(8) }, + [RST_BUS_CSI1] = { 0x2c4, BIT(9) }, + [RST_BUS_HDMI_SLOW] = { 0x2c4, BIT(10) }, + [RST_BUS_HDMI] = { 0x2c4, BIT(11) }, + [RST_BUS_DE] = { 0x2c4, BIT(12) }, + [RST_BUS_TVE0] = { 0x2c4, BIT(13) }, + [RST_BUS_TVE1] = { 0x2c4, BIT(14) }, + [RST_BUS_TVE_TOP] = { 0x2c4, BIT(15) }, + [RST_BUS_GMAC] = { 0x2c4, BIT(17) }, + [RST_BUS_GPU] = { 0x2c4, BIT(20) }, + [RST_BUS_TVD0] = { 0x2c4, BIT(21) }, + [RST_BUS_TVD1] = { 0x2c4, BIT(22) }, + [RST_BUS_TVD2] = { 0x2c4, BIT(23) }, + [RST_BUS_TVD3] = { 0x2c4, BIT(24) }, + [RST_BUS_TVD_TOP] = { 0x2c4, BIT(25) }, + [RST_BUS_TCON_LCD0] = { 0x2c4, BIT(26) }, + [RST_BUS_TCON_LCD1] = { 0x2c4, BIT(27) }, + [RST_BUS_TCON_TV0] = { 0x2c4, BIT(28) }, + [RST_BUS_TCON_TV1] = { 0x2c4, BIT(29) }, + [RST_BUS_TCON_TOP] = { 0x2c4, BIT(30) }, + [RST_BUS_DBG] = { 0x2c4, BIT(31) }, + + [RST_BUS_LVDS] = { 0x2c8, BIT(0) }, + + [RST_BUS_CODEC] = { 0x2d0, BIT(0) }, + [RST_BUS_SPDIF] = { 0x2d0, BIT(1) }, + [RST_BUS_AC97] = { 0x2d0, BIT(2) }, + [RST_BUS_IR0] = { 0x2d0, BIT(6) }, + [RST_BUS_IR1] = { 0x2d0, BIT(7) }, + [RST_BUS_THS] = { 0x2d0, BIT(8) }, + [RST_BUS_KEYPAD] = { 0x2d0, BIT(10) }, + [RST_BUS_I2S0] = { 0x2d0, BIT(12) }, + [RST_BUS_I2S1] = { 0x2d0, BIT(13) }, + [RST_BUS_I2S2] = { 0x2d0, BIT(14) }, + + [RST_BUS_I2C0] = { 0x2d8, BIT(0) }, + [RST_BUS_I2C1] = { 0x2d8, BIT(1) }, + [RST_BUS_I2C2] = { 0x2d8, BIT(2) }, + [RST_BUS_I2C3] = { 0x2d8, BIT(3) }, + [RST_BUS_CAN] = { 0x2d8, BIT(4) }, + [RST_BUS_SCR] = { 0x2d8, BIT(5) }, + [RST_BUS_PS20] = { 0x2d8, BIT(6) }, + [RST_BUS_PS21] = { 0x2d8, BIT(7) }, + [RST_BUS_I2C4] = { 0x2d8, BIT(15) }, + [RST_BUS_UART0] = { 0x2d8, BIT(16) }, + [RST_BUS_UART1] = { 0x2d8, BIT(17) }, + [RST_BUS_UART2] = { 0x2d8, BIT(18) }, + [RST_BUS_UART3] = { 0x2d8, BIT(19) }, + [RST_BUS_UART4] = { 0x2d8, BIT(20) }, + [RST_BUS_UART5] = { 0x2d8, BIT(21) }, + [RST_BUS_UART6] = { 0x2d8, BIT(22) }, + [RST_BUS_UART7] = { 0x2d8, BIT(23) }, +}; + +static const struct sunxi_ccu_desc sun8i_r40_ccu_desc = { + .ccu_clks = sun8i_r40_ccu_clks, + .num_ccu_clks = ARRAY_SIZE(sun8i_r40_ccu_clks), + + .hw_clks = &sun8i_r40_hw_clks, + + .resets = sun8i_r40_ccu_resets, + .num_resets = ARRAY_SIZE(sun8i_r40_ccu_resets), +}; + +static struct ccu_mux_nb sun8i_r40_cpu_nb = { + .common = &cpu_clk.common, + .cm = &cpu_clk.mux, + .delay_us = 1, /* > 8 clock cycles at 24 MHz */ + .bypass_index = 1, /* index of 24 MHz oscillator */ +}; + +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); + + sunxi_ccu_probe(node, reg, &sun8i_r40_ccu_desc); + + ccu_mux_notifier_register(pll_cpu_clk.common.hw.clk, + &sun8i_r40_cpu_nb); +} +CLK_OF_DECLARE(sun8i_r40_ccu, "allwinner,sun8i-r40-ccu", + sun8i_r40_ccu_setup); diff --git a/drivers/clk/sunxi-ng/ccu-sun8i-r40.h b/drivers/clk/sunxi-ng/ccu-sun8i-r40.h new file mode 100644 index 000000000000..0db8e1e97af8 --- /dev/null +++ b/drivers/clk/sunxi-ng/ccu-sun8i-r40.h @@ -0,0 +1,69 @@ +/* + * Copyright 2017 Icenowy Zheng <icenowy@aosc.io> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#ifndef _CCU_SUN8I_R40_H_ +#define _CCU_SUN8I_R40_H_ + +#include <dt-bindings/clock/sun8i-r40-ccu.h> +#include <dt-bindings/reset/sun8i-r40-ccu.h> + +#define CLK_OSC_12M 0 +#define CLK_PLL_CPU 1 +#define CLK_PLL_AUDIO_BASE 2 +#define CLK_PLL_AUDIO 3 +#define CLK_PLL_AUDIO_2X 4 +#define CLK_PLL_AUDIO_4X 5 +#define CLK_PLL_AUDIO_8X 6 +#define CLK_PLL_VIDEO0 7 +#define CLK_PLL_VIDEO0_2X 8 +#define CLK_PLL_VE 9 +#define CLK_PLL_DDR0 10 +#define CLK_PLL_PERIPH0 11 +#define CLK_PLL_PERIPH0_SATA 12 +#define CLK_PLL_PERIPH0_2X 13 +#define CLK_PLL_PERIPH1 14 +#define CLK_PLL_PERIPH1_2X 15 +#define CLK_PLL_VIDEO1 16 +#define CLK_PLL_VIDEO1_2X 17 +#define CLK_PLL_SATA 18 +#define CLK_PLL_SATA_OUT 19 +#define CLK_PLL_GPU 20 +#define CLK_PLL_MIPI 21 +#define CLK_PLL_DE 22 +#define CLK_PLL_DDR1 23 + +/* The CPU clock is exported */ + +#define CLK_AXI 25 +#define CLK_AHB1 26 +#define CLK_APB1 27 +#define CLK_APB2 28 + +/* All the bus gates are exported */ + +/* The first bunch of module clocks are exported */ + +#define CLK_DRAM 132 + +/* All the DRAM gates are exported */ + +/* Some more module clocks are exported */ + +#define CLK_MBUS 155 + +/* Another bunch of module clocks are exported */ + +#define CLK_NUMBER (CLK_OUTB + 1) + +#endif /* _CCU_SUN8I_R40_H_ */ diff --git a/include/dt-bindings/clock/sun8i-r40-ccu.h b/include/dt-bindings/clock/sun8i-r40-ccu.h new file mode 100644 index 000000000000..0d486a63d9e8 --- /dev/null +++ b/include/dt-bindings/clock/sun8i-r40-ccu.h @@ -0,0 +1,187 @@ +/* + * Copyright (C) 2017 Icenowy Zheng <icenowy@aosc.io> + * + * This file is dual-licensed: you can use it either under the terms + * of the GPL or the X11 license, at your option. Note that this dual + * licensing only applies to this file, and not this project as a + * whole. + * + * a) This file is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * This file is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * Or, alternatively, + * + * b) Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, + * copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following + * conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. + */ + +#ifndef _DT_BINDINGS_CLK_SUN8I_R40_H_ +#define _DT_BINDINGS_CLK_SUN8I_R40_H_ + +#define CLK_CPU 24 + +#define CLK_BUS_MIPI_DSI 29 +#define CLK_BUS_CE 30 +#define CLK_BUS_DMA 31 +#define CLK_BUS_MMC0 32 +#define CLK_BUS_MMC1 33 +#define CLK_BUS_MMC2 34 +#define CLK_BUS_MMC3 35 +#define CLK_BUS_NAND 36 +#define CLK_BUS_DRAM 37 +#define CLK_BUS_EMAC 38 +#define CLK_BUS_TS 39 +#define CLK_BUS_HSTIMER 40 +#define CLK_BUS_SPI0 41 +#define CLK_BUS_SPI1 42 +#define CLK_BUS_SPI2 43 +#define CLK_BUS_SPI3 44 +#define CLK_BUS_SATA 45 +#define CLK_BUS_OTG 46 +#define CLK_BUS_EHCI0 47 +#define CLK_BUS_EHCI1 48 +#define CLK_BUS_EHCI2 49 +#define CLK_BUS_OHCI0 50 +#define CLK_BUS_OHCI1 51 +#define CLK_BUS_OHCI2 52 +#define CLK_BUS_VE 53 +#define CLK_BUS_MP 54 +#define CLK_BUS_DEINTERLACE 55 +#define CLK_BUS_CSI0 56 +#define CLK_BUS_CSI1 57 +#define CLK_BUS_HDMI1 58 +#define CLK_BUS_HDMI0 59 +#define CLK_BUS_DE 60 +#define CLK_BUS_TVE0 61 +#define CLK_BUS_TVE1 62 +#define CLK_BUS_TVE_TOP 63 +#define CLK_BUS_GMAC 64 +#define CLK_BUS_GPU 65 +#define CLK_BUS_TVD0 66 +#define CLK_BUS_TVD1 67 +#define CLK_BUS_TVD2 68 +#define CLK_BUS_TVD3 69 +#define CLK_BUS_TVD_TOP 70 +#define CLK_BUS_TCON_LCD0 71 +#define CLK_BUS_TCON_LCD1 72 +#define CLK_BUS_TCON_TV0 73 +#define CLK_BUS_TCON_TV1 74 +#define CLK_BUS_TCON_TOP 75 +#define CLK_BUS_CODEC 76 +#define CLK_BUS_SPDIF 77 +#define CLK_BUS_AC97 78 +#define CLK_BUS_PIO 79 +#define CLK_BUS_IR0 80 +#define CLK_BUS_IR1 81 +#define CLK_BUS_THS 82 +#define CLK_BUS_KEYPAD 83 +#define CLK_BUS_I2S0 84 +#define CLK_BUS_I2S1 85 +#define CLK_BUS_I2S2 86 +#define CLK_BUS_I2C0 87 +#define CLK_BUS_I2C1 88 +#define CLK_BUS_I2C2 89 +#define CLK_BUS_I2C3 90 +#define CLK_BUS_CAN 91 +#define CLK_BUS_SCR 92 +#define CLK_BUS_PS20 93 +#define CLK_BUS_PS21 94 +#define CLK_BUS_I2C4 95 +#define CLK_BUS_UART0 96 +#define CLK_BUS_UART1 97 +#define CLK_BUS_UART2 98 +#define CLK_BUS_UART3 99 +#define CLK_BUS_UART4 100 +#define CLK_BUS_UART5 101 +#define CLK_BUS_UART6 102 +#define CLK_BUS_UART7 103 +#define CLK_BUS_DBG 104 + +#define CLK_THS 105 +#define CLK_NAND 106 +#define CLK_MMC0 107 +#define CLK_MMC1 108 +#define CLK_MMC2 109 +#define CLK_MMC3 110 +#define CLK_TS 111 +#define CLK_CE 112 +#define CLK_SPI0 113 +#define CLK_SPI1 114 +#define CLK_SPI2 115 +#define CLK_SPI3 116 +#define CLK_I2S0 117 +#define CLK_I2S1 118 +#define CLK_I2S2 119 +#define CLK_AC97 120 +#define CLK_SPDIF 121 +#define CLK_KEYPAD 122 +#define CLK_SATA 123 +#define CLK_USB_PHY0 124 +#define CLK_USB_PHY1 125 +#define CLK_USB_PHY2 126 +#define CLK_USB_OHCI0 127 +#define CLK_USB_OHCI1 128 +#define CLK_USB_OHCI2 129 +#define CLK_IR0 130 +#define CLK_IR1 131 + +#define CLK_DRAM_VE 133 +#define CLK_DRAM_CSI0 134 +#define CLK_DRAM_CSI1 135 +#define CLK_DRAM_TS 136 +#define CLK_DRAM_TVD 137 +#define CLK_DRAM_MP 138 +#define CLK_DRAM_DEINTERLACE 139 +#define CLK_DE 140 +#define CLK_MP 141 +#define CLK_TCON_LCD0 142 +#define CLK_TCON_LCD1 143 +#define CLK_TCON_TV0 144 +#define CLK_TCON_TV1 145 +#define CLK_DEINTERLACE 146 +#define CLK_CSI1_MCLK 147 +#define CLK_CSI_SCLK 148 +#define CLK_CSI0_MCLK 149 +#define CLK_VE 150 +#define CLK_ADDA 151 +#define CLK_AVS 152 +#define CLK_HDMI 153 +#define CLK_HDMI_SLOW 154 + +#define CLK_DSI_DPHY 156 +#define CLK_TVE0 157 +#define CLK_TVE1 158 +#define CLK_TVD0 159 +#define CLK_TVD1 160 +#define CLK_TVD2 161 +#define CLK_TVD3 162 +#define CLK_GPU 163 +#define CLK_OUTA 164 +#define CLK_OUTB 165 + +#endif /* _DT_BINDINGS_CLK_SUN8I_R40_H_ */ diff --git a/include/dt-bindings/reset/sun8i-r40-ccu.h b/include/dt-bindings/reset/sun8i-r40-ccu.h new file mode 100644 index 000000000000..bdd7fdb68e25 --- /dev/null +++ b/include/dt-bindings/reset/sun8i-r40-ccu.h @@ -0,0 +1,130 @@ +/* + * Copyright (C) 2017 Icenowy Zheng <icenowy@aosc.io> + * + * This file is dual-licensed: you can use it either under the terms + * of the GPL or the X11 license, at your option. Note that this dual + * licensing only applies to this file, and not this project as a + * whole. + * + * a) This file is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * This file is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * Or, alternatively, + * + * b) Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, + * copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following + * conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. + */ + +#ifndef _DT_BINDINGS_RST_SUN8I_R40_H_ +#define _DT_BINDINGS_RST_SUN8I_R40_H_ + +#define RST_USB_PHY0 0 +#define RST_USB_PHY1 1 +#define RST_USB_PHY2 2 + +#define RST_DRAM 3 +#define RST_MBUS 4 + +#define RST_BUS_MIPI_DSI 5 +#define RST_BUS_CE 6 +#define RST_BUS_DMA 7 +#define RST_BUS_MMC0 8 +#define RST_BUS_MMC1 9 +#define RST_BUS_MMC2 10 +#define RST_BUS_MMC3 11 +#define RST_BUS_NAND 12 +#define RST_BUS_DRAM 13 +#define RST_BUS_EMAC 14 +#define RST_BUS_TS 15 +#define RST_BUS_HSTIMER 16 +#define RST_BUS_SPI0 17 +#define RST_BUS_SPI1 18 +#define RST_BUS_SPI2 19 +#define RST_BUS_SPI3 20 +#define RST_BUS_SATA 21 +#define RST_BUS_OTG 22 +#define RST_BUS_EHCI0 23 +#define RST_BUS_EHCI1 24 +#define RST_BUS_EHCI2 25 +#define RST_BUS_OHCI0 26 +#define RST_BUS_OHCI1 27 +#define RST_BUS_OHCI2 28 +#define RST_BUS_VE 29 +#define RST_BUS_MP 30 +#define RST_BUS_DEINTERLACE 31 +#define RST_BUS_CSI0 32 +#define RST_BUS_CSI1 33 +#define RST_BUS_HDMI_SLOW 34 +#define RST_BUS_HDMI 35 +#define RST_BUS_DE 36 +#define RST_BUS_TVE0 37 +#define RST_BUS_TVE1 38 +#define RST_BUS_TVE_TOP 39 +#define RST_BUS_GMAC 40 +#define RST_BUS_GPU 41 +#define RST_BUS_TVD0 42 +#define RST_BUS_TVD1 43 +#define RST_BUS_TVD2 44 +#define RST_BUS_TVD3 45 +#define RST_BUS_TVD_TOP 46 +#define RST_BUS_TCON_LCD0 47 +#define RST_BUS_TCON_LCD1 48 +#define RST_BUS_TCON_TV0 49 +#define RST_BUS_TCON_TV1 50 +#define RST_BUS_TCON_TOP 51 +#define RST_BUS_DBG 52 +#define RST_BUS_LVDS 53 +#define RST_BUS_CODEC 54 +#define RST_BUS_SPDIF 55 +#define RST_BUS_AC97 56 +#define RST_BUS_IR0 57 +#define RST_BUS_IR1 58 +#define RST_BUS_THS 59 +#define RST_BUS_KEYPAD 60 +#define RST_BUS_I2S0 61 +#define RST_BUS_I2S1 62 +#define RST_BUS_I2S2 63 +#define RST_BUS_I2C0 64 +#define RST_BUS_I2C1 65 +#define RST_BUS_I2C2 66 +#define RST_BUS_I2C3 67 +#define RST_BUS_CAN 68 +#define RST_BUS_SCR 69 +#define RST_BUS_PS20 70 +#define RST_BUS_PS21 71 +#define RST_BUS_I2C4 72 +#define RST_BUS_UART0 73 +#define RST_BUS_UART1 74 +#define RST_BUS_UART2 75 +#define RST_BUS_UART3 76 +#define RST_BUS_UART4 77 +#define RST_BUS_UART5 78 +#define RST_BUS_UART6 79 +#define RST_BUS_UART7 80 + +#endif /* _DT_BINDINGS_RST_SUN8I_R40_H_ */ -- 2.13.0 ^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH v4 3/3] clk: sunxi-ng: support R40 SoC 2017-08-12 12:43 ` [PATCH v4 3/3] clk: sunxi-ng: support R40 SoC Icenowy Zheng @ 2017-08-14 16:12 ` Chen-Yu Tsai 2017-08-14 16:53 ` icenowy at aosc.io 0 siblings, 1 reply; 12+ messages in thread From: Chen-Yu Tsai @ 2017-08-14 16:12 UTC (permalink / raw) To: linux-arm-kernel )On Sat, Aug 12, 2017 at 8:43 PM, Icenowy Zheng <icenowy@aosc.io> wrote: > 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 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 | 1240 +++++++++++++++++++++++++++++ > 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, 1632 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 > > diff --git a/drivers/clk/sunxi-ng/Kconfig b/drivers/clk/sunxi-ng/Kconfig > index 7342928c35cd..7a360737fe3c 100644 > --- a/drivers/clk/sunxi-ng/Kconfig > +++ b/drivers/clk/sunxi-ng/Kconfig > @@ -48,6 +48,11 @@ config SUN8I_V3S_CCU > config SUN8I_DE2_CCU > bool "Support for the Allwinner SoCs DE2 CCU" > > +config SUN8I_R40_CCU > + bool "Support for the Allwinner R40 CCU" > + default MACH_SUN8I > + depends on MACH_SUN8I || COMPILE_TEST > + > config SUN9I_A80_CCU > bool "Support for the Allwinner A80 CCU" > default MACH_SUN9I > diff --git a/drivers/clk/sunxi-ng/Makefile b/drivers/clk/sunxi-ng/Makefile > index 45a5910379a5..b1267fe68a8f 100644 > --- a/drivers/clk/sunxi-ng/Makefile > +++ b/drivers/clk/sunxi-ng/Makefile > @@ -29,6 +29,7 @@ obj-$(CONFIG_SUN8I_H3_CCU) += ccu-sun8i-h3.o > obj-$(CONFIG_SUN8I_V3S_CCU) += ccu-sun8i-v3s.o > obj-$(CONFIG_SUN8I_DE2_CCU) += ccu-sun8i-de2.o > obj-$(CONFIG_SUN8I_R_CCU) += ccu-sun8i-r.o > +obj-$(CONFIG_SUN8I_R40_CCU) += ccu-sun8i-r40.o > obj-$(CONFIG_SUN9I_A80_CCU) += ccu-sun9i-a80.o > obj-$(CONFIG_SUN9I_A80_CCU) += ccu-sun9i-a80-de.o > obj-$(CONFIG_SUN9I_A80_CCU) += ccu-sun9i-a80-usb.o > diff --git a/drivers/clk/sunxi-ng/ccu-sun8i-r40.c b/drivers/clk/sunxi-ng/ccu-sun8i-r40.c > new file mode 100644 > index 000000000000..9dc6ad419f9a > --- /dev/null > +++ b/drivers/clk/sunxi-ng/ccu-sun8i-r40.c [...] > +/* > + * The MIPI PLL has 2 modes: "MIPI" and "HDMI". > + * > + * The MIPI mode is a standard NKM-style clock. The HDMI mode is an > + * integer / fractional clock with switchable multipliers and dividers. > + * This is not supported here. We hardcode the PLL to MIPI mode. > + */ > +#define SUN8I_R40_PLL_MIPI_REG 0x040 > + > +static const char * const pll_mipi_parents[] = { "pll-video0" }; > +static SUNXI_CCU_NKM_WITH_MUX_GATE_LOCK(pll_mipi_clk, "pll-mipi", > + pll_mipi_parents, 0x040, > + 8, 4, /* N */ > + 4, 2, /* K */ > + 0, 4, /* M */ > + 21, 1, /* mux */ > + BIT(31) | BIT(23) | BIT(22), /* gate */ > + BIT(28), /* lock */ > + CLK_SET_RATE_UNGATE); K has a minimum of 2 here. > + > +static SUNXI_CCU_NM_WITH_FRAC_GATE_LOCK(pll_de_clk, "pll-de", > + "osc24M", 0x0048, > + 8, 7, /* N */ > + 0, 4, /* M */ > + BIT(24), /* frac enable */ > + BIT(25), /* frac select */ > + 270000000, /* frac rate 0 */ > + 297000000, /* frac rate 1 */ > + BIT(31), /* gate */ > + BIT(28), /* lock */ > + 0); CLK_SET_RATE_UNGATE should be set for _all_ PLLs. The lock status bit depends on the PLL running, and we check the lock status whenever set_rate is done. > + > +static SUNXI_CCU_NM_WITH_GATE_LOCK(pll_ddr1_clk, "pll-ddr1", > + "osc24M", 0x04c, > + 8, 7, /* N */ > + 0, 2, /* M */ > + BIT(31), /* gate */ > + BIT(28), /* lock */ > + CLK_SET_RATE_UNGATE); Manual says 16 <= N <= 75. [...] > + > +static struct clk_div_table ths_div_table[] = { > + { .val = 0, .div = 1 }, > + { .val = 1, .div = 2 }, > + { .val = 2, .div = 4 }, > + { .val = 3, .div = 8 }, > +}; > +static const char * const ths_parents[] = { "osc24M" }; > +static struct ccu_div ths_clk = { > + .enable = BIT(31), > + .div = _SUNXI_CCU_DIV_TABLE(0, 2, ths_div_table), You could use _SUNXI_CCU_DIV_FLAGS(0, 2, CLK_DIVIDER_POWER_OF_TWO) instead of div_table. > + .mux = _SUNXI_CCU_MUX(24, 2), > + .common = { > + .reg = 0x074, > + .hw.init = CLK_HW_INIT_PARENTS("ths", > + ths_parents, > + &ccu_div_ops, > + 0), > + }, > +}; [...] > +static const char * const keypad_parents[] = { "osc24M", "osc32k", }; Nit: you can drop the extra comma. [...] > +static const char * const sata_parents[] = { "pll-sata-out", "sata-ext" }; > +static SUNXI_CCU_MUX_WITH_GATE(sata_clk, "sata", sata_parents, > + 0x0c8, 24, 1, BIT(31), CLK_SET_RATE_PARENT); You don't have CLK_SET_RATE_PARENT for the parent, which is also a mux+gate. I'm not sure what you are expecting to happen here. > + > +static SUNXI_CCU_GATE(usb_phy0_clk, "usb-phy0", "osc24M", > + 0x0cc, BIT(8), 0); > +static SUNXI_CCU_GATE(usb_phy1_clk, "usb-phy1", "osc24M", > + 0x0cc, BIT(9), 0); > +static SUNXI_CCU_GATE(usb_phy2_clk, "usb-phy2", "osc24M", > + 0x0cc, BIT(10), 0); > +static SUNXI_CCU_GATE(usb_ohci0_clk, "usb-ohci0", "osc12M", > + 0x0cc, BIT(16), 0); > +static SUNXI_CCU_GATE(usb_ohci1_clk, "usb-ohci1", "osc12M", > + 0x0cc, BIT(17), 0); > +static SUNXI_CCU_GATE(usb_ohci2_clk, "usb-ohci2", "osc12M", > + 0x0cc, BIT(18), 0); Maybe you should force the OHCI muxes to 0? [...] > +static const char * const tcon_parents[] = { "pll-video0", "pll-video1", > + "pll-video0-2x", "pll-video1-2x", > + "pll-mipi" }; > +static SUNXI_CCU_MUX_WITH_GATE(tcon_lcd0_clk, "tcon-lcd0", tcon_parents, > + 0x110, 24, 3, BIT(31), CLK_SET_RATE_PARENT); > +static SUNXI_CCU_MUX_WITH_GATE(tcon_lcd1_clk, "tcon-lcd1", tcon_parents, > + 0x114, 24, 3, BIT(31), CLK_SET_RATE_PARENT); > +static SUNXI_CCU_M_WITH_MUX_GATE(tcon_tv0_clk, "tcon-tv0", tcon_parents, > + 0x118, 0, 4, 24, 3, BIT(31), 0); > +static SUNXI_CCU_M_WITH_MUX_GATE(tcon_tv1_clk, "tcon-tv1", tcon_parents, > + 0x11c, 0, 4, 24, 3, BIT(31), 0); You will likely need CLK_SET_RATE_PARENT for tcon-tv* as well. [...] > +static const char * const csi_mclk_parents[] = { "osc24M", "pll-video", pll-video1? > + "pll-periph1" }; > +static SUNXI_CCU_M_WITH_MUX_GATE(csi1_mclk_clk, "csi1-mclk", csi_mclk_parents, > + 0x130, 0, 5, 8, 3, BIT(15), 0); > + > +static const char * const csi_sclk_parents[] = { "pll-periph0", "pll-periph1" }; > +static SUNXI_CCU_M_WITH_MUX_GATE(csi_sclk_clk, "csi-sclk", csi_sclk_parents, > + 0x134, 16, 4, 24, 3, BIT(31), 0); > + > +static SUNXI_CCU_M_WITH_MUX_GATE(csi0_mclk_clk, "csi0-mclk", csi_mclk_parents, > + 0x134, 0, 5, 8, 3, BIT(15), 0); [...] > + > +static SUNXI_CCU_M_WITH_GATE(ve_clk, "ve", "pll-ve", > + 0x13c, 16, 3, BIT(31), 0); CLK_SET_RATE_PARENT? > + > +static SUNXI_CCU_GATE(adda_clk, "adda", "pll-audio", > + 0x140, BIT(31), CLK_SET_RATE_PARENT); You call the bus clock "bus-codec", but here you call it "adda". Pick one and be consistent. [...] > +static const char * const hdmi_parents[] = { "pll-video0", "pll-video1" }; > +static SUNXI_CCU_M_WITH_MUX_GATE(hdmi_clk, "hdmi", hdmi_parents, > + 0x150, 0, 4, 24, 2, BIT(31), 0); CLK_SET_RATE_PARENT? [...] > +static const char * const mbus_parents[] = { "osc24M", "pll-periph0-2x", > + "pll-ddr0" }; > +static SUNXI_CCU_MP_WITH_MUX_GATE(mbus_clk, "mbus", mbus_parents, 0x15c, > + 0, 4, /* M */ > + 16, 2, /* P */ > + 24, 2, /* mux */ > + BIT(31), /* gate */ > + CLK_IS_CRITICAL); The documentation for this one is fuzzy. It mentions the N (or P) factor, but does not include it in the formula. Can you double check it against the BSP and add a comment about it? > + > +static const char * const dsi_dphy_parents[] = { "pll-video0", "pll-video1", > + "pll-periph0" }; > +static SUNXI_CCU_M_WITH_MUX_GATE(dsi_dphy_clk, "dsi-dphy", dsi_dphy_parents, > + 0x168, 0, 4, 8, 2, BIT(15), 0); Note: we might need CLK_SET_RATE_PARENT later on, but we will need to find a way to keep pll-periph* fixed. > + > +static SUNXI_CCU_M_WITH_MUX_GATE(tve0_clk, "tve0", tcon_parents, > + 0x180, 0, 4, 24, 3, BIT(31), 0); > +static SUNXI_CCU_M_WITH_MUX_GATE(tve1_clk, "tve1", tcon_parents, > + 0x184, 0, 4, 24, 3, BIT(31), 0); CLK_SET_RATE_PARENT? > + > +static const char * const tvd_parents[] = { "pll-video0", "pll-video1", > + "pll-video0-2x", "pll-video1-2x" }; > +static SUNXI_CCU_M_WITH_MUX_GATE(tvd0_clk, "tvd0", tvd_parents, > + 0x188, 0, 4, 24, 3, BIT(31), 0); > +static SUNXI_CCU_M_WITH_MUX_GATE(tvd1_clk, "tvd1", tvd_parents, > + 0x18c, 0, 4, 24, 3, BIT(31), 0); > +static SUNXI_CCU_M_WITH_MUX_GATE(tvd2_clk, "tvd2", tvd_parents, > + 0x190, 0, 4, 24, 3, BIT(31), 0); > +static SUNXI_CCU_M_WITH_MUX_GATE(tvd3_clk, "tvd3", tvd_parents, > + 0x194, 0, 4, 24, 3, BIT(31), 0); CLK_SET_RATE_PARENT? [...] You are missing the SYS_32k mux at register 0x310. According to the diagrams, this is the actual clock that supplies the LOSC parent of various muxes in the CCU. It itself is a mux between an internal 2M RC oscillator, and LOSC from the RTC module. > + > +static struct ccu_reset_map sun8i_r40_ccu_resets[] = { [...] > + [RST_BUS_HDMI_SLOW] = { 0x2c4, BIT(10) }, > + [RST_BUS_HDMI] = { 0x2c4, BIT(11) }, Manual says bit 10 is HDMI0, bit 11 is HDMI1. Looking at the clocks, bit 10 would be RST_BUS_HDMI, while bit 11 would be RST_BUS_HDMI_SLOW. [...] > + > +static const struct sunxi_ccu_desc sun8i_r40_ccu_desc = { > + .ccu_clks = sun8i_r40_ccu_clks, > + .num_ccu_clks = ARRAY_SIZE(sun8i_r40_ccu_clks), > + > + .hw_clks = &sun8i_r40_hw_clks, > + > + .resets = sun8i_r40_ccu_resets, > + .num_resets = ARRAY_SIZE(sun8i_r40_ccu_resets), > +}; > + > +static struct ccu_mux_nb sun8i_r40_cpu_nb = { > + .common = &cpu_clk.common, > + .cm = &cpu_clk.mux, > + .delay_us = 1, /* > 8 clock cycles at 24 MHz */ > + .bypass_index = 1, /* index of 24 MHz oscillator */ > +}; > + > +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); You should also force pll-mipi to mipi mode. And the OHCI muxes. > + > + sunxi_ccu_probe(node, reg, &sun8i_r40_ccu_desc); > + > + ccu_mux_notifier_register(pll_cpu_clk.common.hw.clk, > + &sun8i_r40_cpu_nb); Do you also need the gate-then-ungate notifier? Thanks ChenYu ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH v4 3/3] clk: sunxi-ng: support R40 SoC 2017-08-14 16:12 ` Chen-Yu Tsai @ 2017-08-14 16:53 ` icenowy at aosc.io 2017-08-15 2:16 ` [linux-sunxi] " Chen-Yu Tsai 0 siblings, 1 reply; 12+ messages in thread From: icenowy at aosc.io @ 2017-08-14 16:53 UTC (permalink / raw) To: linux-arm-kernel ? 2017-08-15 00:12?Chen-Yu Tsai ??? > )On Sat, Aug 12, 2017 at 8:43 PM, Icenowy Zheng <icenowy@aosc.io> > wrote: >> 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 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 | 1240 >> +++++++++++++++++++++++++++++ >> 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, 1632 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 >> >> diff --git a/drivers/clk/sunxi-ng/Kconfig >> b/drivers/clk/sunxi-ng/Kconfig >> index 7342928c35cd..7a360737fe3c 100644 >> --- a/drivers/clk/sunxi-ng/Kconfig >> +++ b/drivers/clk/sunxi-ng/Kconfig >> @@ -48,6 +48,11 @@ config SUN8I_V3S_CCU >> config SUN8I_DE2_CCU >> bool "Support for the Allwinner SoCs DE2 CCU" >> >> +config SUN8I_R40_CCU >> + bool "Support for the Allwinner R40 CCU" >> + default MACH_SUN8I >> + depends on MACH_SUN8I || COMPILE_TEST >> + >> config SUN9I_A80_CCU >> bool "Support for the Allwinner A80 CCU" >> default MACH_SUN9I >> diff --git a/drivers/clk/sunxi-ng/Makefile >> b/drivers/clk/sunxi-ng/Makefile >> index 45a5910379a5..b1267fe68a8f 100644 >> --- a/drivers/clk/sunxi-ng/Makefile >> +++ b/drivers/clk/sunxi-ng/Makefile >> @@ -29,6 +29,7 @@ obj-$(CONFIG_SUN8I_H3_CCU) += ccu-sun8i-h3.o >> obj-$(CONFIG_SUN8I_V3S_CCU) += ccu-sun8i-v3s.o >> obj-$(CONFIG_SUN8I_DE2_CCU) += ccu-sun8i-de2.o >> obj-$(CONFIG_SUN8I_R_CCU) += ccu-sun8i-r.o >> +obj-$(CONFIG_SUN8I_R40_CCU) += ccu-sun8i-r40.o >> obj-$(CONFIG_SUN9I_A80_CCU) += ccu-sun9i-a80.o >> obj-$(CONFIG_SUN9I_A80_CCU) += ccu-sun9i-a80-de.o >> obj-$(CONFIG_SUN9I_A80_CCU) += ccu-sun9i-a80-usb.o >> diff --git a/drivers/clk/sunxi-ng/ccu-sun8i-r40.c >> b/drivers/clk/sunxi-ng/ccu-sun8i-r40.c >> new file mode 100644 >> index 000000000000..9dc6ad419f9a >> --- /dev/null >> +++ b/drivers/clk/sunxi-ng/ccu-sun8i-r40.c > > [...] > >> +/* >> + * The MIPI PLL has 2 modes: "MIPI" and "HDMI". >> + * >> + * The MIPI mode is a standard NKM-style clock. The HDMI mode is an >> + * integer / fractional clock with switchable multipliers and >> dividers. >> + * This is not supported here. We hardcode the PLL to MIPI mode. >> + */ >> +#define SUN8I_R40_PLL_MIPI_REG 0x040 >> + >> +static const char * const pll_mipi_parents[] = { "pll-video0" }; >> +static SUNXI_CCU_NKM_WITH_MUX_GATE_LOCK(pll_mipi_clk, "pll-mipi", >> + pll_mipi_parents, 0x040, >> + 8, 4, /* N */ >> + 4, 2, /* K */ >> + 0, 4, /* M */ >> + 21, 1, /* mux */ >> + BIT(31) | BIT(23) | BIT(22), >> /* gate */ >> + BIT(28), /* lock */ >> + CLK_SET_RATE_UNGATE); > > K has a minimum of 2 here. I think it's not mentioned on the user manual... It says "The range is from 1 to 4." > >> + >> +static SUNXI_CCU_NM_WITH_FRAC_GATE_LOCK(pll_de_clk, "pll-de", >> + "osc24M", 0x0048, >> + 8, 7, /* N */ >> + 0, 4, /* M */ >> + BIT(24), /* frac enable >> */ >> + BIT(25), /* frac select >> */ >> + 270000000, /* frac rate 0 >> */ >> + 297000000, /* frac rate 1 >> */ >> + BIT(31), /* gate */ >> + BIT(28), /* lock */ >> + 0); > > CLK_SET_RATE_UNGATE should be set for _all_ PLLs. The lock status bit > depends on the PLL running, and we check the lock status whenever > set_rate > is done. Should we also do this on older SoCs? I think at least on H3 I met PLL-DE waiting for lock failure. > >> + >> +static SUNXI_CCU_NM_WITH_GATE_LOCK(pll_ddr1_clk, "pll-ddr1", >> + "osc24M", 0x04c, >> + 8, 7, /* N */ >> + 0, 2, /* M */ >> + BIT(31), /* gate */ >> + BIT(28), /* lock */ >> + CLK_SET_RATE_UNGATE); > > Manual says 16 <= N <= 75. Maybe we need to implement more things for this constraint? But I think the frequency is not going to be changed when running... > > [...] > >> + >> +static struct clk_div_table ths_div_table[] = { >> + { .val = 0, .div = 1 }, >> + { .val = 1, .div = 2 }, >> + { .val = 2, .div = 4 }, >> + { .val = 3, .div = 8 }, >> +}; >> +static const char * const ths_parents[] = { "osc24M" }; >> +static struct ccu_div ths_clk = { >> + .enable = BIT(31), >> + .div = _SUNXI_CCU_DIV_TABLE(0, 2, ths_div_table), > > You could use _SUNXI_CCU_DIV_FLAGS(0, 2, CLK_DIVIDER_POWER_OF_TWO) > instead of div_table. Thanks. > >> + .mux = _SUNXI_CCU_MUX(24, 2), >> + .common = { >> + .reg = 0x074, >> + .hw.init = CLK_HW_INIT_PARENTS("ths", >> + ths_parents, >> + &ccu_div_ops, >> + 0), >> + }, >> +}; > > [...] > >> +static const char * const keypad_parents[] = { "osc24M", "osc32k", }; > > Nit: you can drop the extra comma. Thanks. > > [...] > >> +static const char * const sata_parents[] = { "pll-sata-out", >> "sata-ext" }; >> +static SUNXI_CCU_MUX_WITH_GATE(sata_clk, "sata", sata_parents, >> + 0x0c8, 24, 1, BIT(31), >> CLK_SET_RATE_PARENT); > > You don't have CLK_SET_RATE_PARENT for the parent, which is also a > mux+gate. > I'm not sure what you are expecting to happen here. Oh maybe I should add it there. > >> + >> +static SUNXI_CCU_GATE(usb_phy0_clk, "usb-phy0", "osc24M", >> + 0x0cc, BIT(8), 0); >> +static SUNXI_CCU_GATE(usb_phy1_clk, "usb-phy1", "osc24M", >> + 0x0cc, BIT(9), 0); >> +static SUNXI_CCU_GATE(usb_phy2_clk, "usb-phy2", "osc24M", >> + 0x0cc, BIT(10), 0); >> +static SUNXI_CCU_GATE(usb_ohci0_clk, "usb-ohci0", "osc12M", >> + 0x0cc, BIT(16), 0); >> +static SUNXI_CCU_GATE(usb_ohci1_clk, "usb-ohci1", "osc12M", >> + 0x0cc, BIT(17), 0); >> +static SUNXI_CCU_GATE(usb_ohci2_clk, "usb-ohci2", "osc12M", >> + 0x0cc, BIT(18), 0); > > Maybe you should force the OHCI muxes to 0? This seems to be not done in A64 driver. P.S. I changed this block to make it similar to the A64 driver. > > [...] > >> +static const char * const tcon_parents[] = { "pll-video0", >> "pll-video1", >> + "pll-video0-2x", >> "pll-video1-2x", >> + "pll-mipi" }; >> +static SUNXI_CCU_MUX_WITH_GATE(tcon_lcd0_clk, "tcon-lcd0", >> tcon_parents, >> + 0x110, 24, 3, BIT(31), >> CLK_SET_RATE_PARENT); >> +static SUNXI_CCU_MUX_WITH_GATE(tcon_lcd1_clk, "tcon-lcd1", >> tcon_parents, >> + 0x114, 24, 3, BIT(31), >> CLK_SET_RATE_PARENT); >> +static SUNXI_CCU_M_WITH_MUX_GATE(tcon_tv0_clk, "tcon-tv0", >> tcon_parents, >> + 0x118, 0, 4, 24, 3, BIT(31), 0); >> +static SUNXI_CCU_M_WITH_MUX_GATE(tcon_tv1_clk, "tcon-tv1", >> tcon_parents, >> + 0x11c, 0, 4, 24, 3, BIT(31), 0); > > You will likely need CLK_SET_RATE_PARENT for tcon-tv* as well. According to the experience on H3, the TCONs may be more complex. Leave 0 here until we have either HDMI driver or TVE driver. > > [...] > >> +static const char * const csi_mclk_parents[] = { "osc24M", >> "pll-video", > > pll-video1? oh yes, thanks. > >> + "pll-periph1" }; >> +static SUNXI_CCU_M_WITH_MUX_GATE(csi1_mclk_clk, "csi1-mclk", >> csi_mclk_parents, >> + 0x130, 0, 5, 8, 3, BIT(15), 0); >> + >> +static const char * const csi_sclk_parents[] = { "pll-periph0", >> "pll-periph1" }; >> +static SUNXI_CCU_M_WITH_MUX_GATE(csi_sclk_clk, "csi-sclk", >> csi_sclk_parents, >> + 0x134, 16, 4, 24, 3, BIT(31), 0); >> + >> +static SUNXI_CCU_M_WITH_MUX_GATE(csi0_mclk_clk, "csi0-mclk", >> csi_mclk_parents, >> + 0x134, 0, 5, 8, 3, BIT(15), 0); > > [...] > >> + >> +static SUNXI_CCU_M_WITH_GATE(ve_clk, "ve", "pll-ve", >> + 0x13c, 16, 3, BIT(31), 0); > > CLK_SET_RATE_PARENT? Seems ok. > >> + >> +static SUNXI_CCU_GATE(adda_clk, "adda", >> "pll-audio", >> + 0x140, BIT(31), CLK_SET_RATE_PARENT); > > You call the bus clock "bus-codec", but here you call it "adda". Pick > one and > be consistent. Use codec? > > [...] > >> +static const char * const hdmi_parents[] = { "pll-video0", >> "pll-video1" }; >> +static SUNXI_CCU_M_WITH_MUX_GATE(hdmi_clk, "hdmi", hdmi_parents, >> + 0x150, 0, 4, 24, 2, BIT(31), 0); > > CLK_SET_RATE_PARENT? Wait for HDMI driver. > > > [...] > >> +static const char * const mbus_parents[] = { "osc24M", >> "pll-periph0-2x", >> + "pll-ddr0" }; >> +static SUNXI_CCU_MP_WITH_MUX_GATE(mbus_clk, "mbus", mbus_parents, >> 0x15c, >> + 0, 4, /* M */ >> + 16, 2, /* P */ >> + 24, 2, /* mux */ >> + BIT(31), /* gate */ >> + CLK_IS_CRITICAL); > > The documentation for this one is fuzzy. It mentions the N (or P) > factor, > but does not include it in the formula. Can you double check it against > the BSP and add a comment about it? ``` SUNXI_CLK_PERIPH(mbus, MBUS_CFG, 24, 2, MBUS_CFG, 0, 4, 16, 2, 0, MBUS_CFG, MBUS_RST, 0, 0, 31, 31, 0, 0, &clk_lock, NULL, 0); ``` I think the BSP driver used both factors, however, the driver may be also not accurate as I think maybe mbus is not going to be changed even in BSP kernel. > >> + >> +static const char * const dsi_dphy_parents[] = { "pll-video0", >> "pll-video1", >> + "pll-periph0" }; >> +static SUNXI_CCU_M_WITH_MUX_GATE(dsi_dphy_clk, "dsi-dphy", >> dsi_dphy_parents, >> + 0x168, 0, 4, 8, 2, BIT(15), 0); > > Note: we might need CLK_SET_RATE_PARENT later on, but we will need to > find > a way to keep pll-periph* fixed. > >> + >> +static SUNXI_CCU_M_WITH_MUX_GATE(tve0_clk, "tve0", tcon_parents, >> + 0x180, 0, 4, 24, 3, BIT(31), 0); >> +static SUNXI_CCU_M_WITH_MUX_GATE(tve1_clk, "tve1", tcon_parents, >> + 0x184, 0, 4, 24, 3, BIT(31), 0); > > CLK_SET_RATE_PARENT? Wait for the real driver -- it may be more complex. > >> + >> +static const char * const tvd_parents[] = { "pll-video0", >> "pll-video1", >> + "pll-video0-2x", >> "pll-video1-2x" }; >> +static SUNXI_CCU_M_WITH_MUX_GATE(tvd0_clk, "tvd0", tvd_parents, >> + 0x188, 0, 4, 24, 3, BIT(31), 0); >> +static SUNXI_CCU_M_WITH_MUX_GATE(tvd1_clk, "tvd1", tvd_parents, >> + 0x18c, 0, 4, 24, 3, BIT(31), 0); >> +static SUNXI_CCU_M_WITH_MUX_GATE(tvd2_clk, "tvd2", tvd_parents, >> + 0x190, 0, 4, 24, 3, BIT(31), 0); >> +static SUNXI_CCU_M_WITH_MUX_GATE(tvd3_clk, "tvd3", tvd_parents, >> + 0x194, 0, 4, 24, 3, BIT(31), 0); > > CLK_SET_RATE_PARENT? Not sure at all, maybe they should be changed when really doing TVD driver. > > [...] > > You are missing the SYS_32k mux at register 0x310. According to > the diagrams, this is the actual clock that supplies the LOSC > parent of various muxes in the CCU. It itself is a mux between > an internal 2M RC oscillator, and LOSC from the RTC module. > >> + >> +static struct ccu_reset_map sun8i_r40_ccu_resets[] = { > > [...] > >> + [RST_BUS_HDMI_SLOW] = { 0x2c4, BIT(10) }, >> + [RST_BUS_HDMI] = { 0x2c4, BIT(11) }, > > Manual says bit 10 is HDMI0, bit 11 is HDMI1. Looking at the clocks, > bit 10 would be RST_BUS_HDMI, while bit 11 would be RST_BUS_HDMI_SLOW. Let me just call them 0 and 1 in next version. > > [...] > >> + >> +static const struct sunxi_ccu_desc sun8i_r40_ccu_desc = { >> + .ccu_clks = sun8i_r40_ccu_clks, >> + .num_ccu_clks = ARRAY_SIZE(sun8i_r40_ccu_clks), >> + >> + .hw_clks = &sun8i_r40_hw_clks, >> + >> + .resets = sun8i_r40_ccu_resets, >> + .num_resets = ARRAY_SIZE(sun8i_r40_ccu_resets), >> +}; >> + >> +static struct ccu_mux_nb sun8i_r40_cpu_nb = { >> + .common = &cpu_clk.common, >> + .cm = &cpu_clk.mux, >> + .delay_us = 1, /* > 8 clock cycles at 24 MHz */ >> + .bypass_index = 1, /* index of 24 MHz oscillator */ >> +}; >> + >> +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); > > You should also force pll-mipi to mipi mode. And the OHCI muxes. > >> + >> + sunxi_ccu_probe(node, reg, &sun8i_r40_ccu_desc); >> + >> + ccu_mux_notifier_register(pll_cpu_clk.common.hw.clk, >> + &sun8i_r40_cpu_nb); > > Do you also need the gate-then-ungate notifier? Still unknown... > > Thanks > ChenYu > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel at lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 12+ messages in thread
* [linux-sunxi] Re: [PATCH v4 3/3] clk: sunxi-ng: support R40 SoC 2017-08-14 16:53 ` icenowy at aosc.io @ 2017-08-15 2:16 ` Chen-Yu Tsai 2017-08-15 2:26 ` icenowy at aosc.io 0 siblings, 1 reply; 12+ messages in thread From: Chen-Yu Tsai @ 2017-08-15 2:16 UTC (permalink / raw) To: linux-arm-kernel On Tue, Aug 15, 2017 at 12:53 AM, <icenowy@aosc.io> wrote: > ? 2017-08-15 00:12?Chen-Yu Tsai ??? >> >> )On Sat, Aug 12, 2017 at 8:43 PM, Icenowy Zheng <icenowy@aosc.io> wrote: >>> >>> 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 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 | 1240 >>> +++++++++++++++++++++++++++++ >>> 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, 1632 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 >>> >>> diff --git a/drivers/clk/sunxi-ng/Kconfig b/drivers/clk/sunxi-ng/Kconfig >>> index 7342928c35cd..7a360737fe3c 100644 >>> --- a/drivers/clk/sunxi-ng/Kconfig >>> +++ b/drivers/clk/sunxi-ng/Kconfig >>> @@ -48,6 +48,11 @@ config SUN8I_V3S_CCU >>> config SUN8I_DE2_CCU >>> bool "Support for the Allwinner SoCs DE2 CCU" >>> >>> +config SUN8I_R40_CCU >>> + bool "Support for the Allwinner R40 CCU" >>> + default MACH_SUN8I >>> + depends on MACH_SUN8I || COMPILE_TEST >>> + >>> config SUN9I_A80_CCU >>> bool "Support for the Allwinner A80 CCU" >>> default MACH_SUN9I >>> diff --git a/drivers/clk/sunxi-ng/Makefile >>> b/drivers/clk/sunxi-ng/Makefile >>> index 45a5910379a5..b1267fe68a8f 100644 >>> --- a/drivers/clk/sunxi-ng/Makefile >>> +++ b/drivers/clk/sunxi-ng/Makefile >>> @@ -29,6 +29,7 @@ obj-$(CONFIG_SUN8I_H3_CCU) += ccu-sun8i-h3.o >>> obj-$(CONFIG_SUN8I_V3S_CCU) += ccu-sun8i-v3s.o >>> obj-$(CONFIG_SUN8I_DE2_CCU) += ccu-sun8i-de2.o >>> obj-$(CONFIG_SUN8I_R_CCU) += ccu-sun8i-r.o >>> +obj-$(CONFIG_SUN8I_R40_CCU) += ccu-sun8i-r40.o >>> obj-$(CONFIG_SUN9I_A80_CCU) += ccu-sun9i-a80.o >>> obj-$(CONFIG_SUN9I_A80_CCU) += ccu-sun9i-a80-de.o >>> obj-$(CONFIG_SUN9I_A80_CCU) += ccu-sun9i-a80-usb.o >>> diff --git a/drivers/clk/sunxi-ng/ccu-sun8i-r40.c >>> b/drivers/clk/sunxi-ng/ccu-sun8i-r40.c >>> new file mode 100644 >>> index 000000000000..9dc6ad419f9a >>> --- /dev/null >>> +++ b/drivers/clk/sunxi-ng/ccu-sun8i-r40.c >> >> >> [...] >> >>> +/* >>> + * The MIPI PLL has 2 modes: "MIPI" and "HDMI". >>> + * >>> + * The MIPI mode is a standard NKM-style clock. The HDMI mode is an >>> + * integer / fractional clock with switchable multipliers and dividers. >>> + * This is not supported here. We hardcode the PLL to MIPI mode. >>> + */ >>> +#define SUN8I_R40_PLL_MIPI_REG 0x040 >>> + >>> +static const char * const pll_mipi_parents[] = { "pll-video0" }; >>> +static SUNXI_CCU_NKM_WITH_MUX_GATE_LOCK(pll_mipi_clk, "pll-mipi", >>> + pll_mipi_parents, 0x040, >>> + 8, 4, /* N */ >>> + 4, 2, /* K */ >>> + 0, 4, /* M */ >>> + 21, 1, /* mux */ >>> + BIT(31) | BIT(23) | BIT(22), /* >>> gate */ >>> + BIT(28), /* lock */ >>> + CLK_SET_RATE_UNGATE); >> >> >> K has a minimum of 2 here. > > > I think it's not mentioned on the user manual... > > It says "The range is from 1 to 4." My R40 user manual v1.0 says otherwise. Page 85: PLL_FACTOR_K range is from 2 to 4. > >> >>> + >>> +static SUNXI_CCU_NM_WITH_FRAC_GATE_LOCK(pll_de_clk, "pll-de", >>> + "osc24M", 0x0048, >>> + 8, 7, /* N */ >>> + 0, 4, /* M */ >>> + BIT(24), /* frac enable */ >>> + BIT(25), /* frac select */ >>> + 270000000, /* frac rate 0 */ >>> + 297000000, /* frac rate 1 */ >>> + BIT(31), /* gate */ >>> + BIT(28), /* lock */ >>> + 0); >> >> >> CLK_SET_RATE_UNGATE should be set for _all_ PLLs. The lock status bit >> depends on the PLL running, and we check the lock status whenever set_rate >> is done. > > > Should we also do this on older SoCs? > > I think at least on H3 I met PLL-DE waiting for lock failure. We probably should. But let us focus on this driver for now. > >> >>> + >>> +static SUNXI_CCU_NM_WITH_GATE_LOCK(pll_ddr1_clk, "pll-ddr1", >>> + "osc24M", 0x04c, >>> + 8, 7, /* N */ >>> + 0, 2, /* M */ >>> + BIT(31), /* gate */ >>> + BIT(28), /* lock */ >>> + CLK_SET_RATE_UNGATE); >> >> >> Manual says 16 <= N <= 75. > > > Maybe we need to implement more things for this constraint? > > But I think the frequency is not going to be changed when > running... Either you implement it now, or leave a note saying it has said restrictions. I am in favor of implementing it now. That said, some other PLLs have restrictions on N*K. That we cannot implement at this time. > >> >> [...] >> >>> + >>> +static struct clk_div_table ths_div_table[] = { >>> + { .val = 0, .div = 1 }, >>> + { .val = 1, .div = 2 }, >>> + { .val = 2, .div = 4 }, >>> + { .val = 3, .div = 8 }, >>> +}; >>> +static const char * const ths_parents[] = { "osc24M" }; >>> +static struct ccu_div ths_clk = { >>> + .enable = BIT(31), >>> + .div = _SUNXI_CCU_DIV_TABLE(0, 2, ths_div_table), >> >> >> You could use _SUNXI_CCU_DIV_FLAGS(0, 2, CLK_DIVIDER_POWER_OF_TWO) >> instead of div_table. > > > Thanks. > >> >>> + .mux = _SUNXI_CCU_MUX(24, 2), >>> + .common = { >>> + .reg = 0x074, >>> + .hw.init = CLK_HW_INIT_PARENTS("ths", >>> + ths_parents, >>> + &ccu_div_ops, >>> + 0), >>> + }, >>> +}; >> >> >> [...] >> >>> +static const char * const keypad_parents[] = { "osc24M", "osc32k", }; >> >> >> Nit: you can drop the extra comma. > > > Thanks. > >> >> [...] >> >>> +static const char * const sata_parents[] = { "pll-sata-out", "sata-ext" >>> }; >>> +static SUNXI_CCU_MUX_WITH_GATE(sata_clk, "sata", sata_parents, >>> + 0x0c8, 24, 1, BIT(31), >>> CLK_SET_RATE_PARENT); >> >> >> You don't have CLK_SET_RATE_PARENT for the parent, which is also a >> mux+gate. >> I'm not sure what you are expecting to happen here. > > > Oh maybe I should add it there. Adding it there may affect pll-periph0. >> >>> + >>> +static SUNXI_CCU_GATE(usb_phy0_clk, "usb-phy0", "osc24M", >>> + 0x0cc, BIT(8), 0); >>> +static SUNXI_CCU_GATE(usb_phy1_clk, "usb-phy1", "osc24M", >>> + 0x0cc, BIT(9), 0); >>> +static SUNXI_CCU_GATE(usb_phy2_clk, "usb-phy2", "osc24M", >>> + 0x0cc, BIT(10), 0); >>> +static SUNXI_CCU_GATE(usb_ohci0_clk, "usb-ohci0", "osc12M", >>> + 0x0cc, BIT(16), 0); >>> +static SUNXI_CCU_GATE(usb_ohci1_clk, "usb-ohci1", "osc12M", >>> + 0x0cc, BIT(17), 0); >>> +static SUNXI_CCU_GATE(usb_ohci2_clk, "usb-ohci2", "osc12M", >>> + 0x0cc, BIT(18), 0); >> >> >> Maybe you should force the OHCI muxes to 0? > > > This seems to be not done in A64 driver. > > P.S. I changed this block to make it similar to the A64 driver. Then you should at least leave a note saying this is unimplemented and we are depending on the hardware default. > >> >> [...] >> >>> +static const char * const tcon_parents[] = { "pll-video0", "pll-video1", >>> + "pll-video0-2x", >>> "pll-video1-2x", >>> + "pll-mipi" }; >>> +static SUNXI_CCU_MUX_WITH_GATE(tcon_lcd0_clk, "tcon-lcd0", tcon_parents, >>> + 0x110, 24, 3, BIT(31), >>> CLK_SET_RATE_PARENT); >>> +static SUNXI_CCU_MUX_WITH_GATE(tcon_lcd1_clk, "tcon-lcd1", tcon_parents, >>> + 0x114, 24, 3, BIT(31), >>> CLK_SET_RATE_PARENT); >>> +static SUNXI_CCU_M_WITH_MUX_GATE(tcon_tv0_clk, "tcon-tv0", tcon_parents, >>> + 0x118, 0, 4, 24, 3, BIT(31), 0); >>> +static SUNXI_CCU_M_WITH_MUX_GATE(tcon_tv1_clk, "tcon-tv1", tcon_parents, >>> + 0x11c, 0, 4, 24, 3, BIT(31), 0); >> >> >> You will likely need CLK_SET_RATE_PARENT for tcon-tv* as well. > > > According to the experience on H3, the TCONs may be more complex. > > Leave 0 here until we have either HDMI driver or TVE driver. OK. > >> >> [...] >> >>> +static const char * const csi_mclk_parents[] = { "osc24M", "pll-video", >> >> >> pll-video1? > > > oh yes, thanks. > >> >>> + "pll-periph1" }; >>> +static SUNXI_CCU_M_WITH_MUX_GATE(csi1_mclk_clk, "csi1-mclk", >>> csi_mclk_parents, >>> + 0x130, 0, 5, 8, 3, BIT(15), 0); >>> + >>> +static const char * const csi_sclk_parents[] = { "pll-periph0", >>> "pll-periph1" }; >>> +static SUNXI_CCU_M_WITH_MUX_GATE(csi_sclk_clk, "csi-sclk", >>> csi_sclk_parents, >>> + 0x134, 16, 4, 24, 3, BIT(31), 0); >>> + >>> +static SUNXI_CCU_M_WITH_MUX_GATE(csi0_mclk_clk, "csi0-mclk", >>> csi_mclk_parents, >>> + 0x134, 0, 5, 8, 3, BIT(15), 0); >> >> >> [...] >> >>> + >>> +static SUNXI_CCU_M_WITH_GATE(ve_clk, "ve", "pll-ve", >>> + 0x13c, 16, 3, BIT(31), 0); >> >> >> CLK_SET_RATE_PARENT? > > > Seems ok. > >> >>> + >>> +static SUNXI_CCU_GATE(adda_clk, "adda", >>> "pll-audio", >>> + 0x140, BIT(31), CLK_SET_RATE_PARENT); >> >> >> You call the bus clock "bus-codec", but here you call it "adda". Pick one >> and >> be consistent. > > > Use codec? Cool. > >> >> [...] >> >>> +static const char * const hdmi_parents[] = { "pll-video0", "pll-video1" >>> }; >>> +static SUNXI_CCU_M_WITH_MUX_GATE(hdmi_clk, "hdmi", hdmi_parents, >>> + 0x150, 0, 4, 24, 2, BIT(31), 0); >> >> >> CLK_SET_RATE_PARENT? > > > Wait for HDMI driver. OK. > >> >> >> [...] >> >>> +static const char * const mbus_parents[] = { "osc24M", "pll-periph0-2x", >>> + "pll-ddr0" }; >>> +static SUNXI_CCU_MP_WITH_MUX_GATE(mbus_clk, "mbus", mbus_parents, 0x15c, >>> + 0, 4, /* M */ >>> + 16, 2, /* P */ >>> + 24, 2, /* mux */ >>> + BIT(31), /* gate */ >>> + CLK_IS_CRITICAL); >> >> >> The documentation for this one is fuzzy. It mentions the N (or P) factor, >> but does not include it in the formula. Can you double check it against >> the BSP and add a comment about it? > > > ``` > SUNXI_CLK_PERIPH(mbus, MBUS_CFG, 24, 2, MBUS_CFG, 0, 4, 16, 2, 0, MBUS_CFG, > MBUS_RST, 0, 0, 31, 31, 0, 0, &clk_lock, NULL, 0); > ``` > I think the BSP driver used both factors, however, the driver may be also > not accurate as I think maybe mbus is not going to be changed even in BSP > kernel. OK. Please add a comment saying that the doc is fuzzy and you're following the BSP on this one. > >> >>> + >>> +static const char * const dsi_dphy_parents[] = { "pll-video0", >>> "pll-video1", >>> + "pll-periph0" }; >>> +static SUNXI_CCU_M_WITH_MUX_GATE(dsi_dphy_clk, "dsi-dphy", >>> dsi_dphy_parents, >>> + 0x168, 0, 4, 8, 2, BIT(15), 0); >> >> >> Note: we might need CLK_SET_RATE_PARENT later on, but we will need to find >> a way to keep pll-periph* fixed. >> >>> + >>> +static SUNXI_CCU_M_WITH_MUX_GATE(tve0_clk, "tve0", tcon_parents, >>> + 0x180, 0, 4, 24, 3, BIT(31), 0); >>> +static SUNXI_CCU_M_WITH_MUX_GATE(tve1_clk, "tve1", tcon_parents, >>> + 0x184, 0, 4, 24, 3, BIT(31), 0); >> >> >> CLK_SET_RATE_PARENT? > > > Wait for the real driver -- it may be more complex. OK. > >> >>> + >>> +static const char * const tvd_parents[] = { "pll-video0", "pll-video1", >>> + "pll-video0-2x", >>> "pll-video1-2x" }; >>> +static SUNXI_CCU_M_WITH_MUX_GATE(tvd0_clk, "tvd0", tvd_parents, >>> + 0x188, 0, 4, 24, 3, BIT(31), 0); >>> +static SUNXI_CCU_M_WITH_MUX_GATE(tvd1_clk, "tvd1", tvd_parents, >>> + 0x18c, 0, 4, 24, 3, BIT(31), 0); >>> +static SUNXI_CCU_M_WITH_MUX_GATE(tvd2_clk, "tvd2", tvd_parents, >>> + 0x190, 0, 4, 24, 3, BIT(31), 0); >>> +static SUNXI_CCU_M_WITH_MUX_GATE(tvd3_clk, "tvd3", tvd_parents, >>> + 0x194, 0, 4, 24, 3, BIT(31), 0); >> >> >> CLK_SET_RATE_PARENT? > > > Not sure at all, maybe they should be changed when really doing TVD > driver. OK. > >> >> [...] >> >> You are missing the SYS_32k mux at register 0x310. According to >> the diagrams, this is the actual clock that supplies the LOSC >> parent of various muxes in the CCU. It itself is a mux between >> an internal 2M RC oscillator, and LOSC from the RTC module. >> >>> + >>> +static struct ccu_reset_map sun8i_r40_ccu_resets[] = { >> >> >> [...] >> >>> + [RST_BUS_HDMI_SLOW] = { 0x2c4, BIT(10) }, >>> + [RST_BUS_HDMI] = { 0x2c4, BIT(11) }, >> >> >> Manual says bit 10 is HDMI0, bit 11 is HDMI1. Looking at the clocks, >> bit 10 would be RST_BUS_HDMI, while bit 11 would be RST_BUS_HDMI_SLOW. > > > Let me just call them 0 and 1 in next version. OK. > > >> >> [...] >> >>> + >>> +static const struct sunxi_ccu_desc sun8i_r40_ccu_desc = { >>> + .ccu_clks = sun8i_r40_ccu_clks, >>> + .num_ccu_clks = ARRAY_SIZE(sun8i_r40_ccu_clks), >>> + >>> + .hw_clks = &sun8i_r40_hw_clks, >>> + >>> + .resets = sun8i_r40_ccu_resets, >>> + .num_resets = ARRAY_SIZE(sun8i_r40_ccu_resets), >>> +}; >>> + >>> +static struct ccu_mux_nb sun8i_r40_cpu_nb = { >>> + .common = &cpu_clk.common, >>> + .cm = &cpu_clk.mux, >>> + .delay_us = 1, /* > 8 clock cycles at 24 MHz */ >>> + .bypass_index = 1, /* index of 24 MHz oscillator */ >>> +}; >>> + >>> +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); >> >> >> You should also force pll-mipi to mipi mode. And the OHCI muxes. >> >>> + >>> + sunxi_ccu_probe(node, reg, &sun8i_r40_ccu_desc); >>> + >>> + ccu_mux_notifier_register(pll_cpu_clk.common.hw.clk, >>> + &sun8i_r40_cpu_nb); >> >> >> Do you also need the gate-then-ungate notifier? > > > Still unknown... OK. Thanks ChenYu ^ permalink raw reply [flat|nested] 12+ messages in thread
* [linux-sunxi] Re: [PATCH v4 3/3] clk: sunxi-ng: support R40 SoC 2017-08-15 2:16 ` [linux-sunxi] " Chen-Yu Tsai @ 2017-08-15 2:26 ` icenowy at aosc.io 0 siblings, 0 replies; 12+ messages in thread From: icenowy at aosc.io @ 2017-08-15 2:26 UTC (permalink / raw) To: linux-arm-kernel ? 2017-08-15 10:16?Chen-Yu Tsai ??? > On Tue, Aug 15, 2017 at 12:53 AM, <icenowy@aosc.io> wrote: >> ? 2017-08-15 00:12?Chen-Yu Tsai ??? >>> >>> )On Sat, Aug 12, 2017 at 8:43 PM, Icenowy Zheng <icenowy@aosc.io> >>> wrote: >>>> >>>> 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 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 | 1240 >>>> +++++++++++++++++++++++++++++ >>>> 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, 1632 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 >>>> >>>> diff --git a/drivers/clk/sunxi-ng/Kconfig >>>> b/drivers/clk/sunxi-ng/Kconfig >>>> index 7342928c35cd..7a360737fe3c 100644 >>>> --- a/drivers/clk/sunxi-ng/Kconfig >>>> +++ b/drivers/clk/sunxi-ng/Kconfig >>>> @@ -48,6 +48,11 @@ config SUN8I_V3S_CCU >>>> config SUN8I_DE2_CCU >>>> bool "Support for the Allwinner SoCs DE2 CCU" >>>> >>>> +config SUN8I_R40_CCU >>>> + bool "Support for the Allwinner R40 CCU" >>>> + default MACH_SUN8I >>>> + depends on MACH_SUN8I || COMPILE_TEST >>>> + >>>> config SUN9I_A80_CCU >>>> bool "Support for the Allwinner A80 CCU" >>>> default MACH_SUN9I >>>> diff --git a/drivers/clk/sunxi-ng/Makefile >>>> b/drivers/clk/sunxi-ng/Makefile >>>> index 45a5910379a5..b1267fe68a8f 100644 >>>> --- a/drivers/clk/sunxi-ng/Makefile >>>> +++ b/drivers/clk/sunxi-ng/Makefile >>>> @@ -29,6 +29,7 @@ obj-$(CONFIG_SUN8I_H3_CCU) += ccu-sun8i-h3.o >>>> obj-$(CONFIG_SUN8I_V3S_CCU) += ccu-sun8i-v3s.o >>>> obj-$(CONFIG_SUN8I_DE2_CCU) += ccu-sun8i-de2.o >>>> obj-$(CONFIG_SUN8I_R_CCU) += ccu-sun8i-r.o >>>> +obj-$(CONFIG_SUN8I_R40_CCU) += ccu-sun8i-r40.o >>>> obj-$(CONFIG_SUN9I_A80_CCU) += ccu-sun9i-a80.o >>>> obj-$(CONFIG_SUN9I_A80_CCU) += ccu-sun9i-a80-de.o >>>> obj-$(CONFIG_SUN9I_A80_CCU) += ccu-sun9i-a80-usb.o >>>> diff --git a/drivers/clk/sunxi-ng/ccu-sun8i-r40.c >>>> b/drivers/clk/sunxi-ng/ccu-sun8i-r40.c >>>> new file mode 100644 >>>> index 000000000000..9dc6ad419f9a >>>> --- /dev/null >>>> +++ b/drivers/clk/sunxi-ng/ccu-sun8i-r40.c >>> >>> >>> [...] >>> >>>> +/* >>>> + * The MIPI PLL has 2 modes: "MIPI" and "HDMI". >>>> + * >>>> + * The MIPI mode is a standard NKM-style clock. The HDMI mode is an >>>> + * integer / fractional clock with switchable multipliers and >>>> dividers. >>>> + * This is not supported here. We hardcode the PLL to MIPI mode. >>>> + */ >>>> +#define SUN8I_R40_PLL_MIPI_REG 0x040 >>>> + >>>> +static const char * const pll_mipi_parents[] = { "pll-video0" }; >>>> +static SUNXI_CCU_NKM_WITH_MUX_GATE_LOCK(pll_mipi_clk, "pll-mipi", >>>> + pll_mipi_parents, 0x040, >>>> + 8, 4, /* N */ >>>> + 4, 2, /* K */ >>>> + 0, 4, /* M */ >>>> + 21, 1, /* mux */ >>>> + BIT(31) | BIT(23) | BIT(22), >>>> /* >>>> gate */ >>>> + BIT(28), /* lock */ >>>> + CLK_SET_RATE_UNGATE); >>> >>> >>> K has a minimum of 2 here. >> >> >> I think it's not mentioned on the user manual... >> >> It says "The range is from 1 to 4." > > My R40 user manual v1.0 says otherwise. Page 85: PLL_FACTOR_K > range is from 2 to 4. Sorry... I read wrong page. > >> >>> >>>> + >>>> +static SUNXI_CCU_NM_WITH_FRAC_GATE_LOCK(pll_de_clk, "pll-de", >>>> + "osc24M", 0x0048, >>>> + 8, 7, /* N */ >>>> + 0, 4, /* M */ >>>> + BIT(24), /* frac >>>> enable */ >>>> + BIT(25), /* frac >>>> select */ >>>> + 270000000, /* frac rate >>>> 0 */ >>>> + 297000000, /* frac rate >>>> 1 */ >>>> + BIT(31), /* gate */ >>>> + BIT(28), /* lock */ >>>> + 0); >>> >>> >>> CLK_SET_RATE_UNGATE should be set for _all_ PLLs. The lock status bit >>> depends on the PLL running, and we check the lock status whenever >>> set_rate >>> is done. >> >> >> Should we also do this on older SoCs? >> >> I think at least on H3 I met PLL-DE waiting for lock failure. > > We probably should. But let us focus on this driver for now. > >> >>> >>>> + >>>> +static SUNXI_CCU_NM_WITH_GATE_LOCK(pll_ddr1_clk, "pll-ddr1", >>>> + "osc24M", 0x04c, >>>> + 8, 7, /* N */ >>>> + 0, 2, /* M */ >>>> + BIT(31), /* gate */ >>>> + BIT(28), /* lock */ >>>> + CLK_SET_RATE_UNGATE); >>> >>> >>> Manual says 16 <= N <= 75. >> >> >> Maybe we need to implement more things for this constraint? >> >> But I think the frequency is not going to be changed when >> running... > > Either you implement it now, or leave a note saying it has > said restrictions. I am in favor of implementing it now. > That said, some other PLLs have restrictions on N*K. That > we cannot implement at this time. I prefer to leave a note (also on PLL-DDR0). > >> >>> >>> [...] >>> >>>> + >>>> +static struct clk_div_table ths_div_table[] = { >>>> + { .val = 0, .div = 1 }, >>>> + { .val = 1, .div = 2 }, >>>> + { .val = 2, .div = 4 }, >>>> + { .val = 3, .div = 8 }, >>>> +}; >>>> +static const char * const ths_parents[] = { "osc24M" }; >>>> +static struct ccu_div ths_clk = { >>>> + .enable = BIT(31), >>>> + .div = _SUNXI_CCU_DIV_TABLE(0, 2, ths_div_table), >>> >>> >>> You could use _SUNXI_CCU_DIV_FLAGS(0, 2, CLK_DIVIDER_POWER_OF_TWO) >>> instead of div_table. >> >> >> Thanks. >> >>> >>>> + .mux = _SUNXI_CCU_MUX(24, 2), >>>> + .common = { >>>> + .reg = 0x074, >>>> + .hw.init = CLK_HW_INIT_PARENTS("ths", >>>> + ths_parents, >>>> + &ccu_div_ops, >>>> + 0), >>>> + }, >>>> +}; >>> >>> >>> [...] >>> >>>> +static const char * const keypad_parents[] = { "osc24M", "osc32k", >>>> }; >>> >>> >>> Nit: you can drop the extra comma. >> >> >> Thanks. >> >>> >>> [...] >>> >>>> +static const char * const sata_parents[] = { "pll-sata-out", >>>> "sata-ext" >>>> }; >>>> +static SUNXI_CCU_MUX_WITH_GATE(sata_clk, "sata", sata_parents, >>>> + 0x0c8, 24, 1, BIT(31), >>>> CLK_SET_RATE_PARENT); >>> >>> >>> You don't have CLK_SET_RATE_PARENT for the parent, which is also a >>> mux+gate. >>> I'm not sure what you are expecting to happen here. >> >> >> Oh maybe I should add it there. > > Adding it there may affect pll-periph0. I should add it on pll-sata-out, but not on pll-periph0-sata. pll-periph0-sata is a downstream clock of pll-periph0. > >>> >>>> + >>>> +static SUNXI_CCU_GATE(usb_phy0_clk, "usb-phy0", "osc24M", >>>> + 0x0cc, BIT(8), 0); >>>> +static SUNXI_CCU_GATE(usb_phy1_clk, "usb-phy1", "osc24M", >>>> + 0x0cc, BIT(9), 0); >>>> +static SUNXI_CCU_GATE(usb_phy2_clk, "usb-phy2", "osc24M", >>>> + 0x0cc, BIT(10), 0); >>>> +static SUNXI_CCU_GATE(usb_ohci0_clk, "usb-ohci0", "osc12M", >>>> + 0x0cc, BIT(16), 0); >>>> +static SUNXI_CCU_GATE(usb_ohci1_clk, "usb-ohci1", "osc12M", >>>> + 0x0cc, BIT(17), 0); >>>> +static SUNXI_CCU_GATE(usb_ohci2_clk, "usb-ohci2", "osc12M", >>>> + 0x0cc, BIT(18), 0); >>> >>> >>> Maybe you should force the OHCI muxes to 0? >> >> >> This seems to be not done in A64 driver. >> >> P.S. I changed this block to make it similar to the A64 driver. > > Then you should at least leave a note saying this is unimplemented > and we are depending on the hardware default. Let me force it ;-) > >> >>> >>> [...] >>> >>>> +static const char * const tcon_parents[] = { "pll-video0", >>>> "pll-video1", >>>> + "pll-video0-2x", >>>> "pll-video1-2x", >>>> + "pll-mipi" }; >>>> +static SUNXI_CCU_MUX_WITH_GATE(tcon_lcd0_clk, "tcon-lcd0", >>>> tcon_parents, >>>> + 0x110, 24, 3, BIT(31), >>>> CLK_SET_RATE_PARENT); >>>> +static SUNXI_CCU_MUX_WITH_GATE(tcon_lcd1_clk, "tcon-lcd1", >>>> tcon_parents, >>>> + 0x114, 24, 3, BIT(31), >>>> CLK_SET_RATE_PARENT); >>>> +static SUNXI_CCU_M_WITH_MUX_GATE(tcon_tv0_clk, "tcon-tv0", >>>> tcon_parents, >>>> + 0x118, 0, 4, 24, 3, BIT(31), 0); >>>> +static SUNXI_CCU_M_WITH_MUX_GATE(tcon_tv1_clk, "tcon-tv1", >>>> tcon_parents, >>>> + 0x11c, 0, 4, 24, 3, BIT(31), 0); >>> >>> >>> You will likely need CLK_SET_RATE_PARENT for tcon-tv* as well. >> >> >> According to the experience on H3, the TCONs may be more complex. >> >> Leave 0 here until we have either HDMI driver or TVE driver. > > OK. > >> >>> >>> [...] >>> >>>> +static const char * const csi_mclk_parents[] = { "osc24M", >>>> "pll-video", >>> >>> >>> pll-video1? >> >> >> oh yes, thanks. >> >>> >>>> + "pll-periph1" }; >>>> +static SUNXI_CCU_M_WITH_MUX_GATE(csi1_mclk_clk, "csi1-mclk", >>>> csi_mclk_parents, >>>> + 0x130, 0, 5, 8, 3, BIT(15), 0); >>>> + >>>> +static const char * const csi_sclk_parents[] = { "pll-periph0", >>>> "pll-periph1" }; >>>> +static SUNXI_CCU_M_WITH_MUX_GATE(csi_sclk_clk, "csi-sclk", >>>> csi_sclk_parents, >>>> + 0x134, 16, 4, 24, 3, BIT(31), 0); >>>> + >>>> +static SUNXI_CCU_M_WITH_MUX_GATE(csi0_mclk_clk, "csi0-mclk", >>>> csi_mclk_parents, >>>> + 0x134, 0, 5, 8, 3, BIT(15), 0); >>> >>> >>> [...] >>> >>>> + >>>> +static SUNXI_CCU_M_WITH_GATE(ve_clk, "ve", "pll-ve", >>>> + 0x13c, 16, 3, BIT(31), 0); >>> >>> >>> CLK_SET_RATE_PARENT? >> >> >> Seems ok. >> >>> >>>> + >>>> +static SUNXI_CCU_GATE(adda_clk, "adda", >>>> "pll-audio", >>>> + 0x140, BIT(31), CLK_SET_RATE_PARENT); >>> >>> >>> You call the bus clock "bus-codec", but here you call it "adda". Pick >>> one >>> and >>> be consistent. >> >> >> Use codec? > > Cool. > >> >>> >>> [...] >>> >>>> +static const char * const hdmi_parents[] = { "pll-video0", >>>> "pll-video1" >>>> }; >>>> +static SUNXI_CCU_M_WITH_MUX_GATE(hdmi_clk, "hdmi", hdmi_parents, >>>> + 0x150, 0, 4, 24, 2, BIT(31), 0); >>> >>> >>> CLK_SET_RATE_PARENT? >> >> >> Wait for HDMI driver. > > OK. > >> >>> >>> >>> [...] >>> >>>> +static const char * const mbus_parents[] = { "osc24M", >>>> "pll-periph0-2x", >>>> + "pll-ddr0" }; >>>> +static SUNXI_CCU_MP_WITH_MUX_GATE(mbus_clk, "mbus", mbus_parents, >>>> 0x15c, >>>> + 0, 4, /* M */ >>>> + 16, 2, /* P */ >>>> + 24, 2, /* mux */ >>>> + BIT(31), /* gate */ >>>> + CLK_IS_CRITICAL); >>> >>> >>> The documentation for this one is fuzzy. It mentions the N (or P) >>> factor, >>> but does not include it in the formula. Can you double check it >>> against >>> the BSP and add a comment about it? >> >> >> ``` >> SUNXI_CLK_PERIPH(mbus, MBUS_CFG, 24, 2, MBUS_CFG, 0, 4, 16, 2, 0, >> MBUS_CFG, >> MBUS_RST, 0, 0, 31, 31, 0, 0, &clk_lock, NULL, >> 0); >> ``` >> I think the BSP driver used both factors, however, the driver may be >> also >> not accurate as I think maybe mbus is not going to be changed even in >> BSP >> kernel. > > OK. Please add a comment saying that the doc is fuzzy and you're > following > the BSP on this one. OK. > >> >>> >>>> + >>>> +static const char * const dsi_dphy_parents[] = { "pll-video0", >>>> "pll-video1", >>>> + "pll-periph0" }; >>>> +static SUNXI_CCU_M_WITH_MUX_GATE(dsi_dphy_clk, "dsi-dphy", >>>> dsi_dphy_parents, >>>> + 0x168, 0, 4, 8, 2, BIT(15), 0); >>> >>> >>> Note: we might need CLK_SET_RATE_PARENT later on, but we will need to >>> find >>> a way to keep pll-periph* fixed. >>> >>>> + >>>> +static SUNXI_CCU_M_WITH_MUX_GATE(tve0_clk, "tve0", tcon_parents, >>>> + 0x180, 0, 4, 24, 3, BIT(31), 0); >>>> +static SUNXI_CCU_M_WITH_MUX_GATE(tve1_clk, "tve1", tcon_parents, >>>> + 0x184, 0, 4, 24, 3, BIT(31), 0); >>> >>> >>> CLK_SET_RATE_PARENT? >> >> >> Wait for the real driver -- it may be more complex. > > OK. > >> >>> >>>> + >>>> +static const char * const tvd_parents[] = { "pll-video0", >>>> "pll-video1", >>>> + "pll-video0-2x", >>>> "pll-video1-2x" }; >>>> +static SUNXI_CCU_M_WITH_MUX_GATE(tvd0_clk, "tvd0", tvd_parents, >>>> + 0x188, 0, 4, 24, 3, BIT(31), 0); >>>> +static SUNXI_CCU_M_WITH_MUX_GATE(tvd1_clk, "tvd1", tvd_parents, >>>> + 0x18c, 0, 4, 24, 3, BIT(31), 0); >>>> +static SUNXI_CCU_M_WITH_MUX_GATE(tvd2_clk, "tvd2", tvd_parents, >>>> + 0x190, 0, 4, 24, 3, BIT(31), 0); >>>> +static SUNXI_CCU_M_WITH_MUX_GATE(tvd3_clk, "tvd3", tvd_parents, >>>> + 0x194, 0, 4, 24, 3, BIT(31), 0); >>> >>> >>> CLK_SET_RATE_PARENT? >> >> >> Not sure at all, maybe they should be changed when really doing TVD >> driver. > > OK. > >> >>> >>> [...] >>> >>> You are missing the SYS_32k mux at register 0x310. According to >>> the diagrams, this is the actual clock that supplies the LOSC >>> parent of various muxes in the CCU. It itself is a mux between >>> an internal 2M RC oscillator, and LOSC from the RTC module. >>> >>>> + >>>> +static struct ccu_reset_map sun8i_r40_ccu_resets[] = { >>> >>> >>> [...] >>> >>>> + [RST_BUS_HDMI_SLOW] = { 0x2c4, BIT(10) }, >>>> + [RST_BUS_HDMI] = { 0x2c4, BIT(11) }, >>> >>> >>> Manual says bit 10 is HDMI0, bit 11 is HDMI1. Looking at the clocks, >>> bit 10 would be RST_BUS_HDMI, while bit 11 would be >>> RST_BUS_HDMI_SLOW. >> >> >> Let me just call them 0 and 1 in next version. > > OK. > >> >> >>> >>> [...] >>> >>>> + >>>> +static const struct sunxi_ccu_desc sun8i_r40_ccu_desc = { >>>> + .ccu_clks = sun8i_r40_ccu_clks, >>>> + .num_ccu_clks = ARRAY_SIZE(sun8i_r40_ccu_clks), >>>> + >>>> + .hw_clks = &sun8i_r40_hw_clks, >>>> + >>>> + .resets = sun8i_r40_ccu_resets, >>>> + .num_resets = ARRAY_SIZE(sun8i_r40_ccu_resets), >>>> +}; >>>> + >>>> +static struct ccu_mux_nb sun8i_r40_cpu_nb = { >>>> + .common = &cpu_clk.common, >>>> + .cm = &cpu_clk.mux, >>>> + .delay_us = 1, /* > 8 clock cycles at 24 MHz */ >>>> + .bypass_index = 1, /* index of 24 MHz oscillator */ >>>> +}; >>>> + >>>> +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); >>> >>> >>> You should also force pll-mipi to mipi mode. And the OHCI muxes. >>> >>>> + >>>> + sunxi_ccu_probe(node, reg, &sun8i_r40_ccu_desc); >>>> + >>>> + ccu_mux_notifier_register(pll_cpu_clk.common.hw.clk, >>>> + &sun8i_r40_cpu_nb); >>> >>> >>> Do you also need the gate-then-ungate notifier? >> >> >> Still unknown... > > OK. Maybe I should do some experiments, and if possible, add DVFS even in the start? We have proper driver for AXP221s ;-) > > Thanks > ChenYu > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel at lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2017-08-15 2:26 UTC | newest] Thread overview: 12+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2017-08-12 12:43 [PATCH v4 0/3] Allwinner R40 CCU driver Icenowy Zheng 2017-08-12 12:43 ` [PATCH v4 1/3] clk: sunxi-ng: div: Add support for fixed post-divider Icenowy Zheng 2017-08-12 12:49 ` icenowy at aosc.io 2017-08-13 2:50 ` icenowy at aosc.io 2017-08-14 14:37 ` [linux-sunxi] " Chen-Yu Tsai 2017-08-12 12:43 ` [PATCH v4 2/3] clk: sunxi-ng: nkm: add " Icenowy Zheng 2017-08-14 14:46 ` [linux-sunxi] " Chen-Yu Tsai 2017-08-12 12:43 ` [PATCH v4 3/3] clk: sunxi-ng: support R40 SoC Icenowy Zheng 2017-08-14 16:12 ` Chen-Yu Tsai 2017-08-14 16:53 ` icenowy at aosc.io 2017-08-15 2:16 ` [linux-sunxi] " Chen-Yu Tsai 2017-08-15 2:26 ` icenowy at aosc.io
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).