aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Rivshin <drivshin@allworx.com>2016-03-07 19:57:16 -0500
committerJacek Anaszewski <j.anaszewski@samsung.com>2016-03-14 04:22:22 -0400
commite0442d7def8f9dccde0d825a01d8a6951aa6e95d (patch)
treeb04124723118b5cbf52af1418acf98aa8721a4aa
parent204a70bba9e7aee2c8827724258bd96306469e82 (diff)
leds: Add SN3218 and SN3216 support to the IS31FL32XX driver
Si-En Technology was acquired by ISSI in 2011, and it appears that the IS31FL3218/IS31FL3216 are just rebranded SN3218/SN3216 devices. Add the "si-en,sn3218" and "si-en,sn3216" compatible strings into the IS31FL32XX driver as aliases for the issi equivalents, and update binding documentation. Datasheets: IS31FL3218: http://www.issi.com/WW/pdf/31FL3218.pdf SN3218: http://www.si-en.com/uploadpdf/s2011517171720.pdf IS31FL3216: http://www.issi.com/WW/pdf/31FL3216.pdf SN3216: http://www.si-en.com/uploadpdf/SN3216201152410148.pdf Signed-off-by: David Rivshin <drivshin@allworx.com> Acked-by: Rob Herring <robh@kernel.org> Tested-by: Stefan Wahren <stefan.wahren@i2se.com> Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com>
-rw-r--r--Documentation/devicetree/bindings/leds/leds-is31fl32xx.txt9
-rw-r--r--drivers/leds/Kconfig6
-rw-r--r--drivers/leds/leds-is31fl32xx.c6
3 files changed, 14 insertions, 7 deletions
diff --git a/Documentation/devicetree/bindings/leds/leds-is31fl32xx.txt b/Documentation/devicetree/bindings/leds/leds-is31fl32xx.txt
index e72ed66ec781..926c2117942c 100644
--- a/Documentation/devicetree/bindings/leds/leds-is31fl32xx.txt
+++ b/Documentation/devicetree/bindings/leds/leds-is31fl32xx.txt
@@ -1,6 +1,6 @@
1Binding for ISSI IS31FL32xx LED Drivers 1Binding for ISSI IS31FL32xx and Si-En SN32xx LED Drivers
2 2
3The IS31FL32xx family of LED drivers are I2C devices with multiple 3The IS31FL32xx/SN32xx family of LED drivers are I2C devices with multiple
4constant-current channels, each with independent 256-level PWM control. 4constant-current channels, each with independent 256-level PWM control.
5Each LED is represented as a sub-node of the device. 5Each LED is represented as a sub-node of the device.
6 6
@@ -10,6 +10,8 @@ Required properties:
10 issi,is31fl3235 10 issi,is31fl3235
11 issi,is31fl3218 11 issi,is31fl3218
12 issi,is31fl3216 12 issi,is31fl3216
13 si-en,sn3218
14 si-en,sn3216
13- reg: I2C slave address 15- reg: I2C slave address
14- address-cells : must be 1 16- address-cells : must be 1
15- size-cells : must be 0 17- size-cells : must be 0
@@ -45,5 +47,6 @@ is31fl3236: led-controller@3c {
45 }; 47 };
46}; 48};
47 49
48For more product information please see the link below: 50For more product information please see the links below:
49http://www.issi.com/US/product-analog-fxled-driver.shtml 51http://www.issi.com/US/product-analog-fxled-driver.shtml
52http://www.si-en.com/product.asp?parentid=890
diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig
index 08a5743fe7a5..1f6415168998 100644
--- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig
@@ -572,9 +572,9 @@ config LEDS_IS31FL32XX
572 tristate "LED support for ISSI IS31FL32XX I2C LED controller family" 572 tristate "LED support for ISSI IS31FL32XX I2C LED controller family"
573 depends on LEDS_CLASS && I2C && OF 573 depends on LEDS_CLASS && I2C && OF
574 help 574 help
575 Say Y here to include support for ISSI IS31FL32XX LED controllers. 575 Say Y here to include support for ISSI IS31FL32XX and Si-En SN32xx
576 They are I2C devices with multiple constant-current channels, each 576 LED controllers. They are I2C devices with multiple constant-current
577 with independent 256-level PWM control. 577 channels, each with independent 256-level PWM control.
578 578
579comment "LED driver for blink(1) USB RGB LED is under Special HID drivers (HID_THINGM)" 579comment "LED driver for blink(1) USB RGB LED is under Special HID drivers (HID_THINGM)"
580 580
diff --git a/drivers/leds/leds-is31fl32xx.c b/drivers/leds/leds-is31fl32xx.c
index 9a6785694886..c901d132d80c 100644
--- a/drivers/leds/leds-is31fl32xx.c
+++ b/drivers/leds/leds-is31fl32xx.c
@@ -8,7 +8,9 @@
8 * it under the terms of the GNU General Public License version 2 as 8 * it under the terms of the GNU General Public License version 2 as
9 * published by the Free Software Foundation. 9 * published by the Free Software Foundation.
10 * 10 *
11 * Datasheets: http://www.issi.com/US/product-analog-fxled-driver.shtml 11 * Datasheets:
12 * http://www.issi.com/US/product-analog-fxled-driver.shtml
13 * http://www.si-en.com/product.asp?parentid=890
12 */ 14 */
13 15
14#include <linux/device.h> 16#include <linux/device.h>
@@ -424,7 +426,9 @@ static const struct of_device_id of_is31fl31xx_match[] = {
424 { .compatible = "issi,is31fl3236", .data = &is31fl3236_cdef, }, 426 { .compatible = "issi,is31fl3236", .data = &is31fl3236_cdef, },
425 { .compatible = "issi,is31fl3235", .data = &is31fl3235_cdef, }, 427 { .compatible = "issi,is31fl3235", .data = &is31fl3235_cdef, },
426 { .compatible = "issi,is31fl3218", .data = &is31fl3218_cdef, }, 428 { .compatible = "issi,is31fl3218", .data = &is31fl3218_cdef, },
429 { .compatible = "si-en,sn3218", .data = &is31fl3218_cdef, },
427 { .compatible = "issi,is31fl3216", .data = &is31fl3216_cdef, }, 430 { .compatible = "issi,is31fl3216", .data = &is31fl3216_cdef, },
431 { .compatible = "si-en,sn3216", .data = &is31fl3216_cdef, },
428 {}, 432 {},
429}; 433};
430 434