| Message ID | 1470995882-3009-1-git-send-email-kever.yang@rock-chips.com |
|---|---|
| State | Accepted |
| Delegated to: | Simon Glass |
| Headers | show |
On 12 August 2016 at 03:58, Kever Yang <kever.yang@rock-chips.com> wrote: > We consider the grf setting for pwm controller select as the system > operation instead of driver operation, move it to soc init, let's > remove it from pwm driver first. > > Signed-off-by: Kever Yang <kever.yang@rock-chips.com> > --- > > drivers/pwm/rk_pwm.c | 11 ----------- > 1 file changed, 11 deletions(-) Acked-by: Simon Glass <sjg@chromium.org>
On 12 August 2016 at 11:21, Simon Glass <sjg@chromium.org> wrote: > On 12 August 2016 at 03:58, Kever Yang <kever.yang@rock-chips.com> wrote: >> We consider the grf setting for pwm controller select as the system >> operation instead of driver operation, move it to soc init, let's >> remove it from pwm driver first. >> >> Signed-off-by: Kever Yang <kever.yang@rock-chips.com> >> --- >> >> drivers/pwm/rk_pwm.c | 11 ----------- >> 1 file changed, 11 deletions(-) > > Acked-by: Simon Glass <sjg@chromium.org> Applied to u-boot-rockchip/next, thanks!
diff --git a/drivers/pwm/rk_pwm.c b/drivers/pwm/rk_pwm.c index d69aab5..d3de429 100644 --- a/drivers/pwm/rk_pwm.c +++ b/drivers/pwm/rk_pwm.c @@ -13,17 +13,13 @@ #include <regmap.h> #include <syscon.h> #include <asm/io.h> -#include <asm/arch/clock.h> -#include <asm/arch/grf_rk3288.h> #include <asm/arch/pwm.h> -#include <asm/arch/hardware.h> #include <power/regulator.h> DECLARE_GLOBAL_DATA_PTR; struct rk_pwm_priv { struct rk3288_pwm *regs; - struct rk3288_grf *grf; ulong freq; }; @@ -64,13 +60,8 @@ static int rk_pwm_set_enable(struct udevice *dev, uint channel, bool enable) static int rk_pwm_ofdata_to_platdata(struct udevice *dev) { struct rk_pwm_priv *priv = dev_get_priv(dev); - struct regmap *map; priv->regs = (struct rk3288_pwm *)dev_get_addr(dev); - map = syscon_get_regmap_by_driver_data(ROCKCHIP_SYSCON_GRF); - if (IS_ERR(map)) - return PTR_ERR(map); - priv->grf = regmap_get_range(map, 0); return 0; } @@ -81,8 +72,6 @@ static int rk_pwm_probe(struct udevice *dev) struct clk clk; int ret = 0; - rk_setreg(&priv->grf->soc_con2, 1 << 0); - ret = clk_get_by_index(dev, 0, &clk); if (ret < 0) { printf("%s get clock fail!\n", __func__);
We consider the grf setting for pwm controller select as the system operation instead of driver operation, move it to soc init, let's remove it from pwm driver first. Signed-off-by: Kever Yang <kever.yang@rock-chips.com> --- drivers/pwm/rk_pwm.c | 11 ----------- 1 file changed, 11 deletions(-)