From rpurdie@rpsys.net Tue Sep 6 12:53:51 2005 Subject: [-mm patch 4/5] SharpSL: Abstract model specifics from Corgi Backlight driver From: Richard Purdie To: Andrew Morton Cc: LKML , Russell King Content-Type: text/plain Message-Id: <1126007631.8338.129.camel@localhost.localdomain> Mime-Version: 1.0 X-Mailer: Evolution 2.2.1.1 Date: Tue, 06 Sep 2005 12:53:51 +0100 X-Evolution-Format: text/plain X-Evolution-Account: 1118073168.22071.12@max X-Evolution-Transport: smtp://richard;auth=LOGIN@tim.rpsys.net/;use_ssl=when-possible X-Evolution-Fcc: imap://richard@tim.rpsys.net/INBOX/Sent%20Items X-Evolution-Source: imap://richard@tim.rpsys.net/ Content-Transfer-Encoding: 8bit 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 Index: linux-2.6.13/drivers/video/backlight/corgi_bl.c =================================================================== --- linux-2.6.13.orig/drivers/video/backlight/corgi_bl.c 2005-08-29 00:41:01.000000000 +0100 +++ linux-2.6.13/drivers/video/backlight/corgi_bl.c 2005-09-13 16:20:47.000000000 +0100 @@ -19,17 +19,18 @@ #include #include -#include -#include +#include +#include -#define CORGI_MAX_INTENSITY 0x3e #define CORGI_DEFAULT_INTENSITY 0x1f -#define CORGI_LIMIT_MASK 0x0b +#define CORGI_LIMIT_MASK 0x0b static int corgibl_powermode = FB_BLANK_UNBLANK; static int current_intensity = 0; static int corgibl_limit = 0; +static void (*corgibl_mach_set_intensity)(int intensity); static spinlock_t bl_lock = SPIN_LOCK_UNLOCKED; +static struct backlight_properties corgibl_data; static void corgibl_send_intensity(int intensity) { @@ -43,18 +44,10 @@ 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); + + corgibl_mach_set_intensity(intensity); + spin_unlock_irqrestore(&bl_lock, flags); } @@ -113,8 +106,8 @@ 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 +134,6 @@ .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 +142,18 @@ static int __init corgibl_probe(struct device *dev) { + struct corgibl_machinfo *machinfo = dev->platform_data; + + corgibl_data.max_brightness = machinfo->max_intensity; + corgibl_mach_set_intensity = machinfo->set_bl_intensity; + 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; Index: linux-2.6.13/arch/arm/mach-pxa/corgi_lcd.c =================================================================== --- linux-2.6.13.orig/arch/arm/mach-pxa/corgi_lcd.c 2005-09-13 16:10:43.000000000 +0100 +++ linux-2.6.13/arch/arm/mach-pxa/corgi_lcd.c 2005-09-13 16:11:58.000000000 +0100 @@ -498,3 +498,68 @@ sharpsl_wait_sync(SPITZ_GPIO_HSYNC); } #endif + +/* + * Corgi/Spitz Backlight Power + */ +#ifdef CONFIG_PXA_SHARP_C7xx +void corgi_bl_set_intensity(int intensity) +{ + if (intensity > 0x10) + intensity += 0x10; + + /* 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); +} +#endif + + +#if defined(CONFIG_MACH_SPITZ) || defined(CONFIG_MACH_BORZOI) +void spitz_bl_set_intensity(int intensity) +{ + if (intensity > 0x10) + intensity += 0x10; + + /* Bits 0-4 are accessed via the SSP interface */ + corgi_ssp_blduty_set(intensity & 0x1f); + + /* 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 + +#ifdef CONFIG_MACH_AKITA +void akita_bl_set_intensity(int intensity) +{ + if (intensity > 0x10) + intensity += 0x10; + + /* Bits 0-4 are accessed via the SSP interface */ + corgi_ssp_blduty_set(intensity & 0x1f); + + /* 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 Index: linux-2.6.13/include/asm-arm/arch-pxa/sharpsl.h =================================================================== --- linux-2.6.13.orig/include/asm-arm/arch-pxa/sharpsl.h 2005-09-13 16:10:43.000000000 +0100 +++ linux-2.6.13/include/asm-arm/arch-pxa/sharpsl.h 2005-09-13 16:11:58.000000000 +0100 @@ -20,3 +20,13 @@ void (*put_hsync)(void); void (*wait_hsync)(void); }; + +/* + * SharpSL Backlight + */ + +struct corgibl_machinfo { + int max_intensity; + void (*set_bl_intensity)(int intensity); +}; + Index: linux-2.6.13/arch/arm/mach-pxa/corgi.c =================================================================== --- linux-2.6.13.orig/arch/arm/mach-pxa/corgi.c 2005-09-13 16:10:43.000000000 +0100 +++ linux-2.6.13/arch/arm/mach-pxa/corgi.c 2005-09-13 16:11:58.000000000 +0100 @@ -109,10 +109,16 @@ /* * Corgi Backlight Device */ +static struct corgibl_machinfo corgi_bl_machinfo = { + .max_intensity = 0x2f, + .set_bl_intensity = corgi_bl_set_intensity, +}; + static struct platform_device corgibl_device = { .name = "corgi-bl", .dev = { .parent = &corgifb_device.dev, + .platform_data = &corgi_bl_machinfo, }, .id = -1, }; Index: linux-2.6.13/arch/arm/mach-pxa/sharpsl.h =================================================================== --- linux-2.6.13.orig/arch/arm/mach-pxa/sharpsl.h 2005-09-13 16:10:43.000000000 +0100 +++ linux-2.6.13/arch/arm/mach-pxa/sharpsl.h 2005-09-13 16:11:58.000000000 +0100 @@ -15,6 +15,14 @@ void corgi_ssp_set_machinfo(struct corgissp_machinfo *machinfo); /* + * SharpSL Backlight + */ + +void corgi_bl_set_intensity(int intensity); +void spitz_bl_set_intensity(int intensity); +void akita_bl_set_intensity(int intensity); + +/* * SharpSL Touchscreen Driver */