leds: turris-omnia: use constants instead of macros for color command

PATCH In review Marek Behún 4 participants 10 messages Oct 30, 2020 – Nov 25, 2020

Subsystems (3)

Device tree bindings LED Arm/cz.nic turris support

lore

Share & tools

lore

Marek Behún

author maintainer

2020-10-30 02:39 UTC #0 lore raw

PATCH 1/5 leds: turris-omnia: use constants instead of macros for color command

Use integer constants directly when building I2C messages for LED color change command, instead of macros. The command is simple enough to understand what is going on even without these names.

Signed-off-by Marek Behún <[email protected]>

---
 drivers/leds/leds-turris-omnia.c | 34 ++++++++++++--------------------
 1 file changed, 13 insertions(+), 21 deletions(-)

drivers/leds/leds-turris-omnia.c +13 ~~-21~~

index 8c5bdc3847ee..80b2d94844f2 100644
@@ -27,14 +27,6 @@
 #define CMD_LED_SET_BRIGHTNESS		7
 #define CMD_LED_GET_BRIGHTNESS		8
 
-#define OMNIA_CMD			0
-
-#define OMNIA_CMD_LED_COLOR_LED		1
-#define OMNIA_CMD_LED_COLOR_R		2
-#define OMNIA_CMD_LED_COLOR_G		3
-#define OMNIA_CMD_LED_COLOR_B		4
-#define OMNIA_CMD_LED_COLOR_LEN		5
-
 struct omnia_led {
 	struct led_classdev_mc mc_cdev;
 	struct mc_subled subled_info[OMNIA_LED_NUM_CHANNELS];

@@ -55,21 +47,21 @@ static int omnia_led_brightness_set_blocking(struct led_classdev *cdev,
 	struct led_classdev_mc *mc_cdev = lcdev_to_mccdev(cdev);
 	struct omnia_leds *leds = dev_get_drvdata(cdev->dev->parent);
 	struct omnia_led *led = to_omnia_led(mc_cdev);
-	u8 buf[OMNIA_CMD_LED_COLOR_LEN], state;
+	u8 buf[5], state;
 	int ret;
 
 	mutex_lock(&leds->lock);
 
 	led_mc_calc_color_components(&led->mc_cdev, brightness);
 
-	buf[OMNIA_CMD] = CMD_LED_COLOR;
-	buf[OMNIA_CMD_LED_COLOR_LED] = led->reg;
-	buf[OMNIA_CMD_LED_COLOR_R] = mc_cdev->subled_info[0].brightness;
-	buf[OMNIA_CMD_LED_COLOR_G] = mc_cdev->subled_info[1].brightness;
-	buf[OMNIA_CMD_LED_COLOR_B] = mc_cdev->subled_info[2].brightness;
+	buf[0] = CMD_LED_COLOR;
+	buf[1] = led->reg;
+	buf[2] = mc_cdev->subled_info[0].brightness;
+	buf[3] = mc_cdev->subled_info[1].brightness;
+	buf[4] = mc_cdev->subled_info[2].brightness;
 
 	state = CMD_LED_STATE_LED(led->reg);
-	if (buf[OMNIA_CMD_LED_COLOR_R] || buf[OMNIA_CMD_LED_COLOR_G] || buf[OMNIA_CMD_LED_COLOR_B])
+	if (buf[2] || buf[3] || buf[4])
 		state |= CMD_LED_STATE_ON;
 
 	ret = i2c_smbus_write_byte_data(leds->client, CMD_LED_STATE, state);

@@ -250,18 +242,18 @@ static int omnia_leds_probe(struct i2c_client *client,
 
 static int omnia_leds_remove(struct i2c_client *client)
 {
-	u8 buf[OMNIA_CMD_LED_COLOR_LEN];
+	u8 buf[5];
 
 	/* put all LEDs into default (HW triggered) mode */
 	i2c_smbus_write_byte_data(client, CMD_LED_MODE,
 				  CMD_LED_MODE_LED(OMNIA_BOARD_LEDS));
 
 	/* set all LEDs color to [255, 255, 255] */
-	buf[OMNIA_CMD] = CMD_LED_COLOR;
-	buf[OMNIA_CMD_LED_COLOR_LED] = OMNIA_BOARD_LEDS;
-	buf[OMNIA_CMD_LED_COLOR_R] = 255;
-	buf[OMNIA_CMD_LED_COLOR_G] = 255;
-	buf[OMNIA_CMD_LED_COLOR_B] = 255;
+	buf[0] = CMD_LED_COLOR;
+	buf[1] = OMNIA_BOARD_LEDS;
+	buf[2] = 255;
+	buf[3] = 255;
+	buf[4] = 255;
 
 	i2c_master_send(client, buf, 5);

base-commit: 041883d044672852fcb8254cfc7b683fd306c943

Signature · 1 line

2.26.2

Marek Behún

author maintainer

2020-10-30 02:39 UTC #1 lore raw

PATCH 2/5 leds: turris-omnia: wrap to 80 columns

Although checkpatch changed the max-line-length default to 100 columns, we still prefer 80 columns somewhere.

Signed-off-by Marek Behún <[email protected]>

---
 drivers/leds/leds-turris-omnia.c | 43 ++++++++++++++++++--------------
 1 file changed, 24 insertions(+), 19 deletions(-)

drivers/leds/leds-turris-omnia.c +24 ~~-19~~

index 80b2d94844f2..096ed7b81957 100644
@@ -12,20 +12,20 @@
 #include <linux/of.h>
 #include "leds.h"
 
-#define OMNIA_BOARD_LEDS		12
-#define OMNIA_LED_NUM_CHANNELS		3
+#define OMNIA_BOARD_LEDS	12
+#define OMNIA_LED_NUM_CHANNELS	3
 
-#define CMD_LED_MODE			3
-#define CMD_LED_MODE_LED(l)		((l) & 0x0f)
-#define CMD_LED_MODE_USER		0x10
+#define CMD_LED_MODE		3
+#define CMD_LED_MODE_LED(l)	((l) & 0x0f)
+#define CMD_LED_MODE_USER	0x10
 
-#define CMD_LED_STATE			4
-#define CMD_LED_STATE_LED(l)		((l) & 0x0f)
-#define CMD_LED_STATE_ON		0x10
+#define CMD_LED_STATE		4
+#define CMD_LED_STATE_LED(l)	((l) & 0x0f)
+#define CMD_LED_STATE_ON	0x10
 
-#define CMD_LED_COLOR			5
-#define CMD_LED_SET_BRIGHTNESS		7
-#define CMD_LED_GET_BRIGHTNESS		8
+#define CMD_LED_COLOR		5
+#define CMD_LED_SET_BRIGHTNESS	7
+#define CMD_LED_GET_BRIGHTNESS	8
 
 struct omnia_led {
 	struct led_classdev_mc mc_cdev;

@@ -33,7 +33,7 @@ struct omnia_led {
 	int reg;
 };
 
-#define to_omnia_led(l)			container_of(l, struct omnia_led, mc_cdev)
+#define to_omnia_led(l)		container_of(l, struct omnia_led, mc_cdev)
 
 struct omnia_leds {
 	struct i2c_client *client;

@@ -118,18 +118,21 @@ static int omnia_led_register(struct i2c_client *client, struct omnia_led *led,
 					CMD_LED_MODE_LED(led->reg) |
 					CMD_LED_MODE_USER);
 	if (ret < 0) {
-		dev_err(dev, "Cannot set LED %pOF to software mode: %i\n", np, ret);
+		dev_err(dev, "Cannot set LED %pOF to software mode: %i\n", np,
+			ret);
 		return ret;
 	}
 
 	/* disable the LED */
-	ret = i2c_smbus_write_byte_data(client, CMD_LED_STATE, CMD_LED_STATE_LED(led->reg));
+	ret = i2c_smbus_write_byte_data(client, CMD_LED_STATE,
+					CMD_LED_STATE_LED(led->reg));
 	if (ret < 0) {
 		dev_err(dev, "Cannot set LED %pOF brightness: %i\n", np, ret);
 		return ret;
 	}
 
-	ret = devm_led_classdev_multicolor_register_ext(dev, &led->mc_cdev, &init_data);
+	ret = devm_led_classdev_multicolor_register_ext(dev, &led->mc_cdev,
+							&init_data);
 	if (ret < 0) {
 		dev_err(dev, "Cannot register LED %pOF: %i\n", np, ret);
 		return ret;

@@ -149,7 +152,8 @@ static int omnia_led_register(struct i2c_client *client, struct omnia_led *led,
  * file lives in the device directory of the LED controller, not an individual
  * LED, so it should not confuse users.
  */
-static ssize_t brightness_show(struct device *dev, struct device_attribute *a, char *buf)
+static ssize_t brightness_show(struct device *dev, struct device_attribute *a,
+			       char *buf)
 {
 	struct i2c_client *client = to_i2c_client(dev);
 	struct omnia_leds *leds = i2c_get_clientdata(client);

@@ -165,8 +169,8 @@ static ssize_t brightness_show(struct device *dev, struct device_attribute *a, c
 	return sprintf(buf, "%d\n", ret);
 }
 
-static ssize_t brightness_store(struct device *dev, struct device_attribute *a, const char *buf,
-				size_t count)
+static ssize_t brightness_store(struct device *dev, struct device_attribute *a,
+				const char *buf, size_t count)
 {
 	struct i2c_client *client = to_i2c_client(dev);
 	struct omnia_leds *leds = i2c_get_clientdata(client);

@@ -180,7 +184,8 @@ static ssize_t brightness_store(struct device *dev, struct device_attribute *a,
 		return -EINVAL;
 
 	mutex_lock(&leds->lock);
-	ret = i2c_smbus_write_byte_data(client, CMD_LED_SET_BRIGHTNESS, (u8) brightness);
+	ret = i2c_smbus_write_byte_data(client, CMD_LED_SET_BRIGHTNESS,
+					(u8)brightness);
 	mutex_unlock(&leds->lock);
 
 	if (ret < 0)

Signature · 1 line

2.26.2

Marek Behún

author maintainer

2020-10-30 02:39 UTC #2 lore raw

PATCH 3/5 leds: turris-omnia: fix checkpatch warning

In reply to Marek Behún

Use kstrtoul instead of sscanf to satisfy checkpatch.

Signed-off-by Marek Behún <[email protected]>

---
 drivers/leds/leds-turris-omnia.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

drivers/leds/leds-turris-omnia.c +2 -2

index 096ed7b81957..c0b4e1e0e945 100644
@@ -174,10 +174,10 @@ static ssize_t brightness_store(struct device *dev, struct device_attribute *a,
 {
 	struct i2c_client *client = to_i2c_client(dev);
 	struct omnia_leds *leds = i2c_get_clientdata(client);
-	unsigned int brightness;
+	unsigned long brightness;
 	int ret;
 
-	if (sscanf(buf, "%u", &brightness) != 1)
+	if (kstrtoul(buf, 10, &brightness))
 		return -EINVAL;
 
 	if (brightness > 100)

Signature · 1 line

2.26.2

Marek Behún

author maintainer

2020-10-30 02:39 UTC #3 lore raw

PATCH 4/5 dt-bindings: leds: leds-class-multicolor: use LED_COLOR_ID_RGB for now

In reply to Marek Behún

Commit 77dce3a22e89 ("leds: disallow /sys/class/leds/*:multi:* for now") disallows LED_COLOR_ID_MULTI for now, and instead LED_COLOR_ID_RGB should be used. Fix this is leds-class-multicolor binding.

After we have some usecases for non-RGB multicolor LEDs, this can be changed.

Signed-off-by Marek Behún <[email protected]>

Fixes 77dce3a22e89 ("leds: disallow /sys/class/leds/*:multi:* for now")

Cc [email protected]

---
 .../devicetree/bindings/leds/cznic,turris-omnia-leds.yaml     | 4 ++--
 .../devicetree/bindings/leds/leds-class-multicolor.yaml       | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

Documentation/devicetree/bindings/leds/cznic,turris-omnia-leds.yaml +2 -2

index fe7fa25877fd..2015db9b7618 100644
@@ -73,14 +73,14 @@ examples:
                  * LEDs.
                  */
                 reg = <0>;
-                color = <LED_COLOR_ID_MULTI>;
+                color = <LED_COLOR_ID_RGB>;
                 function = LED_FUNCTION_POWER;
                 linux,default-trigger = "heartbeat";
             };
 
             multi-led@a {
                 reg = <0xa>;
-                color = <LED_COLOR_ID_MULTI>;
+                color = <LED_COLOR_ID_RGB>;
                 function = LED_FUNCTION_INDICATOR;
                 function-enumerator = <1>;
             };

Documentation/devicetree/bindings/leds/leds-class-multicolor.yaml +2 -2

index b1a53f054b89..9faa3609a6bb 100644
@@ -25,10 +25,10 @@ patternProperties:
     description: Represents the LEDs that are to be grouped.
     properties:
       color:
-        const: 8  # LED_COLOR_ID_MULTI
+        const: 9  # LED_COLOR_ID_RGB
         description: |
           For multicolor LED support this property should be defined as
-          LED_COLOR_ID_MULTI which can be found in include/linux/leds/common.h.
+          LED_COLOR_ID_RGB which can be found in include/linux/leds/common.h.
 
     $ref: "common.yaml#"

Signature · 1 line

2.26.2

Dan Murphy

2020-10-30 13:08 UTC #4 lore raw

Re: [PATCH leds 4/5] dt-bindings: leds: leds-class-multicolor: use LED_COLOR_ID_RGB for now

Marek

Documentation/devicetree/bindings/leds/leds-class-multicolor.yaml

Quoted 41 lines · Marek Behún

After we have some usecases for non-RGB multicolor LEDs, this can be changed.

Signed-off-by Marek Behún <[email protected]>

Fixes 77dce3a22e89 ("leds: disallow /sys/class/leds/*:multi:* for now")

Cc [email protected]

---
  .../devicetree/bindings/leds/cznic,turris-omnia-leds.yaml     | 4 ++--
  .../devicetree/bindings/leds/leds-class-multicolor.yaml       | 4 ++--
  2 files changed, 4 insertions(+), 4 deletions(-)

Documentation/devicetree/bindings/leds/cznic,turris-omnia-leds.yaml +2 -2

index fe7fa25877fd..2015db9b7618 100644
@@ -73,14 +73,14 @@ examples:
                   * LEDs.
                   */
                  reg = <0>;
-                color = <LED_COLOR_ID_MULTI>;
+                color = <LED_COLOR_ID_RGB>;
                  function = LED_FUNCTION_POWER;
                  linux,default-trigger = "heartbeat";
              };
 
              multi-led@a {
                  reg = <0xa>;
-                color = <LED_COLOR_ID_MULTI>;
+                color = <LED_COLOR_ID_RGB>;
                  function = LED_FUNCTION_INDICATOR;
                  function-enumerator = <1>;
              };

Documentation/devicetree/bindings/leds/leds-class-multicolor.yaml +0 -0

index b1a53f054b89..9faa3609a6bb 100644

Why are you resubmitting the multicolor.yaml?

https://lore.kernel.org/patchwork/patch/1320863/

This is waiting on DT review.

Dan

Marek Behún

author maintainer

2020-10-30 21:47 UTC #5 lore raw

Re: [PATCH leds 4/5] dt-bindings: leds: leds-class-multicolor: use LED_COLOR_ID_RGB for now

Quoted 8 lines · On Fri, 30 Oct 2020 08:08:01 -0500 Dan Murphy <[email protected]> wrote:

Why are you resubmitting the multicolor.yaml?
https://lore.kernel.org/patchwork/patch/1320863/
This is waiting on DT review.
Dan

I must have overlooked that patch, sorry.

Rob Herring

maintainer

2020-11-04 21:55 UTC #6 lore raw

Re: [PATCH leds 4/5] dt-bindings: leds: leds-class-multicolor: use LED_COLOR_ID_RGB for now

In reply to Dan Murphy

Quoted 46 lines · Dan Murphy

Marek
Documentation/devicetree/bindings/leds/leds-class-multicolor.yaml
Quoted 40 lines · Marek Behún
Commit 77dce3a22e89 ("leds: disallow /sys/class/leds/*:multi:* for now") disallows LED_COLOR_ID_MULTI for now, and instead LED_COLOR_ID_RGB should be used. Fix this is leds-class-multicolor binding.
After we have some usecases for non-RGB multicolor LEDs, this can be changed.
Signed-off-by Marek Behún <[email protected]>
Fixes 77dce3a22e89 ("leds: disallow /sys/class/leds/*:multi:* for now")
Cc [email protected]
Cc [email protected]
---
  .../devicetree/bindings/leds/cznic,turris-omnia-leds.yaml     | 4 ++--
  .../devicetree/bindings/leds/leds-class-multicolor.yaml       | 4 ++--
  2 files changed, 4 insertions(+), 4 deletions(-)
Documentation/devicetree/bindings/leds/cznic,turris-omnia-leds.yaml +2 -2
index fe7fa25877fd..2015db9b7618 100644
@@ -73,14 +73,14 @@ examples:
                   * LEDs.
                   */
                  reg = <0>;
-                color = <LED_COLOR_ID_MULTI>;
+                color = <LED_COLOR_ID_RGB>;
                  function = LED_FUNCTION_POWER;
                  linux,default-trigger = "heartbeat";
              };
              multi-led@a {
                  reg = <0xa>;
-                color = <LED_COLOR_ID_MULTI>;
+                color = <LED_COLOR_ID_RGB>;
                  function = LED_FUNCTION_INDICATOR;
                  function-enumerator = <1>;
              };
Documentation/devicetree/bindings/leds/leds-class-multicolor.yaml +0 -0
index b1a53f054b89..9faa3609a6bb 100644
Why are you resubmitting the multicolor.yaml?

Quoted 3 lines

https://lore.kernel.org/patchwork/patch/1320863/
This is waiting on DT review.

I'm expecting another version as you commented on it.

Rob

Dan Murphy

2020-11-04 21:59 UTC #7 lore raw

Re: [PATCH leds 4/5] dt-bindings: leds: leds-class-multicolor: use LED_COLOR_ID_RGB for now

Rob

Quoted 46 lines · Rob Herring

Quoted 45 lines · Dan Murphy
Marek
Documentation/devicetree/bindings/leds/leds-class-multicolor.yaml
Quoted 40 lines · Marek Behún
Commit 77dce3a22e89 ("leds: disallow /sys/class/leds/*:multi:* for now") disallows LED_COLOR_ID_MULTI for now, and instead LED_COLOR_ID_RGB should be used. Fix this is leds-class-multicolor binding.
After we have some usecases for non-RGB multicolor LEDs, this can be changed.
Signed-off-by Marek Behún <[email protected]>
Fixes 77dce3a22e89 ("leds: disallow /sys/class/leds/*:multi:* for now")
Cc [email protected]
Cc [email protected]
---
   .../devicetree/bindings/leds/cznic,turris-omnia-leds.yaml     | 4 ++--
   .../devicetree/bindings/leds/leds-class-multicolor.yaml       | 4 ++--
   2 files changed, 4 insertions(+), 4 deletions(-)
Documentation/devicetree/bindings/leds/cznic,turris-omnia-leds.yaml +2 -2
index fe7fa25877fd..2015db9b7618 100644
@@ -73,14 +73,14 @@ examples:
                    * LEDs.
                    */
                   reg = <0>;
-                color = <LED_COLOR_ID_MULTI>;
+                color = <LED_COLOR_ID_RGB>;
                   function = LED_FUNCTION_POWER;
                   linux,default-trigger = "heartbeat";
               };
               multi-led@a {
                   reg = <0xa>;
-                color = <LED_COLOR_ID_MULTI>;
+                color = <LED_COLOR_ID_RGB>;
                   function = LED_FUNCTION_INDICATOR;
                   function-enumerator = <1>;
               };
Documentation/devicetree/bindings/leds/leds-class-multicolor.yaml +0 -0
index b1a53f054b89..9faa3609a6bb 100644
Why are you resubmitting the multicolor.yaml?

Quoted 4 lines

Quoted 3 lines
https://lore.kernel.org/patchwork/patch/1320863/
This is waiting on DT review.
I'm expecting another version as you commented on it.

Yes you applied v2

https://www.spinics.net/lists/devicetree/msg384974.html

Dan

Quoted 1 line

Rob

Marek Behún

author maintainer

2020-10-30 02:39 UTC #8 lore raw

PATCH 5/5 leds: turris-omnia: check for LED_COLOR_ID_RGB instead LED_COLOR_ID_MULTI

In reply to Marek Behún

LED core does not allow LED_COLOR_ID_MULTI for now and instead for RGB LEDs prefers LED_COLOR_ID_RGB.

Signed-off-by Marek Behún <[email protected]>

Fixes 77dce3a22e89 ("leds: disallow /sys/class/leds/*:multi:* for now")

---
 drivers/leds/leds-turris-omnia.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

drivers/leds/leds-turris-omnia.c +2 -2

index c0b4e1e0e945..7b2f4d0ae3fe 100644
@@ -90,9 +90,9 @@ static int omnia_led_register(struct i2c_client *client, struct omnia_led *led,
 	}
 
 	ret = of_property_read_u32(np, "color", &color);
-	if (ret || color != LED_COLOR_ID_MULTI) {
+	if (ret || color != LED_COLOR_ID_RGB) {
 		dev_warn(dev,
-			 "Node %pOF: must contain 'color' property with value LED_COLOR_ID_MULTI\n",
+			 "Node %pOF: must contain 'color' property with value LED_COLOR_ID_RGB\n",
 			 np);
 		return 0;
 	}

Signature · 1 line

2.26.2

Pavel Machek

2020-11-25 12:26 UTC #9 lore raw

Re: [PATCH leds 5/5] leds: turris-omnia: check for LED_COLOR_ID_RGB instead LED_COLOR_ID_MULTI

Hi!

Quoted 6 lines

LED core does not allow LED_COLOR_ID_MULTI for now and instead for RGB LEDs prefers LED_COLOR_ID_RGB.
Signed-off-by Marek Behún <[email protected]>
Fixes 77dce3a22e89 ("leds: disallow /sys/class/leds/*:multi:* for
now")

Thanks for patches. I have applied all but 4/, that is for Rob I guess.

Best regards,
Pavel

Signature · 1 line

http://www.livejournal.com/~pavelmachek