From a76818770adabc7afdf3bef07f9f30d061c10082 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Thu, 8 Mar 2012 11:21:33 +0100 Subject: [PATCH 28/73] MIPS: lantiq: convert gpio_stp driver to clkdev api Update from old pmu_{dis,en}able() to ckldev api. Signed-off-by: John Crispin --- arch/mips/lantiq/xway/gpio_stp.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/arch/mips/lantiq/xway/gpio_stp.c b/arch/mips/lantiq/xway/gpio_stp.c index e6b4809..da91c5e 100644 --- a/arch/mips/lantiq/xway/gpio_stp.c +++ b/arch/mips/lantiq/xway/gpio_stp.c @@ -15,6 +15,8 @@ #include #include #include +#include +#include #include @@ -78,8 +80,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 +109,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(IS_ERR(clk)); + clk_enable(clk); return 0; } @@ -138,7 +144,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.9.1