Update from old pmu_{dis,en}able() to ckldev api. Signed-off-by: John Crispin <blogic@xxxxxxxxxxx> --- arch/mips/lantiq/xway/gpio_stp.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/arch/mips/lantiq/xway/gpio_stp.c b/arch/mips/lantiq/xway/gpio_stp.c index e6b4809..8e07958 100644 --- a/arch/mips/lantiq/xway/gpio_stp.c +++ b/arch/mips/lantiq/xway/gpio_stp.c @@ -15,6 +15,7 @@ #include <linux/mutex.h> #include <linux/io.h> #include <linux/gpio.h> +#include <linux/clk.h> #include <lantiq_soc.h> @@ -78,8 +79,10 @@ static struct gpio_chip ltq_stp_chip = { .owner = THIS_MODULE, }; -static int ltq_stp_hw_init(void) +static int ltq_stp_hw_init(struct device *dev) { + struct clk *clk; + /* sane defaults */ ltq_stp_w32(0, LTQ_STP_AR); ltq_stp_w32(0, LTQ_STP_CPU0); @@ -105,7 +108,9 @@ static int ltq_stp_hw_init(void) */ ltq_stp_w32_mask(0, LTQ_STP_ADSL_SRC, LTQ_STP_CON0); - ltq_pmu_enable(PMU_LED); + clk = clk_get(dev, NULL); + WARN_ON(!clk); + clk_enable(clk); return 0; } @@ -138,7 +143,7 @@ static int __devinit ltq_stp_probe(struct platform_device *pdev) } ret = gpiochip_add(<q_stp_chip); if (!ret) - ret = ltq_stp_hw_init(); + ret = ltq_stp_hw_init(&pdev->dev); return ret; } -- 1.7.7.1