kernel: rename 5.20 patches to 6.0
authorRafał Miłecki <rafal@milecki.pl>
Wed, 17 Aug 2022 09:04:29 +0000 (11:04 +0200)
committerRafał Miłecki <rafal@milecki.pl>
Fri, 2 Sep 2022 12:31:59 +0000 (14:31 +0200)
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
(cherry picked from commit 372ee1919d281dd3e86121996805291a6948c982)

target/linux/generic/backport-5.4/800-v5.20-0001-dt-bindings-leds-add-Broadcom-s-BCM63138-controller.patch [deleted file]
target/linux/generic/backport-5.4/800-v5.20-0002-leds-bcm63138-add-support-for-BCM63138-controller.patch [deleted file]
target/linux/generic/backport-5.4/845-v6.0-0001-dt-bindings-leds-add-Broadcom-s-BCM63138-controller.patch [new file with mode: 0644]
target/linux/generic/backport-5.4/845-v6.0-0002-leds-bcm63138-add-support-for-BCM63138-controller.patch [new file with mode: 0644]
target/linux/generic/backport-5.4/846-v5.20-0001-dt-bindings-leds-leds-bcm63138-unify-full-stops-in-d.patch [deleted file]
target/linux/generic/backport-5.4/846-v5.20-0002-leds-add-help-info-about-BCM63138-module-name.patch [deleted file]
target/linux/generic/backport-5.4/846-v5.20-0003-leds-leds-bcm63138-get-rid-of-LED_OFF.patch [deleted file]
target/linux/generic/backport-5.4/846-v6.0-0001-dt-bindings-leds-leds-bcm63138-unify-full-stops-in-d.patch [new file with mode: 0644]
target/linux/generic/backport-5.4/846-v6.0-0002-leds-add-help-info-about-BCM63138-module-name.patch [new file with mode: 0644]
target/linux/generic/backport-5.4/846-v6.0-0003-leds-leds-bcm63138-get-rid-of-LED_OFF.patch [new file with mode: 0644]

