Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5f27a27b authored by Richard Purdie's avatar Richard Purdie Committed by Linus Torvalds
Browse files

[PATCH] backlight: HP Jornada 680 Backlight driver updates/fixes 



Updates to the HP Jornada 680 Backlight driver:

- Correct the suspend/resume functions so the driver compiles
  (SUSPEND_POWER_DOWN/RESUME_POWER_ON no longer exist).

- Convert the driver to match the recent platform device changes.

- Replace the unsafe static struct platform_device with dynamic allocation.

- Convert the driver to the new backlight code.

This has not been tested on a device due to lack of hardware but wouldn't
compile beforehand.

Signed-off-by: default avatarRichard Purdie <rpurdie@rpsys.net>
Signed-off-by: default avatarAntonino Daplas <adaplas@pol.net>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 6ca01765

drivers/video/backlight/hp680_bl.c

+59 −80
Original line number Original line Diff line number Diff line
@@ -13,7 +13,7 @@ 
#include <linux/module.h>

#include <linux/module.h>

#include <linux/kernel.h>

#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/init.h>

#include <linux/device.h>

#include <linux/platform_device.h>

#include <linux/spinlock.h>

#include <linux/spinlock.h>

#include <linux/fb.h>

#include <linux/fb.h>

#include <linux/backlight.h>

#include <linux/backlight.h>
@@ -25,66 +25,58 @@ 
#define HP680_MAX_INTENSITY 255

#define HP680_MAX_INTENSITY 255

#define HP680_DEFAULT_INTENSITY 10

#define HP680_DEFAULT_INTENSITY 10





static int hp680bl_powermode = FB_BLANK_UNBLANK;

static int hp680bl_suspended;

static int current_intensity = 0;

static int current_intensity = 0;

static spinlock_t bl_lock = SPIN_LOCK_UNLOCKED;

static spinlock_t bl_lock = SPIN_LOCK_UNLOCKED;

static struct backlight_device *hp680_backlight_device;





static void hp680bl_send_intensity(int intensity)

static void hp680bl_send_intensity(struct backlight_device *bd)

{

{

	unsigned long flags;

	unsigned long flags;

	u16 v;

	int intensity = bd->props->brightness;





	if (hp680bl_powermode != FB_BLANK_UNBLANK)

	if (bd->props->power != FB_BLANK_UNBLANK)

		intensity = 0;

	if (bd->props->fb_blank != FB_BLANK_UNBLANK)

		intensity = 0;

	if (hp680bl_suspended)

		intensity = 0;

		intensity = 0;





	spin_lock_irqsave(&bl_lock, flags);

	spin_lock_irqsave(&bl_lock, flags);

	if (intensity && current_intensity == 0) {

		sh_dac_enable(DAC_LCD_BRIGHTNESS);

		v = inw(HD64461_GPBDR);

		v &= ~HD64461_GPBDR_LCDOFF;

		outw(v, HD64461_GPBDR);

		sh_dac_output(255-(u8)intensity, DAC_LCD_BRIGHTNESS);

	} else if (intensity == 0 && current_intensity != 0) {

		sh_dac_output(255-(u8)intensity, DAC_LCD_BRIGHTNESS);

		sh_dac_output(255-(u8)intensity, DAC_LCD_BRIGHTNESS);

	spin_unlock_irqrestore(&bl_lock, flags);

}



static void hp680bl_blank(int blank)

{

	u16 v;



	switch(blank) {



	case FB_BLANK_NORMAL:

	case FB_BLANK_VSYNC_SUSPEND:

	case FB_BLANK_HSYNC_SUSPEND:

	case FB_BLANK_POWERDOWN:

		if (hp680bl_powermode == FB_BLANK_UNBLANK) {

			hp680bl_send_intensity(0);

			hp680bl_powermode = blank;

		sh_dac_disable(DAC_LCD_BRIGHTNESS);

		sh_dac_disable(DAC_LCD_BRIGHTNESS);

		v = inw(HD64461_GPBDR);

		v = inw(HD64461_GPBDR);

		v |= HD64461_GPBDR_LCDOFF;

		v |= HD64461_GPBDR_LCDOFF;

		outw(v, HD64461_GPBDR);

		outw(v, HD64461_GPBDR);

	} else if (intensity) {

		sh_dac_output(255-(u8)intensity, DAC_LCD_BRIGHTNESS);

	}

	}

		break;

	spin_unlock_irqrestore(&bl_lock, flags);

	case FB_BLANK_UNBLANK:



		if (hp680bl_powermode != FB_BLANK_UNBLANK) {

	current_intensity = intensity;

			sh_dac_enable(DAC_LCD_BRIGHTNESS);

			v = inw(HD64461_GPBDR);

			v &= ~HD64461_GPBDR_LCDOFF;

			outw(v, HD64461_GPBDR);

			hp680bl_powermode = blank;

			hp680bl_send_intensity(current_intensity);

		}

		break;

	}

}

}







#ifdef CONFIG_PM

#ifdef CONFIG_PM

static int hp680bl_suspend(struct device *dev, pm_message_t state, u32 level)

static int hp680bl_suspend(struct platform_device *dev, pm_message_t state)

