The led driver used OEM commands which are not part of the nvec protocol
definition. Therefore it is renamed to nvec_paz00 to reflect that it only
applies to PAZ00 board based devices.
Signed-off-by: Marc Dietrich <marvin24@xxxxxx>
---
drivers/staging/nvec/Kconfig | 9 ++++----
drivers/staging/nvec/Makefile | 2 +-
drivers/staging/nvec/nvec.c | 2 +-
drivers/staging/nvec/{nvec_leds.c => nvec_paz00.c} | 24 ++++++++++----------
4 files changed, 19 insertions(+), 18 deletions(-)
rename drivers/staging/nvec/{nvec_leds.c => nvec_paz00.c} (76%)
diff --git a/drivers/staging/nvec/Kconfig b/drivers/staging/nvec/Kconfig
index 731301f..43048e9 100644
--- a/drivers/staging/nvec/Kconfig
+++ b/drivers/staging/nvec/Kconfig
@@ -26,8 +26,9 @@ config NVEC_POWER
Say Y to enable support for battery and charger interface for
nVidia compliant embedded controllers.
-config NVEC_LEDS
- bool "NVEC leds"
- depends on MFD_NVEC && LEDS_CLASS
+config NVEC_PAZ00
+ bool "Support for OEM specific functions on Compal PAZ00 based devices"
+ depends on MFD_NVEC && LEDS_CLASS && MACH_PAZ00
help
- Say Y to enable yellow side leds on AC100 or other nVidia tegra nvec leds
+ Say Y to enable control of the yellow side leds on Compal PAZ00 based
+ devices, e.g. Toshbia AC100 and Dynabooks AZ netbooks.
diff --git a/drivers/staging/nvec/Makefile b/drivers/staging/nvec/Makefile
index b844d60..0db0e1f 100644
--- a/drivers/staging/nvec/Makefile
+++ b/drivers/staging/nvec/Makefile
@@ -2,4 +2,4 @@ obj-$(CONFIG_SERIO_NVEC_PS2) += nvec_ps2.o
obj-$(CONFIG_MFD_NVEC) += nvec.o
obj-$(CONFIG_NVEC_POWER) += nvec_power.o
obj-$(CONFIG_KEYBOARD_NVEC) += nvec_kbd.o
-obj-$(CONFIG_NVEC_LEDS) += nvec_leds.o
+obj-$(CONFIG_NVEC_PAZ00) += nvec_paz00.o
diff --git a/drivers/staging/nvec/nvec.c b/drivers/staging/nvec/nvec.c
index 4a56b62..45a08a5 100644
--- a/drivers/staging/nvec/nvec.c
+++ b/drivers/staging/nvec/nvec.c
@@ -93,7 +93,7 @@ static struct mfd_cell nvec_devices[] = {
.id = 2,
},
{
- .name = "nvec-leds",
+ .name = "nvec-paz00",
.id = 1,
},
};
diff --git a/drivers/staging/nvec/nvec_leds.c b/drivers/staging/nvec/nvec_paz00.c
similarity index 76%
rename from drivers/staging/nvec/nvec_leds.c
rename to drivers/staging/nvec/nvec_paz00.c
index 6796d75..a9a7134 100644
--- a/drivers/staging/nvec/nvec_leds.c
+++ b/drivers/staging/nvec/nvec_paz00.c
@@ -1,5 +1,5 @@
/*
- * nvec_leds: LED driver for a NVIDIA compliant embedded controller
+ * nvec_paz00: OEM specific driver for Compal PAZ00 based devices
*
* Copyright (C) 2011 The AC100 Kernel Team <ac100@xxxxxxxxxxxxxxxxxxx>
*
@@ -40,7 +40,7 @@ static void nvec_led_brightness_set(struct led_classdev *led_cdev,
led->cdev.brightness = value;
}
-static int __devinit nvec_led_probe(struct platform_device *pdev)
+static int __devinit nvec_paz00_probe(struct platform_device *pdev)
{
struct nvec_chip *nvec = dev_get_drvdata(pdev->dev.parent);
struct nvec_led *led;
@@ -53,7 +53,7 @@ static int __devinit nvec_led_probe(struct platform_device *pdev)
led->cdev.max_brightness = NVEC_LED_MAX;
led->cdev.brightness_set = nvec_led_brightness_set;
- led->cdev.name = "nvec-led";
+ led->cdev.name = "paz00-led";
led->cdev.flags |= LED_CORE_SUSPENDRESUME;
led->nvec = nvec;
@@ -69,7 +69,7 @@ static int __devinit nvec_led_probe(struct platform_device *pdev)
return 0;
}
-static int __devexit nvec_led_remove(struct platform_device *pdev)
+static int __devexit nvec_paz00_remove(struct platform_device *pdev)
{
struct nvec_led *led = platform_get_drvdata(pdev);
@@ -78,18 +78,18 @@ static int __devexit nvec_led_remove(struct platform_device *pdev)
return 0;
}
-static struct platform_driver nvec_led_driver = {
- .probe = nvec_led_probe,
- .remove = __devexit_p(nvec_led_remove),
+static struct platform_driver nvec_paz00_driver = {
+ .probe = nvec_paz00_probe,
+ .remove = __devexit_p(nvec_paz00_remove),
.driver = {
- .name = "nvec-leds",
- .owner = THIS_MODULE,
+ .name = "nvec-paz00",
+ .owner = THIS_MODULE,
},
};
-module_platform_driver(nvec_led_driver);
+module_platform_driver(nvec_paz00_driver);
MODULE_AUTHOR("Ilya Petrov <ilya.muromec@xxxxxxxxx>");
-MODULE_DESCRIPTION("Tegra NVEC LED driver");
+MODULE_DESCRIPTION("Tegra NVEC PAZ00 driver");
MODULE_LICENSE("GPL");
-MODULE_ALIAS("platform:nvec-leds");
+MODULE_ALIAS("platform:nvec-paz00");
--
1.7.9.5
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
