Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 317544
b: refs/heads/master
c: ac56268
h: refs/heads/master
v: v3
  • Loading branch information
Marc Dietrich authored and Greg Kroah-Hartman committed Jun 25, 2012
1 parent a16743a commit 5007a3b
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 19 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ebefae28cea729cb1fa9c944179f62d7dd65b10f
refs/heads/master: ac562680577a28fa98ebecebff5e5097ccf9a9d2
9 changes: 5 additions & 4 deletions trunk/drivers/staging/nvec/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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.
2 changes: 1 addition & 1 deletion trunk/drivers/staging/nvec/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion trunk/drivers/staging/nvec/nvec.c
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ static struct mfd_cell nvec_devices[] = {
.id = 2,
},
{
.name = "nvec-leds",
.name = "nvec-paz00",
.id = 1,
},
};
Expand Down
Original file line number Diff line number Diff line change
@@ -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@lists.launchpad.net>
*
Expand Down Expand Up @@ -43,7 +43,7 @@ static void nvec_led_brightness_set(struct led_classdev *led_cdev,

}

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;
Expand All @@ -56,7 +56,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;

Expand All @@ -72,7 +72,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);

Expand All @@ -81,18 +81,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@gmail.com>");
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");

0 comments on commit 5007a3b

Please sign in to comment.