From: Richard Purdie Separate out the Sharp Zaurus c7x0 series specific code from the Corgi backlight driver. Abstract model/machine specific functions to corgi_lcd.c via sharpsl.h This enables the driver to be used by the Zaurus cxx00 series. Signed-Off-by: Richard Purdie Cc: Russell King Signed-off-by: Andrew Morton --- arch/arm/mach-pxa/corgi_lcd.c | 60 +++++++++++++++++++++++++++++++++++++ drivers/video/backlight/corgi_bl.c | 27 ++++++---------- include/asm-arm/arch-pxa/sharpsl.h | 6 +++ 3 files changed, 76 insertions(+), 17 deletions(-) diff -puN arch/arm/mach-pxa/corgi_lcd.c~sharpsl-abstract-model-specifics-from-corgi arch/arm/mach-pxa/corgi_lcd.c --- devel/arch/arm/mach-pxa/corgi_lcd.c~sharpsl-abstract-model-specifics-from-corgi 2005-09-06 17:50:51.000000000 -0700 +++ devel-akpm/arch/arm/mach-pxa/corgi_lcd.c 2005-09-06 17:50:51.000000000 -0700 @@ -469,3 +469,63 @@ void inline corgi_wait_hsync(void) } } + +/* + * Corgi/Spitz Backlight Power + */ +int corgi_bl_max(void) +{ + if (machine_is_corgi() || machine_is_shepherd() || machine_is_husky()) + return 0x2e; + return 0x3e; +} + +void corgi_bl_set(int intensity) +{ + if ((machine_is_corgi() || machine_is_shepherd() || machine_is_husky()) + && (intensity > 0x10)) + intensity+=0x10; + + /* Skip 0x20 as it will blank the display */ + if (intensity >= 0x20) + intensity++; + + /* Bits 0-4 are accessed via the SSP interface */ + corgi_ssp_blduty_set(intensity & 0x1f); + + if (machine_is_corgi() || machine_is_shepherd() || machine_is_husky()) { +#ifdef CONFIG_PXA_SHARP_C7xx + /* Bit 5 is via SCOOP */ + if (intensity & 0x0020) + set_scoop_gpio(&corgiscoop_device.dev, CORGI_SCP_BACKLIGHT_CONT); + else + reset_scoop_gpio(&corgiscoop_device.dev, CORGI_SCP_BACKLIGHT_CONT); +#endif + } else if (machine_is_spitz() || machine_is_borzoi()) { +#if defined(CONFIG_MACH_SPITZ) || defined(CONFIG_MACH_BORZOI) + /* Bit 5 is via SCOOP */ + if (intensity & 0x0020) + reset_scoop_gpio(&spitzscoop2_device.dev, SPITZ_SCP2_BACKLIGHT_CONT); + else + set_scoop_gpio(&spitzscoop2_device.dev, SPITZ_SCP2_BACKLIGHT_CONT); + + if (intensity) + set_scoop_gpio(&spitzscoop2_device.dev, SPITZ_SCP2_BACKLIGHT_ON); + else + reset_scoop_gpio(&spitzscoop2_device.dev, SPITZ_SCP2_BACKLIGHT_ON); +#endif + } else if (machine_is_akita()) { +#ifdef CONFIG_MACH_AKITA + /* Bit 5 is via IO-Expander */ + if (intensity & 0x0020) + akita_reset_ioexp(&akitaioexp_device.dev, AKITA_IOEXP_BACKLIGHT_CONT); + else + akita_set_ioexp(&akitaioexp_device.dev, AKITA_IOEXP_BACKLIGHT_CONT); + + if (intensity) + akita_set_ioexp(&akitaioexp_device.dev, AKITA_IOEXP_BACKLIGHT_ON); + else + akita_reset_ioexp(&akitaioexp_device.dev, AKITA_IOEXP_BACKLIGHT_ON); +#endif + } +} diff -puN drivers/video/backlight/corgi_bl.c~sharpsl-abstract-model-specifics-from-corgi drivers/video/backlight/corgi_bl.c --- devel/drivers/video/backlight/corgi_bl.c~sharpsl-abstract-model-specifics-from-corgi 2005-09-06 17:50:51.000000000 -0700 +++ devel-akpm/drivers/video/backlight/corgi_bl.c 2005-09-06 17:50:51.000000000 -0700 @@ -19,10 +19,9 @@ #include #include -#include -#include +#include +#include -#define CORGI_MAX_INTENSITY 0x3e #define CORGI_DEFAULT_INTENSITY 0x1f #define CORGI_LIMIT_MASK 0x0b @@ -30,6 +29,7 @@ static int corgibl_powermode = FB_BLANK_ static int current_intensity = 0; static int corgibl_limit = 0; static spinlock_t bl_lock = SPIN_LOCK_UNLOCKED; +static struct backlight_properties corgibl_data; static void corgibl_send_intensity(int intensity) { @@ -43,18 +43,10 @@ static void corgibl_send_intensity(int i intensity &= CORGI_LIMIT_MASK; } - /* Skip 0x20 as it will blank the display */ - if (intensity >= 0x20) - intensity++; - spin_lock_irqsave(&bl_lock, flags); - /* Bits 0-4 are accessed via the SSP interface */ - corgi_ssp_blduty_set(intensity & 0x1f); - /* Bit 5 is via SCOOP */ - if (intensity & 0x0020) - set_scoop_gpio(&corgiscoop_device.dev, CORGI_SCP_BACKLIGHT_CONT); - else - reset_scoop_gpio(&corgiscoop_device.dev, CORGI_SCP_BACKLIGHT_CONT); + + corgi_bl_set(intensity); + spin_unlock_irqrestore(&bl_lock, flags); } @@ -113,8 +105,8 @@ static int corgibl_get_power(struct back static int corgibl_set_intensity(struct backlight_device *bd, int intensity) { - if (intensity > CORGI_MAX_INTENSITY) - intensity = CORGI_MAX_INTENSITY; + if (intensity > corgibl_data.max_brightness) + intensity = corgibl_data.max_brightness; corgibl_send_intensity(intensity); current_intensity=intensity; return 0; @@ -141,7 +133,6 @@ static struct backlight_properties corgi .owner = THIS_MODULE, .get_power = corgibl_get_power, .set_power = corgibl_set_power, - .max_brightness = CORGI_MAX_INTENSITY, .get_brightness = corgibl_get_intensity, .set_brightness = corgibl_set_intensity, }; @@ -150,12 +141,14 @@ static struct backlight_device *corgi_ba static int __init corgibl_probe(struct device *dev) { + corgibl_data.max_brightness=corgi_bl_max(); corgi_backlight_device = backlight_device_register ("corgi-bl", NULL, &corgibl_data); if (IS_ERR (corgi_backlight_device)) return PTR_ERR (corgi_backlight_device); corgibl_set_intensity(NULL, CORGI_DEFAULT_INTENSITY); + corgibl_limit_intensity(0); printk("Corgi Backlight Driver Initialized.\n"); return 0; diff -puN include/asm-arm/arch-pxa/sharpsl.h~sharpsl-abstract-model-specifics-from-corgi include/asm-arm/arch-pxa/sharpsl.h --- devel/include/asm-arm/arch-pxa/sharpsl.h~sharpsl-abstract-model-specifics-from-corgi 2005-09-06 17:50:51.000000000 -0700 +++ devel-akpm/include/asm-arm/arch-pxa/sharpsl.h 2005-09-06 17:50:51.000000000 -0700 @@ -18,3 +18,9 @@ int corgi_ssp_max1111_get(unsigned long unsigned long corgi_get_hsync_len(void); void corgi_wait_hsync(void); +/* + * SharpSL Backlight + */ + +int corgi_bl_max(void); +void corgi_bl_set(int intensity); _