pxafb: use completion for LCD disable wait code
Signed-off-by: eric miao <eric.miao@marvell.com> Cc: "Antonino A. Daplas" <adaplas@pol.net> Cc: Russell King <rmk@arm.linux.org.uk> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
a7535ba730
commit
2ba162b933
@ -39,6 +39,7 @@
|
|||||||
#include <linux/dma-mapping.h>
|
#include <linux/dma-mapping.h>
|
||||||
#include <linux/clk.h>
|
#include <linux/clk.h>
|
||||||
#include <linux/err.h>
|
#include <linux/err.h>
|
||||||
|
#include <linux/completion.h>
|
||||||
|
|
||||||
#include <asm/hardware.h>
|
#include <asm/hardware.h>
|
||||||
#include <asm/io.h>
|
#include <asm/io.h>
|
||||||
@ -810,11 +811,6 @@ static void pxafb_disable_controller(struct pxafb_info *fbi)
|
|||||||
{
|
{
|
||||||
uint32_t lccr0;
|
uint32_t lccr0;
|
||||||
|
|
||||||
DECLARE_WAITQUEUE(wait, current);
|
|
||||||
|
|
||||||
set_current_state(TASK_UNINTERRUPTIBLE);
|
|
||||||
add_wait_queue(&fbi->ctrlr_wait, &wait);
|
|
||||||
|
|
||||||
/* Clear LCD Status Register */
|
/* Clear LCD Status Register */
|
||||||
lcd_writel(fbi, LCSR, 0xffffffff);
|
lcd_writel(fbi, LCSR, 0xffffffff);
|
||||||
|
|
||||||
@ -822,8 +818,7 @@ static void pxafb_disable_controller(struct pxafb_info *fbi)
|
|||||||
lcd_writel(fbi, LCCR0, lccr0);
|
lcd_writel(fbi, LCCR0, lccr0);
|
||||||
lcd_writel(fbi, LCCR0, lccr0 | LCCR0_DIS);
|
lcd_writel(fbi, LCCR0, lccr0 | LCCR0_DIS);
|
||||||
|
|
||||||
schedule_timeout(200 * HZ / 1000);
|
wait_for_completion_timeout(&fbi->disable_done, 200 * HZ / 1000);
|
||||||
remove_wait_queue(&fbi->ctrlr_wait, &wait);
|
|
||||||
|
|
||||||
/* disable LCD controller clock */
|
/* disable LCD controller clock */
|
||||||
clk_disable(fbi->clk);
|
clk_disable(fbi->clk);
|
||||||
@ -840,7 +835,7 @@ static irqreturn_t pxafb_handle_irq(int irq, void *dev_id)
|
|||||||
if (lcsr & LCSR_LDD) {
|
if (lcsr & LCSR_LDD) {
|
||||||
lccr0 = lcd_readl(fbi, LCCR0);
|
lccr0 = lcd_readl(fbi, LCCR0);
|
||||||
lcd_writel(fbi, LCCR0, lccr0 | LCCR0_LDM);
|
lcd_writel(fbi, LCCR0, lccr0 | LCCR0_LDM);
|
||||||
wake_up(&fbi->ctrlr_wait);
|
complete(&fbi->disable_done);
|
||||||
}
|
}
|
||||||
|
|
||||||
lcd_writel(fbi, LCSR, lcsr);
|
lcd_writel(fbi, LCSR, lcsr);
|
||||||
@ -1190,6 +1185,7 @@ static struct pxafb_info * __init pxafb_init_fbinfo(struct device *dev)
|
|||||||
init_waitqueue_head(&fbi->ctrlr_wait);
|
init_waitqueue_head(&fbi->ctrlr_wait);
|
||||||
INIT_WORK(&fbi->task, pxafb_task);
|
INIT_WORK(&fbi->task, pxafb_task);
|
||||||
init_MUTEX(&fbi->ctrlr_sem);
|
init_MUTEX(&fbi->ctrlr_sem);
|
||||||
|
init_completion(&fbi->disable_done);
|
||||||
|
|
||||||
return fbi;
|
return fbi;
|
||||||
}
|
}
|
||||||
|
@ -114,6 +114,8 @@ struct pxafb_info {
|
|||||||
wait_queue_head_t ctrlr_wait;
|
wait_queue_head_t ctrlr_wait;
|
||||||
struct work_struct task;
|
struct work_struct task;
|
||||||
|
|
||||||
|
struct completion disable_done;
|
||||||
|
|
||||||
#ifdef CONFIG_CPU_FREQ
|
#ifdef CONFIG_CPU_FREQ
|
||||||
struct notifier_block freq_transition;
|
struct notifier_block freq_transition;
|
||||||
struct notifier_block freq_policy;
|
struct notifier_block freq_policy;
|
||||||
|
Loading…
Reference in New Issue
Block a user