Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965675AbXBGICl (ORCPT ); Wed, 7 Feb 2007 03:02:41 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S965677AbXBGICk (ORCPT ); Wed, 7 Feb 2007 03:02:40 -0500 Received: from v813.rev.tld.pl ([195.149.226.213]:38421 "EHLO smtp.host4.kei.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965675AbXBGICj convert rfc822-to-8bit (ORCPT ); Wed, 7 Feb 2007 03:02:39 -0500 X-clamdmail: clamdmail 0.18a From: Marcin Juszkiewicz To: Richard Purdie Subject: Re: [PATCH] backlight control for Frontpath ProGear HX1050+ Date: Wed, 7 Feb 2007 09:02:40 +0100 User-Agent: KMail/1.9.5 Cc: linux-kernel@vger.kernel.org References: <200702061430.42581.openembedded@hrw.one.pl> <1170790019.5826.105.camel@localhost.localdomain> In-Reply-To: <1170790019.5826.105.camel@localhost.localdomain> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-2" Content-Transfer-Encoding: 8BIT Content-Disposition: inline Message-Id: <200702070902.42007.openembedded@hrw.one.pl> Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 8655 Lines: 294 Dnia wtorek, 6 lutego 2007 20:26, Richard Purdie napisa?: > On Tue, 2007-02-06 at 14:30 +0100, Marcin Juszkiewicz wrote: > > Add control of LCD backlight for Frontpath ProGear HX1050+. > > Patch is based on > > http://downloads.sf.net/progear/progear-lcd-0.2.tar.gz driver by M > > Schacht. > This is very similar to corgi_bl which I have some changes I was > considering to make it a bit more efficient/clean. The same changes > could apply to this driver: > > +static int progearbl_intensity; > > +static struct backlight_properties progearbl_data; > > Not sure you need the above line? both removed > > +static struct backlight_device *progear_backlight_device; > > You shouldn't need this structure pointer (see below) removed > > +static int progearbl_get_intensity(struct backlight_device *bd) > > +{ > > + return progearbl_intensity; > > +} > > Can you read PMU_LPCR and return it (minus HW_LEVEL_MIN) here? corgi_bl > only stores this as it can't read back from the hardware. Either > approach is probably ok (although if the register can be updated by > other means, it should be read). changed to be read from hardware > > +static int progearbl_set_intensity(struct backlight_device *bd) > > +{ > > + progearbl_send_intensity(progear_backlight_device); > > + return 0; > > +} > > You can use progearbl_send_intensity(bd); here or maybe lose the > function all together? progearbl_set_intensity dropped, progearbl_sent_intensity renamed to progearbl_set_intensity > > +static struct backlight_properties progearbl_data = { > > + .owner = THIS_MODULE, > > + .get_brightness = progearbl_get_intensity, > > + .update_status = progearbl_set_intensity, > > progearbl_send_intensity? done > > + pci_read_config_byte(sb_dev, SB_MPS1, &temp); > > + pci_write_config_byte(sb_dev, SB_MPS1, temp | 0x20); > > + > > + progear_backlight_device = > > backlight_device_register("progear-bl", + &pdev->dev, NULL, > > &progearbl_data); > > + if (IS_ERR(progear_backlight_device)) > > + return PTR_ERR(progear_backlight_device); > > platform_set_drvdata(pdev, progear_backlight_device); added > > +static int progearbl_remove(struct platform_device *dev) > > +{ > > + backlight_device_unregister(progear_backlight_device); > > struct backlight_device *bd = platform_get_drvdata(pdev); > backlight_device_unregister(bd); changed Updated version below: From: Marcin Juszkiewicz Add control of LCD backlight for Frontpath ProGear HX1050+. Patch is based on http://downloads.sf.net/progear/progear-lcd-0.2.tar.gz driver by M Schacht. Signed-Off-By: Marcin Juszkiewicz --- Patch follow kernel version 2.6.20 Kconfig | 8 +++ Makefile | 1 progear_bl.c | 154 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 163 insertions(+) Index: git/drivers/video/backlight/Kconfig =================================================================== --- git.orig/drivers/video/backlight/Kconfig 2006-12-29 17:31:36.511043439 +0100 +++ git/drivers/video/backlight/Kconfig 2007-02-07 08:57:31.020095845 +0100 @@ -66,3 +66,11 @@ If you have a HP Jornada 680, say y to enable the backlight driver. +config BACKLIGHT_PROGEAR + tristate "Frontpath ProGear Backlight Driver" + depends on BACKLIGHT_DEVICE && PCI && X86 + default y + help + If you have a Frontpath ProGear say Y to enable the + backlight driver. + Index: git/drivers/video/backlight/progear_bl.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ git/drivers/video/backlight/progear_bl.c 2007-02-07 08:55:46.813993140 +0100 @@ -0,0 +1,154 @@ +/* + * Backlight Driver for Frontpath ProGear HX1050+ + * + * Copyright (c) 2006 Marcin Juszkiewicz + * + * Based on Progear LCD driver by M Schacht + * + * + * Based on Sharp's Corgi Backlight Driver + * Based on Backlight Driver for HP Jornada 680 + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define PMU_LPCR 0xB0 +#define SB_MPS1 0x61 +#define HW_LEVEL_MAX 0x77 +#define HW_LEVEL_MIN 0x4f + +static struct pci_dev *pmu_dev = NULL; +static struct pci_dev *sb_dev = NULL; + +static int progearbl_set_intensity(struct backlight_device *bd) +{ + int intensity = bd->props->brightness; + + if (bd->props->power != FB_BLANK_UNBLANK) + intensity = 0; + if (bd->props->fb_blank != FB_BLANK_UNBLANK) + intensity = 0; + + pci_write_config_byte(pmu_dev, PMU_LPCR, intensity + HW_LEVEL_MIN); + + return 0; +} + +static int progearbl_get_intensity(struct backlight_device *bd) +{ + u8 intensity; + pci_read_config_byte(pmu_dev, PMU_LPCR, &intensity); + + return intensity - HW_LEVEL_MIN; +} + +static struct backlight_properties progearbl_data = { + .owner = THIS_MODULE, + .get_brightness = progearbl_get_intensity, + .update_status = progearbl_set_intensity, +}; + +static int progearbl_probe(struct platform_device *pdev) +{ + u8 temp; + struct backlight_device *progear_backlight_device; + + pmu_dev = pci_get_device(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M7101, 0); + if (!pmu_dev) { + printk("ALI M7101 PMU not found.\n"); + return -ENODEV; + } + + sb_dev = pci_get_device(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M1533, 0); + if (!sb_dev) { + printk("ALI 1533 SB not found.\n"); + pci_dev_put(pmu_dev); + return -ENODEV; + } + + /* Set SB_MPS1 to enable brightness control. */ + pci_read_config_byte(sb_dev, SB_MPS1, &temp); + pci_write_config_byte(sb_dev, SB_MPS1, temp | 0x20); + + progear_backlight_device = backlight_device_register("progear-bl", + &pdev->dev, NULL, + &progearbl_data); + if (IS_ERR(progear_backlight_device)) + return PTR_ERR(progear_backlight_device); + + platform_set_drvdata(pdev, progear_backlight_device); + + progearbl_data.power = FB_BLANK_UNBLANK; + progearbl_data.brightness = HW_LEVEL_MAX - HW_LEVEL_MIN; + progearbl_data.max_brightness = HW_LEVEL_MAX - HW_LEVEL_MIN; + progearbl_set_intensity(progear_backlight_device); + + return 0; +} + +static int progearbl_remove(struct platform_device *pdev) +{ + struct backlight_device *bd = platform_get_drvdata(pdev); + backlight_device_unregister(bd); + + return 0; +} + +static struct platform_driver progearbl_driver = { + .probe = progearbl_probe, + .remove = progearbl_remove, + .driver = { + .name = "progear-bl", + }, +}; + +static struct platform_device *progearbl_device; + +static int __init progearbl_init(void) +{ + int ret = platform_driver_register(&progearbl_driver); + + if (!ret) { + progearbl_device = platform_device_alloc("progear-bl", -1); + if (!progearbl_device) + return -ENOMEM; + + ret = platform_device_add(progearbl_device); + + if (ret) { + platform_device_put(progearbl_device); + platform_driver_unregister(&progearbl_driver); + } + } + + return ret; +} + +static void __exit progearbl_exit(void) +{ + pci_dev_put(pmu_dev); + pci_dev_put(sb_dev); + + platform_device_unregister(progearbl_device); + platform_driver_unregister(&progearbl_driver); +} + +module_init(progearbl_init); +module_exit(progearbl_exit); + +MODULE_AUTHOR("Marcin Juszkiewicz "); +MODULE_DESCRIPTION("ProGear Backlight Driver"); +MODULE_LICENSE("GPL"); Index: git/drivers/video/backlight/Makefile =================================================================== --- git.orig/drivers/video/backlight/Makefile 2006-12-29 17:31:36.511043439 +0100 +++ git/drivers/video/backlight/Makefile 2007-02-06 21:34:54.503712923 +0100 @@ -5,3 +5,4 @@ obj-$(CONFIG_BACKLIGHT_CORGI) += corgi_bl.o obj-$(CONFIG_BACKLIGHT_HP680) += hp680_bl.o obj-$(CONFIG_BACKLIGHT_LOCOMO) += locomolcd.o +obj-$(CONFIG_BACKLIGHT_PROGEAR) += progear_bl.o -- JID: hrw-jabber.org OpenEmbedded developer/consultant Don't mind me, I'm just checking if you are dense enough to cause a tide - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/