diff mbox

[OpenWrt-Devel,1/3] brcm63xx: add upstream LED drivers

Message ID 1441457918-9494-1-git-send-email-noltari@gmail.com
State Deferred
Delegated to: Jonas Gorski
Headers show

Commit Message

Álvaro Fernández Rojas Sept. 5, 2015, 12:58 p.m. UTC
This backports upstream LED drivers (BCM6328 and BCM6358).

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
---
 target/linux/brcm63xx/config-3.18                  |   2 +
 target/linux/brcm63xx/config-4.1                   |   2 +
 .../040-leds-add-BCM6328-LED-driver.patch          | 464 +++++++++++++++++++++
 .../041-leds-add-BCM6358-LED-driver.patch          | 293 +++++++++++++
 ...8-add-more-configuration-options-and-fix-.patch | 106 +++++
 .../020-leds-add-BCM6328-LED-driver.patch          | 464 +++++++++++++++++++++
 .../021-leds-add-BCM6358-LED-driver.patch          | 293 +++++++++++++
 ...8-add-more-configuration-options-and-fix-.patch | 106 +++++
 8 files changed, 1730 insertions(+)
 create mode 100644 target/linux/brcm63xx/patches-3.18/040-leds-add-BCM6328-LED-driver.patch
 create mode 100644 target/linux/brcm63xx/patches-3.18/041-leds-add-BCM6358-LED-driver.patch
 create mode 100644 target/linux/brcm63xx/patches-3.18/042-leds-bcm6328-add-more-configuration-options-and-fix-.patch
 create mode 100644 target/linux/brcm63xx/patches-4.1/020-leds-add-BCM6328-LED-driver.patch
 create mode 100644 target/linux/brcm63xx/patches-4.1/021-leds-add-BCM6358-LED-driver.patch
 create mode 100644 target/linux/brcm63xx/patches-4.1/022-leds-bcm6328-add-more-configuration-options-and-fix-.patch

Comments

Jonas Gorski Sept. 5, 2015, 1:05 p.m. UTC | #1
Hi,

On Sat, Sep 5, 2015 at 2:58 PM, Álvaro Fernández Rojas
<noltari@gmail.com> wrote:
> This backports upstream LED drivers (BCM6328 and BCM6358).

Let's wait with this until CC-final is out and I can drop 3.18. I have
pinctrl drivers in my queue that I'm somewhat satisfied with, but will
require changes to the dts(i) files (and I don't want to add "new"
stuff to 3.18).


Jonas
diff mbox

Patch

diff --git a/target/linux/brcm63xx/config-3.18 b/target/linux/brcm63xx/config-3.18
index b72080b..5a9029e 100644
--- a/target/linux/brcm63xx/config-3.18
+++ b/target/linux/brcm63xx/config-3.18
@@ -132,6 +132,8 @@  CONFIG_IRQ_DOMAIN=y
 CONFIG_IRQ_FORCED_THREADING=y
 CONFIG_IRQ_WORK=y
 CONFIG_KEXEC=y
+CONFIG_LEDS_BCM6328=y
+CONFIG_LEDS_BCM6358=y
 CONFIG_LEDS_GPIO=y
 CONFIG_LIBFDT=y
 CONFIG_MDIO_BOARDINFO=y
diff --git a/target/linux/brcm63xx/config-4.1 b/target/linux/brcm63xx/config-4.1
index d61b6e6..8da087c 100644
--- a/target/linux/brcm63xx/config-4.1
+++ b/target/linux/brcm63xx/config-4.1
@@ -137,6 +137,8 @@  CONFIG_IRQ_DOMAIN=y
 CONFIG_IRQ_FORCED_THREADING=y
 CONFIG_IRQ_WORK=y
 CONFIG_KEXEC=y
+CONFIG_LEDS_BCM6328=y
+CONFIG_LEDS_BCM6358=y
 CONFIG_LEDS_GPIO=y
 CONFIG_LIBFDT=y
 # CONFIG_LZ4_COMPRESS is not set
