Messages in this thread | | | Date | Mon, 23 Nov 2015 11:20:14 +0100 | From | Jacek Anaszewski <> | Subject | Re: [PATCH 2/2] leds-bcm6328: Swap LED ON and OFF definitions |
| |
On 11/15/2015 02:34 PM, Simon Arlott wrote: > The values of BCM6328_LED_MODE_ON and BCM6328_LED_MODE_OFF were named > for active low LEDs. These should be swapped so that they are named for > the default case of active high LEDs. > > Signed-off-by: Simon Arlott <simon@fire.lp0.eu> > --- > On 05/11/15 10:41, Jacek Anaszewski wrote: >> On 11/04/2015 04:46 PM, Álvaro Fernández Rojas wrote: >>> BCM6328_LED_MODE_ON and BCM6328_LED_MODE_OFF values were extracted from >>> Broadcom's GPL code, in which they assume leds are active low by default. >>> I can confirm the code is correct as it is right now, since those values >>> match the active high / low values of the LEDs managed by GPIO instead >>> of by using this driver. >> >> BCM6328_LED_MODE_ON and BCM6328_LED_MODE_OFF should represent the values >> that actually set the LED state according to the current logic. >> Otherwise it will confuse people who will be analyzing this code. >> We are interested in the logic as it is seen from this driver's >> perspective and not GPIO perspective. >> >> IMO the values should be swapped. > > drivers/leds/leds-bcm6328.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/drivers/leds/leds-bcm6328.c b/drivers/leds/leds-bcm6328.c > index 95d0cf9..0329dee 100644 > --- a/drivers/leds/leds-bcm6328.c > +++ b/drivers/leds/leds-bcm6328.c > @@ -48,10 +48,10 @@ > BCM6328_SERIAL_LED_SHIFT_DIR) > > #define BCM6328_LED_MODE_MASK 3 > -#define BCM6328_LED_MODE_OFF 0 > +#define BCM6328_LED_MODE_ON 0 > #define BCM6328_LED_MODE_FAST 1 > #define BCM6328_LED_MODE_BLINK 2 > -#define BCM6328_LED_MODE_ON 3 > +#define BCM6328_LED_MODE_OFF 3 > #define BCM6328_LED_SHIFT(X) ((X) << 1) > > /** > @@ -126,9 +126,9 @@ static void bcm6328_led_set(struct led_classdev *led_cdev, > *(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); > + else > + bcm6328_led_mode(led, BCM6328_LED_MODE_OFF); > spin_unlock_irqrestore(led->lock, flags); > } > > @@ -303,8 +303,8 @@ static int bcm6328_led(struct device *dev, struct device_node *nc, u32 reg, > val = bcm6328_led_read(mode) >> > BCM6328_LED_SHIFT(shift % 16); > val &= BCM6328_LED_MODE_MASK; > - if ((led->active_low && val == BCM6328_LED_MODE_ON) || > - (!led->active_low && val == BCM6328_LED_MODE_OFF)) > + if ((led->active_low && val == BCM6328_LED_MODE_OFF) || > + (!led->active_low && val == BCM6328_LED_MODE_ON)) > led->cdev.brightness = LED_FULL; > else > led->cdev.brightness = LED_OFF; >
Applied, thanks.
-- Best Regards, Jacek Anaszewski
| |