{

{

	if (level == SUSPEND_POWER_DOWN)

	hp680bl_suspended = 1;

		hp680bl_blank(FB_BLANK_POWERDOWN);

	hp680bl_send_intensity(hp680_backlight_device);

	return 0;

	return 0;

}

}





static int hp680bl_resume(struct device *dev, u32 level)

static int hp680bl_resume(struct platform_device *dev)

{

{

	if (level == RESUME_POWER_ON)

	hp680bl_suspended = 0;

		hp680bl_blank(FB_BLANK_UNBLANK);

	hp680bl_send_intensity(hp680_backlight_device);

	return 0;

	return 0;

}

}

#else

#else
@@ -92,24 +84,9 @@ static int hp680bl_resume(struct device *dev, u32 level) 
#define hp680bl_resume	NULL

#define hp680bl_resume	NULL

#endif

#endif







static int hp680bl_set_intensity(struct backlight_device *bd)

static int hp680bl_set_power(struct backlight_device *bd, int state)

{

	hp680bl_blank(state);

	return 0;

}



static int hp680bl_get_power(struct backlight_device *bd)

{

	return hp680bl_powermode;

}



static int hp680bl_set_intensity(struct backlight_device *bd, int intensity)

{

{

	if (intensity > HP680_MAX_INTENSITY)

	hp680bl_send_intensity(bd);

		intensity = HP680_MAX_INTENSITY;

	hp680bl_send_intensity(intensity);

	current_intensity = intensity;

	return 0;

	return 0;

}

}
@@ -120,65 +97,67 @@ static int hp680bl_get_intensity(struct backlight_device *bd) 




static struct backlight_properties hp680bl_data = {

static struct backlight_properties hp680bl_data = {

	.owner		= THIS_MODULE,

	.owner		= THIS_MODULE,

	.get_power      = hp680bl_get_power,

	.set_power      = hp680bl_set_power,

	.max_brightness = HP680_MAX_INTENSITY,

	.max_brightness = HP680_MAX_INTENSITY,

	.get_brightness = hp680bl_get_intensity,

	.get_brightness = hp680bl_get_intensity,

	.set_brightness = hp680bl_set_intensity,

	.update_status  = hp680bl_set_intensity,

};

};





static struct backlight_device *hp680_backlight_device;

static int __init hp680bl_probe(struct platform_device *dev)



static int __init hp680bl_probe(struct device *dev)

{

{

	hp680_backlight_device = backlight_device_register ("hp680-bl",

	hp680_backlight_device = backlight_device_register ("hp680-bl",

		NULL, &hp680bl_data);

		NULL, &hp680bl_data);

	if (IS_ERR (hp680_backlight_device))

	if (IS_ERR (hp680_backlight_device))

		return PTR_ERR (hp680_backlight_device);

		return PTR_ERR (hp680_backlight_device);





	hp680bl_set_intensity(NULL, HP680_DEFAULT_INTENSITY);

	hp680_backlight_device->props->brightness = HP680_DEFAULT_INTENSITY;

	hp680bl_send_intensity(hp680_backlight_device);





	return 0;

	return 0;

}

}





static int hp680bl_remove(struct device *dev)

static int hp680bl_remove(struct platform_device *dev)

{

{

	backlight_device_unregister(hp680_backlight_device);

	backlight_device_unregister(hp680_backlight_device);





	return 0;

	return 0;

}

}





static struct device_driver hp680bl_driver = {

static struct platform_driver hp680bl_driver = {

	.name		= "hp680-bl",

	.bus		= &platform_bus_type,

	.probe		= hp680bl_probe,

	.probe		= hp680bl_probe,

	.remove		= hp680bl_remove,

	.remove		= hp680bl_remove,

	.suspend	= hp680bl_suspend,

	.suspend	= hp680bl_suspend,

	.resume		= hp680bl_resume,

	.resume		= hp680bl_resume,

};

	.driver		= {



static struct platform_device hp680bl_device = {

		.name	= "hp680-bl",

		.name	= "hp680-bl",

	.id	= -1,

	},

};

};





static struct platform_device *hp680bl_device;



static int __init hp680bl_init(void)

static int __init hp680bl_init(void)

{

{

	int ret;

	int ret;





	ret=driver_register(&hp680bl_driver);

	ret = platform_driver_register(&hp680bl_driver);

	if (!ret) {

	if (!ret) {

		ret = platform_device_register(&hp680bl_device);

		hp680bl_device = platform_device_alloc("hp680-bl", -1);

		if (ret)

		if (!hp680bl_device)

			driver_unregister(&hp680bl_driver);

			return -ENOMEM;



		ret = platform_device_add(hp680bl_device);



		if (ret) {

			platform_device_put(hp680bl_device);

			platform_driver_unregister(&hp680bl_driver);

		}

	}

	}

	return ret;

	return ret;

}

}





static void __exit hp680bl_exit(void)

static void __exit hp680bl_exit(void)

{

{

	platform_device_unregister(&hp680bl_device);

	platform_device_unregister(hp680bl_device);

 	driver_unregister(&hp680bl_driver);

 	platform_driver_unregister(&hp680bl_driver);

}

}





module_init(hp680bl_init);

module_init(hp680bl_init);