diff options
author | Simon Arlott <simon@fire.lp0.eu> | 2015-11-15 08:34:37 -0500 |
---|---|---|
committer | Jacek Anaszewski <j.anaszewski@samsung.com> | 2016-01-04 03:57:37 -0500 |
commit | b964c5ba6d52475d70e3550fbb3780ebabedf7db (patch) | |
tree | b2cbb931e3e6b9c1572519e3a8ed3c662c4612d1 | |
parent | 9d3c0663df338357625e75e7bead3322f083778b (diff) |
leds: bcm6328: Swap LED ON and OFF definitions
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>
Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com>
-rw-r--r-- | drivers/leds/leds-bcm6328.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/leds/leds-bcm6328.c b/drivers/leds/leds-bcm6328.c index 95d0cf94089b..0329dee4687b 100644 --- a/drivers/leds/leds-bcm6328.c +++ b/drivers/leds/leds-bcm6328.c | |||
@@ -48,10 +48,10 @@ | |||
48 | BCM6328_SERIAL_LED_SHIFT_DIR) | 48 | BCM6328_SERIAL_LED_SHIFT_DIR) |
49 | 49 | ||
50 | #define BCM6328_LED_MODE_MASK 3 | 50 | #define BCM6328_LED_MODE_MASK 3 |
51 | #define BCM6328_LED_MODE_OFF 0 | 51 | #define BCM6328_LED_MODE_ON 0 |
52 | #define BCM6328_LED_MODE_FAST 1 | 52 | #define BCM6328_LED_MODE_FAST 1 |
53 | #define BCM6328_LED_MODE_BLINK 2 | 53 | #define BCM6328_LED_MODE_BLINK 2 |
54 | #define BCM6328_LED_MODE_ON 3 | 54 | #define BCM6328_LED_MODE_OFF 3 |
55 | #define BCM6328_LED_SHIFT(X) ((X) << 1) | 55 | #define BCM6328_LED_SHIFT(X) ((X) << 1) |
56 | 56 | ||
57 | /** | 57 | /** |
@@ -126,9 +126,9 @@ static void bcm6328_led_set(struct led_classdev *led_cdev, | |||
126 | *(led->blink_leds) &= ~BIT(led->pin); | 126 | *(led->blink_leds) &= ~BIT(led->pin); |
127 | if ((led->active_low && value == LED_OFF) || | 127 | if ((led->active_low && value == LED_OFF) || |
128 | (!led->active_low && value != LED_OFF)) | 128 | (!led->active_low && value != LED_OFF)) |
129 | bcm6328_led_mode(led, BCM6328_LED_MODE_OFF); | ||
130 | else | ||
131 | bcm6328_led_mode(led, BCM6328_LED_MODE_ON); | 129 | bcm6328_led_mode(led, BCM6328_LED_MODE_ON); |
130 | else | ||
131 | bcm6328_led_mode(led, BCM6328_LED_MODE_OFF); | ||
132 | spin_unlock_irqrestore(led->lock, flags); | 132 | spin_unlock_irqrestore(led->lock, flags); |
133 | } | 133 | } |
134 | 134 | ||
@@ -303,8 +303,8 @@ static int bcm6328_led(struct device *dev, struct device_node *nc, u32 reg, | |||
303 | val = bcm6328_led_read(mode) >> | 303 | val = bcm6328_led_read(mode) >> |
304 | BCM6328_LED_SHIFT(shift % 16); | 304 | BCM6328_LED_SHIFT(shift % 16); |
305 | val &= BCM6328_LED_MODE_MASK; | 305 | val &= BCM6328_LED_MODE_MASK; |
306 | if ((led->active_low && val == BCM6328_LED_MODE_ON) || | 306 | if ((led->active_low && val == BCM6328_LED_MODE_OFF) || |
307 | (!led->active_low && val == BCM6328_LED_MODE_OFF)) | 307 | (!led->active_low && val == BCM6328_LED_MODE_ON)) |
308 | led->cdev.brightness = LED_FULL; | 308 | led->cdev.brightness = LED_FULL; |
309 | else | 309 | else |
310 | led->cdev.brightness = LED_OFF; | 310 | led->cdev.brightness = LED_OFF; |