diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2010-05-12 02:44:33 +0200 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-05-26 17:34:39 +0100 |
| commit | f5bf403a9dc944bf560f49dd029195e54fcbc41c (patch) | |
| tree | 6decb6bf67a18ef614788a19e5d39834ccf0b921 | |
| parent | 2ddfd12f3584840f5190897214423061d8a0602f (diff) | |
| download | linux-3.10-f5bf403a9dc944bf560f49dd029195e54fcbc41c.tar.gz linux-3.10-f5bf403a9dc944bf560f49dd029195e54fcbc41c.tar.bz2 linux-3.10-f5bf403a9dc944bf560f49dd029195e54fcbc41c.zip | |
backlight: pcf50633: Register a pcf50633-backlight device in pcf50633 core driver.
Register a device newly added pcf50633-backlight driver as a child device in
the pcf50633 core driver.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Acked-by: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
| -rw-r--r-- | drivers/mfd/pcf50633-core.c | 3 | ||||
| -rw-r--r-- | include/linux/mfd/pcf50633/core.h | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/drivers/mfd/pcf50633-core.c b/drivers/mfd/pcf50633-core.c index 63a614d696c..dc95ddb708f 100644 --- a/drivers/mfd/pcf50633-core.c +++ b/drivers/mfd/pcf50633-core.c @@ -620,6 +620,9 @@ static int __devinit pcf50633_probe(struct i2c_client *client, &pcf->mbc_pdev); pcf50633_client_dev_register(pcf, "pcf50633-adc", &pcf->adc_pdev); + pcf50633_client_dev_register(pcf, "pcf50633-backlight", + &pcf->bl_pdev); + for (i = 0; i < PCF50633_NUM_REGULATORS; i++) { struct platform_device *pdev; diff --git a/include/linux/mfd/pcf50633/core.h b/include/linux/mfd/pcf50633/core.h index 3398bd9aab1..ad411a78870 100644 --- a/include/linux/mfd/pcf50633/core.h +++ b/include/linux/mfd/pcf50633/core.h @@ -18,6 +18,7 @@ #include <linux/regulator/driver.h> #include <linux/regulator/machine.h> #include <linux/power_supply.h> +#include <linux/mfd/pcf50633/backlight.h> struct pcf50633; @@ -43,6 +44,8 @@ struct pcf50633_platform_data { void (*force_shutdown)(struct pcf50633 *); u8 resumers[5]; + + struct pcf50633_bl_platform_data *backlight_data; }; struct pcf50633_irq { @@ -152,6 +155,7 @@ struct pcf50633 { struct platform_device *mbc_pdev; struct platform_device *adc_pdev; struct platform_device *input_pdev; + struct platform_device *bl_pdev; struct platform_device *regulator_pdev[PCF50633_NUM_REGULATORS]; }; |