mbp_nvidia_bl: rename to apple_bl
authorMatthew Garrett <mjg@redhat.com>
Tue, 22 Mar 2011 23:30:28 +0000 (16:30 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 23 Mar 2011 00:44:00 +0000 (17:44 -0700)
It works on hardware other than Macbook Pros, and it works on GPUs other
than Nvidia.  It should even work on iMacs, so change the name to match
reality more precisely and include an alias so existing users don't get
confused.

Signed-off-by: Matthew Garrett <mjg@redhat.com>
Acked-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Cc: Mourad De Clerck <mourad@aquazul.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/video/backlight/Kconfig
drivers/video/backlight/Makefile
drivers/video/backlight/apple_bl.c [new file with mode: 0644]
drivers/video/backlight/mbp_nvidia_bl.c [deleted file]

index aa8cf9d2e34f69850970eec051cb47dfdf636fc2..39fff49da19d34a2ad52c206a9db2f8e65fb24bb 100644 (file)
@@ -244,11 +244,11 @@ config BACKLIGHT_MAX8925
          If you have a LCD backlight connected to the WLED output of MAX8925
          WLED output, say Y here to enable this driver.
 
-config BACKLIGHT_MACBOOK
-       tristate "MacBook Backlight Driver"
+config BACKLIGHT_APPLE
+       tristate "Apple Backlight Driver"
        depends on X86
        help
-         If you have an Apple Macbook say Y to enable a driver for its
+         If you have an Intel-based Apple say Y to enable a driver for its
         backlight
 
 config BACKLIGHT_TOSA
index 988d7cd159ea89b5a888abbc125448a2e77fc059..b9ca8490df87850dc746e5a4661b67f5294589a4 100644 (file)
@@ -27,7 +27,7 @@ obj-$(CONFIG_BACKLIGHT_CARILLO_RANCH) += cr_bllcd.o
 obj-$(CONFIG_BACKLIGHT_PWM)    += pwm_bl.o
 obj-$(CONFIG_BACKLIGHT_DA903X) += da903x_bl.o
 obj-$(CONFIG_BACKLIGHT_MAX8925)        += max8925_bl.o
-obj-$(CONFIG_BACKLIGHT_MACBOOK)        += mbp_nvidia_bl.o
+obj-$(CONFIG_BACKLIGHT_APPLE)  += apple_bl.o
 obj-$(CONFIG_BACKLIGHT_TOSA)   += tosa_bl.o
 obj-$(CONFIG_BACKLIGHT_SAHARA) += kb3886_bl.o
 obj-$(CONFIG_BACKLIGHT_WM831X) += wm831x_bl.o
diff --git a/drivers/video/backlight/apple_bl.c b/drivers/video/backlight/apple_bl.c
new file mode 100644 (file)
index 0000000..be98d15
--- /dev/null
@@ -0,0 +1,241 @@
+/*
+ *  Backlight Driver for Intel-based Apples
+ *
+ *  Copyright (c) Red Hat <mjg@redhat.com>
+ *  Based on code from Pommed:
+ *  Copyright (C) 2006 Nicolas Boichat <nicolas @boichat.ch>
+ *  Copyright (C) 2006 Felipe Alfaro Solana <felipe_alfaro @linuxmail.org>
+ *  Copyright (C) 2007 Julien BLACHE <jb@jblache.org>
+ *
+ *  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.
+ *
+ *  This driver triggers SMIs which cause the firmware to change the
+ *  backlight brightness. This is icky in many ways, but it's impractical to
+ *  get at the firmware code in order to figure out what it's actually doing.
+ */
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/backlight.h>
+#include <linux/err.h>
+#include <linux/io.h>
+#include <linux/pci.h>
+#include <linux/acpi.h>
+
+static struct backlight_device *apple_backlight_device;
+
+struct hw_data {
+       /* I/O resource to allocate. */
+       unsigned long iostart;
+       unsigned long iolen;
+       /* Backlight operations structure. */
+       const struct backlight_ops backlight_ops;
+       void (*set_brightness)(int);
+};
+
+static const struct hw_data *hw_data;
+
+#define DRIVER "apple_backlight: "
+
+/* Module parameters. */
+static int debug;
+module_param_named(debug, debug, int, 0644);
+MODULE_PARM_DESC(debug, "Set to one to enable debugging messages.");
+
+/*
+ * Implementation for machines with Intel chipset.
+ */
+static void intel_chipset_set_brightness(int intensity)
+{
+       outb(0x04 | (intensity << 4), 0xb3);
+       outb(0xbf, 0xb2);
+}
+
+static int intel_chipset_send_intensity(struct backlight_device *bd)
+{
+       int intensity = bd->props.brightness;
+
+       if (debug)
+               printk(KERN_DEBUG DRIVER "setting brightness to %d\n",
+                      intensity);
+
+       intel_chipset_set_brightness(intensity);
+       return 0;
+}
+
+static int intel_chipset_get_intensity(struct backlight_device *bd)
+{
+       int intensity;
+
+       outb(0x03, 0xb3);
+       outb(0xbf, 0xb2);
+       intensity = inb(0xb3) >> 4;
+
+       if (debug)
+               printk(KERN_DEBUG DRIVER "read brightness of %d\n",
+                      intensity);
+
+       return intensity;
+}
+
+static const struct hw_data intel_chipset_data = {
+       .iostart = 0xb2,
+       .iolen = 2,
+       .backlight_ops  = {
+               .options        = BL_CORE_SUSPENDRESUME,
+               .get_brightness = intel_chipset_get_intensity,
+               .update_status  = intel_chipset_send_intensity,
+       },
+       .set_brightness = intel_chipset_set_brightness,
+};
+
+/*
+ * Implementation for machines with Nvidia chipset.
+ */
+static void nvidia_chipset_set_brightness(int intensity)
+{
+       outb(0x04 | (intensity << 4), 0x52f);
+       outb(0xbf, 0x52e);
+}
+
+static int nvidia_chipset_send_intensity(struct backlight_device *bd)
+{
+       int intensity = bd->props.brightness;
+
+       if (debug)
+               printk(KERN_DEBUG DRIVER "setting brightness to %d\n",
+                      intensity);
+
+       nvidia_chipset_set_brightness(intensity);
+       return 0;
+}
+
+static int nvidia_chipset_get_intensity(struct backlight_device *bd)
+{
+       int intensity;
+
+       outb(0x03, 0x52f);
+       outb(0xbf, 0x52e);
+       intensity = inb(0x52f) >> 4;
+
+       if (debug)
+               printk(KERN_DEBUG DRIVER "read brightness of %d\n",
+                      intensity);
+
+       return intensity;
+}
+
+static const struct hw_data nvidia_chipset_data = {
+       .iostart = 0x52e,
+       .iolen = 2,
+       .backlight_ops          = {
+               .options        = BL_CORE_SUSPENDRESUME,
+               .get_brightness = nvidia_chipset_get_intensity,
+               .update_status  = nvidia_chipset_send_intensity
+       },
+       .set_brightness = nvidia_chipset_set_brightness,
+};
+
+static int __devinit apple_bl_add(struct acpi_device *dev)
+{
+       struct backlight_properties props;
+       struct pci_dev *host;
+       int intensity;
+
+       host = pci_get_bus_and_slot(0, 0);
+
+       if (!host) {
+               printk(KERN_ERR DRIVER "unable to find PCI host\n");
+               return -ENODEV;
+       }
+
+       if (host->vendor == PCI_VENDOR_ID_INTEL)
+               hw_data = &intel_chipset_data;
+       else if (host->vendor == PCI_VENDOR_ID_NVIDIA)
+               hw_data = &nvidia_chipset_data;
+
+       pci_dev_put(host);
+
+       if (!hw_data) {
+               printk(KERN_ERR DRIVER "unknown hardware\n");
+               return -ENODEV;
+       }
+
+       /* Check that the hardware responds - this may not work under EFI */
+
+       intensity = hw_data->backlight_ops.get_brightness(NULL);
+
+       if (!intensity) {
+               hw_data->set_brightness(1);
+               if (!hw_data->backlight_ops.get_brightness(NULL))
+                       return -ENODEV;
+
+               hw_data->set_brightness(0);
+       }
+
+       if (!request_region(hw_data->iostart, hw_data->iolen,
+                           "Apple backlight"))
+               return -ENXIO;
+
+       memset(&props, 0, sizeof(struct backlight_properties));
+       props.type = BACKLIGHT_PLATFORM;
+       props.max_brightness = 15;
+       apple_backlight_device = backlight_device_register("apple_backlight",
+                                 NULL, NULL, &hw_data->backlight_ops, &props);
+
+       if (IS_ERR(apple_backlight_device)) {
+               release_region(hw_data->iostart, hw_data->iolen);
+               return PTR_ERR(apple_backlight_device);
+       }
+
+       apple_backlight_device->props.brightness =
+               hw_data->backlight_ops.get_brightness(apple_backlight_device);
+       backlight_update_status(apple_backlight_device);
+
+       return 0;
+}
+
+static int __devexit apple_bl_remove(struct acpi_device *dev, int type)
+{
+       backlight_device_unregister(apple_backlight_device);
+
+       release_region(hw_data->iostart, hw_data->iolen);
+       hw_data = NULL;
+       return 0;
+}
+
+static const struct acpi_device_id apple_bl_ids[] = {
+       {"APP0002", 0},
+       {"", 0},
+};
+
+static struct acpi_driver apple_bl_driver = {
+       .name = "Apple backlight",
+       .ids = apple_bl_ids,
+       .ops = {
+               .add = apple_bl_add,
+               .remove = apple_bl_remove,
+       },
+};
+
+static int __init apple_bl_init(void)
+{
+       return acpi_bus_register_driver(&apple_bl_driver);
+}
+
+static void __exit apple_bl_exit(void)
+{
+       acpi_bus_unregister_driver(&apple_bl_driver);
+}
+
+module_init(apple_bl_init);
+module_exit(apple_bl_exit);
+
+MODULE_AUTHOR("Matthew Garrett <mjg@redhat.com>");
+MODULE_DESCRIPTION("Apple Backlight Driver");
+MODULE_LICENSE("GPL");
+MODULE_DEVICE_TABLE(acpi, apple_bl_ids);
+MODULE_ALIAS("mbp_nvidia_bl");
diff --git a/drivers/video/backlight/mbp_nvidia_bl.c b/drivers/video/backlight/mbp_nvidia_bl.c
deleted file mode 100644 (file)
index dd0e145..0000000
+++ /dev/null
@@ -1,240 +0,0 @@
-/*
- *  Backlight Driver for Macbooks
- *
- *  Copyright (c) Red Hat <mjg@redhat.com>
- *  Based on code from Pommed:
- *  Copyright (C) 2006 Nicolas Boichat <nicolas @boichat.ch>
- *  Copyright (C) 2006 Felipe Alfaro Solana <felipe_alfaro @linuxmail.org>
- *  Copyright (C) 2007 Julien BLACHE <jb@jblache.org>
- *
- *  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.
- *
- *  This driver triggers SMIs which cause the firmware to change the
- *  backlight brightness. This is icky in many ways, but it's impractical to
- *  get at the firmware code in order to figure out what it's actually doing.
- */
-
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/backlight.h>
-#include <linux/err.h>
-#include <linux/io.h>
-#include <linux/pci.h>
-#include <linux/acpi.h>
-
-static struct backlight_device *mb_backlight_device;
-
-struct hw_data {
-       /* I/O resource to allocate. */
-       unsigned long iostart;
-       unsigned long iolen;
-       /* Backlight operations structure. */
-       const struct backlight_ops backlight_ops;
-       void (*set_brightness)(int);
-};
-
-static const struct hw_data *hw_data;
-
-#define DRIVER "mb_backlight: "
-
-/* Module parameters. */
-static int debug;
-module_param_named(debug, debug, int, 0644);
-MODULE_PARM_DESC(debug, "Set to one to enable debugging messages.");
-
-/*
- * Implementation for MacBooks with Intel chipset.
- */
-static void intel_chipset_set_brightness(int intensity)
-{
-       outb(0x04 | (intensity << 4), 0xb3);
-       outb(0xbf, 0xb2);
-}
-
-static int intel_chipset_send_intensity(struct backlight_device *bd)
-{
-       int intensity = bd->props.brightness;
-
-       if (debug)
-               printk(KERN_DEBUG DRIVER "setting brightness to %d\n",
-                      intensity);
-
-       intel_chipset_set_brightness(intensity);
-       return 0;
-}
-
-static int intel_chipset_get_intensity(struct backlight_device *bd)
-{
-       int intensity;
-
-       outb(0x03, 0xb3);
-       outb(0xbf, 0xb2);
-       intensity = inb(0xb3) >> 4;
-
-       if (debug)
-               printk(KERN_DEBUG DRIVER "read brightness of %d\n",
-                      intensity);
-
-       return intensity;
-}
-
-static const struct hw_data intel_chipset_data = {
-       .iostart = 0xb2,
-       .iolen = 2,
-       .backlight_ops  = {
-               .options        = BL_CORE_SUSPENDRESUME,
-               .get_brightness = intel_chipset_get_intensity,
-               .update_status  = intel_chipset_send_intensity,
-       },
-       .set_brightness = intel_chipset_set_brightness,
-};
-
-/*
- * Implementation for MacBooks with Nvidia chipset.
- */
-static void nvidia_chipset_set_brightness(int intensity)
-{
-       outb(0x04 | (intensity << 4), 0x52f);
-       outb(0xbf, 0x52e);
-}
-
-static int nvidia_chipset_send_intensity(struct backlight_device *bd)
-{
-       int intensity = bd->props.brightness;
-
-       if (debug)
-               printk(KERN_DEBUG DRIVER "setting brightness to %d\n",
-                      intensity);
-
-       nvidia_chipset_set_brightness(intensity);
-       return 0;
-}
-
-static int nvidia_chipset_get_intensity(struct backlight_device *bd)
-{
-       int intensity;
-
-       outb(0x03, 0x52f);
-       outb(0xbf, 0x52e);
-       intensity = inb(0x52f) >> 4;
-
-       if (debug)
-               printk(KERN_DEBUG DRIVER "read brightness of %d\n",
-                      intensity);
-
-       return intensity;
-}
-
-static const struct hw_data nvidia_chipset_data = {
-       .iostart = 0x52e,
-       .iolen = 2,
-       .backlight_ops          = {
-               .options        = BL_CORE_SUSPENDRESUME,
-               .get_brightness = nvidia_chipset_get_intensity,
-               .update_status  = nvidia_chipset_send_intensity
-       },
-       .set_brightness = nvidia_chipset_set_brightness,
-};
-
-static int __devinit mb_bl_add(struct acpi_device *dev)
-{
-       struct backlight_properties props;
-       struct pci_dev *host;
-       int intensity;
-
-       host = pci_get_bus_and_slot(0, 0);
-
-       if (!host) {
-               printk(KERN_ERR DRIVER "unable to find PCI host\n");
-               return -ENODEV;
-       }
-
-       if (host->vendor == PCI_VENDOR_ID_INTEL)
-               hw_data = &intel_chipset_data;
-       else if (host->vendor == PCI_VENDOR_ID_NVIDIA)
-               hw_data = &nvidia_chipset_data;
-
-       pci_dev_put(host);
-
-       if (!hw_data) {
-               printk(KERN_ERR DRIVER "unknown hardware\n");
-               return -ENODEV;
-       }
-
-       /* Check that the hardware responds - this may not work under EFI */
-
-       intensity = hw_data->backlight_ops.get_brightness(NULL);
-
-       if (!intensity) {
-               hw_data->set_brightness(1);
-               if (!hw_data->backlight_ops.get_brightness(NULL))
-                       return -ENODEV;
-
-               hw_data->set_brightness(0);
-       }
-
-       if (!request_region(hw_data->iostart, hw_data->iolen,
-                           "Macbook backlight"))
-               return -ENXIO;
-
-       memset(&props, 0, sizeof(struct backlight_properties));
-       props.type = BACKLIGHT_PLATFORM;
-       props.max_brightness = 15;
-       mb_backlight_device = backlight_device_register("mb_backlight", NULL,
-                                   NULL, &hw_data->backlight_ops, &props);
-
-       if (IS_ERR(mb_backlight_device)) {
-               release_region(hw_data->iostart, hw_data->iolen);
-               return PTR_ERR(mb_backlight_device);
-       }
-
-       mb_backlight_device->props.brightness =
-               hw_data->backlight_ops.get_brightness(mb_backlight_device);
-       backlight_update_status(mb_backlight_device);
-
-       return 0;
-}
-
-static int __devexit mb_bl_remove(struct acpi_device *dev, int type)
-{
-       backlight_device_unregister(mb_backlight_device);
-
-       release_region(hw_data->iostart, hw_data->iolen);
-       hw_data = NULL;
-       return 0;
-}
-
-static const struct acpi_device_id mb_bl_ids[] = {
-       {"APP0002", 0},
-       {"", 0},
-};
-
-static struct acpi_driver mb_bl_driver = {
-       .name = "Macbook backlight",
-       .ids = mb_bl_ids,
-       .ops = {
-               .add = mb_bl_add,
-               .remove = mb_bl_remove,
-       },
-};
-
-static int __init mb_init(void)
-{
-       return acpi_bus_register_driver(&mb_bl_driver);
-}
-
-static void __exit mb_exit(void)
-{
-       acpi_bus_unregister_driver(&mb_bl_driver);
-}
-
-module_init(mb_init);
-module_exit(mb_exit);
-
-MODULE_AUTHOR("Matthew Garrett <mjg@redhat.com>");
-MODULE_DESCRIPTION("Macbook Backlight Driver");
-MODULE_LICENSE("GPL");
-MODULE_DEVICE_TABLE(acpi, mb_bl_ids);