* [PATCH leds v6 01/12] turris-omnia-mcu-interface.h: Move command execution function to global header
2024-11-08 13:28 [PATCH leds v6 00/12] Turris Omnia LED driver changes Marek Behún
@ 2024-11-08 13:28 ` Marek Behún
2024-11-08 13:28 ` [PATCH leds v6 02/12] leds: turris-omnia: Use command execution functions from the MCU driver Marek Behún
` (10 subsequent siblings)
11 siblings, 0 replies; 15+ messages in thread
From: Marek Behún @ 2024-11-08 13:28 UTC (permalink / raw)
To: Lee Jones
Cc: Pavel Machek, linux-leds, Arnd Bergmann, soc, Gregory CLEMENT,
arm, Andy Shevchenko, Hans de Goede, Ilpo Järvinen,
Andrew Lunn, Sebastian Hesselbarth, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, devicetree, Marek Behún
Move the command execution functions from the turris-omnia-mcu platform
driver private header to the global turris-omnia-mcu-interface.h header,
so that they can be used by the LED driver.
Signed-off-by: Marek Behún <kabel@kernel.org>
---
.../platform/cznic/turris-omnia-mcu-base.c | 1 +
drivers/platform/cznic/turris-omnia-mcu.h | 130 -----------------
include/linux/turris-omnia-mcu-interface.h | 136 +++++++++++++++++-
3 files changed, 136 insertions(+), 131 deletions(-)
diff --git a/drivers/platform/cznic/turris-omnia-mcu-base.c b/drivers/platform/cznic/turris-omnia-mcu-base.c
index 58f9afae2867..bb871226e357 100644
--- a/drivers/platform/cznic/turris-omnia-mcu-base.c
+++ b/drivers/platform/cznic/turris-omnia-mcu-base.c
@@ -52,6 +52,7 @@ int omnia_cmd_write_read(const struct i2c_client *client,
return 0;
}
+EXPORT_SYMBOL_GPL(omnia_cmd_write_read);
static int omnia_get_version_hash(struct omnia_mcu *mcu, bool bootloader,
char version[static OMNIA_FW_VERSION_HEX_LEN])
diff --git a/drivers/platform/cznic/turris-omnia-mcu.h b/drivers/platform/cznic/turris-omnia-mcu.h
index 57ef5d350043..b36f9626e660 100644
--- a/drivers/platform/cznic/turris-omnia-mcu.h
+++ b/drivers/platform/cznic/turris-omnia-mcu.h
@@ -8,7 +8,6 @@
#ifndef __TURRIS_OMNIA_MCU_H
#define __TURRIS_OMNIA_MCU_H
-#include <linux/bitops.h>
#include <linux/completion.h>
#include <linux/gpio/driver.h>
#include <linux/hw_random.h>
@@ -17,8 +16,6 @@
#include <linux/types.h>
#include <linux/watchdog.h>
#include <linux/workqueue.h>
-#include <asm/byteorder.h>
-#include <linux/unaligned.h>
struct i2c_client;
struct rtc_device;
@@ -63,133 +60,6 @@ struct omnia_mcu {
#endif
};
-int omnia_cmd_write_read(const struct i2c_client *client,
- void *cmd, unsigned int cmd_len,
- void *reply, unsigned int reply_len);
-
-static inline int omnia_cmd_write(const struct i2c_client *client, void *cmd,
- unsigned int len)
-{
- return omnia_cmd_write_read(client, cmd, len, NULL, 0);
-}
-
-static inline int omnia_cmd_write_u8(const struct i2c_client *client, u8 cmd,
- u8 val)
-{
- u8 buf[2] = { cmd, val };
-
- return omnia_cmd_write(client, buf, sizeof(buf));
-}
-
-static inline int omnia_cmd_write_u16(const struct i2c_client *client, u8 cmd,
- u16 val)
-{
- u8 buf[3];
-
- buf[0] = cmd;
- put_unaligned_le16(val, &buf[1]);
-
- return omnia_cmd_write(client, buf, sizeof(buf));
-}
-
-static inline int omnia_cmd_write_u32(const struct i2c_client *client, u8 cmd,
- u32 val)
-{
- u8 buf[5];
-
- buf[0] = cmd;
- put_unaligned_le32(val, &buf[1]);
-
- return omnia_cmd_write(client, buf, sizeof(buf));
-}
-
-static inline int omnia_cmd_read(const struct i2c_client *client, u8 cmd,
- void *reply, unsigned int len)
-{
- return omnia_cmd_write_read(client, &cmd, 1, reply, len);
-}
-
-static inline unsigned int
-omnia_compute_reply_length(unsigned long mask, bool interleaved,
- unsigned int offset)
-{
- if (!mask)
- return 0;
-
- return ((__fls(mask) >> 3) << interleaved) + 1 + offset;
-}
-
-/* Returns 0 on success */
-static inline int omnia_cmd_read_bits(const struct i2c_client *client, u8 cmd,
- unsigned long bits, unsigned long *dst)
-{
- __le32 reply;
- int err;
-
- if (!bits) {
- *dst = 0;
- return 0;
- }
-
- err = omnia_cmd_read(client, cmd, &reply,
- omnia_compute_reply_length(bits, false, 0));
- if (err)
- return err;
-
- *dst = le32_to_cpu(reply) & bits;
-
- return 0;
-}
-
-static inline int omnia_cmd_read_bit(const struct i2c_client *client, u8 cmd,
- unsigned long bit)
-{
- unsigned long reply;
- int err;
-
- err = omnia_cmd_read_bits(client, cmd, bit, &reply);
- if (err)
- return err;
-
- return !!reply;
-}
-
-static inline int omnia_cmd_read_u32(const struct i2c_client *client, u8 cmd,
- u32 *dst)
-{
- __le32 reply;
- int err;
-
- err = omnia_cmd_read(client, cmd, &reply, sizeof(reply));
- if (err)
- return err;
-
- *dst = le32_to_cpu(reply);
-
- return 0;
-}
-
-static inline int omnia_cmd_read_u16(const struct i2c_client *client, u8 cmd,
- u16 *dst)
-{
- __le16 reply;
- int err;
-
- err = omnia_cmd_read(client, cmd, &reply, sizeof(reply));
- if (err)
- return err;
-
- *dst = le16_to_cpu(reply);
-
- return 0;
-}
-
-static inline int omnia_cmd_read_u8(const struct i2c_client *client, u8 cmd,
- u8 *reply)
-{
- return omnia_cmd_read(client, cmd, reply, sizeof(*reply));
-}
-
#ifdef CONFIG_TURRIS_OMNIA_MCU_GPIO
extern const u8 omnia_int_to_gpio_idx[32];
extern const struct attribute_group omnia_mcu_gpio_group;
diff --git a/include/linux/turris-omnia-mcu-interface.h b/include/linux/turris-omnia-mcu-interface.h
index 2da8cbeb158a..7f24cc682780 100644
--- a/include/linux/turris-omnia-mcu-interface.h
+++ b/include/linux/turris-omnia-mcu-interface.h
@@ -9,7 +9,10 @@
#define __TURRIS_OMNIA_MCU_INTERFACE_H
#include <linux/bitfield.h>
-#include <linux/bits.h>
+#include <linux/bitops.h>
+#include <linux/types.h>
+#include <linux/unaligned.h>
+#include <asm/byteorder.h>
enum omnia_commands_e {
OMNIA_CMD_GET_STATUS_WORD = 0x01, /* slave sends status word back */
@@ -246,4 +249,135 @@ enum omnia_cmd_usb_ovc_prot_e {
OMNIA_CMD_xET_USB_OVC_PROT_ENABLE = BIT(4),
};
+/* Command execution functions */
+
+struct i2c_client;
+
+int omnia_cmd_write_read(const struct i2c_client *client,
+ void *cmd, unsigned int cmd_len,
+ void *reply, unsigned int reply_len);
+
+static inline int omnia_cmd_write(const struct i2c_client *client, void *cmd,
+ unsigned int len)
+{
+ return omnia_cmd_write_read(client, cmd, len, NULL, 0);
+}
+
+static inline int omnia_cmd_write_u8(const struct i2c_client *client, u8 cmd,
+ u8 val)
+{
+ u8 buf[2] = { cmd, val };
+
+ return omnia_cmd_write(client, buf, sizeof(buf));
+}
+
+static inline int omnia_cmd_write_u16(const struct i2c_client *client, u8 cmd,
+ u16 val)
+{
+ u8 buf[3];
+
+ buf[0] = cmd;
+ put_unaligned_le16(val, &buf[1]);
+
+ return omnia_cmd_write(client, buf, sizeof(buf));
+}
+
+static inline int omnia_cmd_write_u32(const struct i2c_client *client, u8 cmd,
+ u32 val)
+{
+ u8 buf[5];
+
+ buf[0] = cmd;
+ put_unaligned_le32(val, &buf[1]);
+
+ return omnia_cmd_write(client, buf, sizeof(buf));
+}
+
+static inline int omnia_cmd_read(const struct i2c_client *client, u8 cmd,
+ void *reply, unsigned int len)
+{
+ return omnia_cmd_write_read(client, &cmd, 1, reply, len);
+}
+
+static inline unsigned int
+omnia_compute_reply_length(unsigned long mask, bool interleaved,
+ unsigned int offset)
+{
+ if (!mask)
+ return 0;
+
+ return ((__fls(mask) >> 3) << interleaved) + 1 + offset;
+}
+
+/* Returns 0 on success */
+static inline int omnia_cmd_read_bits(const struct i2c_client *client, u8 cmd,
+ unsigned long bits, unsigned long *dst)
+{
+ __le32 reply;
+ int err;
+
+ if (!bits) {
+ *dst = 0;
+ return 0;
+ }
+
+ err = omnia_cmd_read(client, cmd, &reply,
+ omnia_compute_reply_length(bits, false, 0));
+ if (err)
+ return err;
+
+ *dst = le32_to_cpu(reply) & bits;
+
+ return 0;
+}
+
+static inline int omnia_cmd_read_bit(const struct i2c_client *client, u8 cmd,
+ unsigned long bit)
+{
+ unsigned long reply;
+ int err;
+
+ err = omnia_cmd_read_bits(client, cmd, bit, &reply);
+ if (err)
+ return err;
+
+ return !!reply;
+}
+
+static inline int omnia_cmd_read_u32(const struct i2c_client *client, u8 cmd,
+ u32 *dst)
+{
+ __le32 reply;
+ int err;
+
+ err = omnia_cmd_read(client, cmd, &reply, sizeof(reply));
+ if (err)
+ return err;
+
+ *dst = le32_to_cpu(reply);
+
+ return 0;
+}
+
+static inline int omnia_cmd_read_u16(const struct i2c_client *client, u8 cmd,
+ u16 *dst)
+{
+ __le16 reply;
+ int err;
+
+ err = omnia_cmd_read(client, cmd, &reply, sizeof(reply));
+ if (err)
+ return err;
+
+ *dst = le16_to_cpu(reply);
+
+ return 0;
+}
+
+static inline int omnia_cmd_read_u8(const struct i2c_client *client, u8 cmd,
+ u8 *reply)
+{
+ return omnia_cmd_read(client, cmd, reply, sizeof(*reply));
+}
+
#endif /* __TURRIS_OMNIA_MCU_INTERFACE_H */
--
2.45.2
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH leds v6 02/12] leds: turris-omnia: Use command execution functions from the MCU driver
2024-11-08 13:28 [PATCH leds v6 00/12] Turris Omnia LED driver changes Marek Behún
2024-11-08 13:28 ` [PATCH leds v6 01/12] turris-omnia-mcu-interface.h: Move command execution function to global header Marek Behún
@ 2024-11-08 13:28 ` Marek Behún
2024-11-08 13:28 ` [PATCH leds v6 03/12] turris-omnia-mcu-interface.h: Add LED commands related definitions to global header Marek Behún
` (9 subsequent siblings)
11 siblings, 0 replies; 15+ messages in thread
From: Marek Behún @ 2024-11-08 13:28 UTC (permalink / raw)
To: Lee Jones
Cc: Pavel Machek, linux-leds, Arnd Bergmann, soc, Gregory CLEMENT,
arm, Andy Shevchenko, Hans de Goede, Ilpo Järvinen,
Andrew Lunn, Sebastian Hesselbarth, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, devicetree, Marek Behún
Use the MCU command execution functions from the MCU driver instead of
the ad-hoc implementation in the LED driver. This allows as to drop the
LED driver implementation, which is a duplicate.
Signed-off-by: Marek Behún <kabel@kernel.org>
---
drivers/leds/Kconfig | 1 +
drivers/leds/leds-turris-omnia.c | 137 ++++++++++++-------------------
2 files changed, 55 insertions(+), 83 deletions(-)
diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig
index b784bb74a837..fcbe93b61e49 100644
--- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig
@@ -217,6 +217,7 @@ config LEDS_TURRIS_OMNIA
depends on I2C
depends on MACH_ARMADA_38X || COMPILE_TEST
depends on OF
+ depends on TURRIS_OMNIA_MCU
select LEDS_TRIGGERS
help
This option enables basic support for the LEDs found on the front
diff --git a/drivers/leds/leds-turris-omnia.c b/drivers/leds/leds-turris-omnia.c
index 4cff8c4b020c..00cd3bb86703 100644
--- a/drivers/leds/leds-turris-omnia.c
+++ b/drivers/leds/leds-turris-omnia.c
@@ -2,7 +2,7 @@
/*
* CZ.NIC's Turris Omnia LEDs driver
*
- * 2020, 2023 by Marek Behún <kabel@kernel.org>
+ * 2020, 2023, 2024 by Marek Behún <kabel@kernel.org>
*/
#include <linux/i2c.h>
@@ -10,6 +10,7 @@
#include <linux/module.h>
#include <linux/mutex.h>
#include <linux/of.h>
+#include <linux/turris-omnia-mcu-interface.h>
#include "leds.h"
#define OMNIA_BOARD_LEDS 12
@@ -57,66 +58,21 @@ struct omnia_leds {
struct omnia_led leds[];
};
-static int omnia_cmd_write_u8(const struct i2c_client *client, u8 cmd, u8 val)
+static int omnia_cmd_set_color(const struct i2c_client *client, u8 led, u8 r, u8 g, u8 b)
{
- u8 buf[2] = { cmd, val };
- int ret;
-
- ret = i2c_master_send(client, buf, sizeof(buf));
+ u8 buf[5] = { CMD_LED_COLOR, led, r, g, b };
- return ret < 0 ? ret : 0;
-}
-
-static int omnia_cmd_read_raw(struct i2c_adapter *adapter, u8 addr, u8 cmd,
- void *reply, size_t len)
-{
- struct i2c_msg msgs[2];
- int ret;
-
- msgs[0].addr = addr;
- msgs[0].flags = 0;
- msgs[0].len = 1;
- msgs[0].buf = &cmd;
- msgs[1].addr = addr;
- msgs[1].flags = I2C_M_RD;
- msgs[1].len = len;
- msgs[1].buf = reply;
-
- ret = i2c_transfer(adapter, msgs, ARRAY_SIZE(msgs));
- if (likely(ret == ARRAY_SIZE(msgs)))
- return 0;
- else if (ret < 0)
- return ret;
- else
- return -EIO;
-}
-
-static int omnia_cmd_read_u8(const struct i2c_client *client, u8 cmd)
-{
- u8 reply;
- int err;
-
- err = omnia_cmd_read_raw(client->adapter, client->addr, cmd, &reply, 1);
- if (err)
- return err;
-
- return reply;
+ return omnia_cmd_write(client, buf, sizeof(buf));
}
static int omnia_led_send_color_cmd(const struct i2c_client *client,
struct omnia_led *led)
{
- char cmd[5];
int ret;
- cmd[0] = CMD_LED_COLOR;
- cmd[1] = led->reg;
- cmd[2] = led->subled_info[0].brightness;
- cmd[3] = led->subled_info[1].brightness;
- cmd[4] = led->subled_info[2].brightness;
-
/* Send the color change command */
- ret = i2c_master_send(client, cmd, 5);
+ ret = omnia_cmd_set_color(client, led->reg, led->subled_info[0].brightness,
+ led->subled_info[1].brightness, led->subled_info[2].brightness);
if (ret < 0)
return ret;
@@ -352,14 +308,14 @@ static ssize_t brightness_show(struct device *dev, struct device_attribute *a,
char *buf)
{
struct i2c_client *client = to_i2c_client(dev);
- int ret;
-
- ret = omnia_cmd_read_u8(client, CMD_LED_GET_BRIGHTNESS);
+ u8 reply;
+ int err;
- if (ret < 0)
- return ret;
+ err = omnia_cmd_read_u8(client, CMD_LED_GET_BRIGHTNESS, &reply);
+ if (err < 0)
+ return err;
- return sysfs_emit(buf, "%d\n", ret);
+ return sysfs_emit(buf, "%d\n", reply);
}
static ssize_t brightness_store(struct device *dev, struct device_attribute *a,
@@ -386,17 +342,16 @@ static ssize_t gamma_correction_show(struct device *dev,
{
struct i2c_client *client = to_i2c_client(dev);
struct omnia_leds *leds = i2c_get_clientdata(client);
- int ret;
+ u8 reply = 0;
+ int err;
if (leds->has_gamma_correction) {
- ret = omnia_cmd_read_u8(client, CMD_GET_GAMMA_CORRECTION);
- if (ret < 0)
- return ret;
- } else {
- ret = 0;
+ err = omnia_cmd_read_u8(client, CMD_GET_GAMMA_CORRECTION, &reply);
+ if (err < 0)
+ return err;
}
- return sysfs_emit(buf, "%d\n", !!ret);
+ return sysfs_emit(buf, "%d\n", !!reply);
}
static ssize_t gamma_correction_store(struct device *dev,
@@ -427,26 +382,51 @@ static struct attribute *omnia_led_controller_attrs[] = {
};
ATTRIBUTE_GROUPS(omnia_led_controller);
-static int omnia_mcu_get_features(const struct i2c_client *client)
+static int omnia_mcu_get_features(const struct i2c_client *mcu_client)
{
u16 reply;
int err;
- err = omnia_cmd_read_raw(client->adapter, OMNIA_MCU_I2C_ADDR,
- CMD_GET_STATUS_WORD, &reply, sizeof(reply));
+ err = omnia_cmd_read_u16(mcu_client, CMD_GET_STATUS_WORD, &reply);
if (err)
return err;
/* Check whether MCU firmware supports the CMD_GET_FEAUTRES command */
- if (!(le16_to_cpu(reply) & STS_FEATURES_SUPPORTED))
+ if (!(reply & STS_FEATURES_SUPPORTED))
return 0;
- err = omnia_cmd_read_raw(client->adapter, OMNIA_MCU_I2C_ADDR,
- CMD_GET_FEATURES, &reply, sizeof(reply));
+ err = omnia_cmd_read_u16(mcu_client, CMD_GET_FEATURES, &reply);
if (err)
return err;
- return le16_to_cpu(reply);
+ return reply;
+}
+
+static int omnia_match_mcu_client(struct device *dev, void *data)
+{
+ struct i2c_client *client;
+
+ client = i2c_verify_client(dev);
+ if (!client)
+ return 0;
+
+ return client->addr == OMNIA_MCU_I2C_ADDR;
+}
+
+static int omnia_find_mcu_and_get_features(struct device *dev)
+{
+ struct device *mcu_dev;
+ int ret;
+
+ mcu_dev = device_find_child(dev->parent, NULL, omnia_match_mcu_client);
+ if (!mcu_dev)
+ return -ENODEV;
+
+ ret = omnia_mcu_get_features(i2c_verify_client(mcu_dev));
+
+ put_device(mcu_dev);
+
+ return ret;
}
static int omnia_leds_probe(struct i2c_client *client)
@@ -473,7 +453,7 @@ static int omnia_leds_probe(struct i2c_client *client)
leds->client = client;
i2c_set_clientdata(client, leds);
- ret = omnia_mcu_get_features(client);
+ ret = omnia_find_mcu_and_get_features(dev);
if (ret < 0) {
dev_err(dev, "Cannot determine MCU supported features: %d\n",
ret);
@@ -510,20 +490,11 @@ static int omnia_leds_probe(struct i2c_client *client)
static void omnia_leds_remove(struct i2c_client *client)
{
- u8 buf[5];
-
/* put all LEDs into default (HW triggered) mode */
- omnia_cmd_write_u8(client, CMD_LED_MODE,
- CMD_LED_MODE_LED(OMNIA_BOARD_LEDS));
+ omnia_cmd_write_u8(client, CMD_LED_MODE, CMD_LED_MODE_LED(OMNIA_BOARD_LEDS));
/* set all LEDs color to [255, 255, 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);
+ omnia_cmd_set_color(client, OMNIA_BOARD_LEDS, 255, 255, 255);
}
static const struct of_device_id of_omnia_leds_match[] = {
--
2.45.2
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH leds v6 03/12] turris-omnia-mcu-interface.h: Add LED commands related definitions to global header
2024-11-08 13:28 [PATCH leds v6 00/12] Turris Omnia LED driver changes Marek Behún
2024-11-08 13:28 ` [PATCH leds v6 01/12] turris-omnia-mcu-interface.h: Move command execution function to global header Marek Behún
2024-11-08 13:28 ` [PATCH leds v6 02/12] leds: turris-omnia: Use command execution functions from the MCU driver Marek Behún
@ 2024-11-08 13:28 ` Marek Behún
2024-11-08 13:28 ` [PATCH leds v6 04/12] leds: turris-omnia: Use global header for MCU command definitions Marek Behún
` (8 subsequent siblings)
11 siblings, 0 replies; 15+ messages in thread
From: Marek Behún @ 2024-11-08 13:28 UTC (permalink / raw)
To: Lee Jones
Cc: Pavel Machek, linux-leds, Arnd Bergmann, soc, Gregory CLEMENT,
arm, Andy Shevchenko, Hans de Goede, Ilpo Järvinen,
Andrew Lunn, Sebastian Hesselbarth, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, devicetree, Marek Behún
Add definitions for contents of the OMNIA_CMD_LED_MODE and
OMNIA_CMD_LED_STATE commands to the global turris-omnia-mcu-interface.h
header.
Signed-off-by: Marek Behún <kabel@kernel.org>
---
include/linux/turris-omnia-mcu-interface.h | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/include/linux/turris-omnia-mcu-interface.h b/include/linux/turris-omnia-mcu-interface.h
index 7f24cc682780..06c94e032c6f 100644
--- a/include/linux/turris-omnia-mcu-interface.h
+++ b/include/linux/turris-omnia-mcu-interface.h
@@ -239,6 +239,18 @@ enum omnia_int_e {
OMNIA_INT_LAN5_LED1 = BIT(31),
};
+enum omnia_cmd_led_mode_e {
+ OMNIA_CMD_LED_MODE_LED_MASK = GENMASK(3, 0),
+#define OMNIA_CMD_LED_MODE_LED(_l) FIELD_PREP(OMNIA_CMD_LED_MODE_LED_MASK, _l)
+ OMNIA_CMD_LED_MODE_USER = BIT(4),
+};
+
+enum omnia_cmd_led_state_e {
+ OMNIA_CMD_LED_STATE_LED_MASK = GENMASK(3, 0),
+#define OMNIA_CMD_LED_STATE_LED(_l) FIELD_PREP(OMNIA_CMD_LED_STATE_LED_MASK, _l)
+ OMNIA_CMD_LED_STATE_ON = BIT(4),
+};
+
enum omnia_cmd_poweroff_e {
OMNIA_CMD_POWER_OFF_POWERON_BUTTON = BIT(0),
OMNIA_CMD_POWER_OFF_MAGIC = 0xdead,
--
2.45.2
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH leds v6 04/12] leds: turris-omnia: Use global header for MCU command definitions
2024-11-08 13:28 [PATCH leds v6 00/12] Turris Omnia LED driver changes Marek Behún
` (2 preceding siblings ...)
2024-11-08 13:28 ` [PATCH leds v6 03/12] turris-omnia-mcu-interface.h: Add LED commands related definitions to global header Marek Behún
@ 2024-11-08 13:28 ` Marek Behún
2024-11-08 13:28 ` [PATCH leds v6 05/12] dt-bindings: leds: cznic,turris-omnia-leds: Allow interrupts property Marek Behún
` (7 subsequent siblings)
11 siblings, 0 replies; 15+ messages in thread
From: Marek Behún @ 2024-11-08 13:28 UTC (permalink / raw)
To: Lee Jones
Cc: Pavel Machek, linux-leds, Arnd Bergmann, soc, Gregory CLEMENT,
arm, Andy Shevchenko, Hans de Goede, Ilpo Järvinen,
Andrew Lunn, Sebastian Hesselbarth, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, devicetree, Marek Behún
The global turris-omnia-mcu-interface.h header file contains the
definitions for MCU commands. Drop the driver-internal definitions and
use the global ones.
Signed-off-by: Marek Behún <kabel@kernel.org>
---
drivers/leds/leds-turris-omnia.c | 71 +++++++++++---------------------
1 file changed, 23 insertions(+), 48 deletions(-)
diff --git a/drivers/leds/leds-turris-omnia.c b/drivers/leds/leds-turris-omnia.c
index 00cd3bb86703..50fef4389c93 100644
--- a/drivers/leds/leds-turris-omnia.c
+++ b/drivers/leds/leds-turris-omnia.c
@@ -16,30 +16,8 @@
#define OMNIA_BOARD_LEDS 12
#define OMNIA_LED_NUM_CHANNELS 3
-/* MCU controller commands at I2C address 0x2a */
-#define OMNIA_MCU_I2C_ADDR 0x2a
-
-#define CMD_GET_STATUS_WORD 0x01
-#define STS_FEATURES_SUPPORTED BIT(2)
-
-#define CMD_GET_FEATURES 0x10
-#define FEAT_LED_GAMMA_CORRECTION BIT(5)
-
-/* LED controller commands at I2C address 0x2b */
-#define CMD_LED_MODE 0x03
-#define CMD_LED_MODE_LED(l) ((l) & 0x0f)
-#define CMD_LED_MODE_USER 0x10
-
-#define CMD_LED_STATE 0x04
-#define CMD_LED_STATE_LED(l) ((l) & 0x0f)
-#define CMD_LED_STATE_ON 0x10
-
-#define CMD_LED_COLOR 0x05
-#define CMD_LED_SET_BRIGHTNESS 0x07
-#define CMD_LED_GET_BRIGHTNESS 0x08
-
-#define CMD_SET_GAMMA_CORRECTION 0x30
-#define CMD_GET_GAMMA_CORRECTION 0x31
+/* MCU controller I2C address 0x2a, needed for detecting MCU features */
+#define OMNIA_MCU_I2C_ADDR 0x2a
struct omnia_led {
struct led_classdev_mc mc_cdev;
@@ -60,7 +38,7 @@ struct omnia_leds {
static int omnia_cmd_set_color(const struct i2c_client *client, u8 led, u8 r, u8 g, u8 b)
{
- u8 buf[5] = { CMD_LED_COLOR, led, r, g, b };
+ u8 buf[5] = { OMNIA_CMD_LED_COLOR, led, r, g, b };
return omnia_cmd_write(client, buf, sizeof(buf));
}
@@ -127,12 +105,12 @@ static int omnia_led_brightness_set_blocking(struct led_classdev *cdev,
* is not being blinked by HW.
*/
if (!err && !led->hwtrig && !brightness != !led->on) {
- u8 state = CMD_LED_STATE_LED(led->reg);
+ u8 state = OMNIA_CMD_LED_STATE_LED(led->reg);
if (brightness)
- state |= CMD_LED_STATE_ON;
+ state |= OMNIA_CMD_LED_STATE_ON;
- err = omnia_cmd_write_u8(leds->client, CMD_LED_STATE, state);
+ err = omnia_cmd_write_u8(leds->client, OMNIA_CMD_LED_STATE, state);
if (!err)
led->on = !!brightness;
}
@@ -167,8 +145,8 @@ static int omnia_hwtrig_activate(struct led_classdev *cdev)
if (!err) {
/* Put the LED into MCU controlled mode */
- err = omnia_cmd_write_u8(leds->client, CMD_LED_MODE,
- CMD_LED_MODE_LED(led->reg));
+ err = omnia_cmd_write_u8(leds->client, OMNIA_CMD_LED_MODE,
+ OMNIA_CMD_LED_MODE_LED(led->reg));
if (!err)
led->hwtrig = true;
}
@@ -189,9 +167,8 @@ static void omnia_hwtrig_deactivate(struct led_classdev *cdev)
led->hwtrig = false;
/* Put the LED into software mode */
- err = omnia_cmd_write_u8(leds->client, CMD_LED_MODE,
- CMD_LED_MODE_LED(led->reg) |
- CMD_LED_MODE_USER);
+ err = omnia_cmd_write_u8(leds->client, OMNIA_CMD_LED_MODE,
+ OMNIA_CMD_LED_MODE_LED(led->reg) | OMNIA_CMD_LED_MODE_USER);
mutex_unlock(&leds->lock);
@@ -258,9 +235,8 @@ static int omnia_led_register(struct i2c_client *client, struct omnia_led *led,
cdev->default_trigger = omnia_hw_trigger.name;
/* put the LED into software mode */
- ret = omnia_cmd_write_u8(client, CMD_LED_MODE,
- CMD_LED_MODE_LED(led->reg) |
- CMD_LED_MODE_USER);
+ ret = omnia_cmd_write_u8(client, OMNIA_CMD_LED_MODE, OMNIA_CMD_LED_MODE_LED(led->reg) |
+ OMNIA_CMD_LED_MODE_USER);
if (ret) {
dev_err(dev, "Cannot set LED %pOF to software mode: %i\n", np,
ret);
@@ -268,8 +244,7 @@ static int omnia_led_register(struct i2c_client *client, struct omnia_led *led,
}
/* disable the LED */
- ret = omnia_cmd_write_u8(client, CMD_LED_STATE,
- CMD_LED_STATE_LED(led->reg));
+ ret = omnia_cmd_write_u8(client, OMNIA_CMD_LED_STATE, OMNIA_CMD_LED_STATE_LED(led->reg));
if (ret) {
dev_err(dev, "Cannot set LED %pOF brightness: %i\n", np, ret);
return ret;
@@ -311,7 +286,7 @@ static ssize_t brightness_show(struct device *dev, struct device_attribute *a,
u8 reply;
int err;
- err = omnia_cmd_read_u8(client, CMD_LED_GET_BRIGHTNESS, &reply);
+ err = omnia_cmd_read_u8(client, OMNIA_CMD_GET_BRIGHTNESS, &reply);
if (err < 0)
return err;
@@ -331,7 +306,7 @@ static ssize_t brightness_store(struct device *dev, struct device_attribute *a,
if (brightness > 100)
return -EINVAL;
- err = omnia_cmd_write_u8(client, CMD_LED_SET_BRIGHTNESS, brightness);
+ err = omnia_cmd_write_u8(client, OMNIA_CMD_SET_BRIGHTNESS, brightness);
return err ?: count;
}
@@ -346,7 +321,7 @@ static ssize_t gamma_correction_show(struct device *dev,
int err;
if (leds->has_gamma_correction) {
- err = omnia_cmd_read_u8(client, CMD_GET_GAMMA_CORRECTION, &reply);
+ err = omnia_cmd_read_u8(client, OMNIA_CMD_GET_GAMMA_CORRECTION, &reply);
if (err < 0)
return err;
}
@@ -369,7 +344,7 @@ static ssize_t gamma_correction_store(struct device *dev,
if (kstrtobool(buf, &val) < 0)
return -EINVAL;
- err = omnia_cmd_write_u8(client, CMD_SET_GAMMA_CORRECTION, val);
+ err = omnia_cmd_write_u8(client, OMNIA_CMD_SET_GAMMA_CORRECTION, val);
return err ?: count;
}
@@ -387,15 +362,15 @@ static int omnia_mcu_get_features(const struct i2c_client *mcu_client)
u16 reply;
int err;
- err = omnia_cmd_read_u16(mcu_client, CMD_GET_STATUS_WORD, &reply);
+ err = omnia_cmd_read_u16(mcu_client, OMNIA_CMD_GET_STATUS_WORD, &reply);
if (err)
return err;
- /* Check whether MCU firmware supports the CMD_GET_FEAUTRES command */
- if (!(reply & STS_FEATURES_SUPPORTED))
+ /* Check whether MCU firmware supports the OMNIA_CMD_GET_FEAUTRES command */
+ if (!(reply & OMNIA_STS_FEATURES_SUPPORTED))
return 0;
- err = omnia_cmd_read_u16(mcu_client, CMD_GET_FEATURES, &reply);
+ err = omnia_cmd_read_u16(mcu_client, OMNIA_CMD_GET_FEATURES, &reply);
if (err)
return err;
@@ -460,7 +435,7 @@ static int omnia_leds_probe(struct i2c_client *client)
return ret;
}
- leds->has_gamma_correction = ret & FEAT_LED_GAMMA_CORRECTION;
+ leds->has_gamma_correction = ret & OMNIA_FEAT_LED_GAMMA_CORRECTION;
if (!leds->has_gamma_correction) {
dev_info(dev,
"Your board's MCU firmware does not support the LED gamma correction feature.\n");
@@ -491,7 +466,7 @@ static int omnia_leds_probe(struct i2c_client *client)
static void omnia_leds_remove(struct i2c_client *client)
{
/* put all LEDs into default (HW triggered) mode */
- omnia_cmd_write_u8(client, CMD_LED_MODE, CMD_LED_MODE_LED(OMNIA_BOARD_LEDS));
+ omnia_cmd_write_u8(client, OMNIA_CMD_LED_MODE, OMNIA_CMD_LED_MODE_LED(OMNIA_BOARD_LEDS));
/* set all LEDs color to [255, 255, 255] */
omnia_cmd_set_color(client, OMNIA_BOARD_LEDS, 255, 255, 255);
--
2.45.2
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH leds v6 05/12] dt-bindings: leds: cznic,turris-omnia-leds: Allow interrupts property
2024-11-08 13:28 [PATCH leds v6 00/12] Turris Omnia LED driver changes Marek Behún
` (3 preceding siblings ...)
2024-11-08 13:28 ` [PATCH leds v6 04/12] leds: turris-omnia: Use global header for MCU command definitions Marek Behún
@ 2024-11-08 13:28 ` Marek Behún
2024-11-08 13:28 ` [PATCH leds v6 06/12] leds: turris-omnia: Document driver private structures Marek Behún
` (6 subsequent siblings)
11 siblings, 0 replies; 15+ messages in thread
From: Marek Behún @ 2024-11-08 13:28 UTC (permalink / raw)
To: Lee Jones
Cc: Pavel Machek, linux-leds, Arnd Bergmann, soc, Gregory CLEMENT,
arm, Andy Shevchenko, Hans de Goede, Ilpo Järvinen,
Andrew Lunn, Sebastian Hesselbarth, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, devicetree, Marek Behún,
Krzysztof Kozlowski
Extend the cznic,turris-omnia-leds binding with interrupts property,
specifying the global LED brightness changed by button press interrupt.
Signed-off-by: Marek Behún <kabel@kernel.org>
Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
.../devicetree/bindings/leds/cznic,turris-omnia-leds.yaml | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/Documentation/devicetree/bindings/leds/cznic,turris-omnia-leds.yaml b/Documentation/devicetree/bindings/leds/cznic,turris-omnia-leds.yaml
index 34ef5215c150..f52f6304c79e 100644
--- a/Documentation/devicetree/bindings/leds/cznic,turris-omnia-leds.yaml
+++ b/Documentation/devicetree/bindings/leds/cznic,turris-omnia-leds.yaml
@@ -23,6 +23,12 @@ properties:
description: I2C slave address of the microcontroller.
maxItems: 1
+ interrupts:
+ description:
+ Specifier for the global LED brightness changed by front button press
+ interrupt.
+ maxItems: 1
+
"#address-cells":
const: 1
@@ -56,6 +62,7 @@ additionalProperties: false
examples:
- |
+ #include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/leds/common.h>
i2c {
@@ -65,6 +72,7 @@ examples:
led-controller@2b {
compatible = "cznic,turris-omnia-leds";
reg = <0x2b>;
+ interrupts-extended = <&mcu 11 IRQ_TYPE_NONE>;
#address-cells = <1>;
#size-cells = <0>;
--
2.45.2
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH leds v6 06/12] leds: turris-omnia: Document driver private structures
2024-11-08 13:28 [PATCH leds v6 00/12] Turris Omnia LED driver changes Marek Behún
` (4 preceding siblings ...)
2024-11-08 13:28 ` [PATCH leds v6 05/12] dt-bindings: leds: cznic,turris-omnia-leds: Allow interrupts property Marek Behún
@ 2024-11-08 13:28 ` Marek Behún
2024-11-11 9:59 ` Marek Behún
2024-11-08 13:28 ` [PATCH leds v6 07/12] leds: turris-omnia: Notify sysfs on MCU global LEDs brightness change Marek Behún
` (5 subsequent siblings)
11 siblings, 1 reply; 15+ messages in thread
From: Marek Behún @ 2024-11-08 13:28 UTC (permalink / raw)
To: Lee Jones
Cc: Pavel Machek, linux-leds, Arnd Bergmann, soc, Gregory CLEMENT,
arm, Andy Shevchenko, Hans de Goede, Ilpo Järvinen,
Andrew Lunn, Sebastian Hesselbarth, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, devicetree, Marek Behún
Add documentation for driver private structures, `struct omnia_leds` and
`struct omnia_led`.
Signed-off-by: Marek Behún <kabel@kernel.org>
---
drivers/leds/leds-turris-omnia.c | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/drivers/leds/leds-turris-omnia.c b/drivers/leds/leds-turris-omnia.c
index 50fef4389c93..7d2ed0c6500a 100644
--- a/drivers/leds/leds-turris-omnia.c
+++ b/drivers/leds/leds-turris-omnia.c
@@ -19,6 +19,15 @@
/* MCU controller I2C address 0x2a, needed for detecting MCU features */
#define OMNIA_MCU_I2C_ADDR 0x2a
+/**
+ * struct omnia_led - per-LED part of driver private data structure
+ * @mc_cdev: multi-color LED class device
+ * @subled_info: per-channel information
+ * @cached_channels: cached values of per-channel brightness that was sent to the MCU
+ * @on: whether the LED was set on
+ * @hwtrig: whether the LED blinking was offloaded to the MCU
+ * @reg: LED identifier to the MCU
+ */
struct omnia_led {
struct led_classdev_mc mc_cdev;
struct mc_subled subled_info[OMNIA_LED_NUM_CHANNELS];
@@ -29,6 +38,13 @@ struct omnia_led {
#define to_omnia_led(l) container_of(l, struct omnia_led, mc_cdev)
+/**
+ * struct omnia_leds - driver private data structure
+ * @client: I2C client device
+ * @lock: mutex to protect
+ * @has_gamma_correction: whether the MCU firmware supports gamma correction
+ * @leds: flexible array of per-LED data
+ */
struct omnia_leds {
struct i2c_client *client;
struct mutex lock;
--
2.45.2
^ permalink raw reply related [flat|nested] 15+ messages in thread* Re: [PATCH leds v6 06/12] leds: turris-omnia: Document driver private structures
2024-11-08 13:28 ` [PATCH leds v6 06/12] leds: turris-omnia: Document driver private structures Marek Behún
@ 2024-11-11 9:59 ` Marek Behún
0 siblings, 0 replies; 15+ messages in thread
From: Marek Behún @ 2024-11-11 9:59 UTC (permalink / raw)
To: Lee Jones
Cc: Pavel Machek, linux-leds, Arnd Bergmann, soc, Gregory CLEMENT,
arm, Andy Shevchenko, Hans de Goede, Ilpo Järvinen,
Andrew Lunn, Sebastian Hesselbarth, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, devicetree
On Fri, Nov 08, 2024 at 02:28:39PM +0100, Marek Behún wrote:
> +/**
> + * struct omnia_leds - driver private data structure
> + * @client: I2C client device
> + * @lock: mutex to protect
This should be:
mutex to protect cached state
Sigh. Will send v7.
Marek
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH leds v6 07/12] leds: turris-omnia: Notify sysfs on MCU global LEDs brightness change
2024-11-08 13:28 [PATCH leds v6 00/12] Turris Omnia LED driver changes Marek Behún
` (5 preceding siblings ...)
2024-11-08 13:28 ` [PATCH leds v6 06/12] leds: turris-omnia: Document driver private structures Marek Behún
@ 2024-11-08 13:28 ` Marek Behún
2024-11-08 13:28 ` [PATCH leds v6 08/12] platform: cznic: turris-omnia-mcu: Inform about missing LED panel brightness change interrupt feature Marek Behún
` (4 subsequent siblings)
11 siblings, 0 replies; 15+ messages in thread
From: Marek Behún @ 2024-11-08 13:28 UTC (permalink / raw)
To: Lee Jones
Cc: Pavel Machek, linux-leds, Arnd Bergmann, soc, Gregory CLEMENT,
arm, Andy Shevchenko, Hans de Goede, Ilpo Järvinen,
Andrew Lunn, Sebastian Hesselbarth, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, devicetree, Marek Behún
Recall that on Turris Omnia, the LED controller has a global brightness
property, which allows the user to make the front LED panel dimmer.
There is also a button on the front panel, which by default is
configured so that pressing it changes the global brightness to a lower
value (unless it is at 0%, in which case pressing the button changes the
global brightness to 100%).
Newer versions of the MCU firmware support informing the SOC that the
brightness was changed by button press event via an interrupt.
Now that we have the turris-omnia-mcu driver, which adds support for MCU
interrupts, add the ability to inform the userspace (via a sysfs
notification) that the global brightness was changed.
Signed-off-by: Marek Behún <kabel@kernel.org>
---
drivers/leds/Kconfig | 1 +
drivers/leds/leds-turris-omnia.c | 62 ++++++++++++++++++++++++++++++++
2 files changed, 63 insertions(+)
diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig
index fcbe93b61e49..9ab6b56898c6 100644
--- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig
@@ -218,6 +218,7 @@ config LEDS_TURRIS_OMNIA
depends on MACH_ARMADA_38X || COMPILE_TEST
depends on OF
depends on TURRIS_OMNIA_MCU
+ depends on TURRIS_OMNIA_MCU_GPIO
select LEDS_TRIGGERS
help
This option enables basic support for the LEDs found on the front
diff --git a/drivers/leds/leds-turris-omnia.c b/drivers/leds/leds-turris-omnia.c
index 7d2ed0c6500a..b2c37dd2e1cc 100644
--- a/drivers/leds/leds-turris-omnia.c
+++ b/drivers/leds/leds-turris-omnia.c
@@ -43,12 +43,15 @@ struct omnia_led {
* @client: I2C client device
* @lock: mutex to protect
* @has_gamma_correction: whether the MCU firmware supports gamma correction
+ * @brightness_knode: kernel node of the "brightness" device sysfs attribute (this is the
+ * driver specific global brightness, not the LED classdev brightness)
* @leds: flexible array of per-LED data
*/
struct omnia_leds {
struct i2c_client *client;
struct mutex lock;
bool has_gamma_correction;
+ struct kernfs_node *brightness_knode;
struct omnia_led leds[];
};
@@ -373,6 +376,59 @@ static struct attribute *omnia_led_controller_attrs[] = {
};
ATTRIBUTE_GROUPS(omnia_led_controller);
+static irqreturn_t omnia_brightness_changed_threaded_fn(int irq, void *data)
+{
+ struct omnia_leds *leds = data;
+
+ if (unlikely(!leds->brightness_knode)) {
+ /*
+ * Note that sysfs_get_dirent() may sleep. This is okay, because we are in threaded
+ * context.
+ */
+ leds->brightness_knode = sysfs_get_dirent(leds->client->dev.kobj.sd, "brightness");
+ if (!leds->brightness_knode)
+ return IRQ_NONE;
+ }
+
+ sysfs_notify_dirent(leds->brightness_knode);
+
+ return IRQ_HANDLED;
+}
+
+static void omnia_brightness_knode_put(void *data)
+{
+ struct omnia_leds *leds = data;
+
+ if (leds->brightness_knode)
+ sysfs_put(leds->brightness_knode);
+}
+
+static int omnia_request_brightness_irq(struct omnia_leds *leds)
+{
+ struct device *dev = &leds->client->dev;
+ int ret;
+
+ if (!leds->client->irq) {
+ dev_info(dev,
+ "Brightness change interrupt supported by MCU firmware but not described in device-tree\n");
+
+ return 0;
+ }
+
+ /*
+ * Registering the brightness_knode destructor before requesting the IRQ ensures that on
+ * removal the brightness_knode sysfs node is put only after the IRQ is freed.
+ * This is needed because the interrupt handler uses the knode.
+ */
+ ret = devm_add_action(dev, omnia_brightness_knode_put, leds);
+ if (ret < 0)
+ return ret;
+
+ return devm_request_threaded_irq(dev, leds->client->irq, NULL,
+ omnia_brightness_changed_threaded_fn, IRQF_ONESHOT,
+ "leds-turris-omnia", leds);
+}
+
static int omnia_mcu_get_features(const struct i2c_client *mcu_client)
{
u16 reply;
@@ -459,6 +515,12 @@ static int omnia_leds_probe(struct i2c_client *client)
"Consider upgrading MCU firmware with the omnia-mcutool utility.\n");
}
+ if (ret & OMNIA_FEAT_BRIGHTNESS_INT) {
+ ret = omnia_request_brightness_irq(leds);
+ if (ret < 0)
+ return dev_err_probe(dev, ret, "Cannot request brightness IRQ\n");
+ }
+
mutex_init(&leds->lock);
ret = devm_led_trigger_register(dev, &omnia_hw_trigger);
--
2.45.2
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH leds v6 08/12] platform: cznic: turris-omnia-mcu: Inform about missing LED panel brightness change interrupt feature
2024-11-08 13:28 [PATCH leds v6 00/12] Turris Omnia LED driver changes Marek Behún
` (6 preceding siblings ...)
2024-11-08 13:28 ` [PATCH leds v6 07/12] leds: turris-omnia: Notify sysfs on MCU global LEDs brightness change Marek Behún
@ 2024-11-08 13:28 ` Marek Behún
2024-11-08 13:28 ` [PATCH leds v6 09/12] leds: turris-omnia: Inform about missing LED gamma correction feature in the MCU driver Marek Behún
` (3 subsequent siblings)
11 siblings, 0 replies; 15+ messages in thread
From: Marek Behún @ 2024-11-08 13:28 UTC (permalink / raw)
To: Lee Jones
Cc: Pavel Machek, linux-leds, Arnd Bergmann, soc, Gregory CLEMENT,
arm, Andy Shevchenko, Hans de Goede, Ilpo Järvinen,
Andrew Lunn, Sebastian Hesselbarth, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, devicetree, Marek Behún
When reading MCU firmware features, check also for the LED panel
brightness change interrupt feature, and suggest upgrading the firmware
if it is missing.
Signed-off-by: Marek Behún <kabel@kernel.org>
---
drivers/platform/cznic/turris-omnia-mcu-base.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/platform/cznic/turris-omnia-mcu-base.c b/drivers/platform/cznic/turris-omnia-mcu-base.c
index bb871226e357..3bb4a3cfdb29 100644
--- a/drivers/platform/cznic/turris-omnia-mcu-base.c
+++ b/drivers/platform/cznic/turris-omnia-mcu-base.c
@@ -258,6 +258,7 @@ static int omnia_mcu_read_features(struct omnia_mcu *mcu)
_DEF_FEAT(NEW_INT_API, "new interrupt API"),
_DEF_FEAT(POWEROFF_WAKEUP, "poweroff and wakeup"),
_DEF_FEAT(TRNG, "true random number generator"),
+ _DEF_FEAT(BRIGHTNESS_INT, "LED panel brightness change interrupt"),
#undef _DEF_FEAT
};
struct i2c_client *client = mcu->client;
--
2.45.2
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH leds v6 09/12] leds: turris-omnia: Inform about missing LED gamma correction feature in the MCU driver
2024-11-08 13:28 [PATCH leds v6 00/12] Turris Omnia LED driver changes Marek Behún
` (7 preceding siblings ...)
2024-11-08 13:28 ` [PATCH leds v6 08/12] platform: cznic: turris-omnia-mcu: Inform about missing LED panel brightness change interrupt feature Marek Behún
@ 2024-11-08 13:28 ` Marek Behún
2024-11-08 13:28 ` [PATCH leds v6 10/12] leds: turris-omnia: Use dev_err_probe() where appropriate Marek Behún
` (2 subsequent siblings)
11 siblings, 0 replies; 15+ messages in thread
From: Marek Behún @ 2024-11-08 13:28 UTC (permalink / raw)
To: Lee Jones
Cc: Pavel Machek, linux-leds, Arnd Bergmann, soc, Gregory CLEMENT,
arm, Andy Shevchenko, Hans de Goede, Ilpo Järvinen,
Andrew Lunn, Sebastian Hesselbarth, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, devicetree, Marek Behún
If the LED gamma correction feature is missing in the MCU firmware,
inform about this in the MCU firmware probe function instead of LED
driver probe function, so that all the feature checks are in one place.
Signed-off-by: Marek Behún <kabel@kernel.org>
---
drivers/leds/leds-turris-omnia.c | 6 ------
drivers/platform/cznic/turris-omnia-mcu-base.c | 1 +
2 files changed, 1 insertion(+), 6 deletions(-)
diff --git a/drivers/leds/leds-turris-omnia.c b/drivers/leds/leds-turris-omnia.c
index b2c37dd2e1cc..503e6e476c45 100644
--- a/drivers/leds/leds-turris-omnia.c
+++ b/drivers/leds/leds-turris-omnia.c
@@ -508,12 +508,6 @@ static int omnia_leds_probe(struct i2c_client *client)
}
leds->has_gamma_correction = ret & OMNIA_FEAT_LED_GAMMA_CORRECTION;
- if (!leds->has_gamma_correction) {
- dev_info(dev,
- "Your board's MCU firmware does not support the LED gamma correction feature.\n");
- dev_info(dev,
- "Consider upgrading MCU firmware with the omnia-mcutool utility.\n");
- }
if (ret & OMNIA_FEAT_BRIGHTNESS_INT) {
ret = omnia_request_brightness_irq(leds);
diff --git a/drivers/platform/cznic/turris-omnia-mcu-base.c b/drivers/platform/cznic/turris-omnia-mcu-base.c
index 3bb4a3cfdb29..770e680b96f9 100644
--- a/drivers/platform/cznic/turris-omnia-mcu-base.c
+++ b/drivers/platform/cznic/turris-omnia-mcu-base.c
@@ -259,6 +259,7 @@ static int omnia_mcu_read_features(struct omnia_mcu *mcu)
_DEF_FEAT(POWEROFF_WAKEUP, "poweroff and wakeup"),
_DEF_FEAT(TRNG, "true random number generator"),
_DEF_FEAT(BRIGHTNESS_INT, "LED panel brightness change interrupt"),
+ _DEF_FEAT(LED_GAMMA_CORRECTION, "LED gamma correction"),
#undef _DEF_FEAT
};
struct i2c_client *client = mcu->client;
--
2.45.2
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH leds v6 10/12] leds: turris-omnia: Use dev_err_probe() where appropriate
2024-11-08 13:28 [PATCH leds v6 00/12] Turris Omnia LED driver changes Marek Behún
` (8 preceding siblings ...)
2024-11-08 13:28 ` [PATCH leds v6 09/12] leds: turris-omnia: Inform about missing LED gamma correction feature in the MCU driver Marek Behún
@ 2024-11-08 13:28 ` Marek Behún
2024-11-08 13:28 ` [PATCH leds v6 11/12] leds: turris-omnia: Use uppercase first letter in all comments Marek Behún
2024-11-08 13:28 ` [PATCH leds v6 12/12] ARM: dts: turris-omnia: Add global LED brightness change interrupt Marek Behún
11 siblings, 0 replies; 15+ messages in thread
From: Marek Behún @ 2024-11-08 13:28 UTC (permalink / raw)
To: Lee Jones
Cc: Pavel Machek, linux-leds, Arnd Bergmann, soc, Gregory CLEMENT,
arm, Andy Shevchenko, Hans de Goede, Ilpo Järvinen,
Andrew Lunn, Sebastian Hesselbarth, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, devicetree, Marek Behún
Use dev_err_probe() instead of dev_err() + separate return where
appropriate.
Signed-off-by: Marek Behún <kabel@kernel.org>
---
drivers/leds/leds-turris-omnia.c | 50 ++++++++++----------------------
1 file changed, 16 insertions(+), 34 deletions(-)
diff --git a/drivers/leds/leds-turris-omnia.c b/drivers/leds/leds-turris-omnia.c
index 503e6e476c45..cee53ef94bc9 100644
--- a/drivers/leds/leds-turris-omnia.c
+++ b/drivers/leds/leds-turris-omnia.c
@@ -256,33 +256,23 @@ static int omnia_led_register(struct i2c_client *client, struct omnia_led *led,
/* put the LED into software mode */
ret = omnia_cmd_write_u8(client, OMNIA_CMD_LED_MODE, OMNIA_CMD_LED_MODE_LED(led->reg) |
OMNIA_CMD_LED_MODE_USER);
- if (ret) {
- dev_err(dev, "Cannot set LED %pOF to software mode: %i\n", np,
- ret);
- return ret;
- }
+ if (ret)
+ return dev_err_probe(dev, ret, "Cannot set LED %pOF to software mode\n", np);
/* disable the LED */
ret = omnia_cmd_write_u8(client, OMNIA_CMD_LED_STATE, OMNIA_CMD_LED_STATE_LED(led->reg));
- if (ret) {
- dev_err(dev, "Cannot set LED %pOF brightness: %i\n", np, ret);
- return ret;
- }
+ if (ret)
+ return dev_err_probe(dev, ret, "Cannot set LED %pOF brightness\n", np);
/* Set initial color and cache it */
ret = omnia_led_send_color_cmd(client, led);
- if (ret < 0) {
- dev_err(dev, "Cannot set LED %pOF initial color: %i\n", np,
- ret);
- return ret;
- }
+ if (ret < 0)
+ return dev_err_probe(dev, ret, "Cannot set LED %pOF initial color\n", np);
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;
- }
+ if (ret < 0)
+ return dev_err_probe(dev, ret, "Cannot register LED %pOF\n", np);
return 1;
}
@@ -485,13 +475,10 @@ static int omnia_leds_probe(struct i2c_client *client)
int ret, count;
count = of_get_available_child_count(np);
- if (!count) {
- dev_err(dev, "LEDs are not defined in device tree!\n");
- return -ENODEV;
- } else if (count > OMNIA_BOARD_LEDS) {
- dev_err(dev, "Too many LEDs defined in device tree!\n");
- return -EINVAL;
- }
+ if (count == 0)
+ return dev_err_probe(dev, -ENODEV, "LEDs are not defined in device tree!\n");
+ if (count > OMNIA_BOARD_LEDS)
+ return dev_err_probe(dev, -EINVAL, "Too many LEDs defined in device tree!\n");
leds = devm_kzalloc(dev, struct_size(leds, leds, count), GFP_KERNEL);
if (!leds)
@@ -501,11 +488,8 @@ static int omnia_leds_probe(struct i2c_client *client)
i2c_set_clientdata(client, leds);
ret = omnia_find_mcu_and_get_features(dev);
- if (ret < 0) {
- dev_err(dev, "Cannot determine MCU supported features: %d\n",
- ret);
- return ret;
- }
+ if (ret < 0)
+ return dev_err_probe(dev, ret, "Cannot determine MCU supported features\n");
leds->has_gamma_correction = ret & OMNIA_FEAT_LED_GAMMA_CORRECTION;
@@ -518,10 +502,8 @@ static int omnia_leds_probe(struct i2c_client *client)
mutex_init(&leds->lock);
ret = devm_led_trigger_register(dev, &omnia_hw_trigger);
- if (ret < 0) {
- dev_err(dev, "Cannot register private LED trigger: %d\n", ret);
- return ret;
- }
+ if (ret < 0)
+ return dev_err_probe(dev, ret, "Cannot register private LED trigger\n");
led = &leds->leds[0];
for_each_available_child_of_node_scoped(np, child) {
--
2.45.2
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH leds v6 11/12] leds: turris-omnia: Use uppercase first letter in all comments
2024-11-08 13:28 [PATCH leds v6 00/12] Turris Omnia LED driver changes Marek Behún
` (9 preceding siblings ...)
2024-11-08 13:28 ` [PATCH leds v6 10/12] leds: turris-omnia: Use dev_err_probe() where appropriate Marek Behún
@ 2024-11-08 13:28 ` Marek Behún
2024-11-08 13:28 ` [PATCH leds v6 12/12] ARM: dts: turris-omnia: Add global LED brightness change interrupt Marek Behún
11 siblings, 0 replies; 15+ messages in thread
From: Marek Behún @ 2024-11-08 13:28 UTC (permalink / raw)
To: Lee Jones
Cc: Pavel Machek, linux-leds, Arnd Bergmann, soc, Gregory CLEMENT,
arm, Andy Shevchenko, Hans de Goede, Ilpo Järvinen,
Andrew Lunn, Sebastian Hesselbarth, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, devicetree, Marek Behún
Change first letter of 4 more comments to uppercase to make the driver
comments uniform.
Signed-off-by: Marek Behún <kabel@kernel.org>
---
drivers/leds/leds-turris-omnia.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/leds/leds-turris-omnia.c b/drivers/leds/leds-turris-omnia.c
index cee53ef94bc9..2c116abe4de2 100644
--- a/drivers/leds/leds-turris-omnia.c
+++ b/drivers/leds/leds-turris-omnia.c
@@ -253,13 +253,13 @@ static int omnia_led_register(struct i2c_client *client, struct omnia_led *led,
*/
cdev->default_trigger = omnia_hw_trigger.name;
- /* put the LED into software mode */
+ /* Put the LED into software mode */
ret = omnia_cmd_write_u8(client, OMNIA_CMD_LED_MODE, OMNIA_CMD_LED_MODE_LED(led->reg) |
OMNIA_CMD_LED_MODE_USER);
if (ret)
return dev_err_probe(dev, ret, "Cannot set LED %pOF to software mode\n", np);
- /* disable the LED */
+ /* Disable the LED */
ret = omnia_cmd_write_u8(client, OMNIA_CMD_LED_STATE, OMNIA_CMD_LED_STATE_LED(led->reg));
if (ret)
return dev_err_probe(dev, ret, "Cannot set LED %pOF brightness\n", np);
@@ -519,10 +519,10 @@ static int omnia_leds_probe(struct i2c_client *client)
static void omnia_leds_remove(struct i2c_client *client)
{
- /* put all LEDs into default (HW triggered) mode */
+ /* Put all LEDs into default (HW triggered) mode */
omnia_cmd_write_u8(client, OMNIA_CMD_LED_MODE, OMNIA_CMD_LED_MODE_LED(OMNIA_BOARD_LEDS));
- /* set all LEDs color to [255, 255, 255] */
+ /* Set all LEDs color to [255, 255, 255] */
omnia_cmd_set_color(client, OMNIA_BOARD_LEDS, 255, 255, 255);
}
--
2.45.2
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH leds v6 12/12] ARM: dts: turris-omnia: Add global LED brightness change interrupt
2024-11-08 13:28 [PATCH leds v6 00/12] Turris Omnia LED driver changes Marek Behún
` (10 preceding siblings ...)
2024-11-08 13:28 ` [PATCH leds v6 11/12] leds: turris-omnia: Use uppercase first letter in all comments Marek Behún
@ 2024-11-08 13:28 ` Marek Behún
2024-11-08 13:34 ` Marek Behún
11 siblings, 1 reply; 15+ messages in thread
From: Marek Behún @ 2024-11-08 13:28 UTC (permalink / raw)
To: Lee Jones
Cc: Pavel Machek, linux-leds, Arnd Bergmann, soc, Gregory CLEMENT,
arm, Andy Shevchenko, Hans de Goede, Ilpo Järvinen,
Andrew Lunn, Sebastian Hesselbarth, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, devicetree, Marek Behún
When global LED brightness is changed by pressing the front button on
Turris Omnia, the MCU can produce an interrupt to the CPU. Add the
description of this interrupt to the LED controller node.
Signed-off-by: Marek Behún <kabel@kernel.org>
---
arch/arm/boot/dts/marvell/armada-385-turris-omnia.dts | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm/boot/dts/marvell/armada-385-turris-omnia.dts b/arch/arm/boot/dts/marvell/armada-385-turris-omnia.dts
index 43202890c959..83fe00abd652 100644
--- a/arch/arm/boot/dts/marvell/armada-385-turris-omnia.dts
+++ b/arch/arm/boot/dts/marvell/armada-385-turris-omnia.dts
@@ -251,6 +251,7 @@ mcu: system-controller@2a {
led-controller@2b {
compatible = "cznic,turris-omnia-leds";
reg = <0x2b>;
+ interrupts-extended = <&mcu 11 IRQ_TYPE_NONE>;
#address-cells = <1>;
#size-cells = <0>;
status = "okay";
--
2.45.2
^ permalink raw reply related [flat|nested] 15+ messages in thread* Re: [PATCH leds v6 12/12] ARM: dts: turris-omnia: Add global LED brightness change interrupt
2024-11-08 13:28 ` [PATCH leds v6 12/12] ARM: dts: turris-omnia: Add global LED brightness change interrupt Marek Behún
@ 2024-11-08 13:34 ` Marek Behún
0 siblings, 0 replies; 15+ messages in thread
From: Marek Behún @ 2024-11-08 13:34 UTC (permalink / raw)
To: Marek Behún
Cc: Lee Jones, Pavel Machek, linux-leds, Arnd Bergmann, soc,
Gregory CLEMENT, arm, Andy Shevchenko, Hans de Goede,
Ilpo Järvinen, Andrew Lunn, Sebastian Hesselbarth,
Rob Herring, Krzysztof Kozlowski, Conor Dooley, devicetree
Forgot to drop this patch (Gregory already applied it on mvebu/dt).
Sorry.
Marek
^ permalink raw reply [flat|nested] 15+ messages in thread