Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit f5bf403a9dc944bf560f49dd029195e54fcbc41c

Authored by Lars-Peter Clausen
Committed by Richard Purdie
1 parent 2ddfd12f35
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

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>

Showing 2 changed files with 7 additions and 0 deletions Side-by-side Diff

drivers/mfd/pcf50633-core.c
Diff comments   View file @ f5bf403
... ... @@ -620,6 +620,9 @@
620 620 &pcf->mbc_pdev);
621 621 pcf50633_client_dev_register(pcf, "pcf50633-adc",
622 622 &pcf->adc_pdev);
  623 + pcf50633_client_dev_register(pcf, "pcf50633-backlight",
  624 + &pcf->bl_pdev);
  625 +
623 626  
624 627 for (i = 0; i < PCF50633_NUM_REGULATORS; i++) {
625 628 struct platform_device *pdev;
include/linux/mfd/pcf50633/core.h
Diff comments   View file @ f5bf403
... ... @@ -18,6 +18,7 @@
18 18 #include <linux/regulator/driver.h>
19 19 #include <linux/regulator/machine.h>
20 20 #include <linux/power_supply.h>
  21 +#include <linux/mfd/pcf50633/backlight.h>
21 22  
22 23 struct pcf50633;
23 24  
... ... @@ -43,6 +44,8 @@
43 44 void (*force_shutdown)(struct pcf50633 *);
44 45  
45 46 u8 resumers[5];
  47 +
  48 + struct pcf50633_bl_platform_data *backlight_data;
46 49 };
47 50  
48 51 struct pcf50633_irq {
... ... @@ -152,6 +155,7 @@
152 155 struct platform_device *mbc_pdev;
153 156 struct platform_device *adc_pdev;
154 157 struct platform_device *input_pdev;
  158 + struct platform_device *bl_pdev;
155 159 struct platform_device *regulator_pdev[PCF50633_NUM_REGULATORS];
156 160 };
157 161