From patchwork Thu Jul 25 18:28:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Murphy X-Patchwork-Id: 169740 Delivered-To: patch@linaro.org Received: by 2002:ac9:2daa:0:0:0:0:0 with SMTP id g42csp4402710oce; Thu, 25 Jul 2019 11:28:30 -0700 (PDT) X-Google-Smtp-Source: APXvYqz5K9EHrXzUmWRkVg1Ur/KE+Gwcaz7JS7D+DEGtlaR+aUutatj5Eloo2vSWbEwLa1TO6DtP X-Received: by 2002:a65:6850:: with SMTP id q16mr50986997pgt.423.1564079310027; Thu, 25 Jul 2019 11:28:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564079310; cv=none; d=google.com; s=arc-20160816; b=U/V+szX6xzJDQ2Syv7xudoY7envqMVp5c/r+lajwB2vWbMbfau0+5y2n3efLtTlNo4 Ix3/BQciEyUrE23/ZbPANwHEKTs+3zhwH2+3PbZ+z8h5VIfT1FLhaS4sNaTB9/dJajI7 VZqvLIQb3GqJK90IaxRrMH0XJhFiukBG4/vT4nJxo8TpyIf9Sg70T0iqYxmyfmxfxqXh u/kmZIiFFZM+v5fXeN3Rpq5Y644te393iwOGdjCZHW9VXJ3IwsFr7bw2+Nysm2VN1c9n n+qAF9Gi7/KVEBZyyIWdPSa75QQFYVyWvyZ9bBapYCsxgYu6QKvMLcckllHf5WszPfGe d2ow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=WkStwTDHRORbLu8v4kzj4Al57uWdjYLoA8MHxxQrYEM=; b=pzEdose2RrL0peHh3wF23cltPUqkg2kg+0k4C6PHAQmV74ZNqsHOGqDTfmEefIM22i fe95hR0o+082zSUlqCiKSFB/kQA0XXtkyHL7VXk6bzXVhNDi8s+Dnyd7+TYPOAlG6O55 BlW3yfGW7DF8LPs98Dn1q6c4aq2zrlckhXlql+1hKVOR1n7S8q3em0xlNPXAa/21h4KR Ej7NTuhF2TP2EWYnA+EPTaIu/B5YzdgZkJNq+3LnqaSgkkwvk2omujIFichG4ab/18Bg EfEfTROcLiZO+LTVIfKIobP2SH1opxz1la6gftURKTkuw7yJhqZbWx2/ffso9/0Ln/Zy hh0A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=nk+5yQwo; spf=pass (google.com: best guess record for domain of linux-leds-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-leds-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id o70si15271470pgo.280.2019.07.25.11.28.29; Thu, 25 Jul 2019 11:28:30 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-leds-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=nk+5yQwo; spf=pass (google.com: best guess record for domain of linux-leds-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-leds-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726248AbfGYS23 (ORCPT + 1 other); Thu, 25 Jul 2019 14:28:29 -0400 Received: from fllv0015.ext.ti.com ([198.47.19.141]:55948 "EHLO fllv0015.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726267AbfGYS22 (ORCPT ); Thu, 25 Jul 2019 14:28:28 -0400 Received: from fllv0034.itg.ti.com ([10.64.40.246]) by fllv0015.ext.ti.com (8.15.2/8.15.2) with ESMTP id x6PISORP018050; Thu, 25 Jul 2019 13:28:24 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1564079304; bh=WkStwTDHRORbLu8v4kzj4Al57uWdjYLoA8MHxxQrYEM=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=nk+5yQwoq0xZEgFFP419I5YKA/zu/15z/CIOfLX8F2uOQC/x6vXyE+Wtk6gyp545z js8TD4vMGYUSc3p5Zmstl0umxY75BZcHQdvpyunt7N1r5UusqQPrs59nCw1HvPhDXp WInA4+yrmakfSk7Pfflv3ABNtdfxU+WuODWIaoFA= Received: from DFLE115.ent.ti.com (dfle115.ent.ti.com [10.64.6.36]) by fllv0034.itg.ti.com (8.15.2/8.15.2) with ESMTPS id x6PISOUx061806 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 25 Jul 2019 13:28:24 -0500 Received: from DFLE101.ent.ti.com (10.64.6.22) by DFLE115.ent.ti.com (10.64.6.36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1713.5; Thu, 25 Jul 2019 13:28:24 -0500 Received: from fllv0040.itg.ti.com (10.64.41.20) by DFLE101.ent.ti.com (10.64.6.22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1713.5 via Frontend Transport; Thu, 25 Jul 2019 13:28:24 -0500 Received: from localhost (ileax41-snat.itg.ti.com [10.172.224.153]) by fllv0040.itg.ti.com (8.15.2/8.15.2) with ESMTP id x6PISOeG126348; Thu, 25 Jul 2019 13:28:24 -0500 From: Dan Murphy To: , CC: , , Dan Murphy Subject: [PATCH v4 9/9] leds: Update the lp55xx to use the multi color framework Date: Thu, 25 Jul 2019 13:28:18 -0500 Message-ID: <20190725182818.29556-10-dmurphy@ti.com> X-Mailer: git-send-email 2.22.0.214.g8dca754b1e In-Reply-To: <20190725182818.29556-1-dmurphy@ti.com> References: <20190725182818.29556-1-dmurphy@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Sender: linux-leds-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-leds@vger.kernel.org Update the lp5523 to use the multi color framework. Signed-off-by: Dan Murphy --- drivers/leds/leds-lp5523.c | 13 ++ drivers/leds/leds-lp55xx-common.c | 153 ++++++++++++++++++---- drivers/leds/leds-lp55xx-common.h | 10 ++ include/linux/platform_data/leds-lp55xx.h | 6 + modules.builtin.modinfo | Bin 0 -> 43550 bytes 5 files changed, 159 insertions(+), 23 deletions(-) create mode 100644 modules.builtin.modinfo diff --git a/modules.builtin.modinfo b/modules.builtin.modinfo new file mode 100644 index 0000000000000000000000000000000000000000..e528d8f57796621b6cfef52ad0da44551a482481 GIT binary patch literal 43550 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 literal 0 HcmV?d00001 -- 2.22.0.214.g8dca754b1e diff --git a/drivers/leds/leds-lp5523.c b/drivers/leds/leds-lp5523.c index d0b931a136b9..45380b32563f 100644 --- a/drivers/leds/leds-lp5523.c +++ b/drivers/leds/leds-lp5523.c @@ -791,6 +791,18 @@ static ssize_t store_master_fader_leds(struct device *dev, return ret; } +static int lp5523_led_intensity(struct lp55xx_led *led, int chan_num) +{ + struct lp55xx_chip *chip = led->chip; + int ret; + + mutex_lock(&chip->lock); + ret = lp55xx_write(chip, LP5523_REG_LED_PWM_BASE + chan_num, + led->brightness); + mutex_unlock(&chip->lock); + return ret; +} + static int lp5523_led_brightness(struct lp55xx_led *led) { struct lp55xx_chip *chip = led->chip; @@ -857,6 +869,7 @@ static struct lp55xx_device_config lp5523_cfg = { .max_channel = LP5523_MAX_LEDS, .post_init_device = lp5523_post_init_device, .brightness_fn = lp5523_led_brightness, + .intensity_fn = lp5523_led_intensity, .set_led_current = lp5523_set_led_current, .firmware_cb = lp5523_firmware_loaded, .run_engine = lp5523_run_engine, diff --git a/drivers/leds/leds-lp55xx-common.c b/drivers/leds/leds-lp55xx-common.c index 44ced02b49f9..32a4ab8664ca 100644 --- a/drivers/leds/leds-lp55xx-common.c +++ b/drivers/leds/leds-lp55xx-common.c @@ -35,6 +35,11 @@ static struct lp55xx_led *dev_to_lp55xx_led(struct device *dev) return cdev_to_lp55xx_led(dev_get_drvdata(dev)); } +static struct lp55xx_led *mcdev_to_lp55xx_led(struct led_classdev_mc *mc_dev) +{ + return container_of(mc_dev, struct lp55xx_led, mc_cdev); +} + static void lp55xx_reset_device(struct lp55xx_chip *chip) { struct lp55xx_device_config *cfg = chip->cfg; @@ -136,20 +141,55 @@ static int lp55xx_set_brightness(struct led_classdev *cdev, { struct lp55xx_led *led = cdev_to_lp55xx_led(cdev); struct lp55xx_device_config *cfg = led->chip->cfg; + int adj_value[LED_COLOR_ID_MAX]; + int ret; + int i; + + if (led->mc_cdev.num_leds > 1) { + set_cluster_brightness(&led->mc_cdev, brightness, adj_value); + for (i = 0; i < led->mc_cdev.num_leds; i++) { + led->brightness = adj_value[i]; + ret = cfg->intensity_fn(led, led->grouped_channels[i]); + if (ret) + break; + } + } else { + led->brightness = (u8)brightness; + ret = cfg->brightness_fn(led); + } + + return ret; +} + +static int lp55xx_set_color(struct led_classdev_mc *mcled_cdev, + int color, int value) +{ + struct lp55xx_led *led = mcdev_to_lp55xx_led(mcled_cdev); + struct lp55xx_device_config *cfg = led->chip->cfg; + int i; + + for (i = 0; i < led->mc_cdev.num_leds; i++) { + if (led->channel_color[i] == color) + break; + } - led->brightness = (u8)brightness; - return cfg->brightness_fn(led); + led->brightness = (u8)value; + return cfg->intensity_fn(led, led->grouped_channels[i]); } +static struct led_multicolor_ops lp55xx_mc_ops = { + .set_color_brightness = lp55xx_set_color, +}; + static int lp55xx_init_led(struct lp55xx_led *led, struct lp55xx_chip *chip, int chan) { struct lp55xx_platform_data *pdata = chip->pdata; struct lp55xx_device_config *cfg = chip->cfg; struct device *dev = &chip->cl->dev; + int max_channel = cfg->max_channel; char name[32]; int ret; - int max_channel = cfg->max_channel; if (chan >= max_channel) { dev_err(dev, "invalid channel: %d / %d\n", chan, max_channel); @@ -159,10 +199,37 @@ static int lp55xx_init_led(struct lp55xx_led *led, if (pdata->led_config[chan].led_current == 0) return 0; + if (pdata->led_config[chan].name) { + led->cdev.name = pdata->led_config[chan].name; + } else { + snprintf(name, sizeof(name), "%s:channel%d", + pdata->label ? : chip->cl->name, chan); + led->cdev.name = name; + } + + if (pdata->led_config[chan].num_colors > 1) { + led->mc_cdev.led_cdev = &led->cdev; + led->cdev.brightness_set_blocking = lp55xx_set_brightness; + led->cdev.name = led->cdev.name; + led->cdev.groups = lp55xx_led_groups; + led->mc_cdev.ops = &lp55xx_mc_ops; + led->mc_cdev.num_leds = pdata->led_config[chan].num_colors; + led->mc_cdev.available_colors = pdata->led_config[chan].available_colors; + memcpy(led->channel_color, + pdata->led_config[chan].channel_color, + sizeof(led->channel_color)); + memcpy(led->grouped_channels, + pdata->led_config[chan].grouped_channels, + sizeof(led->grouped_channels)); + } else { + + led->cdev.default_trigger = pdata->led_config[chan].default_trigger; + led->cdev.brightness_set_blocking = lp55xx_set_brightness; + } led->cdev.groups = lp55xx_led_groups; + led->led_current = pdata->led_config[chan].led_current; led->max_current = pdata->led_config[chan].max_current; led->chan_nr = pdata->led_config[chan].chan_nr; - led->cdev.default_trigger = pdata->led_config[chan].default_trigger; if (led->chan_nr >= max_channel) { dev_err(dev, "Use channel numbers between 0 and %d\n", @@ -170,18 +237,11 @@ static int lp55xx_init_led(struct lp55xx_led *led, return -EINVAL; } - led->cdev.brightness_set_blocking = lp55xx_set_brightness; - led->cdev.groups = lp55xx_led_groups; - - if (pdata->led_config[chan].name) { - led->cdev.name = pdata->led_config[chan].name; - } else { - snprintf(name, sizeof(name), "%s:channel%d", - pdata->label ? : chip->cl->name, chan); - led->cdev.name = name; - } + if (pdata->led_config[chan].num_colors > 1) + ret = led_classdev_multicolor_register(dev, &led->mc_cdev); + else + ret = led_classdev_register(dev, &led->cdev); - ret = led_classdev_register(dev, &led->cdev); if (ret) { dev_err(dev, "led register err: %d\n", ret); return ret; @@ -466,7 +526,6 @@ int lp55xx_register_leds(struct lp55xx_led *led, struct lp55xx_chip *chip) dev_err(&chip->cl->dev, "empty brightness configuration\n"); return -EINVAL; } - for (i = 0; i < num_channels; i++) { /* do not initialize channels that are not connected */ @@ -538,6 +597,39 @@ void lp55xx_unregister_sysfs(struct lp55xx_chip *chip) } EXPORT_SYMBOL_GPL(lp55xx_unregister_sysfs); +static int lp5xx_parse_channel_child(struct device_node *np, + struct lp55xx_led_config *cfg, + int chan_num) +{ + struct device_node *child; + int num_colors = 0; + u32 color_id; + u32 led_number; + int ret; + + cfg[chan_num].default_trigger = + of_get_property(np, "linux,default-trigger", NULL); + + for_each_child_of_node(np, child) { + of_property_read_string(child, "chan-name", + &cfg[chan_num].name); + of_property_read_u8(child, "led-cur", + &cfg[chan_num].led_current); + of_property_read_u8(child, "max-cur", + &cfg[chan_num].max_current); + of_property_read_u32(child, "color", &color_id); + cfg[chan_num].channel_color[num_colors] = color_id; + cfg[chan_num].available_colors |= 1 << color_id; + ret = of_property_read_u32(child, "reg", &led_number); + cfg[chan_num].grouped_channels[num_colors] = led_number; + num_colors++; + } + + cfg->num_colors = num_colors; + + return 0; +} + struct lp55xx_platform_data *lp55xx_of_populate_pdata(struct device *dev, struct device_node *np) { @@ -545,6 +637,8 @@ struct lp55xx_platform_data *lp55xx_of_populate_pdata(struct device *dev, struct lp55xx_platform_data *pdata; struct lp55xx_led_config *cfg; int num_channels; + int num_chan_children; + u32 led_number; int i = 0; pdata = devm_kzalloc(dev, sizeof(*pdata), GFP_KERNEL); @@ -565,13 +659,26 @@ struct lp55xx_platform_data *lp55xx_of_populate_pdata(struct device *dev, pdata->num_channels = num_channels; for_each_child_of_node(np, child) { - cfg[i].chan_nr = i; - - of_property_read_string(child, "chan-name", &cfg[i].name); - of_property_read_u8(child, "led-cur", &cfg[i].led_current); - of_property_read_u8(child, "max-cur", &cfg[i].max_current); - cfg[i].default_trigger = - of_get_property(child, "linux,default-trigger", NULL); + num_chan_children = of_get_child_count(child); + if (num_chan_children != 0) + lp5xx_parse_channel_child(child, cfg, i); + else { + of_property_read_string(child, "chan-name", + &cfg[i].name); + of_property_read_u8(child, "led-cur", + &cfg[i].led_current); + of_property_read_u8(child, "max-cur", + &cfg[i].max_current); + cfg[i].default_trigger = + of_get_property(child, "linux,default-trigger", + NULL); + of_property_read_u32(child, "reg", &led_number); + + if (led_number < 0 || led_number > 6) + return ERR_PTR(EINVAL); + + cfg[i].chan_nr = led_number; + } i++; } diff --git a/drivers/leds/leds-lp55xx-common.h b/drivers/leds/leds-lp55xx-common.h index 783ed5103ce5..0737e79bc21b 100644 --- a/drivers/leds/leds-lp55xx-common.h +++ b/drivers/leds/leds-lp55xx-common.h @@ -12,6 +12,8 @@ #ifndef _LEDS_LP55XX_COMMON_H #define _LEDS_LP55XX_COMMON_H +#include + enum lp55xx_engine_index { LP55XX_ENGINE_INVALID, LP55XX_ENGINE_1, @@ -109,6 +111,9 @@ struct lp55xx_device_config { /* access brightness register */ int (*brightness_fn)(struct lp55xx_led *led); + /* access specific brightness register */ + int (*intensity_fn)(struct lp55xx_led *led, int chan_num); + /* current setting function */ void (*set_led_current) (struct lp55xx_led *led, u8 led_current); @@ -159,6 +164,7 @@ struct lp55xx_chip { * struct lp55xx_led * @chan_nr : Channel number * @cdev : LED class device + * @mc_cdev : Multi color class device * @led_current : Current setting at each led channel * @max_current : Maximun current at each led channel * @brightness : Brightness value @@ -167,9 +173,13 @@ struct lp55xx_chip { struct lp55xx_led { int chan_nr; struct led_classdev cdev; + struct led_classdev_mc mc_cdev; u8 led_current; u8 max_current; u8 brightness; +/* int num_colors;*/ + int channel_color[LED_COLOR_ID_MAX]; + int grouped_channels[LED_COLOR_ID_MAX]; struct lp55xx_chip *chip; }; diff --git a/include/linux/platform_data/leds-lp55xx.h b/include/linux/platform_data/leds-lp55xx.h index 96a787100fda..adce8cec411b 100644 --- a/include/linux/platform_data/leds-lp55xx.h +++ b/include/linux/platform_data/leds-lp55xx.h @@ -12,6 +12,8 @@ #ifndef _LEDS_LP55XX_H #define _LEDS_LP55XX_H +#include + /* Clock configuration */ #define LP55XX_CLOCK_AUTO 0 #define LP55XX_CLOCK_INT 1 @@ -23,6 +25,10 @@ struct lp55xx_led_config { u8 chan_nr; u8 led_current; /* mA x10, 0 if led is not connected */ u8 max_current; + int num_colors; + int available_colors; + u32 channel_color[LED_COLOR_ID_MAX]; + int grouped_channels[LED_COLOR_ID_MAX]; }; struct lp55xx_predef_pattern {