target/linux/bcm63xx/patches-5.4/120-leds-bcm6328-support-second-hw-blinking-interval.patch

   1 --- a/drivers/leds/leds-bcm6328.c
   2 +++ b/drivers/leds/leds-bcm6328.c
   3 @@ -24,12 +24,16 @@
   4
   5  #define BCM6328_LED_MAX_COUNT          24
   6  #define BCM6328_LED_DEF_DELAY          500
   7 +#define BCM6328_LED_INTERVAL_NUM       2
   8  #define BCM6328_LED_INTERVAL_MS                20
   9
  10  #define BCM6328_LED_INTV_MASK          0x3f
  11 -#define BCM6328_LED_FAST_INTV_SHIFT    6
  12 -#define BCM6328_LED_FAST_INTV_MASK     (BCM6328_LED_INTV_MASK << \
  13 -                                        BCM6328_LED_FAST_INTV_SHIFT)
  14 +#define BCM6328_LED_INTV1_SHIFT                0
  15 +#define BCM6328_LED_INTV1_MASK         (BCM6328_LED_INTV_MASK << \
  16 +                                        BCM6328_LED_INTV1_SHIFT)
  17 +#define BCM6328_LED_INTV2_SHIFT                6
  18 +#define BCM6328_LED_INTV2_MASK         (BCM6328_LED_INTV_MASK << \
  19 +                                        BCM6328_LED_INTV2_SHIFT)
  20  #define BCM6328_SERIAL_LED_EN          BIT(12)
  21  #define BCM6328_SERIAL_LED_MUX         BIT(13)
  22  #define BCM6328_SERIAL_LED_CLK_NPOL    BIT(14)
  23 @@ -45,8 +49,8 @@
  24
  25  #define BCM6328_LED_MODE_MASK          3
  26  #define BCM6328_LED_MODE_ON            0
  27 -#define BCM6328_LED_MODE_FAST          1
  28 -#define BCM6328_LED_MODE_BLINK         2
  29 +#define BCM6328_LED_MODE_INTV1         1
  30 +#define BCM6328_LED_MODE_INTV2         2
  31  #define BCM6328_LED_MODE_OFF           3
  32  #define BCM6328_LED_SHIFT(X)           ((X) << 1)
  33
  34 @@ -127,12 +131,18 @@ static void bcm6328_led_set(struct led_c
  35         unsigned long flags;
  36
  37         spin_lock_irqsave(led->lock, flags);
  38 -       *(led->blink_leds) &= ~BIT(led->pin);
  39 +
  40 +       /* Remove LED from cached HW blinking intervals */
  41 +       led->blink_leds[0] &= ~BIT(led->pin);
  42 +       led->blink_leds[1] &= ~BIT(led->pin);
  43 +
  44 +       /* Set LED on/off */
  45         if ((led->active_low && value == LED_OFF) ||
  46             (!led->active_low && value != LED_OFF))
  47                 bcm6328_led_mode(led, BCM6328_LED_MODE_ON);
  48         else
  49                 bcm6328_led_mode(led, BCM6328_LED_MODE_OFF);
  50 +
  51         spin_unlock_irqrestore(led->lock, flags);
  52  }
  53
  54 @@ -176,20 +186,59 @@ static int bcm6328_blink_set(struct led_
  55         }
  56
  57         spin_lock_irqsave(led->lock, flags);
  58 -       if (*(led->blink_leds) == 0 ||
  59 -           *(led->blink_leds) == BIT(led->pin) ||
  60 -           *(led->blink_delay) == delay) {
  61 +       /*
  62 +        * Check if any of the two configurable HW blinking intervals is
  63 +        * available:
  64 +        *   1. No LEDs assigned to the HW blinking interval.
  65 +        *   2. LEDs with the same delay assigned.
  66 +        */
  67 +       if (led->blink_leds[0] == 0 ||
  68 +           led->blink_leds[0] == BIT(led->pin) ||
  69 +           led->blink_delay[0] == delay) {
  70 +               unsigned long val;
  71 +
  72 +               /* Add LED to the first HW blinking interval cache */
  73 +               led->blink_leds[0] |= BIT(led->pin);
  74 +
  75 +               /* Remove LED from the second HW blinking interval cache */
  76 +               led->blink_leds[1] &= ~BIT(led->pin);
  77 +
  78 +               /* Cache the LED in the first HW blinking interval delay */
  79 +               led->blink_delay[0] = delay;
  80 +
  81 +               /* Update the delay for the first HW blinking interval */
  82 +               val = bcm6328_led_read(led->mem + BCM6328_REG_INIT);
  83 +               val &= ~BCM6328_LED_INTV1_MASK;
  84 +               val |= (delay << BCM6328_LED_INTV1_SHIFT);
  85 +               bcm6328_led_write(led->mem + BCM6328_REG_INIT, val);
  86 +
  87 +               /* Set the LED to first HW blinking interval */
  88 +               bcm6328_led_mode(led, BCM6328_LED_MODE_INTV1);
  89 +
  90 +               rc = 0;
  91 +       } else if (led->blink_leds[1] == 0 ||
  92 +                  led->blink_leds[1] == BIT(led->pin) ||
  93 +                  led->blink_delay[1] == delay) {
  94                 unsigned long val;
  95
  96 -               *(led->blink_leds) |= BIT(led->pin);
  97 -               *(led->blink_delay) = delay;
  98 +               /* Remove LED from the first HW blinking interval */
  99 +               led->blink_leds[0] &= ~BIT(led->pin);
 100 +
 101 +               /* Add LED to the second HW blinking interval */
 102 +               led->blink_leds[1] |= BIT(led->pin);
 103
 104 +               /* Cache the LED in the first HW blinking interval delay */
 105 +               led->blink_delay[1] = delay;
 106 +
 107 +               /* Update the delay for the second HW blinking interval */
 108                 val = bcm6328_led_read(led->mem + BCM6328_REG_INIT);
 109 -               val &= ~BCM6328_LED_FAST_INTV_MASK;
 110 -               val |= (delay << BCM6328_LED_FAST_INTV_SHIFT);
 111 +               val &= ~BCM6328_LED_INTV2_MASK;
 112 +               val |= (delay << BCM6328_LED_INTV2_SHIFT);
 113                 bcm6328_led_write(led->mem + BCM6328_REG_INIT, val);
 114
 115 -               bcm6328_led_mode(led, BCM6328_LED_MODE_BLINK);
 116 +               /* Set the LED to second HW blinking interval */
 117 +               bcm6328_led_mode(led, BCM6328_LED_MODE_INTV2);
 118 +
 119                 rc = 0;
 120         } else {
 121                 dev_dbg(led_cdev->dev,
 122 @@ -363,11 +412,13 @@ static int bcm6328_leds_probe(struct pla
 123         if (!lock)
 124                 return -ENOMEM;
 125
 126 -       blink_leds = devm_kzalloc(dev, sizeof(*blink_leds), GFP_KERNEL);
 127 +       blink_leds = devm_kcalloc(dev, BCM6328_LED_INTERVAL_NUM,
 128 +                                 sizeof(*blink_leds), GFP_KERNEL);
 129         if (!blink_leds)
 130                 return -ENOMEM;
 131
 132 -       blink_delay = devm_kzalloc(dev, sizeof(*blink_delay), GFP_KERNEL);
 133 +       blink_delay = devm_kcalloc(dev, BCM6328_LED_INTERVAL_NUM,
 134 +                                  sizeof(*blink_delay), GFP_KERNEL);
 135         if (!blink_delay)
 136                 return -ENOMEM;
 137