diff --git a/target/linux/brcm63xx/patches-3.18/040-leds-add-BCM6328-LED-driver.patch b/target/linux/brcm63xx/patches-3.18/040-leds-add-BCM6328-LED-driver.patch
new file mode 100644
index 0000000..fc3d03a
--- /dev/null
+++ b/target/linux/brcm63xx/patches-3.18/040-leds-add-BCM6328-LED-driver.patch
@@ -0,0 +1,464 @@ 
+From fd7b025a238d0a5440bfa26c585eb78097bf48dc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= <noltari@gmail.com>
+Date: Tue, 28 Apr 2015 09:50:50 -0700
+Subject: [PATCH] leds: add BCM6328 LED driver
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This adds support for the LED controller on Broadcom's BCM6328.
+
+Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
+Signed-off-by: Jonas Gorski <jogo@openwrt.org>
+Acked-by: Jacek Anaszewski <j.anaszewski@samsung.com>
+Signed-off-by: Bryan Wu <cooloney@gmail.com>
+---
+ drivers/leds/Kconfig        |   8 +
+ drivers/leds/Makefile       |   1 +
+ drivers/leds/leds-bcm6328.c | 413 ++++++++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 422 insertions(+)
+ create mode 100644 drivers/leds/leds-bcm6328.c
+
+--- a/drivers/leds/Kconfig
++++ b/drivers/leds/Kconfig
+@@ -42,6 +42,14 @@ config LEDS_88PM860X
+ 	  This option enables support for on-chip LED drivers found on Marvell
+ 	  Semiconductor 88PM8606 PMIC.
+ 
++config LEDS_BCM6328
++	tristate "LED Support for Broadcom BCM6328"
++	depends on LEDS_CLASS
++	depends on OF
++	help
++	  This option enables support for LEDs connected to the BCM6328
++	  LED HW controller accessed via MMIO registers.
++
+ config LEDS_LM3530
+ 	tristate "LCD Backlight driver for LM3530"
+ 	depends on LEDS_CLASS
+--- a/drivers/leds/Makefile
++++ b/drivers/leds/Makefile
+@@ -7,6 +7,7 @@ obj-$(CONFIG_LEDS_TRIGGERS)		+= led-trig
+ 
+ # LED Platform Drivers
+ obj-$(CONFIG_LEDS_88PM860X)		+= leds-88pm860x.o
++obj-$(CONFIG_LEDS_BCM6328)		+= leds-bcm6328.o
+ obj-$(CONFIG_LEDS_BD2802)		+= leds-bd2802.o
+ obj-$(CONFIG_LEDS_LOCOMO)		+= leds-locomo.o
+ obj-$(CONFIG_LEDS_LM3530)		+= leds-lm3530.o
+--- /dev/null
++++ b/drivers/leds/leds-bcm6328.c
+@@ -0,0 +1,413 @@
++/*
++ * Driver for BCM6328 memory-mapped LEDs, based on leds-syscon.c
++ *
++ * Copyright 2015 Álvaro Fernández Rojas <noltari@gmail.com>
++ * Copyright 2015 Jonas Gorski <jogo@openwrt.org>
++ *
++ * This program is free software; you can redistribute  it and/or modify it
++ * under  the terms of  the GNU General  Public License as published by the
++ * Free Software Foundation;  either version 2 of the  License, or (at your
++ * option) any later version.
++ */
++#include <linux/io.h>
++#include <linux/leds.h>
++#include <linux/module.h>
++#include <linux/of.h>
++#include <linux/platform_device.h>
++#include <linux/spinlock.h>
++
++#define BCM6328_REG_INIT		0x00
++#define BCM6328_REG_MODE_HI		0x04
++#define BCM6328_REG_MODE_LO		0x08
++#define BCM6328_REG_HWDIS		0x0c
++#define BCM6328_REG_STROBE		0x10
++#define BCM6328_REG_LNKACTSEL_HI	0x14
++#define BCM6328_REG_LNKACTSEL_LO	0x18
++#define BCM6328_REG_RBACK		0x1c
++#define BCM6328_REG_SERMUX		0x20
++
++#define BCM6328_LED_MAX_COUNT		24
++#define BCM6328_LED_DEF_DELAY		500
++#define BCM6328_LED_INTERVAL_MS		20
++
++#define BCM6328_LED_INTV_MASK		0x3f
++#define BCM6328_LED_FAST_INTV_SHIFT	6
++#define BCM6328_LED_FAST_INTV_MASK	(BCM6328_LED_INTV_MASK << \
++					 BCM6328_LED_FAST_INTV_SHIFT)
++#define BCM6328_SERIAL_LED_EN		BIT(12)
++#define BCM6328_SERIAL_LED_MUX		BIT(13)
++#define BCM6328_SERIAL_LED_CLK_NPOL	BIT(14)
++#define BCM6328_SERIAL_LED_DATA_PPOL	BIT(15)
++#define BCM6328_SERIAL_LED_SHIFT_DIR	BIT(16)
++#define BCM6328_LED_SHIFT_TEST		BIT(30)
++#define BCM6328_LED_TEST		BIT(31)
++
++#define BCM6328_LED_MODE_MASK		3
++#define BCM6328_LED_MODE_OFF		0
++#define BCM6328_LED_MODE_FAST		1
++#define BCM6328_LED_MODE_BLINK		2
++#define BCM6328_LED_MODE_ON		3
++#define BCM6328_LED_SHIFT(X)		((X) << 1)
++
++/**
++ * struct bcm6328_led - state container for bcm6328 based LEDs
++ * @cdev: LED class device for this LED
++ * @mem: memory resource
++ * @lock: memory lock
++ * @pin: LED pin number
++ * @blink_leds: blinking LEDs
++ * @blink_delay: blinking delay
++ * @active_low: LED is active low
++ */
++struct bcm6328_led {
++	struct led_classdev cdev;
++	void __iomem *mem;
++	spinlock_t *lock;
++	unsigned long pin;
++	unsigned long *blink_leds;
++	unsigned long *blink_delay;
++	bool active_low;
++};
++
++static void bcm6328_led_write(void __iomem *reg, unsigned long data)
++{
++	iowrite32be(data, reg);
++}
++
++static unsigned long bcm6328_led_read(void __iomem *reg)
++{
++	return ioread32be(reg);
++}
++
++/**
++ * LEDMode 64 bits / 24 LEDs
++ * bits [31:0] -> LEDs 8-23
++ * bits [47:32] -> LEDs 0-7
++ * bits [63:48] -> unused
++ */
++static unsigned long bcm6328_pin2shift(unsigned long pin)
++{
++	if (pin < 8)
++		return pin + 16; /* LEDs 0-7 (bits 47:32) */
++	else
++		return pin - 8; /* LEDs 8-23 (bits 31:0) */
++}
++
++static void bcm6328_led_mode(struct bcm6328_led *led, unsigned long value)
++{
++	void __iomem *mode;
++	unsigned long val, shift;
++
++	shift = bcm6328_pin2shift(led->pin);
++	if (shift / 16)
++		mode = led->mem + BCM6328_REG_MODE_HI;
++	else
++		mode = led->mem + BCM6328_REG_MODE_LO;
++
++	val = bcm6328_led_read(mode);
++	val &= ~(BCM6328_LED_MODE_MASK << BCM6328_LED_SHIFT(shift % 16));
++	val |= (value << BCM6328_LED_SHIFT(shift % 16));
++	bcm6328_led_write(mode, val);
++}
++
++static void bcm6328_led_set(struct led_classdev *led_cdev,
++			    enum led_brightness value)
++{
++	struct bcm6328_led *led =
++		container_of(led_cdev, struct bcm6328_led, cdev);
++	unsigned long flags;
++
++	spin_lock_irqsave(led->lock, flags);
++	*(led->blink_leds) &= ~BIT(led->pin);
++	if ((led->active_low && value == LED_OFF) ||
++	    (!led->active_low && value != LED_OFF))
++		bcm6328_led_mode(led, BCM6328_LED_MODE_OFF);
++	else
++		bcm6328_led_mode(led, BCM6328_LED_MODE_ON);
++	spin_unlock_irqrestore(led->lock, flags);
++}
++
++static int bcm6328_blink_set(struct led_classdev *led_cdev,
++			     unsigned long *delay_on, unsigned long *delay_off)
++{
++	struct bcm6328_led *led =
++		container_of(led_cdev, struct bcm6328_led, cdev);
++	unsigned long delay, flags;
++
++	if (!*delay_on)
++		*delay_on = BCM6328_LED_DEF_DELAY;
++	if (!*delay_off)
++		*delay_off = BCM6328_LED_DEF_DELAY;
++
++	if (*delay_on != *delay_off) {
++		dev_dbg(led_cdev->dev,
++			"fallback to soft blinking (delay_on != delay_off)\n");
++		return -EINVAL;
++	}
++
++	delay = *delay_on / BCM6328_LED_INTERVAL_MS;
++	if (delay == 0)
++		delay = 1;
++	else if (delay > BCM6328_LED_INTV_MASK) {
++		dev_dbg(led_cdev->dev,
++			"fallback to soft blinking (delay > %ums)\n",
++			BCM6328_LED_INTV_MASK * BCM6328_LED_INTERVAL_MS);
++		return -EINVAL;
++	}
++
++	spin_lock_irqsave(led->lock, flags);
++	if (*(led->blink_leds) == 0 ||
++	    *(led->blink_leds) == BIT(led->pin) ||
++	    *(led->blink_delay) == delay) {
++		unsigned long val;
++
++		*(led->blink_leds) |= BIT(led->pin);
++		*(led->blink_delay) = delay;
++
++		val = bcm6328_led_read(led->mem + BCM6328_REG_INIT);
++		val &= ~BCM6328_LED_FAST_INTV_MASK;
++		val |= (delay << BCM6328_LED_FAST_INTV_SHIFT);
++		bcm6328_led_write(led->mem + BCM6328_REG_INIT, val);
++
++		bcm6328_led_mode(led, BCM6328_LED_MODE_BLINK);
++
++		spin_unlock_irqrestore(led->lock, flags);
++	} else {
++		spin_unlock_irqrestore(led->lock, flags);
++		dev_dbg(led_cdev->dev,
++			"fallback to soft blinking (delay already set)\n");
++		return -EINVAL;
++	}
++
++	return 0;
++}
++
++static int bcm6328_hwled(struct device *dev, struct device_node *nc, u32 reg,
++			 void __iomem *mem, spinlock_t *lock)
++{
++	int i, cnt;
++	unsigned long flags, val;
++
++	spin_lock_irqsave(lock, flags);
++	val = bcm6328_led_read(mem + BCM6328_REG_HWDIS);
++	val &= ~BIT(reg);
++	bcm6328_led_write(mem + BCM6328_REG_HWDIS, val);
++	spin_unlock_irqrestore(lock, flags);
++
++	/* Only LEDs 0-7 can be activity/link controlled */
++	if (reg >= 8)
++		return 0;
++
++	cnt = of_property_count_elems_of_size(nc, "brcm,link-signal-sources",
++					      sizeof(u32));
++	for (i = 0; i < cnt; i++) {
++		u32 sel;
++		void __iomem *addr;
++
++		if (reg < 4)
++			addr = mem + BCM6328_REG_LNKACTSEL_LO;
++		else
++			addr = mem + BCM6328_REG_LNKACTSEL_HI;
++
++		of_property_read_u32_index(nc, "brcm,link-signal-sources", i,
++					   &sel);
++
++		if (reg / 4 != sel / 4) {
++			dev_warn(dev, "invalid link signal source\n");
++			continue;
++		}
++
++		spin_lock_irqsave(lock, flags);
++		val = bcm6328_led_read(addr);
++		val |= (BIT(reg) << (((sel % 4) * 4) + 16));
++		bcm6328_led_write(addr, val);
++		spin_unlock_irqrestore(lock, flags);
++	}
++
++	cnt = of_property_count_elems_of_size(nc,
++					      "brcm,activity-signal-sources",
++					      sizeof(u32));
++	for (i = 0; i < cnt; i++) {
++		u32 sel;
++		void __iomem *addr;
++
++		if (reg < 4)
++			addr = mem + BCM6328_REG_LNKACTSEL_LO;
++		else
++			addr = mem + BCM6328_REG_LNKACTSEL_HI;
++
++		of_property_read_u32_index(nc, "brcm,activity-signal-sources",
++					   i, &sel);
++
++		if (reg / 4 != sel / 4) {
++			dev_warn(dev, "invalid activity signal source\n");
++			continue;
++		}
++
++		spin_lock_irqsave(lock, flags);
++		val = bcm6328_led_read(addr);
++		val |= (BIT(reg) << ((sel % 4) * 4));
++		bcm6328_led_write(addr, val);
++		spin_unlock_irqrestore(lock, flags);
++	}
++
++	return 0;
++}
++
++static int bcm6328_led(struct device *dev, struct device_node *nc, u32 reg,
++		       void __iomem *mem, spinlock_t *lock,
++		       unsigned long *blink_leds, unsigned long *blink_delay)
++{
++	struct bcm6328_led *led;
++	unsigned long flags;
++	const char *state;
++	int rc;
++
++	led = devm_kzalloc(dev, sizeof(*led), GFP_KERNEL);
++	if (!led)
++		return -ENOMEM;
++
++	led->pin = reg;
++	led->mem = mem;
++	led->lock = lock;
++	led->blink_leds = blink_leds;
++	led->blink_delay = blink_delay;
++
++	if (of_property_read_bool(nc, "active-low"))
++		led->active_low = true;
++
++	led->cdev.name = of_get_property(nc, "label", NULL) ? : nc->name;
++	led->cdev.default_trigger = of_get_property(nc,
++						    "linux,default-trigger",
++						    NULL);
++
++	if (!of_property_read_string(nc, "default-state", &state)) {
++		spin_lock_irqsave(lock, flags);
++		if (!strcmp(state, "on")) {
++			led->cdev.brightness = LED_FULL;
++			bcm6328_led_mode(led, BCM6328_LED_MODE_ON);
++		} else if (!strcmp(state, "keep")) {
++			void __iomem *mode;
++			unsigned long val, shift;
++
++			shift = bcm6328_pin2shift(led->pin);
++			if (shift / 16)
++				mode = mem + BCM6328_REG_MODE_HI;
++			else
++				mode = mem + BCM6328_REG_MODE_LO;
++
++			val = bcm6328_led_read(mode) >> (shift % 16);
++			val &= BCM6328_LED_MODE_MASK;
++			if (val == BCM6328_LED_MODE_ON)
++				led->cdev.brightness = LED_FULL;
++			else {
++				led->cdev.brightness = LED_OFF;
++				bcm6328_led_mode(led, BCM6328_LED_MODE_OFF);
++			}
++		} else {
++			led->cdev.brightness = LED_OFF;
++			bcm6328_led_mode(led, BCM6328_LED_MODE_OFF);
++		}
++		spin_unlock_irqrestore(lock, flags);
++	}
++
++	led->cdev.brightness_set = bcm6328_led_set;
++	led->cdev.blink_set = bcm6328_blink_set;
++
++	rc = led_classdev_register(dev, &led->cdev);
++	if (rc < 0)
++		return rc;
++
++	dev_dbg(dev, "registered LED %s\n", led->cdev.name);
++
++	return 0;
++}
++
++static int bcm6328_leds_probe(struct platform_device *pdev)
++{
++	struct device *dev = &pdev->dev;
++	struct device_node *np = pdev->dev.of_node;
++	struct device_node *child;
++	struct resource *mem_r;
++	void __iomem *mem;
++	spinlock_t *lock;
++	unsigned long val, *blink_leds, *blink_delay;
++
++	mem_r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
++	if (!mem_r)
++		return -EINVAL;
++
++	mem = devm_ioremap_resource(dev, mem_r);
++	if (IS_ERR(mem))
++		return PTR_ERR(mem);
++
++	lock = devm_kzalloc(dev, sizeof(*lock), GFP_KERNEL);
++	if (!lock)
++		return -ENOMEM;
++
++	blink_leds = devm_kzalloc(dev, sizeof(*blink_leds), GFP_KERNEL);
++	if (!blink_leds)
++		return -ENOMEM;
++
++	blink_delay = devm_kzalloc(dev, sizeof(*blink_delay), GFP_KERNEL);
++	if (!blink_delay)
++		return -ENOMEM;
++
++	spin_lock_init(lock);
++
++	bcm6328_led_write(mem + BCM6328_REG_HWDIS, ~0);
++	bcm6328_led_write(mem + BCM6328_REG_LNKACTSEL_HI, 0);
++	bcm6328_led_write(mem + BCM6328_REG_LNKACTSEL_LO, 0);
++
++	val = bcm6328_led_read(mem + BCM6328_REG_INIT);
++	val &= ~BCM6328_SERIAL_LED_EN;
++	if (of_property_read_bool(np, "brcm,serial-leds"))
++		val |= BCM6328_SERIAL_LED_EN;
++	bcm6328_led_write(mem + BCM6328_REG_INIT, val);
++
++	for_each_available_child_of_node(np, child) {
++		int rc;
++		u32 reg;
++
++		if (of_property_read_u32(child, "reg", &reg))
++			continue;
++
++		if (reg >= BCM6328_LED_MAX_COUNT) {
++			dev_err(dev, "invalid LED (>= %d)\n",
++				BCM6328_LED_MAX_COUNT);
++			continue;
++		}
++
++		if (of_property_read_bool(child, "brcm,hardware-controlled"))
++			rc = bcm6328_hwled(dev, child, reg, mem, lock);
++		else
++			rc = bcm6328_led(dev, child, reg, mem, lock,
++					 blink_leds, blink_delay);
++
++		if (rc < 0)
++			return rc;
++	}
++
++	return 0;
++}
++
++static const struct of_device_id bcm6328_leds_of_match[] = {
++	{ .compatible = "brcm,bcm6328-leds", },
++	{ },
++};
++
++static struct platform_driver bcm6328_leds_driver = {
++	.probe = bcm6328_leds_probe,
++	.driver = {
++		.name = "leds-bcm6328",
++		.of_match_table = bcm6328_leds_of_match,
++	},
++};
++
++module_platform_driver(bcm6328_leds_driver);
++
++MODULE_AUTHOR("Álvaro Fernández Rojas <noltari@gmail.com>");
++MODULE_AUTHOR("Jonas Gorski <jogo@openwrt.org>");
++MODULE_DESCRIPTION("LED driver for BCM6328 controllers");
++MODULE_LICENSE("GPL v2");
++MODULE_ALIAS("platform:leds-bcm6328");
diff --git a/target/linux/brcm63xx/patches-3.18/041-leds-add-BCM6358-LED-driver.patch b/target/linux/brcm63xx/patches-3.18/041-leds-add-BCM6358-LED-driver.patch
new file mode 100644
index 0000000..dead890
--- /dev/null
+++ b/target/linux/brcm63xx/patches-3.18/041-leds-add-BCM6358-LED-driver.patch
@@ -0,0 +1,293 @@ 
+From 589fca16c14adec7ebeb601e22850826e18b8f8d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= <noltari@gmail.com>
+Date: Thu, 21 May 2015 10:11:10 -0700
+Subject: [PATCH] leds: add BCM6358 LED driver
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This adds support for the LED controller on Broadcom's BCM6358.
+
+Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
+Acked-by: Jacek Anaszewski <j.anaszewski@samsung.com>
+Signed-off-by: Bryan Wu <cooloney@gmail.com>
+---
+ drivers/leds/Kconfig        |   8 ++
+ drivers/leds/Makefile       |   1 +
+ drivers/leds/leds-bcm6358.c | 243 ++++++++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 252 insertions(+)
+ create mode 100644 drivers/leds/leds-bcm6358.c
+
+--- a/drivers/leds/Kconfig
++++ b/drivers/leds/Kconfig
+@@ -50,6 +50,14 @@ config LEDS_BCM6328
+ 	  This option enables support for LEDs connected to the BCM6328
+ 	  LED HW controller accessed via MMIO registers.
+ 
++config LEDS_BCM6358
++	tristate "LED Support for Broadcom BCM6358"
++	depends on LEDS_CLASS
++	depends on OF
++	help
++	  This option enables support for LEDs connected to the BCM6358
++	  LED HW controller accessed via MMIO registers.
++
+ config LEDS_LM3530
+ 	tristate "LCD Backlight driver for LM3530"
+ 	depends on LEDS_CLASS
+--- a/drivers/leds/Makefile
++++ b/drivers/leds/Makefile
+@@ -8,6 +8,7 @@ obj-$(CONFIG_LEDS_TRIGGERS)		+= led-trig
+ # LED Platform Drivers
+ obj-$(CONFIG_LEDS_88PM860X)		+= leds-88pm860x.o
+ obj-$(CONFIG_LEDS_BCM6328)		+= leds-bcm6328.o
++obj-$(CONFIG_LEDS_BCM6358)		+= leds-bcm6358.o
+ obj-$(CONFIG_LEDS_BD2802)		+= leds-bd2802.o
+ obj-$(CONFIG_LEDS_LOCOMO)		+= leds-locomo.o
+ obj-$(CONFIG_LEDS_LM3530)		+= leds-lm3530.o
+--- /dev/null
++++ b/drivers/leds/leds-bcm6358.c
+@@ -0,0 +1,243 @@
++/*
++ * Driver for BCM6358 memory-mapped LEDs, based on leds-syscon.c
++ *
++ * Copyright 2015 Álvaro Fernández Rojas <noltari@gmail.com>
++ *
++ * This program is free software; you can redistribute  it and/or modify it
++ * under  the terms of  the GNU General  Public License as published by the
++ * Free Software Foundation;  either version 2 of the  License, or (at your
++ * option) any later version.
++ */
++#include <linux/delay.h>
++#include <linux/io.h>
++#include <linux/leds.h>
++#include <linux/module.h>
++#include <linux/of.h>
++#include <linux/platform_device.h>
++#include <linux/spinlock.h>
++
++#define BCM6358_REG_MODE		0x0
++#define BCM6358_REG_CTRL		0x4
++
++#define BCM6358_SLED_CLKDIV_MASK	3
++#define BCM6358_SLED_CLKDIV_1		0
++#define BCM6358_SLED_CLKDIV_2		1
++#define BCM6358_SLED_CLKDIV_4		2
++#define BCM6358_SLED_CLKDIV_8		3
++
++#define BCM6358_SLED_POLARITY		BIT(2)
++#define BCM6358_SLED_BUSY		BIT(3)
++
++#define BCM6358_SLED_MAX_COUNT		32
++#define BCM6358_SLED_WAIT		100
++
++/**
++ * struct bcm6358_led - state container for bcm6358 based LEDs
++ * @cdev: LED class device for this LED
++ * @mem: memory resource
++ * @lock: memory lock
++ * @pin: LED pin number
++ * @active_low: LED is active low
++ */
++struct bcm6358_led {
++	struct led_classdev cdev;
++	void __iomem *mem;
++	spinlock_t *lock;
++	unsigned long pin;
++	bool active_low;
++};
++
++static void bcm6358_led_write(void __iomem *reg, unsigned long data)
++{
++	iowrite32be(data, reg);
++}
++
++static unsigned long bcm6358_led_read(void __iomem *reg)
++{
++	return ioread32be(reg);
++}
++
++static unsigned long bcm6358_led_busy(void __iomem *mem)
++{
++	unsigned long val;
++
++	while ((val = bcm6358_led_read(mem + BCM6358_REG_CTRL)) &
++		BCM6358_SLED_BUSY)
++		udelay(BCM6358_SLED_WAIT);
++
++	return val;
++}
++
++static void bcm6358_led_mode(struct bcm6358_led *led, unsigned long value)
++{
++	unsigned long val;
++
++	bcm6358_led_busy(led->mem);
++
++	val = bcm6358_led_read(led->mem + BCM6358_REG_MODE);
++	if ((led->active_low && value == LED_OFF) ||
++	    (!led->active_low && value != LED_OFF))
++		val |= BIT(led->pin);
++	else
++		val &= ~(BIT(led->pin));
++	bcm6358_led_write(led->mem + BCM6358_REG_MODE, val);
++}
++
++static void bcm6358_led_set(struct led_classdev *led_cdev,
++			    enum led_brightness value)
++{
++	struct bcm6358_led *led =
++		container_of(led_cdev, struct bcm6358_led, cdev);
++	unsigned long flags;
++
++	spin_lock_irqsave(led->lock, flags);
++	bcm6358_led_mode(led, value);
++	spin_unlock_irqrestore(led->lock, flags);
++}
++
++static int bcm6358_led(struct device *dev, struct device_node *nc, u32 reg,
++		       void __iomem *mem, spinlock_t *lock)
++{
++	struct bcm6358_led *led;
++	unsigned long flags;
++	const char *state;
++	int rc;
++
++	led = devm_kzalloc(dev, sizeof(*led), GFP_KERNEL);
++	if (!led)
++		return -ENOMEM;
++
++	led->pin = reg;
++	led->mem = mem;
++	led->lock = lock;
++
++	if (of_property_read_bool(nc, "active-low"))
++		led->active_low = true;
++
++	led->cdev.name = of_get_property(nc, "label", NULL) ? : nc->name;
++	led->cdev.default_trigger = of_get_property(nc,
++						    "linux,default-trigger",
++						    NULL);
++
++	spin_lock_irqsave(lock, flags);
++	if (!of_property_read_string(nc, "default-state", &state)) {
++		if (!strcmp(state, "on")) {
++			led->cdev.brightness = LED_FULL;
++		} else if (!strcmp(state, "keep")) {
++			unsigned long val;
++
++			bcm6358_led_busy(led->mem);
++
++			val = bcm6358_led_read(led->mem + BCM6358_REG_MODE);
++			val &= BIT(led->pin);
++			if ((led->active_low && !val) ||
++			    (!led->active_low && val))
++				led->cdev.brightness = LED_FULL;
++			else
++				led->cdev.brightness = LED_OFF;
++		} else {
++			led->cdev.brightness = LED_OFF;
++		}
++	} else {
++		led->cdev.brightness = LED_OFF;
++	}
++	bcm6358_led_mode(led, led->cdev.brightness);
++	spin_unlock_irqrestore(lock, flags);
++
++	led->cdev.brightness_set = bcm6358_led_set;
++
++	rc = led_classdev_register(dev, &led->cdev);
++	if (rc < 0)
++		return rc;
++
++	dev_dbg(dev, "registered LED %s\n", led->cdev.name);
++
++	return 0;
++}
++
++static int bcm6358_leds_probe(struct platform_device *pdev)
++{
++	struct device *dev = &pdev->dev;
++	struct device_node *np = pdev->dev.of_node;
++	struct device_node *child;
++	struct resource *mem_r;
++	void __iomem *mem;
++	spinlock_t *lock; /* memory lock */
++	unsigned long val;
++	u32 clk_div;
++
++	mem_r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
++	if (!mem_r)
++		return -EINVAL;
++
++	mem = devm_ioremap_resource(dev, mem_r);
++	if (IS_ERR(mem))
++		return PTR_ERR(mem);
++
++	lock = devm_kzalloc(dev, sizeof(*lock), GFP_KERNEL);
++	if (!lock)
++		return -ENOMEM;
++
++	spin_lock_init(lock);
++
++	val = bcm6358_led_busy(mem);
++	val &= ~(BCM6358_SLED_POLARITY | BCM6358_SLED_CLKDIV_MASK);
++	if (of_property_read_bool(np, "brcm,clk-dat-low"))
++		val |= BCM6358_SLED_POLARITY;
++	of_property_read_u32(np, "brcm,clk-div", &clk_div);
++	switch (clk_div) {
++	case 8:
++		val |= BCM6358_SLED_CLKDIV_8;
++		break;
++	case 4:
++		val |= BCM6358_SLED_CLKDIV_4;
++		break;
++	case 2:
++		val |= BCM6358_SLED_CLKDIV_2;
++		break;
++	default:
++		val |= BCM6358_SLED_CLKDIV_1;
++		break;
++	}
++	bcm6358_led_write(mem + BCM6358_REG_CTRL, val);
++
++	for_each_available_child_of_node(np, child) {
++		int rc;
++		u32 reg;
++
++		if (of_property_read_u32(child, "reg", &reg))
++			continue;
++
++		if (reg >= BCM6358_SLED_MAX_COUNT) {
++			dev_err(dev, "invalid LED (%u >= %d)\n", reg,
++				BCM6358_SLED_MAX_COUNT);
++			continue;
++		}
++
++		rc = bcm6358_led(dev, child, reg, mem, lock);
++		if (rc < 0)
++			return rc;
++	}
++
++	return 0;
++}
++
++static const struct of_device_id bcm6358_leds_of_match[] = {
++	{ .compatible = "brcm,bcm6358-leds", },
++	{ },
++};
++
++static struct platform_driver bcm6358_leds_driver = {
++	.probe = bcm6358_leds_probe,
++	.driver = {
++		.name = "leds-bcm6358",
++		.of_match_table = bcm6358_leds_of_match,
++	},
++};
++
++module_platform_driver(bcm6358_leds_driver);
++
++MODULE_AUTHOR("Álvaro Fernández Rojas <noltari@gmail.com>");
++MODULE_DESCRIPTION("LED driver for BCM6358 controllers");
++MODULE_LICENSE("GPL v2");
++MODULE_ALIAS("platform:leds-bcm6358");
diff --git a/target/linux/brcm63xx/patches-3.18/042-leds-bcm6328-add-more-configuration-options-and-fix-.patch b/target/linux/brcm63xx/patches-3.18/042-leds-bcm6328-add-more-configuration-options-and-fix-.patch
new file mode 100644
index 0000000..0371122
--- /dev/null
+++ b/target/linux/brcm63xx/patches-3.18/042-leds-bcm6328-add-more-configuration-options-and-fix-.patch
@@ -0,0 +1,106 @@ 
+From 7a4f726f42d600f526155d6c66b8c4e5a0feb5f6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= <noltari@gmail.com>
+Date: Thu, 30 Jul 2015 08:38:33 +0200
+Subject: [PATCH] leds-bcm6328: add more configuration options and fix default
+ state initialization
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
+---
+ .../devicetree/bindings/leds/leds-bcm6328.txt      |  8 +++++
+ drivers/leds/leds-bcm6328.c                        | 41 ++++++++++++++++------
+ 1 files changed, 30 insertions(+), 11 deletions(-)
+
+--- a/drivers/leds/leds-bcm6328.c
++++ b/drivers/leds/leds-bcm6328.c
+@@ -41,6 +41,11 @@
+ #define BCM6328_SERIAL_LED_SHIFT_DIR	BIT(16)
+ #define BCM6328_LED_SHIFT_TEST		BIT(30)
+ #define BCM6328_LED_TEST		BIT(31)
++#define BCM6328_INIT_MASK		(BCM6328_SERIAL_LED_EN | \
++					 BCM6328_SERIAL_LED_MUX  | \
++					 BCM6328_SERIAL_LED_CLK_NPOL | \
++					 BCM6328_SERIAL_LED_DATA_PPOL | \
++					 BCM6328_SERIAL_LED_SHIFT_DIR)
+ 
+ #define BCM6328_LED_MODE_MASK		3
+ #define BCM6328_LED_MODE_OFF		0
+@@ -281,11 +286,10 @@ static int bcm6328_led(struct device *de
+ 						    "linux,default-trigger",
+ 						    NULL);
+ 
++	spin_lock_irqsave(lock, flags);
+ 	if (!of_property_read_string(nc, "default-state", &state)) {
+-		spin_lock_irqsave(lock, flags);
+ 		if (!strcmp(state, "on")) {
+ 			led->cdev.brightness = LED_FULL;
+-			bcm6328_led_mode(led, BCM6328_LED_MODE_ON);
+ 		} else if (!strcmp(state, "keep")) {
+ 			void __iomem *mode;
+ 			unsigned long val, shift;
+@@ -296,21 +300,28 @@ static int bcm6328_led(struct device *de
+ 			else
+ 				mode = mem + BCM6328_REG_MODE_LO;
+ 
+-			val = bcm6328_led_read(mode) >> (shift % 16);
++			val = bcm6328_led_read(mode) >>
++			      BCM6328_LED_SHIFT(shift % 16);
+ 			val &= BCM6328_LED_MODE_MASK;
+-			if (val == BCM6328_LED_MODE_ON)
++			if ((led->active_low && val == BCM6328_LED_MODE_ON) ||
++			    (!led->active_low && val == BCM6328_LED_MODE_OFF))
+ 				led->cdev.brightness = LED_FULL;
+-			else {
++			else
+ 				led->cdev.brightness = LED_OFF;
+-				bcm6328_led_mode(led, BCM6328_LED_MODE_OFF);
+-			}
+ 		} else {
+ 			led->cdev.brightness = LED_OFF;
+-			bcm6328_led_mode(led, BCM6328_LED_MODE_OFF);
+ 		}
+-		spin_unlock_irqrestore(lock, flags);
++	} else {
++		led->cdev.brightness = LED_OFF;
+ 	}
+ 
++	if ((led->active_low && led->cdev.brightness == LED_FULL) ||
++	    (!led->active_low && led->cdev.brightness == LED_OFF))
++		bcm6328_led_mode(led, BCM6328_LED_MODE_ON);
++	else
++		bcm6328_led_mode(led, BCM6328_LED_MODE_OFF);
++	spin_unlock_irqrestore(lock, flags);
++
+ 	led->cdev.brightness_set = bcm6328_led_set;
+ 	led->cdev.blink_set = bcm6328_blink_set;
+ 
+@@ -360,9 +371,17 @@ static int bcm6328_leds_probe(struct pla
+ 	bcm6328_led_write(mem + BCM6328_REG_LNKACTSEL_LO, 0);
+ 
+ 	val = bcm6328_led_read(mem + BCM6328_REG_INIT);
+-	val &= ~BCM6328_SERIAL_LED_EN;
++	val &= ~(BCM6328_INIT_MASK);
+ 	if (of_property_read_bool(np, "brcm,serial-leds"))
+ 		val |= BCM6328_SERIAL_LED_EN;
++	if (of_property_read_bool(np, "brcm,serial-mux"))
++		val |= BCM6328_SERIAL_LED_MUX;
++	if (of_property_read_bool(np, "brcm,serial-clk-low"))
++		val |= BCM6328_SERIAL_LED_CLK_NPOL;
++	if (!of_property_read_bool(np, "brcm,serial-dat-low"))
++		val |= BCM6328_SERIAL_LED_DATA_PPOL;
++	if (!of_property_read_bool(np, "brcm,serial-shift-inv"))
++		val |= BCM6328_SERIAL_LED_SHIFT_DIR;
+ 	bcm6328_led_write(mem + BCM6328_REG_INIT, val);
+ 
+ 	for_each_available_child_of_node(np, child) {
+@@ -373,7 +392,7 @@ static int bcm6328_leds_probe(struct pla
+ 			continue;
+ 
+ 		if (reg >= BCM6328_LED_MAX_COUNT) {
+-			dev_err(dev, "invalid LED (>= %d)\n",
++			dev_err(dev, "invalid LED (%u >= %d)\n", reg,
+ 				BCM6328_LED_MAX_COUNT);
+ 			continue;
+ 		}
diff --git a/target/linux/brcm63xx/patches-4.1/020-leds-add-BCM6328-LED-driver.patch b/target/linux/brcm63xx/patches-4.1/020-leds-add-BCM6328-LED-driver.patch
new file mode 100644
index 0000000..fc3d03a
--- /dev/null
+++ b/target/linux/brcm63xx/patches-4.1/020-leds-add-BCM6328-LED-driver.patch
@@ -0,0 +1,464 @@ 
+From fd7b025a238d0a5440bfa26c585eb78097bf48dc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= <noltari@gmail.com>
+Date: Tue, 28 Apr 2015 09:50:50 -0700
+Subject: [PATCH] leds: add BCM6328 LED driver
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This adds support for the LED controller on Broadcom's BCM6328.
+
+Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
+Signed-off-by: Jonas Gorski <jogo@openwrt.org>
+Acked-by: Jacek Anaszewski <j.anaszewski@samsung.com>
+Signed-off-by: Bryan Wu <cooloney@gmail.com>
+---
+ drivers/leds/Kconfig        |   8 +
+ drivers/leds/Makefile       |   1 +
+ drivers/leds/leds-bcm6328.c | 413 ++++++++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 422 insertions(+)
+ create mode 100644 drivers/leds/leds-bcm6328.c
+
+--- a/drivers/leds/Kconfig
++++ b/drivers/leds/Kconfig
+@@ -42,6 +42,14 @@ config LEDS_88PM860X
+ 	  This option enables support for on-chip LED drivers found on Marvell
+ 	  Semiconductor 88PM8606 PMIC.
+ 
++config LEDS_BCM6328
++	tristate "LED Support for Broadcom BCM6328"
++	depends on LEDS_CLASS
++	depends on OF
++	help
++	  This option enables support for LEDs connected to the BCM6328
++	  LED HW controller accessed via MMIO registers.
++
+ config LEDS_LM3530
+ 	tristate "LCD Backlight driver for LM3530"
+ 	depends on LEDS_CLASS
+--- a/drivers/leds/Makefile
++++ b/drivers/leds/Makefile
+@@ -7,6 +7,7 @@ obj-$(CONFIG_LEDS_TRIGGERS)		+= led-trig
+ 
+ # LED Platform Drivers
+ obj-$(CONFIG_LEDS_88PM860X)		+= leds-88pm860x.o
++obj-$(CONFIG_LEDS_BCM6328)		+= leds-bcm6328.o
+ obj-$(CONFIG_LEDS_BD2802)		+= leds-bd2802.o
+ obj-$(CONFIG_LEDS_LOCOMO)		+= leds-locomo.o
+ obj-$(CONFIG_LEDS_LM3530)		+= leds-lm3530.o
+--- /dev/null
++++ b/drivers/leds/leds-bcm6328.c
+@@ -0,0 +1,413 @@
++/*
++ * Driver for BCM6328 memory-mapped LEDs, based on leds-syscon.c
++ *
++ * Copyright 2015 Álvaro Fernández Rojas <noltari@gmail.com>
++ * Copyright 2015 Jonas Gorski <jogo@openwrt.org>
++ *
++ * This program is free software; you can redistribute  it and/or modify it
++ * under  the terms of  the GNU General  Public License as published by the
++ * Free Software Foundation;  either version 2 of the  License, or (at your
++ * option) any later version.
++ */
++#include <linux/io.h>
++#include <linux/leds.h>
++#include <linux/module.h>
++#include <linux/of.h>
++#include <linux/platform_device.h>
++#include <linux/spinlock.h>
++
++#define BCM6328_REG_INIT		0x00
++#define BCM6328_REG_MODE_HI		0x04
++#define BCM6328_REG_MODE_LO		0x08
++#define BCM6328_REG_HWDIS		0x0c
++#define BCM6328_REG_STROBE		0x10
++#define BCM6328_REG_LNKACTSEL_HI	0x14
++#define BCM6328_REG_LNKACTSEL_LO	0x18
++#define BCM6328_REG_RBACK		0x1c
++#define BCM6328_REG_SERMUX		0x20
++
++#define BCM6328_LED_MAX_COUNT		24
++#define BCM6328_LED_DEF_DELAY		500
++#define BCM6328_LED_INTERVAL_MS		20
++
++#define BCM6328_LED_INTV_MASK		0x3f
++#define BCM6328_LED_FAST_INTV_SHIFT	6
++#define BCM6328_LED_FAST_INTV_MASK	(BCM6328_LED_INTV_MASK << \
++					 BCM6328_LED_FAST_INTV_SHIFT)
++#define BCM6328_SERIAL_LED_EN		BIT(12)
++#define BCM6328_SERIAL_LED_MUX		BIT(13)
++#define BCM6328_SERIAL_LED_CLK_NPOL	BIT(14)
++#define BCM6328_SERIAL_LED_DATA_PPOL	BIT(15)
++#define BCM6328_SERIAL_LED_SHIFT_DIR	BIT(16)
++#define BCM6328_LED_SHIFT_TEST		BIT(30)
++#define BCM6328_LED_TEST		BIT(31)
++
++#define BCM6328_LED_MODE_MASK		3
++#define BCM6328_LED_MODE_OFF		0
++#define BCM6328_LED_MODE_FAST		1
++#define BCM6328_LED_MODE_BLINK		2
++#define BCM6328_LED_MODE_ON		3
++#define BCM6328_LED_SHIFT(X)		((X) << 1)
++
++/**
++ * struct bcm6328_led - state container for bcm6328 based LEDs
++ * @cdev: LED class device for this LED
++ * @mem: memory resource
++ * @lock: memory lock
++ * @pin: LED pin number
++ * @blink_leds: blinking LEDs
++ * @blink_delay: blinking delay
++ * @active_low: LED is active low
++ */
++struct bcm6328_led {
++	struct led_classdev cdev;
++	void __iomem *mem;
++	spinlock_t *lock;
++	unsigned long pin;
++	unsigned long *blink_leds;
++	unsigned long *blink_delay;
++	bool active_low;
++};
++
++static void bcm6328_led_write(void __iomem *reg, unsigned long data)
++{
++	iowrite32be(data, reg);
++}
++
++static unsigned long bcm6328_led_read(void __iomem *reg)
++{
++	return ioread32be(reg);
++}
++
++/**
++ * LEDMode 64 bits / 24 LEDs
++ * bits [31:0] -> LEDs 8-23
++ * bits [47:32] -> LEDs 0-7
++ * bits [63:48] -> unused
++ */
++static unsigned long bcm6328_pin2shift(unsigned long pin)
++{
++	if (pin < 8)
++		return pin + 16; /* LEDs 0-7 (bits 47:32) */
++	else
++		return pin - 8; /* LEDs 8-23 (bits 31:0) */
++}
++
++static void bcm6328_led_mode(struct bcm6328_led *led, unsigned long value)
++{
++	void __iomem *mode;
++	unsigned long val, shift;
++
++	shift = bcm6328_pin2shift(led->pin);
++	if (shift / 16)
++		mode = led->mem + BCM6328_REG_MODE_HI;
++	else
++		mode = led->mem + BCM6328_REG_MODE_LO;
++
++	val = bcm6328_led_read(mode);
++	val &= ~(BCM6328_LED_MODE_MASK << BCM6328_LED_SHIFT(shift % 16));
++	val |= (value << BCM6328_LED_SHIFT(shift % 16));
++	bcm6328_led_write(mode, val);
++}
++
++static void bcm6328_led_set(struct led_classdev *led_cdev,
++			    enum led_brightness value)
++{
++	struct bcm6328_led *led =
++		container_of(led_cdev, struct bcm6328_led, cdev);
++	unsigned long flags;
++
++	spin_lock_irqsave(led->lock, flags);
++	*(led->blink_leds) &= ~BIT(led->pin);
++	if ((led->active_low && value == LED_OFF) ||
++	    (!led->active_low && value != LED_OFF))
++		bcm6328_led_mode(led, BCM6328_LED_MODE_OFF);
++	else
++		bcm6328_led_mode(led, BCM6328_LED_MODE_ON);
++	spin_unlock_irqrestore(led->lock, flags);
++}
++
++static int bcm6328_blink_set(struct led_classdev *led_cdev,
++			     unsigned long *delay_on, unsigned long *delay_off)
++{
++	struct bcm6328_led *led =
++		container_of(led_cdev, struct bcm6328_led, cdev);
++	unsigned long delay, flags;
++
++	if (!*delay_on)
++		*delay_on = BCM6328_LED_DEF_DELAY;
++	if (!*delay_off)
++		*delay_off = BCM6328_LED_DEF_DELAY;
++
++	if (*delay_on != *delay_off) {
++		dev_dbg(led_cdev->dev,
++			"fallback to soft blinking (delay_on != delay_off)\n");
++		return -EINVAL;
++	}
++
++	delay = *delay_on / BCM6328_LED_INTERVAL_MS;
++	if (delay == 0)
++		delay = 1;
++	else if (delay > BCM6328_LED_INTV_MASK) {
++		dev_dbg(led_cdev->dev,
++			"fallback to soft blinking (delay > %ums)\n",
++			BCM6328_LED_INTV_MASK * BCM6328_LED_INTERVAL_MS);
++		return -EINVAL;
++	}
++
++	spin_lock_irqsave(led->lock, flags);
++	if (*(led->blink_leds) == 0 ||
++	    *(led->blink_leds) == BIT(led->pin) ||
++	    *(led->blink_delay) == delay) {
++		unsigned long val;
++
++		*(led->blink_leds) |= BIT(led->pin);
++		*(led->blink_delay) = delay;
++
++		val = bcm6328_led_read(led->mem + BCM6328_REG_INIT);
++		val &= ~BCM6328_LED_FAST_INTV_MASK;
++		val |= (delay << BCM6328_LED_FAST_INTV_SHIFT);
++		bcm6328_led_write(led->mem + BCM6328_REG_INIT, val);
++
++		bcm6328_led_mode(led, BCM6328_LED_MODE_BLINK);
++
++		spin_unlock_irqrestore(led->lock, flags);
++	} else {
++		spin_unlock_irqrestore(led->lock, flags);
++		dev_dbg(led_cdev->dev,
++			"fallback to soft blinking (delay already set)\n");
++		return -EINVAL;
++	}
++
++	return 0;
++}
++
++static int bcm6328_hwled(struct device *dev, struct device_node *nc, u32 reg,
++			 void __iomem *mem, spinlock_t *lock)
++{
++	int i, cnt;
++	unsigned long flags, val;
++
++	spin_lock_irqsave(lock, flags);
++	val = bcm6328_led_read(mem + BCM6328_REG_HWDIS);
++	val &= ~BIT(reg);
++	bcm6328_led_write(mem + BCM6328_REG_HWDIS, val);
++	spin_unlock_irqrestore(lock, flags);
++
++	/* Only LEDs 0-7 can be activity/link controlled */
++	if (reg >= 8)
++		return 0;
++
++	cnt = of_property_count_elems_of_size(nc, "brcm,link-signal-sources",
++					      sizeof(u32));
++	for (i = 0; i < cnt; i++) {
++		u32 sel;
++		void __iomem *addr;
++
++		if (reg < 4)
++			addr = mem + BCM6328_REG_LNKACTSEL_LO;
++		else
++			addr = mem + BCM6328_REG_LNKACTSEL_HI;
++
++		of_property_read_u32_index(nc, "brcm,link-signal-sources", i,
++					   &sel);
++
++		if (reg / 4 != sel / 4) {
++			dev_warn(dev, "invalid link signal source\n");
++			continue;
++		}
++
++		spin_lock_irqsave(lock, flags);
++		val = bcm6328_led_read(addr);
++		val |= (BIT(reg) << (((sel % 4) * 4) + 16));
++		bcm6328_led_write(addr, val);
++		spin_unlock_irqrestore(lock, flags);
++	}
++
++	cnt = of_property_count_elems_of_size(nc,
++					      "brcm,activity-signal-sources",
++					      sizeof(u32));
++	for (i = 0; i < cnt; i++) {
++		u32 sel;
++		void __iomem *addr;
++
++		if (reg < 4)
++			addr = mem + BCM6328_REG_LNKACTSEL_LO;
++		else
++			addr = mem + BCM6328_REG_LNKACTSEL_HI;
++
++		of_property_read_u32_index(nc, "brcm,activity-signal-sources",
++					   i, &sel);
++
++		if (reg / 4 != sel / 4) {
++			dev_warn(dev, "invalid activity signal source\n");
++			continue;
++		}
++
++		spin_lock_irqsave(lock, flags);
++		val = bcm6328_led_read(addr);
++		val |= (BIT(reg) << ((sel % 4) * 4));
++		bcm6328_led_write(addr, val);
++		spin_unlock_irqrestore(lock, flags);
++	}
++
++	return 0;
++}
++
++static int bcm6328_led(struct device *dev, struct device_node *nc, u32 reg,
++		       void __iomem *mem, spinlock_t *lock,
++		       unsigned long *blink_leds, unsigned long *blink_delay)
++{
++	struct bcm6328_led *led;
++	unsigned long flags;
++	const char *state;
++	int rc;
++
++	led = devm_kzalloc(dev, sizeof(*led), GFP_KERNEL);
++	if (!led)
++		return -ENOMEM;
++
++	led->pin = reg;
++	led->mem = mem;
++	led->lock = lock;
++	led->blink_leds = blink_leds;
++	led->blink_delay = blink_delay;
++
++	if (of_property_read_bool(nc, "active-low"))
++		led->active_low = true;
++
++	led->cdev.name = of_get_property(nc, "label", NULL) ? : nc->name;
++	led->cdev.default_trigger = of_get_property(nc,
++						    "linux,default-trigger",
++						    NULL);
++
++	if (!of_property_read_string(nc, "default-state", &state)) {
++		spin_lock_irqsave(lock, flags);
++		if (!strcmp(state, "on")) {
++			led->cdev.brightness = LED_FULL;
++			bcm6328_led_mode(led, BCM6328_LED_MODE_ON);
++		} else if (!strcmp(state, "keep")) {
++			void __iomem *mode;
++			unsigned long val, shift;
++
++			shift = bcm6328_pin2shift(led->pin);
++			if (shift / 16)
++				mode = mem + BCM6328_REG_MODE_HI;
++			else
++				mode = mem + BCM6328_REG_MODE_LO;
++
++			val = bcm6328_led_read(mode) >> (shift % 16);
++			val &= BCM6328_LED_MODE_MASK;
++			if (val == BCM6328_LED_MODE_ON)
++				led->cdev.brightness = LED_FULL;
++			else {
++				led->cdev.brightness = LED_OFF;
++				bcm6328_led_mode(led, BCM6328_LED_MODE_OFF);
++			}
++		} else {
++			led->cdev.brightness = LED_OFF;
++			bcm6328_led_mode(led, BCM6328_LED_MODE_OFF);
++		}
++		spin_unlock_irqrestore(lock, flags);
++	}
++
++	led->cdev.brightness_set = bcm6328_led_set;
++	led->cdev.blink_set = bcm6328_blink_set;
++
++	rc = led_classdev_register(dev, &led->cdev);
++	if (rc < 0)
++		return rc;
++
++	dev_dbg(dev, "registered LED %s\n", led->cdev.name);
++
++	return 0;
++}
++
++static int bcm6328_leds_probe(struct platform_device *pdev)
++{
++	struct device *dev = &pdev->dev;
++	struct device_node *np = pdev->dev.of_node;
++	struct device_node *child;
++	struct resource *mem_r;
++	void __iomem *mem;
++	spinlock_t *lock;
++	unsigned long val, *blink_leds, *blink_delay;
++
++	mem_r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
++	if (!mem_r)
++		return -EINVAL;
++
++	mem = devm_ioremap_resource(dev, mem_r);
++	if (IS_ERR(mem))
++		return PTR_ERR(mem);
++
++	lock = devm_kzalloc(dev, sizeof(*lock), GFP_KERNEL);
++	if (!lock)
++		return -ENOMEM;
++
++	blink_leds = devm_kzalloc(dev, sizeof(*blink_leds), GFP_KERNEL);
++	if (!blink_leds)
++		return -ENOMEM;
++
++	blink_delay = devm_kzalloc(dev, sizeof(*blink_delay), GFP_KERNEL);
++	if (!blink_delay)
++		return -ENOMEM;
++
++	spin_lock_init(lock);
++
++	bcm6328_led_write(mem + BCM6328_REG_HWDIS, ~0);
++	bcm6328_led_write(mem + BCM6328_REG_LNKACTSEL_HI, 0);
++	bcm6328_led_write(mem + BCM6328_REG_LNKACTSEL_LO, 0);
++
++	val = bcm6328_led_read(mem + BCM6328_REG_INIT);
++	val &= ~BCM6328_SERIAL_LED_EN;
++	if (of_property_read_bool(np, "brcm,serial-leds"))
++		val |= BCM6328_SERIAL_LED_EN;
++	bcm6328_led_write(mem + BCM6328_REG_INIT, val);
++
++	for_each_available_child_of_node(np, child) {
++		int rc;
++		u32 reg;
++
++		if (of_property_read_u32(child, "reg", &reg))
++			continue;
++
++		if (reg >= BCM6328_LED_MAX_COUNT) {
++			dev_err(dev, "invalid LED (>= %d)\n",
++				BCM6328_LED_MAX_COUNT);
++			continue;
++		}
++
++		if (of_property_read_bool(child, "brcm,hardware-controlled"))
++			rc = bcm6328_hwled(dev, child, reg, mem, lock);
++		else
++			rc = bcm6328_led(dev, child, reg, mem, lock,
++					 blink_leds, blink_delay);
++
++		if (rc < 0)
++			return rc;
++	}
++
++	return 0;
++}
++
++static const struct of_device_id bcm6328_leds_of_match[] = {
++	{ .compatible = "brcm,bcm6328-leds", },
++	{ },
++};
++
++static struct platform_driver bcm6328_leds_driver = {
++	.probe = bcm6328_leds_probe,
++	.driver = {
++		.name = "leds-bcm6328",
++		.of_match_table = bcm6328_leds_of_match,
++	},
++};
++
++module_platform_driver(bcm6328_leds_driver);
++
++MODULE_AUTHOR("Álvaro Fernández Rojas <noltari@gmail.com>");
++MODULE_AUTHOR("Jonas Gorski <jogo@openwrt.org>");
++MODULE_DESCRIPTION("LED driver for BCM6328 controllers");
++MODULE_LICENSE("GPL v2");
++MODULE_ALIAS("platform:leds-bcm6328");
diff --git a/target/linux/brcm63xx/patches-4.1/021-leds-add-BCM6358-LED-driver.patch b/target/linux/brcm63xx/patches-4.1/021-leds-add-BCM6358-LED-driver.patch
new file mode 100644
index 0000000..dead890
--- /dev/null
+++ b/target/linux/brcm63xx/patches-4.1/021-leds-add-BCM6358-LED-driver.patch
@@ -0,0 +1,293 @@ 
+From 589fca16c14adec7ebeb601e22850826e18b8f8d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= <noltari@gmail.com>
+Date: Thu, 21 May 2015 10:11:10 -0700
+Subject: [PATCH] leds: add BCM6358 LED driver
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This adds support for the LED controller on Broadcom's BCM6358.
+
+Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
+Acked-by: Jacek Anaszewski <j.anaszewski@samsung.com>
+Signed-off-by: Bryan Wu <cooloney@gmail.com>
+---
+ drivers/leds/Kconfig        |   8 ++
+ drivers/leds/Makefile       |   1 +
+ drivers/leds/leds-bcm6358.c | 243 ++++++++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 252 insertions(+)
+ create mode 100644 drivers/leds/leds-bcm6358.c
+
+--- a/drivers/leds/Kconfig
++++ b/drivers/leds/Kconfig
+@@ -50,6 +50,14 @@ config LEDS_BCM6328
+ 	  This option enables support for LEDs connected to the BCM6328
+ 	  LED HW controller accessed via MMIO registers.
+ 
++config LEDS_BCM6358
++	tristate "LED Support for Broadcom BCM6358"
++	depends on LEDS_CLASS
++	depends on OF
++	help
++	  This option enables support for LEDs connected to the BCM6358
++	  LED HW controller accessed via MMIO registers.
++
+ config LEDS_LM3530
+ 	tristate "LCD Backlight driver for LM3530"
+ 	depends on LEDS_CLASS
+--- a/drivers/leds/Makefile
++++ b/drivers/leds/Makefile
+@@ -8,6 +8,7 @@ obj-$(CONFIG_LEDS_TRIGGERS)		+= led-trig
+ # LED Platform Drivers
+ obj-$(CONFIG_LEDS_88PM860X)		+= leds-88pm860x.o
+ obj-$(CONFIG_LEDS_BCM6328)		+= leds-bcm6328.o
++obj-$(CONFIG_LEDS_BCM6358)		+= leds-bcm6358.o
+ obj-$(CONFIG_LEDS_BD2802)		+= leds-bd2802.o
+ obj-$(CONFIG_LEDS_LOCOMO)		+= leds-locomo.o
+ obj-$(CONFIG_LEDS_LM3530)		+= leds-lm3530.o
+--- /dev/null
++++ b/drivers/leds/leds-bcm6358.c
+@@ -0,0 +1,243 @@
++/*
++ * Driver for BCM6358 memory-mapped LEDs, based on leds-syscon.c
++ *
++ * Copyright 2015 Álvaro Fernández Rojas <noltari@gmail.com>
++ *
++ * This program is free software; you can redistribute  it and/or modify it
++ * under  the terms of  the GNU General  Public License as published by the
++ * Free Software Foundation;  either version 2 of the  License, or (at your
++ * option) any later version.
++ */
++#include <linux/delay.h>
++#include <linux/io.h>
++#include <linux/leds.h>
++#include <linux/module.h>
++#include <linux/of.h>
++#include <linux/platform_device.h>
++#include <linux/spinlock.h>
++
++#define BCM6358_REG_MODE		0x0
++#define BCM6358_REG_CTRL		0x4
++
++#define BCM6358_SLED_CLKDIV_MASK	3
++#define BCM6358_SLED_CLKDIV_1		0
++#define BCM6358_SLED_CLKDIV_2		1
++#define BCM6358_SLED_CLKDIV_4		2
++#define BCM6358_SLED_CLKDIV_8		3
++
++#define BCM6358_SLED_POLARITY		BIT(2)
++#define BCM6358_SLED_BUSY		BIT(3)
++
++#define BCM6358_SLED_MAX_COUNT		32
++#define BCM6358_SLED_WAIT		100
++
++/**
++ * struct bcm6358_led - state container for bcm6358 based LEDs
++ * @cdev: LED class device for this LED
++ * @mem: memory resource
++ * @lock: memory lock
++ * @pin: LED pin number
++ * @active_low: LED is active low
++ */
++struct bcm6358_led {
++	struct led_classdev cdev;
++	void __iomem *mem;
++	spinlock_t *lock;
++	unsigned long pin;
++	bool active_low;
++};
++
++static void bcm6358_led_write(void __iomem *reg, unsigned long data)
++{
++	iowrite32be(data, reg);
++}
++
++static unsigned long bcm6358_led_read(void __iomem *reg)
++{
++	return ioread32be(reg);
++}
++
++static unsigned long bcm6358_led_busy(void __iomem *mem)
++{
++	unsigned long val;
++
++	while ((val = bcm6358_led_read(mem + BCM6358_REG_CTRL)) &
++		BCM6358_SLED_BUSY)
++		udelay(BCM6358_SLED_WAIT);
++
++	return val;
++}
++
++static void bcm6358_led_mode(struct bcm6358_led *led, unsigned long value)
++{
++	unsigned long val;
++
++	bcm6358_led_busy(led->mem);
++
++	val = bcm6358_led_read(led->mem + BCM6358_REG_MODE);
++	if ((led->active_low && value == LED_OFF) ||
++	    (!led->active_low && value != LED_OFF))
++		val |= BIT(led->pin);
++	else
++		val &= ~(BIT(led->pin));
++	bcm6358_led_write(led->mem + BCM6358_REG_MODE, val);
++}
++
++static void bcm6358_led_set(struct led_classdev *led_cdev,
++			    enum led_brightness value)
++{
++	struct bcm6358_led *led =
++		container_of(led_cdev, struct bcm6358_led, cdev);
++	unsigned long flags;
++
++	spin_lock_irqsave(led->lock, flags);
++	bcm6358_led_mode(led, value);
++	spin_unlock_irqrestore(led->lock, flags);
++}
++
++static int bcm6358_led(struct device *dev, struct device_node *nc, u32 reg,
++		       void __iomem *mem, spinlock_t *lock)
++{
++	struct bcm6358_led *led;
++	unsigned long flags;
++	const char *state;
++	int rc;
++
++	led = devm_kzalloc(dev, sizeof(*led), GFP_KERNEL);
++	if (!led)
++		return -ENOMEM;
++
++	led->pin = reg;
++	led->mem = mem;
++	led->lock = lock;
++
++	if (of_property_read_bool(nc, "active-low"))
++		led->active_low = true;
++
++	led->cdev.name = of_get_property(nc, "label", NULL) ? : nc->name;
++	led->cdev.default_trigger = of_get_property(nc,
++						    "linux,default-trigger",
++						    NULL);
++
++	spin_lock_irqsave(lock, flags);
++	if (!of_property_read_string(nc, "default-state", &state)) {
++		if (!strcmp(state, "on")) {
++			led->cdev.brightness = LED_FULL;
++		} else if (!strcmp(state, "keep")) {
++			unsigned long val;
++
++			bcm6358_led_busy(led->mem);
++
++			val = bcm6358_led_read(led->mem + BCM6358_REG_MODE);
++			val &= BIT(led->pin);
++			if ((led->active_low && !val) ||
++			    (!led->active_low && val))
++				led->cdev.brightness = LED_FULL;
++			else
++				led->cdev.brightness = LED_OFF;
++		} else {
++			led->cdev.brightness = LED_OFF;
++		}
++	} else {
++		led->cdev.brightness = LED_OFF;
++	}
++	bcm6358_led_mode(led, led->cdev.brightness);
++	spin_unlock_irqrestore(lock, flags);
++
++	led->cdev.brightness_set = bcm6358_led_set;
++
++	rc = led_classdev_register(dev, &led->cdev);
++	if (rc < 0)
++		return rc;
++
++	dev_dbg(dev, "registered LED %s\n", led->cdev.name);
++
++	return 0;
++}
++
++static int bcm6358_leds_probe(struct platform_device *pdev)
++{
++	struct device *dev = &pdev->dev;
++	struct device_node *np = pdev->dev.of_node;
++	struct device_node *child;
++	struct resource *mem_r;
++	void __iomem *mem;
++	spinlock_t *lock; /* memory lock */
++	unsigned long val;
++	u32 clk_div;
++
++	mem_r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
++	if (!mem_r)
++		return -EINVAL;
++
++	mem = devm_ioremap_resource(dev, mem_r);
++	if (IS_ERR(mem))
++		return PTR_ERR(mem);
++
++	lock = devm_kzalloc(dev, sizeof(*lock), GFP_KERNEL);
++	if (!lock)
++		return -ENOMEM;
++
++	spin_lock_init(lock);
++
++	val = bcm6358_led_busy(mem);
++	val &= ~(BCM6358_SLED_POLARITY | BCM6358_SLED_CLKDIV_MASK);
++	if (of_property_read_bool(np, "brcm,clk-dat-low"))
++		val |= BCM6358_SLED_POLARITY;
++	of_property_read_u32(np, "brcm,clk-div", &clk_div);
++	switch (clk_div) {
++	case 8:
++		val |= BCM6358_SLED_CLKDIV_8;
++		break;
++	case 4:
++		val |= BCM6358_SLED_CLKDIV_4;
++		break;
++	case 2:
++		val |= BCM6358_SLED_CLKDIV_2;
++		break;
++	default:
++		val |= BCM6358_SLED_CLKDIV_1;
++		break;
++	}
++	bcm6358_led_write(mem + BCM6358_REG_CTRL, val);
++
++	for_each_available_child_of_node(np, child) {
++		int rc;
++		u32 reg;
++
++		if (of_property_read_u32(child, "reg", &reg))
++			continue;
++
++		if (reg >= BCM6358_SLED_MAX_COUNT) {
++			dev_err(dev, "invalid LED (%u >= %d)\n", reg,
++				BCM6358_SLED_MAX_COUNT);
++			continue;
++		}
++
++		rc = bcm6358_led(dev, child, reg, mem, lock);
++		if (rc < 0)
++			return rc;
++	}
++
++	return 0;
++}
++
++static const struct of_device_id bcm6358_leds_of_match[] = {
++	{ .compatible = "brcm,bcm6358-leds", },
++	{ },
++};
++
++static struct platform_driver bcm6358_leds_driver = {
++	.probe = bcm6358_leds_probe,
++	.driver = {
++		.name = "leds-bcm6358",
++		.of_match_table = bcm6358_leds_of_match,
++	},
++};
++
++module_platform_driver(bcm6358_leds_driver);
++
++MODULE_AUTHOR("Álvaro Fernández Rojas <noltari@gmail.com>");
++MODULE_DESCRIPTION("LED driver for BCM6358 controllers");
++MODULE_LICENSE("GPL v2");
++MODULE_ALIAS("platform:leds-bcm6358");
diff --git a/target/linux/brcm63xx/patches-4.1/022-leds-bcm6328-add-more-configuration-options-and-fix-.patch b/target/linux/brcm63xx/patches-4.1/022-leds-bcm6328-add-more-configuration-options-and-fix-.patch
new file mode 100644
index 0000000..0371122
--- /dev/null
+++ b/target/linux/brcm63xx/patches-4.1/022-leds-bcm6328-add-more-configuration-options-and-fix-.patch
@@ -0,0 +1,106 @@ 
+From 7a4f726f42d600f526155d6c66b8c4e5a0feb5f6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= <noltari@gmail.com>
+Date: Thu, 30 Jul 2015 08:38:33 +0200
+Subject: [PATCH] leds-bcm6328: add more configuration options and fix default
+ state initialization
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
+---
+ .../devicetree/bindings/leds/leds-bcm6328.txt      |  8 +++++
+ drivers/leds/leds-bcm6328.c                        | 41 ++++++++++++++++------
+ 1 files changed, 30 insertions(+), 11 deletions(-)
+
+--- a/drivers/leds/leds-bcm6328.c
++++ b/drivers/leds/leds-bcm6328.c
+@@ -41,6 +41,11 @@
+ #define BCM6328_SERIAL_LED_SHIFT_DIR	BIT(16)
+ #define BCM6328_LED_SHIFT_TEST		BIT(30)
+ #define BCM6328_LED_TEST		BIT(31)
++#define BCM6328_INIT_MASK		(BCM6328_SERIAL_LED_EN | \
++					 BCM6328_SERIAL_LED_MUX  | \
++					 BCM6328_SERIAL_LED_CLK_NPOL | \
++					 BCM6328_SERIAL_LED_DATA_PPOL | \
++					 BCM6328_SERIAL_LED_SHIFT_DIR)
+ 
+ #define BCM6328_LED_MODE_MASK		3
+ #define BCM6328_LED_MODE_OFF		0
+@@ -281,11 +286,10 @@ static int bcm6328_led(struct device *de
+ 						    "linux,default-trigger",
+ 						    NULL);
+ 
++	spin_lock_irqsave(lock, flags);
+ 	if (!of_property_read_string(nc, "default-state", &state)) {
+-		spin_lock_irqsave(lock, flags);
+ 		if (!strcmp(state, "on")) {
+ 			led->cdev.brightness = LED_FULL;
+-			bcm6328_led_mode(led, BCM6328_LED_MODE_ON);
+ 		} else if (!strcmp(state, "keep")) {
+ 			void __iomem *mode;
+ 			unsigned long val, shift;
+@@ -296,21 +300,28 @@ static int bcm6328_led(struct device *de
+ 			else
+ 				mode = mem + BCM6328_REG_MODE_LO;
+ 
+-			val = bcm6328_led_read(mode) >> (shift % 16);
++			val = bcm6328_led_read(mode) >>
++			      BCM6328_LED_SHIFT(shift % 16);
+ 			val &= BCM6328_LED_MODE_MASK;
+-			if (val == BCM6328_LED_MODE_ON)
++			if ((led->active_low && val == BCM6328_LED_MODE_ON) ||
++			    (!led->active_low && val == BCM6328_LED_MODE_OFF))
+ 				led->cdev.brightness = LED_FULL;
+-			else {
++			else
+ 				led->cdev.brightness = LED_OFF;
+-				bcm6328_led_mode(led, BCM6328_LED_MODE_OFF);
+-			}
+ 		} else {
+ 			led->cdev.brightness = LED_OFF;
+-			bcm6328_led_mode(led, BCM6328_LED_MODE_OFF);
+ 		}
+-		spin_unlock_irqrestore(lock, flags);
++	} else {
++		led->cdev.brightness = LED_OFF;
+ 	}
+ 
++	if ((led->active_low && led->cdev.brightness == LED_FULL) ||
++	    (!led->active_low && led->cdev.brightness == LED_OFF))
++		bcm6328_led_mode(led, BCM6328_LED_MODE_ON);
++	else
++		bcm6328_led_mode(led, BCM6328_LED_MODE_OFF);
++	spin_unlock_irqrestore(lock, flags);
++
+ 	led->cdev.brightness_set = bcm6328_led_set;
+ 	led->cdev.blink_set = bcm6328_blink_set;
+ 
+@@ -360,9 +371,17 @@ static int bcm6328_leds_probe(struct pla
+ 	bcm6328_led_write(mem + BCM6328_REG_LNKACTSEL_LO, 0);
+ 
+ 	val = bcm6328_led_read(mem + BCM6328_REG_INIT);
+-	val &= ~BCM6328_SERIAL_LED_EN;
++	val &= ~(BCM6328_INIT_MASK);
+ 	if (of_property_read_bool(np, "brcm,serial-leds"))
+ 		val |= BCM6328_SERIAL_LED_EN;
++	if (of_property_read_bool(np, "brcm,serial-mux"))
++		val |= BCM6328_SERIAL_LED_MUX;
++	if (of_property_read_bool(np, "brcm,serial-clk-low"))
++		val |= BCM6328_SERIAL_LED_CLK_NPOL;
++	if (!of_property_read_bool(np, "brcm,serial-dat-low"))
++		val |= BCM6328_SERIAL_LED_DATA_PPOL;
++	if (!of_property_read_bool(np, "brcm,serial-shift-inv"))
++		val |= BCM6328_SERIAL_LED_SHIFT_DIR;
+ 	bcm6328_led_write(mem + BCM6328_REG_INIT, val);
+ 
+ 	for_each_available_child_of_node(np, child) {
+@@ -373,7 +392,7 @@ static int bcm6328_leds_probe(struct pla
+ 			continue;
+ 
+ 		if (reg >= BCM6328_LED_MAX_COUNT) {
+-			dev_err(dev, "invalid LED (>= %d)\n",
++			dev_err(dev, "invalid LED (%u >= %d)\n", reg,
+ 				BCM6328_LED_MAX_COUNT);
+ 			continue;
+ 		}