From patchwork Tue Nov 1 21:25:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joseph Strauss X-Patchwork-Id: 13898 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp3217693wru; Tue, 1 Nov 2022 14:27:05 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5cE8dxS1yW34DlhzDiUasEkn/xEu4s3Syz0Q+e/DGekcuDGV3KAIgo90ijRLBvH1TXxAio X-Received: by 2002:a17:90a:7e10:b0:213:9e81:87e2 with SMTP id i16-20020a17090a7e1000b002139e8187e2mr23895170pjl.1.1667338024814; Tue, 01 Nov 2022 14:27:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667338024; cv=none; d=google.com; s=arc-20160816; b=r7y170FnkTtlKf98qM5v0BdgPBHVkb4vGJWcaovcR0M5X5y7WrY20YxSBG0JKScqOz Hl7dt2twLUUp/tyyxD32qCZ5f3bjDRXCGl1f4qGtbUmzutUADNBagmhJ+1HrsY0LSDDP vCCBuOhrORpHi3MYUaC9gpIumBA84iJ1DlnpAuKqHwodpC0IFiNnwlZk556unRyHHypY HcLkXQML9tmurXxcL63k4N0pUZt+a6/r8x6h70QH2KRbZ9/QTcUSmu3PboZeyh9lLnpq j4sTnppDn9t76XI1xvxlR5xgpEtVyhVWsYuPns/nbPRy4bWjTsgOvBc9wI1oOzbmvzNb IaWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :feedback-id:message-id:subject:cc:from:to:dkim-signature:date; bh=rCxr2+LpIlmRelx7KjMNeroG2ulBJCksqvnWFVCz+WM=; b=ak/YQev+hA0B4bJUwa1iYPdYSfvhlFzzG6zHKlJs1rHUrE8rya5k8sI/ijJjoffBtX Ycq+mp2ervQpZ9eEgTDlPO/4ywgTOZ6evsxt0KibA/sAJgRgtwdmos7kljcl6VhbWCze OAtAHtPwKP1WfBQOVp4NpujBsw2e7oMXFP8E/kV5jtDBLxcGWbUcU8Efd+tbl0nrCVpK MBksu1CyYMB3mkgoHvDoka304RFoSYCa1Cp+BbbiKpp852TgmGl6LV1cawvH4owtM6ku zQZ9kI69OFO3ueUMnC/8EoFgOqAlEwoT6KT8PdQLQIQttw+KPP+reBgpS1utP+nrNGHa 8o4w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@proton.me header.s=protonmail header.b=SnzluPrj; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=proton.me Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id c29-20020a630d1d000000b0046f57dc1613si13742076pgl.599.2022.11.01.14.26.51; Tue, 01 Nov 2022 14:27:04 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@proton.me header.s=protonmail header.b=SnzluPrj; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=proton.me Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230313AbiKAVZm (ORCPT + 99 others); Tue, 1 Nov 2022 17:25:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45558 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230323AbiKAVZk (ORCPT ); Tue, 1 Nov 2022 17:25:40 -0400 Received: from mail-0301.mail-europe.com (mail-0301.mail-europe.com [188.165.51.139]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C1BE71054D for ; Tue, 1 Nov 2022 14:25:38 -0700 (PDT) Date: Tue, 01 Nov 2022 21:25:27 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proton.me; s=protonmail; t=1667337934; x=1667597134; bh=rCxr2+LpIlmRelx7KjMNeroG2ulBJCksqvnWFVCz+WM=; h=Date:To:From:Cc:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=SnzluPrjO+HK7mtJaHmxMtQrEWzUq34g8ugM3QEGHX19XDxiqIVkg1gLikjP9nSo0 CWMHzjOV5qzSeOBlm2B7SVijMN29a19gc/JQj+B2YqjjkRkvthIlIzu4uDwMRU76ag R4LbJtib0aB3DbbleC8R6RpkCBSIa3LKIqPhkmLbcNQAHbx/ugFWShTF/EjE19HYI0 tiiK3rKQRoDO4LdxEP4oNajxu8P2dw+OVRErW62QuNLcUcpJ79xApIlAjgS7YSoLtE qMY+frvPVe7HNizCkhdJFWuQ4D/FW0jEr47Lv9cbYzjHfp1xQ2D+EW2WTj0uq4giU0 UvHoih4RvAz3w== To: pavel@ucw.cz, jansimon.moeller@gmx.de From: Joseph Strauss Cc: linux-leds@vger.kernel.org, linux-kernel@vger.kernel.org, Joseph Strauss Subject: [PATCH RESEND] Add multicolor support to BlinkM LED driver Message-ID: <20221101212347.6783-1-jstrauss16@proton.me> Feedback-ID: 52406082:user:proton MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1748330636537626560?= X-GMAIL-MSGID: =?utf-8?q?1748330636537626560?= Added multicolor support to the BlinkM driver, making it easier to control from userspace. The BlinkM LED is a programmable RGB LED. The driver currently supports only the regular LED sysfs class, resulting in the creation of three distinct classes, one for red, green, and blue. The user then has to input three values into the three seperate brightness files within those classes. The multicolor LED framework makes the device easier to control with the multi_intensity file: the user can input three values at once to form a color, while still controlling the lightness with the brightness file. The main struct blinkm_led has changed slightly. A struct led_classdev_mc has been added to represent the multicolor sysfs class, and an additional struct led_classdev pointer has been added for convenience, which points to the struct led_classdev within struct led_classdev_mc. The struct led_classdev for the regular sysfs classes remain. Additionally, a field representing the multicolor LED has been added to the struct blinkm_data, seperate from the blinkm_leds[3] array. In the blinkm_probe function, the multicolor LED class is registered after the regular LED classes. The blinkm_set_brightness_mc() function had to be added to calculate the three color components and then set the fields of the blinkm_data structure accordingly. Signed-off-by: Joseph Strauss --- Documentation/leds/leds-blinkm.rst | 24 ++++- drivers/leds/Kconfig | 1 + drivers/leds/leds-blinkm.c | 154 ++++++++++++++++++++++++----- 3 files changed, 151 insertions(+), 28 deletions(-) -- 2.37.2 diff --git a/Documentation/leds/leds-blinkm.rst b/Documentation/leds/leds-blinkm.rst index c74b5bc877b1..3f5dbd5e97b0 100644 --- a/Documentation/leds/leds-blinkm.rst +++ b/Documentation/leds/leds-blinkm.rst @@ -13,9 +13,27 @@ The device accepts RGB and HSB color values through separate commands. Also you can store blinking sequences as "scripts" in the controller and run them. Also fading is an option. -The interface this driver provides is 2-fold: +The interface this driver provides is 3-fold: -a) LED class interface for use with triggers +a) LED multicolor class interface for use with triggers +####################################################### + +The registration follows the scheme:: + + blinkm---multi + + $ ls -h /sys/class/leds/blinkm-1-9-multi + brightness device max_brightness multi_index multi_intensity power subsystem trigger uevent + +The order in which to write the intensity values can be found in multi_index. +Exactly three values between 0 and 255 must be written to multi_intensity to change the color:: + + $ echo 255 100 50 > multi_intensity + +The overall brightness of the color that you choose can also be changed by +writing a value between 0 and 255 to the brightness file. + +b) LED class interface for use with triggers ############################################ The registration follows the scheme:: @@ -50,7 +68,7 @@ E.g.:: $ -b) Sysfs group to control rgb, fade, hsb, scripts ... +c) Sysfs group to control rgb, fade, hsb, scripts ... ##################################################### This extended interface is available as folder blinkm diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig index b6742b4231bf..6f73deb7d95c 100644 --- a/drivers/leds/Kconfig +++ b/drivers/leds/Kconfig @@ -787,6 +787,7 @@ comment "LED driver for blink(1) USB RGB LED is under Special HID drivers (HID_T config LEDS_BLINKM tristate "LED support for the BlinkM I2C RGB LED" depends on LEDS_CLASS + depends on LEDS_CLASS_MULTICOLOR depends on I2C help This option enables support for the BlinkM RGB LED connected diff --git a/drivers/leds/leds-blinkm.c b/drivers/leds/leds-blinkm.c index b4e1fdff4186..a78bcc2eaff3 100644 --- a/drivers/leds/leds-blinkm.c +++ b/drivers/leds/leds-blinkm.c @@ -15,6 +15,9 @@ #include #include #include +#include + +#define NUM_LEDS 3 /* Addresses to scan - BlinkM is on 0x09 by default*/ static const unsigned short normal_i2c[] = { 0x09, I2C_CLIENT_END }; @@ -22,19 +25,26 @@ static const unsigned short normal_i2c[] = { 0x09, I2C_CLIENT_END }; static int blinkm_transfer_hw(struct i2c_client *client, int cmd); static int blinkm_test_run(struct i2c_client *client); +/* Contains data structures for both the color-seperated sysfs classes, and the new multicolor class */ struct blinkm_led { struct i2c_client *i2c_client; - struct led_classdev led_cdev; + struct led_classdev monochrome_led_cdev; + /* points to struct led_classdev inside of struct led_classdev_mc */ + struct led_classdev *led_cdev; + struct led_classdev_mc mcled_cdev; int id; }; -#define cdev_to_blmled(c) container_of(c, struct blinkm_led, led_cdev) +#define monochrome_led_cdev_to_blmled(c) container_of(c, struct blinkm_led, monochrome_led_cdev) +#define mcled_cdev_to_led(c) container_of(c, struct blinkm_led, mcled_cdev) struct blinkm_data { struct i2c_client *i2c_client; struct mutex update_lock; /* used for led class interface */ + struct blinkm_led mc_blinkm_led; struct blinkm_led blinkm_leds[3]; + /* used for "blinkm" sysfs interface */ u8 red; /* color red */ u8 green; /* color green */ @@ -260,9 +270,9 @@ static ssize_t test_show(struct device *dev, struct device_attribute *attr, static ssize_t test_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) { - struct i2c_client *client; int ret; + client = to_i2c_client(dev); /*test */ @@ -317,6 +327,7 @@ static int blinkm_read(struct i2c_client *client, int cmd, u8 *arg) int result; int i; int retlen = blinkm_cmds[cmd].nr_ret; + for (i = 0; i < retlen; i++) { /* repeat for retlen */ result = i2c_smbus_read_byte(client); @@ -419,11 +430,53 @@ static int blinkm_transfer_hw(struct i2c_client *client, int cmd) return 0; } +static int blinkm_set_mc_brightness(struct led_classdev *led_cdev, + enum led_brightness value) +{ + struct led_classdev_mc *mcled_cdev; + struct blinkm_led *led; + struct blinkm_data *data; + int i; + + mcled_cdev = lcdev_to_mccdev(led_cdev); + led = mcled_cdev_to_led(mcled_cdev); + data = i2c_get_clientdata(led->i2c_client); + + led_mc_calc_color_components(mcled_cdev, value); + + for (i = 0; i < NUM_LEDS; i++) { + switch (i) { + case RED: + if (data->next_red == (u8) mcled_cdev->subled_info[i].brightness) + break; + data->next_red = (u8) mcled_cdev->subled_info[i].brightness; + break; + case GREEN: + if (data->next_green == (u8) mcled_cdev->subled_info[i].brightness) + break; + data->next_green = (u8) mcled_cdev->subled_info[i].brightness; + break; + case BLUE: + if (data->next_blue == (u8) mcled_cdev->subled_info[i].brightness) + break; + data->next_blue = (u8) mcled_cdev->subled_info[i].brightness; + break; + } + } + blinkm_transfer_hw(led->i2c_client, BLM_GO_RGB); + dev_dbg(&led->i2c_client->dev, + "# DONE # next_red = %d, next_green = %d," + " next_blue = %d\n", + data->next_red, data->next_green, + data->next_blue); + return 0; +} + static int blinkm_led_common_set(struct led_classdev *led_cdev, enum led_brightness value, int color) { /* led_brightness is 0, 127 or 255 - we just use it here as-is */ - struct blinkm_led *led = cdev_to_blmled(led_cdev); + struct blinkm_led *led = monochrome_led_cdev_to_blmled(led_cdev); struct blinkm_data *data = i2c_get_clientdata(led->i2c_client); switch (color) { @@ -570,7 +623,11 @@ static int blinkm_probe(struct i2c_client *client, const struct i2c_device_id *id) { struct blinkm_data *data; - struct blinkm_led *led[3]; + /* For multicolor support */ + struct blinkm_led *mc_led; + struct mc_subled *mc_led_info; + /* 3 seperate classes for red, green, and blue respectively */ + struct blinkm_led *leds[3]; int err, i; char blinkm_led_name[28]; @@ -581,6 +638,12 @@ static int blinkm_probe(struct i2c_client *client, goto exit; } + mc_led_info = devm_kmalloc_array(&client->dev, 3, sizeof(*mc_led_info), + GFP_KERNEL | __GFP_ZERO); + if (!mc_led_info) { + err = -ENOMEM; + goto exit; + } data->i2c_addr = 0x08; /* i2c addr - use fake addr of 0x08 initially (real is 0x09) */ data->fw_ver = 0xfe; @@ -599,28 +662,30 @@ static int blinkm_probe(struct i2c_client *client, goto exit; } + + /* Register red, green, and blue sysfs classes */ for (i = 0; i < 3; i++) { /* RED = 0, GREEN = 1, BLUE = 2 */ - led[i] = &data->blinkm_leds[i]; - led[i]->i2c_client = client; - led[i]->id = i; - led[i]->led_cdev.max_brightness = 255; - led[i]->led_cdev.flags = LED_CORE_SUSPENDRESUME; + leds[i] = &data->blinkm_leds[i]; + leds[i]->i2c_client = client; + leds[i]->id = i; + leds[i]->monochrome_led_cdev.max_brightness = 255; + leds[i]->monochrome_led_cdev.flags = LED_CORE_SUSPENDRESUME; switch (i) { case RED: snprintf(blinkm_led_name, sizeof(blinkm_led_name), "blinkm-%d-%d-red", client->adapter->nr, client->addr); - led[i]->led_cdev.name = blinkm_led_name; - led[i]->led_cdev.brightness_set_blocking = + leds[i]->monochrome_led_cdev.name = blinkm_led_name; + leds[i]->monochrome_led_cdev.brightness_set_blocking = blinkm_led_red_set; err = led_classdev_register(&client->dev, - &led[i]->led_cdev); + &leds[i]->monochrome_led_cdev); if (err < 0) { dev_err(&client->dev, "couldn't register LED %s\n", - led[i]->led_cdev.name); + leds[i]->monochrome_led_cdev.name); goto failred; } break; @@ -629,15 +694,15 @@ static int blinkm_probe(struct i2c_client *client, "blinkm-%d-%d-green", client->adapter->nr, client->addr); - led[i]->led_cdev.name = blinkm_led_name; - led[i]->led_cdev.brightness_set_blocking = + leds[i]->monochrome_led_cdev.name = blinkm_led_name; + leds[i]->monochrome_led_cdev.brightness_set_blocking = blinkm_led_green_set; err = led_classdev_register(&client->dev, - &led[i]->led_cdev); + &leds[i]->monochrome_led_cdev); if (err < 0) { dev_err(&client->dev, "couldn't register LED %s\n", - led[i]->led_cdev.name); + leds[i]->monochrome_led_cdev.name); goto failgreen; } break; @@ -646,34 +711,72 @@ static int blinkm_probe(struct i2c_client *client, "blinkm-%d-%d-blue", client->adapter->nr, client->addr); - led[i]->led_cdev.name = blinkm_led_name; - led[i]->led_cdev.brightness_set_blocking = + leds[i]->monochrome_led_cdev.name = blinkm_led_name; + leds[i]->monochrome_led_cdev.brightness_set_blocking = blinkm_led_blue_set; err = led_classdev_register(&client->dev, - &led[i]->led_cdev); + &leds[i]->monochrome_led_cdev); if (err < 0) { dev_err(&client->dev, "couldn't register LED %s\n", - led[i]->led_cdev.name); + leds[i]->monochrome_led_cdev.name); goto failblue; } break; } /* end switch */ } /* end for */ + + + /* Register multicolor sysfs class */ + mc_led = &data->mc_blinkm_led; + mc_led->i2c_client = client; + mc_led->id = 4; + + mc_led_info[0].color_index = LED_COLOR_ID_RED; + mc_led_info[0].channel = 0; + mc_led_info[1].color_index = LED_COLOR_ID_GREEN; + mc_led_info[1].channel = 1; + mc_led_info[2].color_index = LED_COLOR_ID_BLUE; + mc_led_info[2].channel = 2; + mc_led->mcled_cdev.subled_info = mc_led_info; + mc_led->mcled_cdev.num_colors = NUM_LEDS; + + mc_led->led_cdev = &mc_led->mcled_cdev.led_cdev; + mc_led->led_cdev->brightness = 255; + mc_led->led_cdev->max_brightness = 255; + mc_led->led_cdev->flags = LED_CORE_SUSPENDRESUME; + snprintf(blinkm_led_name, sizeof(blinkm_led_name), + "blinkm-%d-%d-multi", + client->adapter->nr, + client->addr); + mc_led->led_cdev->name = blinkm_led_name; + mc_led->led_cdev->brightness_set_blocking = + blinkm_set_mc_brightness; + + err = led_classdev_multicolor_register(&client->dev, &mc_led->mcled_cdev); + if (err < 0) { + dev_err(&client->dev, "couldn't register LED %s\n", + mc_led->led_cdev->name); + goto failmulti; + } /* Initialize the blinkm */ blinkm_init_hw(client); return 0; +failmulti: + led_classdev_unregister(&leds[BLUE]->monochrome_led_cdev); + failblue: - led_classdev_unregister(&led[GREEN]->led_cdev); + led_classdev_unregister(&leds[GREEN]->monochrome_led_cdev); failgreen: - led_classdev_unregister(&led[RED]->led_cdev); + led_classdev_unregister(&leds[RED]->monochrome_led_cdev); failred: sysfs_remove_group(&client->dev.kobj, &blinkm_group); + exit: return err; } @@ -685,8 +788,9 @@ static int blinkm_remove(struct i2c_client *client) int i; /* make sure no workqueue entries are pending */ + led_classdev_unregister(&data->mc_blinkm_led.mcled_cdev.led_cdev); for (i = 0; i < 3; i++) - led_classdev_unregister(&data->blinkm_leds[i].led_cdev); + led_classdev_unregister(&data->blinkm_leds[i].monochrome_led_cdev); /* reset rgb */ data->next_red = 0x00;