diff --git a/target/linux/generic/backport-5.4/800-v5.20-0001-dt-bindings-leds-add-Broadcom-s-BCM63138-controller.patch b/target/linux/generic/backport-5.4/800-v5.20-0001-dt-bindings-leds-add-Broadcom-s-BCM63138-controller.patch
deleted file mode 100644 (file)
index b1072ce..0000000
+++ /dev/null
@@ -1,125 +0,0 @@
-From 13344f8ce8a0d98aa7f5d69ce3b47393c73a343b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
-Date: Mon, 27 Dec 2021 15:59:04 +0100
-Subject: [PATCH] dt-bindings: leds: add Broadcom's BCM63138 controller
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Broadcom used 2 LEDs hardware blocks for their BCM63xx SoCs:
-1. Older one (BCM6318, BCM6328, BCM6362, BCM63268, BCM6838)
-2. Newer one (BCM6848, BCM6858, BCM63138, BCM63148, BCM63381, BCM68360)
-
-The newer one was also later also used on BCM4908 SoC.
-
-Old block is already documented in the leds-bcm6328.yaml. This binding
-documents the new one which uses different registers & programming. It's
-first used in BCM63138 thus the binding name.
-
-Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
-Reviewed-by: Rob Herring <robh@kernel.org>
-Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
-Signed-off-by: Pavel Machek <pavel@ucw.cz>
----
- .../bindings/leds/leds-bcm63138.yaml          | 95 +++++++++++++++++++
- 1 file changed, 95 insertions(+)
- create mode 100644 Documentation/devicetree/bindings/leds/leds-bcm63138.yaml
-
---- /dev/null
-+++ b/Documentation/devicetree/bindings/leds/leds-bcm63138.yaml
-@@ -0,0 +1,95 @@
-+# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
-+%YAML 1.2
-+---
-+$id: http://devicetree.org/schemas/leds/leds-bcm63138.yaml#
-+$schema: http://devicetree.org/meta-schemas/core.yaml#
-+
-+title: Broadcom's BCM63138 LEDs controller
-+
-+maintainers:
-+  - Rafał Miłecki <rafal@milecki.pl>
-+
-+description: |
-+  This LEDs controller was first used on BCM63138 and later reused on BCM4908,
-+  BCM6848, BCM6858, BCM63138, BCM63148, BCM63381 and BCM68360 SoCs.
-+
-+  It supports up to 32 LEDs that can be connected parallelly or serially. It
-+  also includes limited support for hardware blinking.
-+
-+  Binding serially connected LEDs isn't documented yet.
-+
-+properties:
-+  compatible:
-+    oneOf:
-+      - items:
-+          - enum:
-+              - brcm,bcm4908-leds
-+              - brcm,bcm6848-leds
-+              - brcm,bcm6858-leds
-+              - brcm,bcm63148-leds
-+              - brcm,bcm63381-leds
-+              - brcm,bcm68360-leds
-+          - const: brcm,bcm63138-leds
-+      - const: brcm,bcm63138-leds
-+
-+  reg:
-+    maxItems: 1
-+
-+  "#address-cells":
-+    const: 1
-+
-+  "#size-cells":
-+    const: 0
-+
-+patternProperties:
-+  "^led@[a-f0-9]+$":
-+    type: object
-+
-+    $ref: common.yaml#
-+
-+    properties:
-+      reg:
-+        maxItems: 1
-+        description: LED pin number
-+
-+      active-low:
-+        type: boolean
-+        description: Makes LED active low.
-+
-+    required:
-+      - reg
-+
-+    unevaluatedProperties: false
-+
-+required:
-+  - reg
-+  - "#address-cells"
-+  - "#size-cells"
-+
-+additionalProperties: false
-+
-+examples:
-+  - |
-+    #include <dt-bindings/leds/common.h>
-+
-+    leds@ff800800 {
-+        compatible = "brcm,bcm4908-leds", "brcm,bcm63138-leds";
-+        reg = <0xff800800 0xdc>;
-+
-+        #address-cells = <1>;
-+        #size-cells = <0>;
-+
-+        led@0 {
-+            reg = <0x0>;
-+            function = LED_FUNCTION_POWER;
-+            color = <LED_COLOR_ID_GREEN>;
-+            default-state = "on";
-+        };
-+
-+        led@3 {
-+            reg = <0x3>;
-+            function = LED_FUNCTION_STATUS;
-+            color = <LED_COLOR_ID_GREEN>;
-+            active-low;
-+        };
-+    };
diff --git a/target/linux/generic/backport-5.4/800-v5.20-0002-leds-bcm63138-add-support-for-BCM63138-controller.patch b/target/linux/generic/backport-5.4/800-v5.20-0002-leds-bcm63138-add-support-for-BCM63138-controller.patch
deleted file mode 100644 (file)
index a2c3934..0000000
+++ /dev/null
@@ -1,371 +0,0 @@
-From a0ba692072d89075d0a75c7ad9df31f2c1ee9a1c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
-Date: Mon, 27 Dec 2021 15:59:05 +0100
-Subject: [PATCH] leds: bcm63138: add support for BCM63138 controller
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-It's a new controller first introduced in BCM63138 SoC. Later it was
-also used in BCM4908, some BCM68xx and some BCM63xxx SoCs.
-
-Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
-Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
-Signed-off-by: Pavel Machek <pavel@ucw.cz>
----
- drivers/leds/blink/Kconfig         |  12 ++
- drivers/leds/blink/Makefile        |   1 +
- drivers/leds/blink/leds-bcm63138.c | 308 +++++++++++++++++++++++++++++
- 3 files changed, 321 insertions(+)
- create mode 100644 drivers/leds/blink/leds-bcm63138.c
-
---- /dev/null
-+++ b/drivers/leds/blink/Kconfig
-@@ -0,0 +1,11 @@
-+config LEDS_BCM63138
-+      tristate "LED Support for Broadcom BCM63138 SoC"
-+      depends on LEDS_CLASS
-+      depends on ARCH_BCM4908 || ARCH_BCM_5301X || BCM63XX || COMPILE_TEST
-+      depends on HAS_IOMEM
-+      depends on OF
-+      default ARCH_BCM4908
-+      help
-+        This option enables support for LED controller that is part of
-+        BCM63138 SoC. The same hardware block is known to be also used
-+        in BCM4908, BCM6848, BCM6858, BCM63148, BCM63381 and BCM68360.
---- /dev/null
-+++ b/drivers/leds/blink/Makefile
-@@ -0,0 +1,2 @@
-+# SPDX-License-Identifier: GPL-2.0
-+obj-$(CONFIG_LEDS_BCM63138)   += leds-bcm63138.o
---- /dev/null
-+++ b/drivers/leds/blink/leds-bcm63138.c
-@@ -0,0 +1,308 @@
-+// SPDX-License-Identifier: GPL-2.0-only
-+/*
-+ * Copyright (C) 2021 Rafał Miłecki <rafal@milecki.pl>
-+ */
-+#include <linux/delay.h>
-+#include <linux/io.h>
-+#include <linux/leds.h>
-+#include <linux/module.h>
-+#include <linux/of.h>
-+#include <linux/pinctrl/consumer.h>
-+#include <linux/platform_device.h>
-+#include <linux/spinlock.h>
-+
-+#define BCM63138_MAX_LEDS                             32
-+#define BCM63138_MAX_BRIGHTNESS                               9
-+
-+#define BCM63138_LED_BITS                             4                               /* how many bits control a single LED */
-+#define BCM63138_LED_MASK                             ((1 << BCM63138_LED_BITS) - 1)  /* 0xf */
-+#define BCM63138_LEDS_PER_REG                         (32 / BCM63138_LED_BITS)        /* 8 */
-+
-+#define BCM63138_GLB_CTRL                             0x00
-+#define  BCM63138_GLB_CTRL_SERIAL_LED_DATA_PPOL               0x00000002
-+#define  BCM63138_GLB_CTRL_SERIAL_LED_EN_POL          0x00000008
-+#define BCM63138_MASK                                 0x04
-+#define BCM63138_HW_LED_EN                            0x08
-+#define BCM63138_SERIAL_LED_SHIFT_SEL                 0x0c
-+#define BCM63138_FLASH_RATE_CTRL1                     0x10
-+#define BCM63138_FLASH_RATE_CTRL2                     0x14
-+#define BCM63138_FLASH_RATE_CTRL3                     0x18
-+#define BCM63138_FLASH_RATE_CTRL4                     0x1c
-+#define BCM63138_BRIGHT_CTRL1                         0x20
-+#define BCM63138_BRIGHT_CTRL2                         0x24
-+#define BCM63138_BRIGHT_CTRL3                         0x28
-+#define BCM63138_BRIGHT_CTRL4                         0x2c
-+#define BCM63138_POWER_LED_CFG                                0x30
-+#define BCM63138_HW_POLARITY                          0xb4
-+#define BCM63138_SW_DATA                              0xb8
-+#define BCM63138_SW_POLARITY                          0xbc
-+#define BCM63138_PARALLEL_LED_POLARITY                        0xc0
-+#define BCM63138_SERIAL_LED_POLARITY                  0xc4
-+#define BCM63138_HW_LED_STATUS                                0xc8
-+#define BCM63138_FLASH_CTRL_STATUS                    0xcc
-+#define BCM63138_FLASH_BRT_CTRL                               0xd0
-+#define BCM63138_FLASH_P_LED_OUT_STATUS                       0xd4
-+#define BCM63138_FLASH_S_LED_OUT_STATUS                       0xd8
-+
-+struct bcm63138_leds {
-+      struct device *dev;
-+      void __iomem *base;
-+      spinlock_t lock;
-+};
-+
-+struct bcm63138_led {
-+      struct bcm63138_leds *leds;
-+      struct led_classdev cdev;
-+      u32 pin;
-+      bool active_low;
-+};
-+
-+/*
-+ * I/O access
-+ */
-+
-+static void bcm63138_leds_write(struct bcm63138_leds *leds, unsigned int reg,
-+                              u32 data)
-+{
-+      writel(data, leds->base + reg);
-+}
-+
-+static unsigned long bcm63138_leds_read(struct bcm63138_leds *leds,
-+                                      unsigned int reg)
-+{
-+      return readl(leds->base + reg);
-+}
-+
-+static void bcm63138_leds_update_bits(struct bcm63138_leds *leds,
-+                                    unsigned int reg, u32 mask, u32 val)
-+{
-+      WARN_ON(val & ~mask);
-+
-+      bcm63138_leds_write(leds, reg, (bcm63138_leds_read(leds, reg) & ~mask) | (val & mask));
-+}
-+
-+/*
-+ * Helpers
-+ */
-+
-+static void bcm63138_leds_set_flash_rate(struct bcm63138_leds *leds,
-+                                       struct bcm63138_led *led,
-+                                       u8 value)
-+{
-+      int reg_offset = (led->pin >> fls((BCM63138_LEDS_PER_REG - 1))) * 4;
-+      int shift = (led->pin & (BCM63138_LEDS_PER_REG - 1)) * BCM63138_LED_BITS;
-+
-+      bcm63138_leds_update_bits(leds, BCM63138_FLASH_RATE_CTRL1 + reg_offset,
-+                                BCM63138_LED_MASK << shift, value << shift);
-+}
-+
-+static void bcm63138_leds_set_bright(struct bcm63138_leds *leds,
-+                                   struct bcm63138_led *led,
-+                                   u8 value)
-+{
-+      int reg_offset = (led->pin >> fls((BCM63138_LEDS_PER_REG - 1))) * 4;
-+      int shift = (led->pin & (BCM63138_LEDS_PER_REG - 1)) * BCM63138_LED_BITS;
-+
-+      bcm63138_leds_update_bits(leds, BCM63138_BRIGHT_CTRL1 + reg_offset,
-+                                BCM63138_LED_MASK << shift, value << shift);
-+}
-+
-+static void bcm63138_leds_enable_led(struct bcm63138_leds *leds,
-+                                   struct bcm63138_led *led,
-+                                   enum led_brightness value)
-+{
-+      u32 bit = BIT(led->pin);
-+
-+      bcm63138_leds_update_bits(leds, BCM63138_SW_DATA, bit,
-+                                value == LED_OFF ? 0 : bit);
-+}
-+
-+/*
-+ * API callbacks
-+ */
-+
-+static void bcm63138_leds_brightness_set(struct led_classdev *led_cdev,
-+                                       enum led_brightness value)
-+{
-+      struct bcm63138_led *led = container_of(led_cdev, struct bcm63138_led, cdev);
-+      struct bcm63138_leds *leds = led->leds;
-+      unsigned long flags;
-+
-+      spin_lock_irqsave(&leds->lock, flags);
-+
-+      bcm63138_leds_enable_led(leds, led, value);
-+      if (!value)
-+              bcm63138_leds_set_flash_rate(leds, led, 0);
-+      else
-+              bcm63138_leds_set_bright(leds, led, value);
-+
-+      spin_unlock_irqrestore(&leds->lock, flags);
-+}
-+
-+static int bcm63138_leds_blink_set(struct led_classdev *led_cdev,
-+                                 unsigned long *delay_on,
-+                                 unsigned long *delay_off)
-+{
-+      struct bcm63138_led *led = container_of(led_cdev, struct bcm63138_led, cdev);
-+      struct bcm63138_leds *leds = led->leds;
-+      unsigned long flags;
-+      u8 value;
-+
-+      if (!*delay_on && !*delay_off) {
-+              *delay_on = 640;
-+              *delay_off = 640;
-+      }
-+
-+      if (*delay_on != *delay_off) {
-+              dev_dbg(led_cdev->dev, "Blinking at unequal delays is not supported\n");
-+              return -EINVAL;
-+      }
-+
-+      switch (*delay_on) {
-+      case 1152 ... 1408: /* 1280 ms ± 10% */
-+              value = 0x7;
-+              break;
-+      case 576 ... 704: /* 640 ms ± 10% */
-+              value = 0x6;
-+              break;
-+      case 288 ... 352: /* 320 ms ± 10% */
-+              value = 0x5;
-+              break;
-+      case 126 ... 154: /* 140 ms ± 10% */
-+              value = 0x4;
-+              break;
-+      case 59 ... 72: /* 65 ms ± 10% */
-+              value = 0x3;
-+              break;
-+      default:
-+              dev_dbg(led_cdev->dev, "Blinking delay value %lu is unsupported\n",
-+                      *delay_on);
-+              return -EINVAL;
-+      }
-+
-+      spin_lock_irqsave(&leds->lock, flags);
-+
-+      bcm63138_leds_enable_led(leds, led, BCM63138_MAX_BRIGHTNESS);
-+      bcm63138_leds_set_flash_rate(leds, led, value);
-+
-+      spin_unlock_irqrestore(&leds->lock, flags);
-+
-+      return 0;
-+}
-+
-+/*
-+ * LED driver
-+ */
-+
-+static void bcm63138_leds_create_led(struct bcm63138_leds *leds,
-+                                   struct device_node *np)
-+{
-+      struct led_init_data init_data = {
-+              .fwnode = of_fwnode_handle(np),
-+      };
-+      struct device *dev = leds->dev;
-+      struct bcm63138_led *led;
-+      struct pinctrl *pinctrl;
-+      u32 bit;
-+      int err;
-+
-+      led = devm_kzalloc(dev, sizeof(*led), GFP_KERNEL);
-+      if (!led) {
-+              dev_err(dev, "Failed to alloc LED\n");
-+              return;
-+      }
-+
-+      led->leds = leds;
-+
-+      if (of_property_read_u32(np, "reg", &led->pin)) {
-+              dev_err(dev, "Missing \"reg\" property in %pOF\n", np);
-+              goto err_free;
-+      }
-+
-+      if (led->pin >= BCM63138_MAX_LEDS) {
-+              dev_err(dev, "Invalid \"reg\" value %d\n", led->pin);
-+              goto err_free;
-+      }
-+
-+      led->active_low = of_property_read_bool(np, "active-low");
-+
-+      led->cdev.max_brightness = BCM63138_MAX_BRIGHTNESS;
-+      led->cdev.brightness_set = bcm63138_leds_brightness_set;
-+      led->cdev.blink_set = bcm63138_leds_blink_set;
-+
-+      err = devm_led_classdev_register_ext(dev, &led->cdev, &init_data);
-+      if (err) {
-+              dev_err(dev, "Failed to register LED %pOF: %d\n", np, err);
-+              goto err_free;
-+      }
-+
-+      pinctrl = devm_pinctrl_get_select_default(led->cdev.dev);
-+      if (IS_ERR(pinctrl) && PTR_ERR(pinctrl) != -ENODEV) {
-+              dev_warn(led->cdev.dev, "Failed to select %pOF pinctrl: %ld\n",
-+                       np, PTR_ERR(pinctrl));
-+      }
-+
-+      bit = BIT(led->pin);
-+      bcm63138_leds_update_bits(leds, BCM63138_PARALLEL_LED_POLARITY, bit,
-+                                led->active_low ? 0 : bit);
-+      bcm63138_leds_update_bits(leds, BCM63138_HW_LED_EN, bit, 0);
-+      bcm63138_leds_set_flash_rate(leds, led, 0);
-+      bcm63138_leds_enable_led(leds, led, led->cdev.brightness);
-+
-+      return;
-+
-+err_free:
-+      devm_kfree(dev, led);
-+}
-+
-+static int bcm63138_leds_probe(struct platform_device *pdev)
-+{
-+      struct device_node *np = dev_of_node(&pdev->dev);
-+      struct device *dev = &pdev->dev;
-+      struct bcm63138_leds *leds;
-+      struct device_node *child;
-+
-+      leds = devm_kzalloc(dev, sizeof(*leds), GFP_KERNEL);
-+      if (!leds)
-+              return -ENOMEM;
-+
-+      leds->dev = dev;
-+
-+      leds->base = devm_platform_ioremap_resource(pdev, 0);
-+      if (IS_ERR(leds->base))
-+              return PTR_ERR(leds->base);
-+
-+      spin_lock_init(&leds->lock);
-+
-+      bcm63138_leds_write(leds, BCM63138_GLB_CTRL,
-+                          BCM63138_GLB_CTRL_SERIAL_LED_DATA_PPOL |
-+                          BCM63138_GLB_CTRL_SERIAL_LED_EN_POL);
-+      bcm63138_leds_write(leds, BCM63138_HW_LED_EN, 0);
-+      bcm63138_leds_write(leds, BCM63138_SERIAL_LED_POLARITY, 0);
-+      bcm63138_leds_write(leds, BCM63138_PARALLEL_LED_POLARITY, 0);
-+
-+      for_each_available_child_of_node(np, child) {
-+              bcm63138_leds_create_led(leds, child);
-+      }
-+
-+      return 0;
-+}
-+
-+static const struct of_device_id bcm63138_leds_of_match_table[] = {
-+      { .compatible = "brcm,bcm63138-leds", },
-+      { },
-+};
-+
-+static struct platform_driver bcm63138_leds_driver = {
-+      .probe = bcm63138_leds_probe,
-+      .driver = {
-+              .name = "leds-bcm63xxx",
-+              .of_match_table = bcm63138_leds_of_match_table,
-+      },
-+};
-+
-+module_platform_driver(bcm63138_leds_driver);
-+
-+MODULE_AUTHOR("Rafał Miłecki");
-+MODULE_LICENSE("GPL");
-+MODULE_DEVICE_TABLE(of, bcm63138_leds_of_match_table);
---- a/drivers/leds/Kconfig
-+++ b/drivers/leds/Kconfig
-@@ -824,6 +824,8 @@ config LEDS_LM36274
-         Say Y to enable the LM36274 LED driver for TI LMU devices.
-         This supports the LED device LM36274.
-+source "drivers/leds/blink/Kconfig"
-+
- comment "LED Triggers"
- source "drivers/leds/trigger/Kconfig"
---- a/drivers/leds/Makefile
-+++ b/drivers/leds/Makefile
-@@ -95,3 +95,6 @@ obj-$(CONFIG_LEDS_USER)                      += uleds.o
- # LED Triggers
- obj-$(CONFIG_LEDS_TRIGGERS)           += trigger/
-+
-+# LED Blink
-+obj-y                                 += blink/
diff --git a/target/linux/generic/backport-5.4/845-v6.0-0001-dt-bindings-leds-add-Broadcom-s-BCM63138-controller.patch b/target/linux/generic/backport-5.4/845-v6.0-0001-dt-bindings-leds-add-Broadcom-s-BCM63138-controller.patch
new file mode 100644 (file)
index 0000000..b1072ce
--- /dev/null
@@ -0,0 +1,125 @@
+From 13344f8ce8a0d98aa7f5d69ce3b47393c73a343b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
+Date: Mon, 27 Dec 2021 15:59:04 +0100
+Subject: [PATCH] dt-bindings: leds: add Broadcom's BCM63138 controller
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Broadcom used 2 LEDs hardware blocks for their BCM63xx SoCs:
+1. Older one (BCM6318, BCM6328, BCM6362, BCM63268, BCM6838)
+2. Newer one (BCM6848, BCM6858, BCM63138, BCM63148, BCM63381, BCM68360)
+
+The newer one was also later also used on BCM4908 SoC.
+
+Old block is already documented in the leds-bcm6328.yaml. This binding
+documents the new one which uses different registers & programming. It's
+first used in BCM63138 thus the binding name.
+
+Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
+Reviewed-by: Rob Herring <robh@kernel.org>
+Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
+Signed-off-by: Pavel Machek <pavel@ucw.cz>
+---
+ .../bindings/leds/leds-bcm63138.yaml          | 95 +++++++++++++++++++
+ 1 file changed, 95 insertions(+)
+ create mode 100644 Documentation/devicetree/bindings/leds/leds-bcm63138.yaml
+
+--- /dev/null
++++ b/Documentation/devicetree/bindings/leds/leds-bcm63138.yaml
+@@ -0,0 +1,95 @@
++# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
++%YAML 1.2
++---
++$id: http://devicetree.org/schemas/leds/leds-bcm63138.yaml#
++$schema: http://devicetree.org/meta-schemas/core.yaml#
++
++title: Broadcom's BCM63138 LEDs controller
++
++maintainers:
++  - Rafał Miłecki <rafal@milecki.pl>
++
++description: |
++  This LEDs controller was first used on BCM63138 and later reused on BCM4908,
++  BCM6848, BCM6858, BCM63138, BCM63148, BCM63381 and BCM68360 SoCs.
++
++  It supports up to 32 LEDs that can be connected parallelly or serially. It
++  also includes limited support for hardware blinking.
++
++  Binding serially connected LEDs isn't documented yet.
++
++properties:
++  compatible:
++    oneOf:
++      - items:
++          - enum:
++              - brcm,bcm4908-leds
++              - brcm,bcm6848-leds
++              - brcm,bcm6858-leds
++              - brcm,bcm63148-leds
++              - brcm,bcm63381-leds
++              - brcm,bcm68360-leds
++          - const: brcm,bcm63138-leds
++      - const: brcm,bcm63138-leds
++
++  reg:
++    maxItems: 1
++
++  "#address-cells":
++    const: 1
++
++  "#size-cells":
++    const: 0
++
++patternProperties:
++  "^led@[a-f0-9]+$":
++    type: object
++
++    $ref: common.yaml#
++
++    properties:
++      reg:
++        maxItems: 1
++        description: LED pin number
++
++      active-low:
++        type: boolean
++        description: Makes LED active low.
++
++    required:
++      - reg
++
++    unevaluatedProperties: false
++
++required:
++  - reg
++  - "#address-cells"
++  - "#size-cells"
++
++additionalProperties: false
++
++examples:
++  - |
++    #include <dt-bindings/leds/common.h>
++
++    leds@ff800800 {
++        compatible = "brcm,bcm4908-leds", "brcm,bcm63138-leds";
++        reg = <0xff800800 0xdc>;
++
++        #address-cells = <1>;
++        #size-cells = <0>;
++
++        led@0 {
++            reg = <0x0>;
++            function = LED_FUNCTION_POWER;
++            color = <LED_COLOR_ID_GREEN>;
++            default-state = "on";
++        };
++
++        led@3 {
++            reg = <0x3>;
++            function = LED_FUNCTION_STATUS;
++            color = <LED_COLOR_ID_GREEN>;
++            active-low;
++        };
++    };
diff --git a/target/linux/generic/backport-5.4/845-v6.0-0002-leds-bcm63138-add-support-for-BCM63138-controller.patch b/target/linux/generic/backport-5.4/845-v6.0-0002-leds-bcm63138-add-support-for-BCM63138-controller.patch
new file mode 100644 (file)
index 0000000..a2c3934
--- /dev/null
@@ -0,0 +1,371 @@
+From a0ba692072d89075d0a75c7ad9df31f2c1ee9a1c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
+Date: Mon, 27 Dec 2021 15:59:05 +0100
+Subject: [PATCH] leds: bcm63138: add support for BCM63138 controller
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+It's a new controller first introduced in BCM63138 SoC. Later it was
+also used in BCM4908, some BCM68xx and some BCM63xxx SoCs.
+
+Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
+Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
+Signed-off-by: Pavel Machek <pavel@ucw.cz>
+---
+ drivers/leds/blink/Kconfig         |  12 ++
+ drivers/leds/blink/Makefile        |   1 +
+ drivers/leds/blink/leds-bcm63138.c | 308 +++++++++++++++++++++++++++++
+ 3 files changed, 321 insertions(+)
+ create mode 100644 drivers/leds/blink/leds-bcm63138.c
+
+--- /dev/null
++++ b/drivers/leds/blink/Kconfig
+@@ -0,0 +1,11 @@
++config LEDS_BCM63138
++      tristate "LED Support for Broadcom BCM63138 SoC"
++      depends on LEDS_CLASS
++      depends on ARCH_BCM4908 || ARCH_BCM_5301X || BCM63XX || COMPILE_TEST
++      depends on HAS_IOMEM
++      depends on OF
++      default ARCH_BCM4908
++      help
++        This option enables support for LED controller that is part of
++        BCM63138 SoC. The same hardware block is known to be also used
++        in BCM4908, BCM6848, BCM6858, BCM63148, BCM63381 and BCM68360.
+--- /dev/null
++++ b/drivers/leds/blink/Makefile
+@@ -0,0 +1,2 @@
++# SPDX-License-Identifier: GPL-2.0
++obj-$(CONFIG_LEDS_BCM63138)   += leds-bcm63138.o
+--- /dev/null
++++ b/drivers/leds/blink/leds-bcm63138.c
+@@ -0,0 +1,308 @@
++// SPDX-License-Identifier: GPL-2.0-only
++/*
++ * Copyright (C) 2021 Rafał Miłecki <rafal@milecki.pl>
++ */
++#include <linux/delay.h>
++#include <linux/io.h>
++#include <linux/leds.h>
++#include <linux/module.h>
++#include <linux/of.h>
++#include <linux/pinctrl/consumer.h>
++#include <linux/platform_device.h>
++#include <linux/spinlock.h>
++
++#define BCM63138_MAX_LEDS                             32
++#define BCM63138_MAX_BRIGHTNESS                               9
++
++#define BCM63138_LED_BITS                             4                               /* how many bits control a single LED */
++#define BCM63138_LED_MASK                             ((1 << BCM63138_LED_BITS) - 1)  /* 0xf */
++#define BCM63138_LEDS_PER_REG                         (32 / BCM63138_LED_BITS)        /* 8 */
++
++#define BCM63138_GLB_CTRL                             0x00
++#define  BCM63138_GLB_CTRL_SERIAL_LED_DATA_PPOL               0x00000002
++#define  BCM63138_GLB_CTRL_SERIAL_LED_EN_POL          0x00000008
++#define BCM63138_MASK                                 0x04
++#define BCM63138_HW_LED_EN                            0x08
++#define BCM63138_SERIAL_LED_SHIFT_SEL                 0x0c
++#define BCM63138_FLASH_RATE_CTRL1                     0x10
++#define BCM63138_FLASH_RATE_CTRL2                     0x14
++#define BCM63138_FLASH_RATE_CTRL3                     0x18
++#define BCM63138_FLASH_RATE_CTRL4                     0x1c
++#define BCM63138_BRIGHT_CTRL1                         0x20
++#define BCM63138_BRIGHT_CTRL2                         0x24
++#define BCM63138_BRIGHT_CTRL3                         0x28
++#define BCM63138_BRIGHT_CTRL4                         0x2c
++#define BCM63138_POWER_LED_CFG                                0x30
++#define BCM63138_HW_POLARITY                          0xb4
++#define BCM63138_SW_DATA                              0xb8
++#define BCM63138_SW_POLARITY                          0xbc
++#define BCM63138_PARALLEL_LED_POLARITY                        0xc0
++#define BCM63138_SERIAL_LED_POLARITY                  0xc4
++#define BCM63138_HW_LED_STATUS                                0xc8
++#define BCM63138_FLASH_CTRL_STATUS                    0xcc
++#define BCM63138_FLASH_BRT_CTRL                               0xd0
++#define BCM63138_FLASH_P_LED_OUT_STATUS                       0xd4
++#define BCM63138_FLASH_S_LED_OUT_STATUS                       0xd8
++
++struct bcm63138_leds {
++      struct device *dev;
++      void __iomem *base;
++      spinlock_t lock;
++};
++
++struct bcm63138_led {
++      struct bcm63138_leds *leds;
++      struct led_classdev cdev;
++      u32 pin;
++      bool active_low;
++};
++
++/*
++ * I/O access
++ */
++
++static void bcm63138_leds_write(struct bcm63138_leds *leds, unsigned int reg,
++                              u32 data)
++{
++      writel(data, leds->base + reg);
++}
++
++static unsigned long bcm63138_leds_read(struct bcm63138_leds *leds,
++                                      unsigned int reg)
++{
++      return readl(leds->base + reg);
++}
++
++static void bcm63138_leds_update_bits(struct bcm63138_leds *leds,
++                                    unsigned int reg, u32 mask, u32 val)
++{
++      WARN_ON(val & ~mask);
++
++      bcm63138_leds_write(leds, reg, (bcm63138_leds_read(leds, reg) & ~mask) | (val & mask));
++}
++
++/*
++ * Helpers
++ */
++
++static void bcm63138_leds_set_flash_rate(struct bcm63138_leds *leds,
++                                       struct bcm63138_led *led,
++                                       u8 value)
++{
++      int reg_offset = (led->pin >> fls((BCM63138_LEDS_PER_REG - 1))) * 4;
++      int shift = (led->pin & (BCM63138_LEDS_PER_REG - 1)) * BCM63138_LED_BITS;
++
++      bcm63138_leds_update_bits(leds, BCM63138_FLASH_RATE_CTRL1 + reg_offset,
++                                BCM63138_LED_MASK << shift, value << shift);
++}
++
++static void bcm63138_leds_set_bright(struct bcm63138_leds *leds,
++                                   struct bcm63138_led *led,
++                                   u8 value)
++{
++      int reg_offset = (led->pin >> fls((BCM63138_LEDS_PER_REG - 1))) * 4;
++      int shift = (led->pin & (BCM63138_LEDS_PER_REG - 1)) * BCM63138_LED_BITS;
++
++      bcm63138_leds_update_bits(leds, BCM63138_BRIGHT_CTRL1 + reg_offset,
++                                BCM63138_LED_MASK << shift, value << shift);
++}
++
++static void bcm63138_leds_enable_led(struct bcm63138_leds *leds,
++                                   struct bcm63138_led *led,
++                                   enum led_brightness value)
++{
++      u32 bit = BIT(led->pin);
++
++      bcm63138_leds_update_bits(leds, BCM63138_SW_DATA, bit,
++                                value == LED_OFF ? 0 : bit);
++}
++
++/*
++ * API callbacks
++ */
++
++static void bcm63138_leds_brightness_set(struct led_classdev *led_cdev,
++                                       enum led_brightness value)
++{
++      struct bcm63138_led *led = container_of(led_cdev, struct bcm63138_led, cdev);
++      struct bcm63138_leds *leds = led->leds;
++      unsigned long flags;
++
++      spin_lock_irqsave(&leds->lock, flags);
++
++      bcm63138_leds_enable_led(leds, led, value);
++      if (!value)
++              bcm63138_leds_set_flash_rate(leds, led, 0);
++      else
++              bcm63138_leds_set_bright(leds, led, value);
++
++      spin_unlock_irqrestore(&leds->lock, flags);
++}
++
++static int bcm63138_leds_blink_set(struct led_classdev *led_cdev,
++                                 unsigned long *delay_on,
++                                 unsigned long *delay_off)
++{
++      struct bcm63138_led *led = container_of(led_cdev, struct bcm63138_led, cdev);
++      struct bcm63138_leds *leds = led->leds;
++      unsigned long flags;
++      u8 value;
++
++      if (!*delay_on && !*delay_off) {
++              *delay_on = 640;
++              *delay_off = 640;
++      }
++
++      if (*delay_on != *delay_off) {
++              dev_dbg(led_cdev->dev, "Blinking at unequal delays is not supported\n");
++              return -EINVAL;
++      }
++
++      switch (*delay_on) {
++      case 1152 ... 1408: /* 1280 ms ± 10% */
++              value = 0x7;
++              break;
++      case 576 ... 704: /* 640 ms ± 10% */
++              value = 0x6;
++              break;
++      case 288 ... 352: /* 320 ms ± 10% */
++              value = 0x5;
++              break;
++      case 126 ... 154: /* 140 ms ± 10% */
++              value = 0x4;
++              break;
++      case 59 ... 72: /* 65 ms ± 10% */
++              value = 0x3;
++              break;
++      default:
++              dev_dbg(led_cdev->dev, "Blinking delay value %lu is unsupported\n",
++                      *delay_on);
++              return -EINVAL;
++      }
++
++      spin_lock_irqsave(&leds->lock, flags);
++
++      bcm63138_leds_enable_led(leds, led, BCM63138_MAX_BRIGHTNESS);
++      bcm63138_leds_set_flash_rate(leds, led, value);
++
++      spin_unlock_irqrestore(&leds->lock, flags);
++
++      return 0;
++}
++
++/*
++ * LED driver
++ */
++
++static void bcm63138_leds_create_led(struct bcm63138_leds *leds,
++                                   struct device_node *np)
++{
++      struct led_init_data init_data = {
++              .fwnode = of_fwnode_handle(np),
++      };
++      struct device *dev = leds->dev;
++      struct bcm63138_led *led;
++      struct pinctrl *pinctrl;
++      u32 bit;
++      int err;
++
++      led = devm_kzalloc(dev, sizeof(*led), GFP_KERNEL);
++      if (!led) {
++              dev_err(dev, "Failed to alloc LED\n");
++              return;
++      }
++
++      led->leds = leds;
++
++      if (of_property_read_u32(np, "reg", &led->pin)) {
++              dev_err(dev, "Missing \"reg\" property in %pOF\n", np);
++              goto err_free;
++      }
++
++      if (led->pin >= BCM63138_MAX_LEDS) {
++              dev_err(dev, "Invalid \"reg\" value %d\n", led->pin);
++              goto err_free;
++      }
++
++      led->active_low = of_property_read_bool(np, "active-low");
++
++      led->cdev.max_brightness = BCM63138_MAX_BRIGHTNESS;
++      led->cdev.brightness_set = bcm63138_leds_brightness_set;
++      led->cdev.blink_set = bcm63138_leds_blink_set;
++
++      err = devm_led_classdev_register_ext(dev, &led->cdev, &init_data);
++      if (err) {
++              dev_err(dev, "Failed to register LED %pOF: %d\n", np, err);
++              goto err_free;
++      }
++
++      pinctrl = devm_pinctrl_get_select_default(led->cdev.dev);
++      if (IS_ERR(pinctrl) && PTR_ERR(pinctrl) != -ENODEV) {
++              dev_warn(led->cdev.dev, "Failed to select %pOF pinctrl: %ld\n",
++                       np, PTR_ERR(pinctrl));
++      }
++
++      bit = BIT(led->pin);
++      bcm63138_leds_update_bits(leds, BCM63138_PARALLEL_LED_POLARITY, bit,
++                                led->active_low ? 0 : bit);
++      bcm63138_leds_update_bits(leds, BCM63138_HW_LED_EN, bit, 0);
++      bcm63138_leds_set_flash_rate(leds, led, 0);
++      bcm63138_leds_enable_led(leds, led, led->cdev.brightness);
++
++      return;
++
++err_free:
++      devm_kfree(dev, led);
++}
++
++static int bcm63138_leds_probe(struct platform_device *pdev)
++{
++      struct device_node *np = dev_of_node(&pdev->dev);
++      struct device *dev = &pdev->dev;
++      struct bcm63138_leds *leds;
++      struct device_node *child;
++
++      leds = devm_kzalloc(dev, sizeof(*leds), GFP_KERNEL);
++      if (!leds)
++              return -ENOMEM;
++
++      leds->dev = dev;
++
++      leds->base = devm_platform_ioremap_resource(pdev, 0);
++      if (IS_ERR(leds->base))
++              return PTR_ERR(leds->base);
++
++      spin_lock_init(&leds->lock);
++
++      bcm63138_leds_write(leds, BCM63138_GLB_CTRL,
++                          BCM63138_GLB_CTRL_SERIAL_LED_DATA_PPOL |
++                          BCM63138_GLB_CTRL_SERIAL_LED_EN_POL);
++      bcm63138_leds_write(leds, BCM63138_HW_LED_EN, 0);
++      bcm63138_leds_write(leds, BCM63138_SERIAL_LED_POLARITY, 0);
++      bcm63138_leds_write(leds, BCM63138_PARALLEL_LED_POLARITY, 0);
++
++      for_each_available_child_of_node(np, child) {
++              bcm63138_leds_create_led(leds, child);
++      }
++
++      return 0;
++}
++
++static const struct of_device_id bcm63138_leds_of_match_table[] = {
++      { .compatible = "brcm,bcm63138-leds", },
++      { },
++};
++
++static struct platform_driver bcm63138_leds_driver = {
++      .probe = bcm63138_leds_probe,
++      .driver = {
++              .name = "leds-bcm63xxx",
++              .of_match_table = bcm63138_leds_of_match_table,
++      },
++};
++
++module_platform_driver(bcm63138_leds_driver);
++
++MODULE_AUTHOR("Rafał Miłecki");
++MODULE_LICENSE("GPL");
++MODULE_DEVICE_TABLE(of, bcm63138_leds_of_match_table);
+--- a/drivers/leds/Kconfig
++++ b/drivers/leds/Kconfig
+@@ -824,6 +824,8 @@ config LEDS_LM36274
+         Say Y to enable the LM36274 LED driver for TI LMU devices.
+         This supports the LED device LM36274.
++source "drivers/leds/blink/Kconfig"
++
+ comment "LED Triggers"
+ source "drivers/leds/trigger/Kconfig"
+--- a/drivers/leds/Makefile
++++ b/drivers/leds/Makefile
+@@ -95,3 +95,6 @@ obj-$(CONFIG_LEDS_USER)                      += uleds.o
+ # LED Triggers
+ obj-$(CONFIG_LEDS_TRIGGERS)           += trigger/
++
++# LED Blink
++obj-y                                 += blink/
diff --git a/target/linux/generic/backport-5.4/846-v5.20-0001-dt-bindings-leds-leds-bcm63138-unify-full-stops-in-d.patch b/target/linux/generic/backport-5.4/846-v5.20-0001-dt-bindings-leds-leds-bcm63138-unify-full-stops-in-d.patch
deleted file mode 100644 (file)
index 483826a..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-From 13b64a0c19059b38150c79d65d350ae44034c5df Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
-Date: Sun, 17 Jul 2022 14:42:46 +0200
-Subject: [PATCH] dt-bindings: leds: leds-bcm63138: unify full stops in
- descriptions
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Description of "reg" doesn't have full stop at the end. It makes sense
-as it's a one-sentence only. Use the same style for "active-low".
-
-Reported-by: Pavel Machek <pavel@ucw.cz>
-Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
-Signed-off-by: Pavel Machek <pavel@ucw.cz>
----
- Documentation/devicetree/bindings/leds/leds-bcm63138.yaml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/Documentation/devicetree/bindings/leds/leds-bcm63138.yaml
-+++ b/Documentation/devicetree/bindings/leds/leds-bcm63138.yaml
-@@ -54,7 +54,7 @@ patternProperties:
-       active-low:
-         type: boolean
--        description: Makes LED active low.
-+        description: Makes LED active low
-     required:
-       - reg
diff --git a/target/linux/generic/backport-5.4/846-v5.20-0002-leds-add-help-info-about-BCM63138-module-name.patch b/target/linux/generic/backport-5.4/846-v5.20-0002-leds-add-help-info-about-BCM63138-module-name.patch
deleted file mode 100644 (file)
index 44e8be8..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-From bcc607cdbb1f931111196699426f0cb83bfb296a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
-Date: Sun, 17 Jul 2022 14:42:47 +0200
-Subject: [PATCH] leds: add help info about BCM63138 module name
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-It's what we do for all other LEDs drivers.
-
-Reported-by: Pavel Machek <pavel@ucw.cz>
-Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
-Signed-off-by: Pavel Machek <pavel@ucw.cz>
----
- drivers/leds/blink/Kconfig | 2 ++
- 1 file changed, 2 insertions(+)
-
---- a/drivers/leds/blink/Kconfig
-+++ b/drivers/leds/blink/Kconfig
-@@ -9,3 +9,5 @@ config LEDS_BCM63138
-         This option enables support for LED controller that is part of
-         BCM63138 SoC. The same hardware block is known to be also used
-         in BCM4908, BCM6848, BCM6858, BCM63148, BCM63381 and BCM68360.
-+
-+        If compiled as module it will be called leds-bcm63138.
diff --git a/target/linux/generic/backport-5.4/846-v5.20-0003-leds-leds-bcm63138-get-rid-of-LED_OFF.patch b/target/linux/generic/backport-5.4/846-v5.20-0003-leds-leds-bcm63138-get-rid-of-LED_OFF.patch
deleted file mode 100644 (file)
index e125a54..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-From 92cfc71ee2ddfb499ed53e21b28bdf8739bc70bc Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
-Date: Sun, 17 Jul 2022 14:42:48 +0200
-Subject: [PATCH] leds: leds-bcm63138: get rid of LED_OFF
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The whole "enum led_brightness" is marked as obsolete. Replace it with a
-(non-)zero check.
-
-Reported-by: Pavel Machek <pavel@ucw.cz>
-Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
-Signed-off-by: Pavel Machek <pavel@ucw.cz>
----
- drivers/leds/blink/leds-bcm63138.c | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
---- a/drivers/leds/blink/leds-bcm63138.c
-+++ b/drivers/leds/blink/leds-bcm63138.c
-@@ -113,8 +113,7 @@ static void bcm63138_leds_enable_led(str
- {
-       u32 bit = BIT(led->pin);
--      bcm63138_leds_update_bits(leds, BCM63138_SW_DATA, bit,
--                                value == LED_OFF ? 0 : bit);
-+      bcm63138_leds_update_bits(leds, BCM63138_SW_DATA, bit, value ? bit : 0);
- }
- /*
diff --git a/target/linux/generic/backport-5.4/846-v6.0-0001-dt-bindings-leds-leds-bcm63138-unify-full-stops-in-d.patch b/target/linux/generic/backport-5.4/846-v6.0-0001-dt-bindings-leds-leds-bcm63138-unify-full-stops-in-d.patch
new file mode 100644 (file)
index 0000000..483826a
--- /dev/null
@@ -0,0 +1,30 @@
+From 13b64a0c19059b38150c79d65d350ae44034c5df Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
+Date: Sun, 17 Jul 2022 14:42:46 +0200
+Subject: [PATCH] dt-bindings: leds: leds-bcm63138: unify full stops in
+ descriptions
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Description of "reg" doesn't have full stop at the end. It makes sense
+as it's a one-sentence only. Use the same style for "active-low".
+
+Reported-by: Pavel Machek <pavel@ucw.cz>
+Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
+Signed-off-by: Pavel Machek <pavel@ucw.cz>
+---
+ Documentation/devicetree/bindings/leds/leds-bcm63138.yaml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/Documentation/devicetree/bindings/leds/leds-bcm63138.yaml
++++ b/Documentation/devicetree/bindings/leds/leds-bcm63138.yaml
+@@ -54,7 +54,7 @@ patternProperties:
+       active-low:
+         type: boolean
+-        description: Makes LED active low.
++        description: Makes LED active low
+     required:
+       - reg
diff --git a/target/linux/generic/backport-5.4/846-v6.0-0002-leds-add-help-info-about-BCM63138-module-name.patch b/target/linux/generic/backport-5.4/846-v6.0-0002-leds-add-help-info-about-BCM63138-module-name.patch
new file mode 100644 (file)
index 0000000..44e8be8
--- /dev/null
@@ -0,0 +1,25 @@
+From bcc607cdbb1f931111196699426f0cb83bfb296a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
+Date: Sun, 17 Jul 2022 14:42:47 +0200
+Subject: [PATCH] leds: add help info about BCM63138 module name
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+It's what we do for all other LEDs drivers.
+
+Reported-by: Pavel Machek <pavel@ucw.cz>
+Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
+Signed-off-by: Pavel Machek <pavel@ucw.cz>
+---
+ drivers/leds/blink/Kconfig | 2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/drivers/leds/blink/Kconfig
++++ b/drivers/leds/blink/Kconfig
+@@ -9,3 +9,5 @@ config LEDS_BCM63138
+         This option enables support for LED controller that is part of
+         BCM63138 SoC. The same hardware block is known to be also used
+         in BCM4908, BCM6848, BCM6858, BCM63148, BCM63381 and BCM68360.
++
++        If compiled as module it will be called leds-bcm63138.
diff --git a/target/linux/generic/backport-5.4/846-v6.0-0003-leds-leds-bcm63138-get-rid-of-LED_OFF.patch b/target/linux/generic/backport-5.4/846-v6.0-0003-leds-leds-bcm63138-get-rid-of-LED_OFF.patch
new file mode 100644 (file)
index 0000000..e125a54
--- /dev/null
@@ -0,0 +1,30 @@
+From 92cfc71ee2ddfb499ed53e21b28bdf8739bc70bc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
+Date: Sun, 17 Jul 2022 14:42:48 +0200
+Subject: [PATCH] leds: leds-bcm63138: get rid of LED_OFF
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The whole "enum led_brightness" is marked as obsolete. Replace it with a
+(non-)zero check.
+
+Reported-by: Pavel Machek <pavel@ucw.cz>
+Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
+Signed-off-by: Pavel Machek <pavel@ucw.cz>
+---
+ drivers/leds/blink/leds-bcm63138.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+--- a/drivers/leds/blink/leds-bcm63138.c
++++ b/drivers/leds/blink/leds-bcm63138.c
+@@ -113,8 +113,7 @@ static void bcm63138_leds_enable_led(str
+ {
+       u32 bit = BIT(led->pin);
+-      bcm63138_leds_update_bits(leds, BCM63138_SW_DATA, bit,
+-                                value == LED_OFF ? 0 : bit);
++      bcm63138_leds_update_bits(leds, BCM63138_SW_DATA, bit, value ? bit : 0);
+ }
+ /*