| Message ID | 1468621041-11487-5-git-send-email-heiko@sntech.de |
|---|---|
| State | Accepted |
| Commit | b339b5dbca4c776a4c138b852082fad2df826410 |
| Delegated to: | Simon Glass |
| Headers | show |
On 15 July 2016 at 16:17, Heiko Stuebner <heiko@sntech.de> wrote: > The function is very specific to the rk3288 in its arguments > referencing the rk3288 cru and grf and every other rockchip soc > has differing cru and grf registers. So make that function naming > explicit. > > Signed-off-by: Heiko Stuebner <heiko@sntech.de> > --- > arch/arm/include/asm/arch-rockchip/clock.h | 2 +- > arch/arm/mach-rockchip/rk3288/sdram_rk3288.c | 2 +- > drivers/clk/clk_rk3288.c | 2 +- > 3 files changed, 3 insertions(+), 3 deletions(-) Acked-by: Simon Glass <sjg@chromium.org>
On 17 July 2016 at 08:13, Simon Glass <sjg@chromium.org> wrote: > On 15 July 2016 at 16:17, Heiko Stuebner <heiko@sntech.de> wrote: >> The function is very specific to the rk3288 in its arguments >> referencing the rk3288 cru and grf and every other rockchip soc >> has differing cru and grf registers. So make that function naming >> explicit. >> >> Signed-off-by: Heiko Stuebner <heiko@sntech.de> >> --- >> arch/arm/include/asm/arch-rockchip/clock.h | 2 +- >> arch/arm/mach-rockchip/rk3288/sdram_rk3288.c | 2 +- >> drivers/clk/clk_rk3288.c | 2 +- >> 3 files changed, 3 insertions(+), 3 deletions(-) > > Acked-by: Simon Glass <sjg@chromium.org> Applied to u-boot-rockchip, thanks!
diff --git a/arch/arm/include/asm/arch-rockchip/clock.h b/arch/arm/include/asm/arch-rockchip/clock.h index 317e512..4bebd62 100644 --- a/arch/arm/include/asm/arch-rockchip/clock.h +++ b/arch/arm/include/asm/arch-rockchip/clock.h @@ -65,6 +65,6 @@ void *rockchip_get_cru(void); struct rk3288_cru; struct rk3288_grf; -void rkclk_configure_cpu(struct rk3288_cru *cru, struct rk3288_grf *grf); +void rk3288_clk_configure_cpu(struct rk3288_cru *cru, struct rk3288_grf *grf); #endif diff --git a/arch/arm/mach-rockchip/rk3288/sdram_rk3288.c b/arch/arm/mach-rockchip/rk3288/sdram_rk3288.c index b36b6af..fc0f2f3 100644 --- a/arch/arm/mach-rockchip/rk3288/sdram_rk3288.c +++ b/arch/arm/mach-rockchip/rk3288/sdram_rk3288.c @@ -784,7 +784,7 @@ static int veyron_init(struct dram_info *priv) return ret; udelay(100);/* Must wait for voltage to stabilize, 2mV/us */ - rkclk_configure_cpu(priv->cru, priv->grf); + rk3288_clk_configure_cpu(priv->cru, priv->grf); return 0; } diff --git a/drivers/clk/clk_rk3288.c b/drivers/clk/clk_rk3288.c index 679f010..dece4bc 100644 --- a/drivers/clk/clk_rk3288.c +++ b/drivers/clk/clk_rk3288.c @@ -447,7 +447,7 @@ static void rkclk_init(struct rk3288_cru *cru, struct rk3288_grf *grf) } #endif -void rkclk_configure_cpu(struct rk3288_cru *cru, struct rk3288_grf *grf) +void rk3288_clk_configure_cpu(struct rk3288_cru *cru, struct rk3288_grf *grf) { /* pll enter slow-mode */ rk_clrsetreg(&cru->cru_mode_con,
The function is very specific to the rk3288 in its arguments referencing the rk3288 cru and grf and every other rockchip soc has differing cru and grf registers. So make that function naming explicit. Signed-off-by: Heiko Stuebner <heiko@sntech.de> --- arch/arm/include/asm/arch-rockchip/clock.h | 2 +- arch/arm/mach-rockchip/rk3288/sdram_rk3288.c | 2 +- drivers/clk/clk_rk3288.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)