| Message ID | 1500410199-13039-35-git-send-email-philipp.tomsich@theobroma-systems.com |
|---|---|
| State | Superseded |
| Delegated to: | Philipp Tomsich |
| Headers | show |
Hi Philipp: On 2017年07月19日 04:36, Philipp Tomsich wrote: > With the RK3368's limited TPL size, we'll want to use OF_PLATFDATA for > the SPL stage. This implements support for OF_PLATDATA in the clock TPL or SPL? > driver for the RK3368. > Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com> > --- > > drivers/clk/rockchip/clk_rk3368.c | 17 +++++++++++++++++ > 1 file changed, 17 insertions(+) > > diff --git a/drivers/clk/rockchip/clk_rk3368.c b/drivers/clk/rockchip/clk_rk3368.c > index d8f06d5..809ad19 100644 > --- a/drivers/clk/rockchip/clk_rk3368.c > +++ b/drivers/clk/rockchip/clk_rk3368.c > @@ -8,7 +8,9 @@ > #include <common.h> > #include <clk-uclass.h> > #include <dm.h> > +#include <dt-structs.h> > #include <errno.h> > +#include <mapmem.h> > #include <syscon.h> > #include <asm/arch/clock.h> > #include <asm/arch/cru_rk3368.h> > @@ -19,6 +21,12 @@ > > DECLARE_GLOBAL_DATA_PTR; > > +#if CONFIG_IS_ENABLED(OF_PLATDATA) > +struct rk3368_clk_plat { > + struct dtd_rockchip_rk3368_cru dtd; > +}; > +#endif > + > struct pll_div { > u32 nr; > u32 nf; > @@ -254,7 +262,11 @@ static struct clk_ops rk3368_clk_ops = { > static int rk3368_clk_probe(struct udevice *dev) > { > struct rk3368_clk_priv *priv = dev_get_priv(dev); > +#if CONFIG_IS_ENABLED(OF_PLATDATA) > + struct rk3368_clk_plat *plat = dev_get_platdata(dev); > > + priv->cru = map_sysmem(plat->dtd.reg[1], plat->dtd.reg[3]); > +#endif > rkclk_init(priv->cru); > > return 0; > @@ -262,9 +274,11 @@ static int rk3368_clk_probe(struct udevice *dev) > > static int rk3368_clk_ofdata_to_platdata(struct udevice *dev) > { > +#if !CONFIG_IS_ENABLED(OF_PLATDATA) > struct rk3368_clk_priv *priv = dev_get_priv(dev); > > priv->cru = (struct rk3368_cru *)devfdt_get_addr(dev); > +#endif > > return 0; > } > @@ -291,6 +305,9 @@ U_BOOT_DRIVER(rockchip_rk3368_cru) = { > .id = UCLASS_CLK, > .of_match = rk3368_clk_ids, > .priv_auto_alloc_size = sizeof(struct rk3368_clk_priv), > +#if CONFIG_IS_ENABLED(OF_PLATDATA) > + .platdata_auto_alloc_size = sizeof(struct rk3368_clk_plat), > +#endif > .ofdata_to_platdata = rk3368_clk_ofdata_to_platdata, > .ops = &rk3368_clk_ops, > .bind = rk3368_clk_bind,
> On 21 Jul 2017, at 08:36, Andy Yan <andy.yan@rock-chips.com> wrote: > > Hi Philipp: > > > On 2017年07月19日 04:36, Philipp Tomsich wrote: >> With the RK3368's limited TPL size, we'll want to use OF_PLATFDATA for >> the SPL stage. This implements support for OF_PLATDATA in the clock > > TPL or SPL? Thanks for catching this. In fact it was first done for SPL and later reused for TPL (when I split the CONFIG_IS_ENABLED for TPL and SPL). There may be more of such confused uses of TPL/SPL lurking in my commit messages... >> driver for the RK3368. > > >> Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com> >> --- >> >> drivers/clk/rockchip/clk_rk3368.c | 17 +++++++++++++++++ >> 1 file changed, 17 insertions(+) >> >> diff --git a/drivers/clk/rockchip/clk_rk3368.c b/drivers/clk/rockchip/clk_rk3368.c >> index d8f06d5..809ad19 100644 >> --- a/drivers/clk/rockchip/clk_rk3368.c >> +++ b/drivers/clk/rockchip/clk_rk3368.c >> @@ -8,7 +8,9 @@ >> #include <common.h> >> #include <clk-uclass.h> >> #include <dm.h> >> +#include <dt-structs.h> >> #include <errno.h> >> +#include <mapmem.h> >> #include <syscon.h> >> #include <asm/arch/clock.h> >> #include <asm/arch/cru_rk3368.h> >> @@ -19,6 +21,12 @@ >> DECLARE_GLOBAL_DATA_PTR; >> +#if CONFIG_IS_ENABLED(OF_PLATDATA) >> +struct rk3368_clk_plat { >> + struct dtd_rockchip_rk3368_cru dtd; >> +}; >> +#endif >> + >> struct pll_div { >> u32 nr; >> u32 nf; >> @@ -254,7 +262,11 @@ static struct clk_ops rk3368_clk_ops = { >> static int rk3368_clk_probe(struct udevice *dev) >> { >> struct rk3368_clk_priv *priv = dev_get_priv(dev); >> +#if CONFIG_IS_ENABLED(OF_PLATDATA) >> + struct rk3368_clk_plat *plat = dev_get_platdata(dev); >> + priv->cru = map_sysmem(plat->dtd.reg[1], plat->dtd.reg[3]); >> +#endif >> rkclk_init(priv->cru); >> return 0; >> @@ -262,9 +274,11 @@ static int rk3368_clk_probe(struct udevice *dev) >> static int rk3368_clk_ofdata_to_platdata(struct udevice *dev) >> { >> +#if !CONFIG_IS_ENABLED(OF_PLATDATA) >> struct rk3368_clk_priv *priv = dev_get_priv(dev); >> priv->cru = (struct rk3368_cru *)devfdt_get_addr(dev); >> +#endif >> return 0; >> } >> @@ -291,6 +305,9 @@ U_BOOT_DRIVER(rockchip_rk3368_cru) = { >> .id = UCLASS_CLK, >> .of_match = rk3368_clk_ids, >> .priv_auto_alloc_size = sizeof(struct rk3368_clk_priv), >> +#if CONFIG_IS_ENABLED(OF_PLATDATA) >> + .platdata_auto_alloc_size = sizeof(struct rk3368_clk_plat), >> +#endif >> .ofdata_to_platdata = rk3368_clk_ofdata_to_platdata, >> .ops = &rk3368_clk_ops, >> .bind = rk3368_clk_bind, > >
diff --git a/drivers/clk/rockchip/clk_rk3368.c b/drivers/clk/rockchip/clk_rk3368.c index d8f06d5..809ad19 100644 --- a/drivers/clk/rockchip/clk_rk3368.c +++ b/drivers/clk/rockchip/clk_rk3368.c @@ -8,7 +8,9 @@ #include <common.h> #include <clk-uclass.h> #include <dm.h> +#include <dt-structs.h> #include <errno.h> +#include <mapmem.h> #include <syscon.h> #include <asm/arch/clock.h> #include <asm/arch/cru_rk3368.h> @@ -19,6 +21,12 @@ DECLARE_GLOBAL_DATA_PTR; +#if CONFIG_IS_ENABLED(OF_PLATDATA) +struct rk3368_clk_plat { + struct dtd_rockchip_rk3368_cru dtd; +}; +#endif + struct pll_div { u32 nr; u32 nf; @@ -254,7 +262,11 @@ static struct clk_ops rk3368_clk_ops = { static int rk3368_clk_probe(struct udevice *dev) { struct rk3368_clk_priv *priv = dev_get_priv(dev); +#if CONFIG_IS_ENABLED(OF_PLATDATA) + struct rk3368_clk_plat *plat = dev_get_platdata(dev); + priv->cru = map_sysmem(plat->dtd.reg[1], plat->dtd.reg[3]); +#endif rkclk_init(priv->cru); return 0; @@ -262,9 +274,11 @@ static int rk3368_clk_probe(struct udevice *dev) static int rk3368_clk_ofdata_to_platdata(struct udevice *dev) { +#if !CONFIG_IS_ENABLED(OF_PLATDATA) struct rk3368_clk_priv *priv = dev_get_priv(dev); priv->cru = (struct rk3368_cru *)devfdt_get_addr(dev); +#endif return 0; } @@ -291,6 +305,9 @@ U_BOOT_DRIVER(rockchip_rk3368_cru) = { .id = UCLASS_CLK, .of_match = rk3368_clk_ids, .priv_auto_alloc_size = sizeof(struct rk3368_clk_priv), +#if CONFIG_IS_ENABLED(OF_PLATDATA) + .platdata_auto_alloc_size = sizeof(struct rk3368_clk_plat), +#endif .ofdata_to_platdata = rk3368_clk_ofdata_to_platdata, .ops = &rk3368_clk_ops, .bind = rk3368_clk_bind,
With the RK3368's limited TPL size, we'll want to use OF_PLATFDATA for the SPL stage. This implements support for OF_PLATDATA in the clock driver for the RK3368. Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com> --- drivers/clk/rockchip/clk_rk3368.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)