Skip to contentSkip to conversation

Input: navpoint: add clk_prepare/clk_unprepare calls

PATCH In review Philipp Zabel 2 participants 2 messages Mar 15, 2012 – Mar 16, 2012

Subsystems (2)
HID Input drivers
lore
Share & tools
lore

Philipp Zabel

author
#0 lore raw

PATCH 1/1 Input: navpoint: add clk_prepare/clk_unprepare calls

This patch adds clk_prepare/clk_unprepare calls to the navpoint driver by using the helper functions clk_prepare_enable and clk_disable_unprepare.

Signed-off-by Philipp Zabel <[email protected]>
Cc Dmitry Torokhov <[email protected]>
Cc Paul Parsons <[email protected]>
---
 drivers/input/mouse/navpoint.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
drivers/input/mouse/navpoint.c +2 -2
index 253ec18..cb0d3b1 100644
@@ -225,7 +225,7 @@ static int navpoint_suspend(struct device *dev)
 
 	pxa_ssp_write_reg(ssp, SSCR0, 0);
 
-	clk_disable(ssp->clk);
+	clk_disable_unprepare(ssp->clk);
 
 	return 0;
 }

@@ -236,7 +236,7 @@ static int navpoint_resume(struct device *dev)
 	struct ssp_device *ssp = drv_data->ssp;
 	int timeout;
 
-	clk_enable(ssp->clk);
+	clk_prepare_enable(ssp->clk);
 
 	pxa_ssp_write_reg(ssp, SSCR1, sscr1);
 	pxa_ssp_write_reg(ssp, SSSR, sssr);
Signature · 1 line
1.7.9.1
Acked-by on v1 1/1
#1 lore raw
Quoted 36 lines · Philipp Zabel

This patch adds
clk_prepare/clk_unprepare calls to the navpoint driver by using the helper functions clk_prepare_enable and clk_disable_unprepare.

Signed-off-by Philipp Zabel <[email protected]>
Cc Dmitry Torokhov <[email protected]>
Cc Paul Parsons <[email protected]>
---
 drivers/input/mouse/navpoint.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
drivers/input/mouse/navpoint.c +1 -1
index 253ec18..cb0d3b1 100644
@@ -225,7 +225,7 @@ static int navpoint_suspend(struct
 device *dev)
 
     pxa_ssp_write_reg(ssp, SSCR0, 0);
 
-    clk_disable(ssp->clk);
+    clk_disable_unprepare(ssp->clk);
 
     return 0;

}

drivers/input/mouse/navpoint.c +1 -1
@@ -236,7 +236,7 @@ static int navpoint_resume(struct device
 *dev)
     struct ssp_device *ssp =
 drv_data->ssp;
     int timeout;
 
-    clk_enable(ssp->clk);
+    clk_prepare_enable(ssp->clk);
Quoted 4 lines

    pxa_ssp_write_reg(ssp, SSCR1, sscr1); pxa_ssp_write_reg(ssp, SSSR, sssr);

Signature · 1 line
1.7.9.1

AFAIK the navpoint driver itself has yet to be accepted.

Acked-by Paul Parsons <[email protected]>

--
To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html