From patchwork Thu May 23 19:08:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Murphy X-Patchwork-Id: 165049 Delivered-To: patch@linaro.org Received: by 2002:a92:9e1a:0:0:0:0:0 with SMTP id q26csp2598436ili; Thu, 23 May 2019 12:08:47 -0700 (PDT) X-Google-Smtp-Source: APXvYqzl7NZOF+kZrDlq1XbciwRiRwiTK5Kb2+d5u51b0CEEep3kEIg8hmWnqNewzqopKMYLlGNF X-Received: by 2002:a65:530d:: with SMTP id m13mr4936351pgq.68.1558638527452; Thu, 23 May 2019 12:08:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1558638527; cv=none; d=google.com; s=arc-20160816; b=maRK7ZN8tll0T6JxdKayoQAO8XT66zLb/d3DIZwEtJiMX4Qq+JVbdbd+Sz0+gqEFQi /es76YuLao8vB7v0XpmCjWPhQ6wkdDl8S1tCgF84tUnRINQIZ8iUDISiUWZOSRslJceu 4YQB2thFB1HsB+pyAaeBNzrIso33Is7uUrRBq72zFCiI4ULKyJ/YXp1nn8lDxoDu1g04 DriShgvOi1YyfTM2oAqpeY4JrTLEcctoxqGWYGPYY5VI8WHu+Tmy/tkiS09wVdyo7IRJ qEjaf8C1JgJlZgqdbWt4FQeuduu8VUKcXvkyzBSsO3O+ZdULWo2wrZJkBIRnDQ7Xqi2U b2lw== 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=NOGPoNwWv6Pn/PLmO8rE0HQXiSYvUFN87f5nSAAmvIE=; b=URHwY7B5u88tR0e/iOkn3GUY00ZaIYYqfGQUGBHzmHKxpYctqcM8/ncUWcV9d7yUmC wnCXvfY2YtR6sAwam+0gqIVz5VKKZlximsgiyg4m6d60Pfb8XBx6usugbtXFtKUeEar6 iFsLeWkOxR/P/paXnv5yRCI4BxgxoOBI7pkegQ5wG5xiuvjykglcT/39O21hLKMWwHRz rBmQ/jHB5RLCKtDYsQcNAdnZAd4geIiBOAbA78P+pHzeUjPWF+4Hrmajn2BFmrrMe3zZ yO1MkPnzDNM/aXxgQUBy26ew/X9sA7XZblPgYdyNjBd9ofWbZKyIVDckigRQVEKQ8eHw +X1Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=ftte8Z4j; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-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 h12si480211plt.389.2019.05.23.12.08.47; Thu, 23 May 2019 12:08:47 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-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=ftte8Z4j; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-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 S1731885AbfEWTIq (ORCPT + 30 others); Thu, 23 May 2019 15:08:46 -0400 Received: from fllv0016.ext.ti.com ([198.47.19.142]:56294 "EHLO fllv0016.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731841AbfEWTIm (ORCPT ); Thu, 23 May 2019 15:08:42 -0400 Received: from lelv0265.itg.ti.com ([10.180.67.224]) by fllv0016.ext.ti.com (8.15.2/8.15.2) with ESMTP id x4NJ8btM092486; Thu, 23 May 2019 14:08:37 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1558638517; bh=NOGPoNwWv6Pn/PLmO8rE0HQXiSYvUFN87f5nSAAmvIE=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=ftte8Z4j52lAhLnoqLNsMSuDfTgJH9AszYsc/dkSmcWfss676p7TJ0VjvMGCy4JAP gSO81UNzM01hfFirotm5swl8bWclY6GDM/OWO9QPshL9cajgb/yiH4EZUStp00xdj6 WpRHjpFPlUTFUbDR18Q8NhhhtawDztspjcdRPPPs= Received: from DLEE115.ent.ti.com (dlee115.ent.ti.com [157.170.170.26]) by lelv0265.itg.ti.com (8.15.2/8.15.2) with ESMTPS id x4NJ8bos123868 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 23 May 2019 14:08:37 -0500 Received: from DLEE104.ent.ti.com (157.170.170.34) by DLEE115.ent.ti.com (157.170.170.26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1713.5; Thu, 23 May 2019 14:08:37 -0500 Received: from lelv0327.itg.ti.com (10.180.67.183) by DLEE104.ent.ti.com (157.170.170.34) 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, 23 May 2019 14:08:37 -0500 Received: from localhost (ileax41-snat.itg.ti.com [10.172.224.153]) by lelv0327.itg.ti.com (8.15.2/8.15.2) with ESMTP id x4NJ8b8m095902; Thu, 23 May 2019 14:08:37 -0500 From: Dan Murphy To: , , CC: , , , Dan Murphy Subject: [PATCH v3 2/9] dt: bindings: Add multicolor class dt bindings documention Date: Thu, 23 May 2019 14:08:13 -0500 Message-ID: <20190523190820.29375-3-dmurphy@ti.com> X-Mailer: git-send-email 2.21.0.5.gaeb582a983 In-Reply-To: <20190523190820.29375-1-dmurphy@ti.com> References: <20190523190820.29375-1-dmurphy@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add DT bindings for the LEDs multicolor class framework. Signed-off-by: Dan Murphy --- .../bindings/leds/leds-class-multicolor.txt | 97 +++++++++++++++++++ 1 file changed, 97 insertions(+) create mode 100644 Documentation/devicetree/bindings/leds/leds-class-multicolor.txt -- 2.21.0.5.gaeb582a983 diff --git a/Documentation/devicetree/bindings/leds/leds-class-multicolor.txt b/Documentation/devicetree/bindings/leds/leds-class-multicolor.txt new file mode 100644 index 000000000000..e2a2ce3279cb --- /dev/null +++ b/Documentation/devicetree/bindings/leds/leds-class-multicolor.txt @@ -0,0 +1,97 @@ +* Multicolor LED properties + +Multicolor LEDs can consist of a RGB, RGBW or a RGBA LED clusters. These devices +can be grouped together and also provide a modeling mechanism so that the +cluster LEDs can vary in hue and intensity to produce a wide range of colors. + +The nodes and properties defined in this document are unique to the multicolor +LED class. Common LED nodes and properties are inherited from the common.txt +within this documentation directory. + +Required LED Child properties: + - color : For multicolor LED support this property should be defined as + LED_COLOR_ID_MULTI and further definition can be found in + include/linux/leds/common.h. + +led-controller@30 { + #address-cells = <1>; + #size-cells = <0>; + compatible = "ti,lp5024"; + reg = <0x29>; + + multi-led@4 { + #address-cells = <1>; + #size-cells = <0>; + reg = <4>; + color = ; + function = LED_FUNCTION_ACTIVITY; + + led@12 { + reg = <12>; + color = ; + }; + + led@13 { + reg = <13>; + color = ; + }; + + led@14 { + reg = <14>; + color = ; + }; + }; + + /* Only support RGB no model defined */ + multi-led@1 { + #address-cells = <1>; + #size-cells = <0>; + reg = <1>; + color = ; + function = LED_FUNCTION_; + + + led@3 { + reg = <3>; + color = ; + }; + + led@4 { + reg = <4>; + color = ; + }; + + led@5 { + reg = <5>; + color = ; + }; + }; + + multi-led@2 { + #address-cells = <1>; + #size-cells = <0>; + color = ; + function = LED_FUNCTION_ACTIVITY; + reg = <2>; + ti,led-bank = <2 3 5>; + + led@6 { + reg = <0x6>; + color = ; + led-sources = <6 9 15>; + }; + + led@7 { + reg = <0x7>; + color = ; + led-sources = <7 10 16>; + }; + + led@8 { + reg = <0x8>; + color = ; + led-sources = <8 11 17>; + }; + }; + +}; From patchwork Thu May 23 19:08:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Murphy X-Patchwork-Id: 165068 Delivered-To: patch@linaro.org Received: by 2002:a92:9e1a:0:0:0:0:0 with SMTP id q26csp2646169ili; Thu, 23 May 2019 12:51:48 -0700 (PDT) X-Google-Smtp-Source: APXvYqx1nkmUhHkxp0Ii/gULZlv2+CuYXVQ9qUhkuNX7QihE2oRWd6YXXzpAOBNXKlqhe6r2mvUV X-Received: by 2002:a17:902:e60a:: with SMTP id cm10mr91660030plb.316.1558641108246; Thu, 23 May 2019 12:51:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1558641108; cv=none; d=google.com; s=arc-20160816; b=rfXGW3RJkULgF2fl5W+oYfCtHThCDgEl/IekQriyFOzIMCzAqQLEwzcJ8nodkW7/Ga WczuCe4Ll3UW/xo5aEiARLnl3AHxuWE6mONVWWFtB3wFrdsJZam8kS4Dbg23XEhixR80 zVzF2kxF8X8FbzRCW+9dckTiC26TQPvz3DAAWqelRINa/MKjZC7S+Vlvu+z9e+DH2PXk xjrbg8F42llgWQPfFWfS9muFmy1VopFAZDuroejM8QIJtzO3vknclyh3DyfRpFGwvt6Q N6RBsixTKy1QiSbUF3/EIA1IHQyxU7556gvX7n0ChElWOIjyzPzQn7qJ+U/WTMTnn4Lf JAVw== 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=uLRO4LuM3Cx4BzGDVEVCqujZlgCV+aiVlzqD9CTygSE=; b=TnRlTVVIMvFZMS4txtBOaErkaLQP1f3MWlWuT9Q9iXQ1iKIAtLug/8wBORlJqKCm/e 2zSFlEXgJ7hVJd4x8/GFvqEq49Jrwmj8KFINukfmYJEq31+hZNj8M7Drce53pJ/y5x6l erwiv71gPTZKqtLfD2YN2TH7ANZyKPscSAvMkF/tHUVn1TzCm9whmtKRSLGv5NhrRDbq WcwAsKEhmdD0i1JjXNAKJ+gfPiaTbKfMoSnv52IHE1WAoYouVszUzFzTuQ33I6g5bEJk 57vHY4jZIW298+yHnf+efKefpor7ysktdq5MLUfZQtOn+s4h41e1o+XmEdpnRo9j0o+j C1yA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=YMCrXIqc; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-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 z8si481803pjq.89.2019.05.23.12.51.47; Thu, 23 May 2019 12:51:48 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-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=YMCrXIqc; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-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 S2388212AbfEWTvq (ORCPT + 30 others); Thu, 23 May 2019 15:51:46 -0400 Received: from lelv0143.ext.ti.com ([198.47.23.248]:52942 "EHLO lelv0143.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731847AbfEWTIn (ORCPT ); Thu, 23 May 2019 15:08:43 -0400 Received: from fllv0035.itg.ti.com ([10.64.41.0]) by lelv0143.ext.ti.com (8.15.2/8.15.2) with ESMTP id x4NJ8b6v065640; Thu, 23 May 2019 14:08:37 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1558638517; bh=uLRO4LuM3Cx4BzGDVEVCqujZlgCV+aiVlzqD9CTygSE=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=YMCrXIqcsj51rmyolxPP9XZp8Y3nrFRTTCFuH44rTRKiowkvX9qNR1g531mcVUu3C bkaE9oAJbwV6E3BjD61Ho+l0Snh5q8sEjfBS+dalP82qsrO+2B8sf0QF50irLCKm+H aiMzQMGqJiQJVDS4ZoGXhkDYY1pwZjpTV02ozOwE= Received: from DFLE111.ent.ti.com (dfle111.ent.ti.com [10.64.6.32]) by fllv0035.itg.ti.com (8.15.2/8.15.2) with ESMTPS id x4NJ8bii079032 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 23 May 2019 14:08:37 -0500 Received: from DFLE109.ent.ti.com (10.64.6.30) by DFLE111.ent.ti.com (10.64.6.32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1713.5; Thu, 23 May 2019 14:08:37 -0500 Received: from fllv0040.itg.ti.com (10.64.41.20) by DFLE109.ent.ti.com (10.64.6.30) 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, 23 May 2019 14:08:37 -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 x4NJ8bAO071436; Thu, 23 May 2019 14:08:37 -0500 From: Dan Murphy To: , , CC: , , , Dan Murphy Subject: [PATCH v3 3/9] documention: leds: Add multicolor class documentation Date: Thu, 23 May 2019 14:08:14 -0500 Message-ID: <20190523190820.29375-4-dmurphy@ti.com> X-Mailer: git-send-email 2.21.0.5.gaeb582a983 In-Reply-To: <20190523190820.29375-1-dmurphy@ti.com> References: <20190523190820.29375-1-dmurphy@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add the support documentation on the multicolor LED framework. This document defines the directores and file generated by the multicolor framework. It also documents usage. Signed-off-by: Dan Murphy --- Documentation/leds/leds-class-multicolor.txt | 99 ++++++++++++++++++++ 1 file changed, 99 insertions(+) create mode 100644 Documentation/leds/leds-class-multicolor.txt -- 2.21.0.5.gaeb582a983 diff --git a/Documentation/leds/leds-class-multicolor.txt b/Documentation/leds/leds-class-multicolor.txt new file mode 100644 index 000000000000..edbb8139e514 --- /dev/null +++ b/Documentation/leds/leds-class-multicolor.txt @@ -0,0 +1,99 @@ + +Multi Color LED handling under Linux +================================================= + +Author: Dan Murphy + +Description +----------- +There are varying monochrome LED colors available for application. These +LEDs can be used as a single use case LED or can be mixed with other color +LEDs to produce the full spectrum of color. Color LEDs that are grouped +can be presented under a single LED node with individual color control. +The multicolor class groups these LEDs and allows dynamically setting the value +of a single LED or setting the brightness values of the LEDs in the group and +updating the LEDs virtually simultaneously. + +Multicolor Class Control +------------------------- +The multicolor class presents the LED groups under a directory called "colors". +This directory is a child under the LED parent node created by the led_class +framework. The led_class framework is documented in led-class.txt within this +documentation directory. + +Each colored LED is given its own directory. These directories can be, but not +limited to red, green, blue, white, amber, yellow and violet. Under these +directories the brightness and max_brightness files are presented for each LED. + +Under the "colors" directory there are two files created: "sync" and +"sync_enable". The sync_enable file controls whether the LED brightness +value is set real time or if the LED brightness value setting is deferred until +the "sync" file is written. If sync_enable is set then writing to each LED +"brightness" file will store the brightness value. Once the "sync" file is +written then each LED color defined in the node will write the brightness of +the LED in the device driver. + +If "sync_enable" is not set then writing the brightness value of the LED to the +device driver is done immediately. Writing the "sync" file has no affect. + +Directory Layout Example +------------------------ +root:/sys/class/leds/rgb:grouped_leds# ls -lR colors/ +colors/: +drwxr-xr-x 2 root root 0 Jun 28 20:21 blue +drwxr-xr-x 2 root root 0 Jun 28 20:21 green +drwxr-xr-x 2 root root 0 Jun 28 20:21 red +--w------- 1 root root 4096 Jun 28 20:21 sync +-rw------- 1 root root 4096 Jun 28 20:22 sync_enable + +colors/blue: +-rw------- 1 root root 4096 Jun 28 20:21 brightness +-r-------- 1 root root 4096 Jun 28 20:27 max_brightness + +colors/green: +-rw------- 1 root root 4096 Jun 28 20:22 brightness +-r-------- 1 root root 4096 Jun 28 20:27 max_brightness + +colors/red: +-rw------- 1 root root 4096 Jun 28 20:21 brightness +-r-------- 1 root root 4096 Jun 28 20:27 max_brightness + +Example of Writing LEDs with Sync Enabled +----------------------------------------- +Below the red, green and blue LEDs are set to corresponding values. These +values are stored and not written until the sync file is written. + +cd /sys/class/leds/rgb:grouped_leds/colors + +echo 1 > sync_enable + +echo 100 > red/brightness +echo 80 > green/brightness +echo 180 > blue/brightness + +* LED device driver has not been updated and the LED states have not changed. +* Writing the LED brightness files again will only change the stored value and +* not the device driver value. + +echo 1 > sync + +* LED device driver has been updated; the LEDs should present the brightness +* levels that have been set. Since sync_enable is still enabled writing to the +* LED brightness files will not change the current brightnesses. + +Example of Writing LEDs with Sync Disabled +------------------------------------------ +Below the values of each LED are written to the device driver immediately upon +request. + +cd /sys/class/leds/rgb:grouped_leds/colors + +echo 0 > sync_enable + +echo 100 > red/brightness // Red LED should be on with the current brightness +echo 80 > green/brightness // Green LED should be on with the current brightness +echo 180 > blue/brightness // Blue LED should be on with the current brightness +. +. +. +echo 0 > green/brightness // Green LED should be off From patchwork Thu May 23 19:08:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Murphy X-Patchwork-Id: 165064 Delivered-To: patch@linaro.org Received: by 2002:a92:9e1a:0:0:0:0:0 with SMTP id q26csp2645770ili; Thu, 23 May 2019 12:51:22 -0700 (PDT) X-Google-Smtp-Source: APXvYqzO+YxxEbDr7aIPJDsJYdgZuFj6eDuLZv/rvi57dvE9YHZp9uBTJ78aZmEc0Am4rSOX2CS7 X-Received: by 2002:a17:90a:c688:: with SMTP id n8mr3825007pjt.33.1558641082041; Thu, 23 May 2019 12:51:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1558641082; cv=none; d=google.com; s=arc-20160816; b=UJk17v5tvkjuhGguou0lmLo9anw8AeMLEMFzA9Z3y/2ocmT7nAgGhuyeiBxvyJsNKO 3YjjoZWqyc5Ecn4ejMSMBFlOg5IrSzkWCjJlzT2Cq6LXgjvaY9btSWRjP8TviBbzmDeC 0WZfC7PFCMVxoVMXfJ3YX0W3XPTErWhgKNlVt8CwNN3jgIACADyd+apB7GyNoLr6pEtu ARfsYFIjAA8N3jMztE4/H/CnOI5ejEpAc3ARHMGSTbCmJcLRZR+8YVsbm9lKrZy6S5FW xoihtvISFNyQf8N85VY1ohN9fnJ076PV1uPGcSHXl7VPgMjC79vQ6dHqlphH6xNKTHXY 4FdA== 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=lY3gjhHWadMOzAp7KaANb1110CsAFnaB9Wjpue05HKk=; b=nn80GXKgvVcCBZxFN1NyP6X9jFMUoIlNjNErz/28nv6ndoTSIgLiKchfXbcAtOMp/z EEtCyC+n0x/LqSUQnoe+H4h7NeirQ7iwqf96u6fzakLL6Hrn6jcA6pi3EAgHHxsQzB76 vU3XWEF8gVOo4jwex9CFrEwjAwd9eT34DaFPaCkPJBhV4DljLSBck5+zBdnommXvZP7/ Ds6mmpPQn8ikT+UZAsmDuQh4Tml2EzgtAfE5llgHiRMfv12jkdSyaL0/mZIpQ3ATsDjc 7ZZFeytUxw5krbzbTqy/22T2kt/oQ4YeJytYeY1IxA/Ed8zEBuP77j5xmXtEXJgcScqL KY+g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=ox+sPjLm; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-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 s207si487261pfs.119.2019.05.23.12.51.21; Thu, 23 May 2019 12:51:22 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-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=ox+sPjLm; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-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 S2388058AbfEWTvU (ORCPT + 30 others); Thu, 23 May 2019 15:51:20 -0400 Received: from lelv0142.ext.ti.com ([198.47.23.249]:42806 "EHLO lelv0142.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731849AbfEWTIo (ORCPT ); Thu, 23 May 2019 15:08:44 -0400 Received: from lelv0266.itg.ti.com ([10.180.67.225]) by lelv0142.ext.ti.com (8.15.2/8.15.2) with ESMTP id x4NJ8cJh034793; Thu, 23 May 2019 14:08:38 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1558638519; bh=lY3gjhHWadMOzAp7KaANb1110CsAFnaB9Wjpue05HKk=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=ox+sPjLmcfo0SSXAqHWi3vfPmrtreYBJ2kDbXFc+BJAnGO+xTxcOYSL1JRFkiLAKG PDvC4sKN6qrGjC0Yzmu1jL/F5o9Zx9u791jM9iIU89qA5PVGBh7Fo2C0Hd332fYt/y 9E3l1aueBALlwBm3oIsDoODvQOsP1boLksRba1Z8= Received: from DLEE109.ent.ti.com (dlee109.ent.ti.com [157.170.170.41]) by lelv0266.itg.ti.com (8.15.2/8.15.2) with ESMTPS id x4NJ8cGh003829 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 23 May 2019 14:08:38 -0500 Received: from DLEE101.ent.ti.com (157.170.170.31) by DLEE109.ent.ti.com (157.170.170.41) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1713.5; Thu, 23 May 2019 14:08:38 -0500 Received: from lelv0327.itg.ti.com (10.180.67.183) by DLEE101.ent.ti.com (157.170.170.31) 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, 23 May 2019 14:08:38 -0500 Received: from localhost (ileax41-snat.itg.ti.com [10.172.224.153]) by lelv0327.itg.ti.com (8.15.2/8.15.2) with ESMTP id x4NJ8cVr095928; Thu, 23 May 2019 14:08:38 -0500 From: Dan Murphy To: , , CC: , , , Dan Murphy Subject: [PATCH v3 8/9] leds: lp50xx: Add the LP50XX family of the RGB LED driver Date: Thu, 23 May 2019 14:08:19 -0500 Message-ID: <20190523190820.29375-9-dmurphy@ti.com> X-Mailer: git-send-email 2.21.0.5.gaeb582a983 In-Reply-To: <20190523190820.29375-1-dmurphy@ti.com> References: <20190523190820.29375-1-dmurphy@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Introduce the LP5036/30/24/18 RGB LED driver. The difference in these parts are the number of LED outputs where the: LP5036 can control 36 LEDs LP5030 can control 30 LEDs LP5024 can control 24 LEDs LP5018 can control 18 LEDs The device has the ability to group LED output into control banks so that multiple LED banks can be controlled with the same mixing and brightness. Inversely the LEDs can also be controlled independently. Signed-off-by: Dan Murphy --- drivers/leds/Kconfig | 7 + drivers/leds/Makefile | 1 + drivers/leds/leds-lp50xx.c | 714 +++++++++++++++++++++++++++++++++++++ 3 files changed, 722 insertions(+) create mode 100644 drivers/leds/leds-lp50xx.c -- 2.21.0.5.gaeb582a983 diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig index 0696a13c9527..518429999986 100644 --- a/drivers/leds/Kconfig +++ b/drivers/leds/Kconfig @@ -336,6 +336,13 @@ config LEDS_LP3952 To compile this driver as a module, choose M here: the module will be called leds-lp3952. +config LEDS_LP50XX + tristate "LED Support for TI LP5036/30/24/18 LED driver chip" + depends on LEDS_CLASS && REGMAP_I2C + help + If you say yes here you get support for the Texas Instruments + LP5036, LP5030, LP5024 and LP5018 LED driver. + config LEDS_LP55XX_COMMON tristate "Common Driver for TI/National LP5521/5523/55231/5562/8501" depends on LEDS_LP5521 || LEDS_LP5523 || LEDS_LP5562 || LEDS_LP8501 diff --git a/drivers/leds/Makefile b/drivers/leds/Makefile index c57c2aec9510..5e8dfe28c5a5 100644 --- a/drivers/leds/Makefile +++ b/drivers/leds/Makefile @@ -33,6 +33,7 @@ obj-$(CONFIG_LEDS_GPIO_REGISTER) += leds-gpio-register.o obj-$(CONFIG_LEDS_GPIO) += leds-gpio.o obj-$(CONFIG_LEDS_LP3944) += leds-lp3944.o obj-$(CONFIG_LEDS_LP3952) += leds-lp3952.o +obj-$(CONFIG_LEDS_LP50XX) += leds-lp50xx.o obj-$(CONFIG_LEDS_LP55XX_COMMON) += leds-lp55xx-common.o obj-$(CONFIG_LEDS_LP5521) += leds-lp5521.o obj-$(CONFIG_LEDS_LP5523) += leds-lp5523.o diff --git a/drivers/leds/leds-lp50xx.c b/drivers/leds/leds-lp50xx.c new file mode 100644 index 000000000000..5245e87e725f --- /dev/null +++ b/drivers/leds/leds-lp50xx.c @@ -0,0 +1,714 @@ +// SPDX-License-Identifier: GPL-2.0 +// TI LP50XX LED chip family driver +// Copyright (C) 2018 Texas Instruments Incorporated - http://www.ti.com/ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +#define LP50XX_DEV_CFG0 0x00 +#define LP50XX_DEV_CFG1 0x01 +#define LP50XX_LED_CFG0 0x02 + +/* LP5018 and LP5024 registers */ +#define LP5024_BNK_BRT 0x03 +#define LP5024_BNKA_CLR 0x04 +#define LP5024_BNKB_CLR 0x05 +#define LP5024_BNKC_CLR 0x06 +#define LP5024_LED0_BRT 0x07 +#define LP5024_LED1_BRT 0x08 +#define LP5024_LED2_BRT 0x09 +#define LP5024_LED3_BRT 0x0a +#define LP5024_LED4_BRT 0x0b +#define LP5024_LED5_BRT 0x0c +#define LP5024_LED6_BRT 0x0d +#define LP5024_LED7_BRT 0x0e + +#define LP5024_OUT0_CLR 0x0f +#define LP5024_OUT1_CLR 0x10 +#define LP5024_OUT2_CLR 0x11 +#define LP5024_OUT3_CLR 0x12 +#define LP5024_OUT4_CLR 0x13 +#define LP5024_OUT5_CLR 0x14 +#define LP5024_OUT6_CLR 0x15 +#define LP5024_OUT7_CLR 0x16 +#define LP5024_OUT8_CLR 0x17 +#define LP5024_OUT9_CLR 0x18 +#define LP5024_OUT10_CLR 0x19 +#define LP5024_OUT11_CLR 0x1a +#define LP5024_OUT12_CLR 0x1b +#define LP5024_OUT13_CLR 0x1c +#define LP5024_OUT14_CLR 0x1d +#define LP5024_OUT15_CLR 0x1e +#define LP5024_OUT16_CLR 0x1f +#define LP5024_OUT17_CLR 0x20 +#define LP5024_OUT18_CLR 0x21 +#define LP5024_OUT19_CLR 0x22 +#define LP5024_OUT20_CLR 0x23 +#define LP5024_OUT21_CLR 0x24 +#define LP5024_OUT22_CLR 0x25 +#define LP5024_OUT23_CLR 0x26 +#define LP5024_RESET 0x27 + +/* LP5030 and LP5036 registers */ +#define LP5036_LED_CFG1 0x03 +#define LP5036_BNK_BRT 0x04 +#define LP5036_BNKA_CLR 0x05 +#define LP5036_BNKB_CLR 0x06 +#define LP5036_BNKC_CLR 0x07 +#define LP5036_LED0_BRT 0x08 +#define LP5036_LED1_BRT 0x09 +#define LP5036_LED2_BRT 0x0a +#define LP5036_LED3_BRT 0x0b +#define LP5036_LED4_BRT 0x0c +#define LP5036_LED5_BRT 0x0d +#define LP5036_LED6_BRT 0x0e +#define LP5036_LED7_BRT 0x0f +#define LP5036_LED8_BRT 0x10 +#define LP5036_LED9_BRT 0x11 +#define LP5036_LED10_BRT 0x12 +#define LP5036_LED11_BRT 0x13 + +#define LP5036_OUT0_CLR 0x14 +#define LP5036_OUT1_CLR 0x15 +#define LP5036_OUT2_CLR 0x16 +#define LP5036_OUT3_CLR 0x17 +#define LP5036_OUT4_CLR 0x18 +#define LP5036_OUT5_CLR 0x19 +#define LP5036_OUT6_CLR 0x1a +#define LP5036_OUT7_CLR 0x1b +#define LP5036_OUT8_CLR 0x1c +#define LP5036_OUT9_CLR 0x1d +#define LP5036_OUT10_CLR 0x1e +#define LP5036_OUT11_CLR 0x1f +#define LP5036_OUT12_CLR 0x20 +#define LP5036_OUT13_CLR 0x21 +#define LP5036_OUT14_CLR 0x22 +#define LP5036_OUT15_CLR 0x23 +#define LP5036_OUT16_CLR 0x24 +#define LP5036_OUT17_CLR 0x25 +#define LP5036_OUT18_CLR 0x26 +#define LP5036_OUT19_CLR 0x27 +#define LP5036_OUT20_CLR 0x28 +#define LP5036_OUT21_CLR 0x29 +#define LP5036_OUT22_CLR 0x2a +#define LP5036_OUT23_CLR 0x2b +#define LP5036_OUT24_CLR 0x2c +#define LP5036_OUT25_CLR 0x2d +#define LP5036_OUT26_CLR 0x2e +#define LP5036_OUT27_CLR 0x2f +#define LP5036_OUT28_CLR 0x30 +#define LP5036_OUT29_CLR 0x31 +#define LP5036_OUT30_CLR 0x32 +#define LP5036_OUT31_CLR 0x33 +#define LP5036_OUT32_CLR 0x34 +#define LP5036_OUT33_CLR 0x35 +#define LP5036_OUT34_CLR 0x36 +#define LP5036_OUT35_CLR 0x37 +#define LP5036_RESET 0x38 + +#define LP50XX_SW_RESET 0xff + +#define LP50XX_CHIP_EN BIT(6) + +#define LP5018_MAX_LED_MODULES 6 +#define LP5024_MAX_LED_MODULES 8 +#define LP5030_MAX_LED_MODULES 10 +#define LP5036_MAX_LED_MODULES 12 + +enum lp50xx_model { + LP5018, + LP5024, + LP5030, + LP5036, +}; + +struct lp50xx_led { + unsigned long bank_modules; + char label[LED_MAX_NAME_SIZE]; + struct led_classdev led_dev; + struct led_classdev_mc mc_cdev; + struct lp50xx *priv; + u8 ctrl_bank_enabled; + u32 available_leds; + int sync_enabled; + int led_number; +}; + +/** + * struct lp50xx - + * @enable_gpio: Hardware enable gpio + * @regulator: LED supply regulator pointer + * @client: Pointer to the I2C client + * @regmap: Devices register map + * @dev: Pointer to the devices device struct + * @lock: Lock for reading/writing the device + * @model_id: id of the device + * @max_leds: maximum number of LEDs the device supports + * @num_of_banked_leds: holds the number of banked LEDs + * @led_brightness0_reg: first brightness register of the device + * @mix_out0_reg: first color mix register of the device + * @bank_brt_reg: bank brightness register + * @bank_mix_reg: color mix register + * @reset_reg: devices reset register + * @leds: Array of LED strings + */ +struct lp50xx { + struct gpio_desc *enable_gpio; + struct regulator *regulator; + struct i2c_client *client; + struct regmap *regmap; + struct device *dev; + struct mutex lock; + enum lp50xx_model model_id; + int max_leds; + int num_of_banked_leds; + + u8 led_brightness0_reg; + u8 mix_out0_reg; + u8 bank_brt_reg; + u8 bank_mix_reg; + u8 reset_reg; + + /* This needs to be at the end of the struct */ + struct lp50xx_led leds[]; +}; + +static const struct reg_default lp5024_reg_defs[] = { + {LP50XX_DEV_CFG0, 0x0}, + {LP50XX_DEV_CFG1, 0x3c}, + {LP50XX_LED_CFG0, 0x0}, + {LP5024_BNK_BRT, 0xff}, + {LP5024_BNKA_CLR, 0x0f}, + {LP5024_BNKB_CLR, 0x0f}, + {LP5024_BNKC_CLR, 0x0f}, + {LP5024_LED0_BRT, 0x0f}, + {LP5024_LED1_BRT, 0xff}, + {LP5024_LED2_BRT, 0xff}, + {LP5024_LED3_BRT, 0xff}, + {LP5024_LED4_BRT, 0xff}, + {LP5024_LED5_BRT, 0xff}, + {LP5024_LED6_BRT, 0xff}, + {LP5024_LED7_BRT, 0xff}, + {LP5024_OUT0_CLR, 0x0f}, + {LP5024_OUT1_CLR, 0x00}, + {LP5024_OUT2_CLR, 0x00}, + {LP5024_OUT3_CLR, 0x00}, + {LP5024_OUT4_CLR, 0x00}, + {LP5024_OUT5_CLR, 0x00}, + {LP5024_OUT6_CLR, 0x00}, + {LP5024_OUT7_CLR, 0x00}, + {LP5024_OUT8_CLR, 0x00}, + {LP5024_OUT9_CLR, 0x00}, + {LP5024_OUT10_CLR, 0x00}, + {LP5024_OUT11_CLR, 0x00}, + {LP5024_OUT12_CLR, 0x00}, + {LP5024_OUT13_CLR, 0x00}, + {LP5024_OUT14_CLR, 0x00}, + {LP5024_OUT15_CLR, 0x00}, + {LP5024_OUT16_CLR, 0x00}, + {LP5024_OUT17_CLR, 0x00}, + {LP5024_OUT18_CLR, 0x00}, + {LP5024_OUT19_CLR, 0x00}, + {LP5024_OUT20_CLR, 0x00}, + {LP5024_OUT21_CLR, 0x00}, + {LP5024_OUT22_CLR, 0x00}, + {LP5024_OUT23_CLR, 0x00}, + {LP5024_RESET, 0x00} +}; + +static const struct reg_default lp5036_reg_defs[] = { + {LP50XX_DEV_CFG0, 0x0}, + {LP50XX_DEV_CFG1, 0x3c}, + {LP50XX_LED_CFG0, 0x0}, + {LP5036_LED_CFG1, 0x0}, + {LP5036_BNK_BRT, 0xff}, + {LP5036_BNKA_CLR, 0x0f}, + {LP5036_BNKB_CLR, 0x0f}, + {LP5036_BNKC_CLR, 0x0f}, + {LP5036_LED0_BRT, 0x0f}, + {LP5036_LED1_BRT, 0xff}, + {LP5036_LED2_BRT, 0xff}, + {LP5036_LED3_BRT, 0xff}, + {LP5036_LED4_BRT, 0xff}, + {LP5036_LED5_BRT, 0xff}, + {LP5036_LED6_BRT, 0xff}, + {LP5036_LED7_BRT, 0xff}, + {LP5036_OUT0_CLR, 0x0f}, + {LP5036_OUT1_CLR, 0x00}, + {LP5036_OUT2_CLR, 0x00}, + {LP5036_OUT3_CLR, 0x00}, + {LP5036_OUT4_CLR, 0x00}, + {LP5036_OUT5_CLR, 0x00}, + {LP5036_OUT6_CLR, 0x00}, + {LP5036_OUT7_CLR, 0x00}, + {LP5036_OUT8_CLR, 0x00}, + {LP5036_OUT9_CLR, 0x00}, + {LP5036_OUT10_CLR, 0x00}, + {LP5036_OUT11_CLR, 0x00}, + {LP5036_OUT12_CLR, 0x00}, + {LP5036_OUT13_CLR, 0x00}, + {LP5036_OUT14_CLR, 0x00}, + {LP5036_OUT15_CLR, 0x00}, + {LP5036_OUT16_CLR, 0x00}, + {LP5036_OUT17_CLR, 0x00}, + {LP5036_OUT18_CLR, 0x00}, + {LP5036_OUT19_CLR, 0x00}, + {LP5036_OUT20_CLR, 0x00}, + {LP5036_OUT21_CLR, 0x00}, + {LP5036_OUT22_CLR, 0x00}, + {LP5036_OUT23_CLR, 0x00}, + {LP5036_OUT24_CLR, 0x00}, + {LP5036_OUT25_CLR, 0x00}, + {LP5036_OUT26_CLR, 0x00}, + {LP5036_OUT27_CLR, 0x00}, + {LP5036_OUT28_CLR, 0x00}, + {LP5036_OUT29_CLR, 0x00}, + {LP5036_OUT30_CLR, 0x00}, + {LP5036_OUT31_CLR, 0x00}, + {LP5036_OUT32_CLR, 0x00}, + {LP5036_OUT33_CLR, 0x00}, + {LP5036_OUT34_CLR, 0x00}, + {LP5036_OUT35_CLR, 0x00}, + {LP5036_RESET, 0x00} +}; + +static const struct regmap_config lp5024_regmap_config = { + .reg_bits = 8, + .val_bits = 8, + + .max_register = LP5024_RESET, + .reg_defaults = lp5024_reg_defs, + .num_reg_defaults = ARRAY_SIZE(lp5024_reg_defs), + .cache_type = REGCACHE_RBTREE, +}; + +static const struct regmap_config lp5036_regmap_config = { + .reg_bits = 8, + .val_bits = 8, + + .max_register = LP5036_RESET, + .reg_defaults = lp5036_reg_defs, + .num_reg_defaults = ARRAY_SIZE(lp5036_reg_defs), + .cache_type = REGCACHE_RBTREE, +}; + +static struct lp50xx_led *mcled_cdev_to_led(struct led_classdev_mc *mcled_cdev) +{ + return container_of(mcled_cdev, struct lp50xx_led, mc_cdev); +} + +static int lp50xx_brightness_set(struct led_classdev_mc *mcled_cdev, + int brt_val) +{ + struct lp50xx_led *led = mcled_cdev_to_led(mcled_cdev); + int ret = 0; + u8 reg_val; + + mutex_lock(&led->priv->lock); + + if (led->ctrl_bank_enabled) + reg_val = led->priv->bank_brt_reg; + else + reg_val = led->priv->led_brightness0_reg + led->led_number; + + ret = regmap_write(led->priv->regmap, reg_val, brt_val); + + mutex_unlock(&led->priv->lock); + + return ret; +} + +static int lp50xx_brightness_get(struct led_classdev_mc *mcled_cdev, + int color_id) +{ + struct lp50xx_led *led = mcled_cdev_to_led(mcled_cdev); + unsigned int brt_val; + u8 reg_val; + int ret; + + mutex_lock(&led->priv->lock); + + if (led->ctrl_bank_enabled) + reg_val = led->priv->bank_brt_reg; + else + reg_val = led->priv->led_brightness0_reg + led->led_number; + + ret = regmap_read(led->priv->regmap, reg_val, &brt_val); + + mutex_unlock(&led->priv->lock); + + return brt_val; +} + +static int lp50xx_get_color(struct led_classdev_mc *mcled_cdev, int color) +{ + struct lp50xx_led *led = mcled_cdev_to_led(mcled_cdev); + struct lp50xx *priv = led->priv; + u8 led_offset, reg_number, reg_color_off; + unsigned int value; + int ret; + + if (color == LED_COLOR_ID_RED) + reg_color_off = 0; + else if (color == LED_COLOR_ID_GREEN) + reg_color_off = 1; + else if (color == LED_COLOR_ID_BLUE) + reg_color_off = 2; + else + goto out; + + if (led->ctrl_bank_enabled) { + reg_number = priv->bank_mix_reg + reg_color_off; + } else { + led_offset = (led->led_number * 3) + reg_color_off; + reg_number = priv->mix_out0_reg + led_offset; + } + + ret = regmap_read(led->priv->regmap, reg_number, &value); + if (ret) { + dev_err(&priv->client->dev, "Cannot write LED value\n"); + goto out; + } +out: + return value; +} + +static int lp50xx_set_color(struct led_classdev_mc *mcled_cdev, + int color, int value) +{ + struct lp50xx_led *led = mcled_cdev_to_led(mcled_cdev); + struct lp50xx *priv = led->priv; + u8 led_offset, reg_number, reg_color_off; + int ret = -EINVAL; + + if (color == LED_COLOR_ID_RED) + reg_color_off = 0; + else if (color == LED_COLOR_ID_GREEN) + reg_color_off = 1; + else if (color == LED_COLOR_ID_BLUE) + reg_color_off = 2; + else + goto out; + + if (led->ctrl_bank_enabled) { + reg_number = priv->bank_mix_reg + reg_color_off; + } else { + led_offset = (led->led_number * 3) + reg_color_off; + reg_number = priv->mix_out0_reg + led_offset; + } + + ret = regmap_write(priv->regmap, reg_number, value); + if (ret) { + dev_err(&priv->client->dev, "Cannot write LED value\n"); + goto out; + } +out: + return ret; +} + +static struct led_multicolor_ops lp50xx_mc_ops = { + .set_color_brightness = lp50xx_set_color, + .get_color_brightness = lp50xx_get_color, + .set_module_brightness = lp50xx_brightness_set, + .get_module_brightness = lp50xx_brightness_get, +}; + +static void lp50xx_set_led_values(struct lp50xx *priv) +{ + if (priv->model_id == LP5018 || priv->model_id == LP5024) { + priv->led_brightness0_reg = LP5024_LED0_BRT; + priv->mix_out0_reg = LP5024_OUT0_CLR; + priv->bank_brt_reg = LP5024_BNK_BRT; + priv->bank_mix_reg = LP5024_BNKA_CLR; + priv->reset_reg = LP5024_RESET; + } else { + priv->led_brightness0_reg = LP5036_LED0_BRT; + priv->mix_out0_reg = LP5036_OUT0_CLR; + priv->bank_brt_reg = LP5036_BNK_BRT; + priv->bank_mix_reg = LP5036_BNKA_CLR; + priv->reset_reg = LP5036_RESET; + } +} + +static int lp50xx_set_banks(struct lp50xx *priv, u32 led_strings[]) +{ + u8 led_ctrl_enable = 0; + u8 led1_ctrl_enable = 0; + u8 ctrl_ext = 0; + int ret; + int j; + + for (j = 0; j <= priv->max_leds - 1; j++) { + if (led_strings[j] > (LP5024_MAX_LED_MODULES - 1)) { + ctrl_ext = led_strings[j] - LP5024_MAX_LED_MODULES; + led1_ctrl_enable |= (1 << ctrl_ext); + } else { + led_ctrl_enable |= (1 << led_strings[j]); + } + } + + ret = regmap_write(priv->regmap, LP50XX_LED_CFG0, led_ctrl_enable); + + if (led1_ctrl_enable) + ret = regmap_write(priv->regmap, LP5036_LED_CFG1, + led1_ctrl_enable); + + return ret; +} + +static int lp50xx_reset(struct lp50xx *priv) +{ + if (priv->enable_gpio) + return gpiod_direction_output(priv->enable_gpio, 1); + else + return regmap_write(priv->regmap, priv->reset_reg, + LP50XX_SW_RESET); +} + +static int lp50xx_enable_disable(struct lp50xx *priv, u8 enable_disable) +{ + return regmap_write(priv->regmap, LP50XX_DEV_CFG0, enable_disable); +} + +static int lp50xx_probe_dt(struct lp50xx *priv) +{ + u32 led_strings[LP5036_MAX_LED_MODULES]; + struct fwnode_handle *child = NULL; + struct fwnode_handle *led_node = NULL; + struct led_init_data init_data; + struct led_classdev *led_cdev; + struct lp50xx_led *led; + int num_colors; + u32 color_id; + int led_number; + size_t i = 0; + int ret; + + priv->enable_gpio = devm_gpiod_get_optional(&priv->client->dev, + "enable", GPIOD_OUT_LOW); + if (IS_ERR(priv->enable_gpio)) { + ret = PTR_ERR(priv->enable_gpio); + dev_err(&priv->client->dev, "Failed to get enable gpio: %d\n", + ret); + return ret; + } + + priv->regulator = devm_regulator_get(&priv->client->dev, "vled"); + if (IS_ERR(priv->regulator)) + priv->regulator = NULL; + + if (priv->model_id == LP5018) + priv->max_leds = LP5018_MAX_LED_MODULES; + else if (priv->model_id == LP5024) + priv->max_leds = LP5024_MAX_LED_MODULES; + else if (priv->model_id == LP5030) + priv->max_leds = LP5030_MAX_LED_MODULES; + else + priv->max_leds = LP5036_MAX_LED_MODULES; + + device_for_each_child_node(&priv->client->dev, child) { + led = &priv->leds[i]; + if (fwnode_property_present(child, "ti,led-bank")) { + ret = fwnode_property_read_u32_array(child, + "ti,led-bank", + NULL, 0); + ret = fwnode_property_read_u32_array(child, + "ti,led-bank", + led_strings, + ret); + + priv->num_of_banked_leds = ARRAY_SIZE(led_strings); + + ret = lp50xx_set_banks(priv, led_strings); + if (ret) { + dev_err(&priv->client->dev, + "Cannot setup banked LEDs\n"); + fwnode_handle_put(child); + goto child_out; + } + led->ctrl_bank_enabled = 1; + + } else { + ret = fwnode_property_read_u32(child, "reg", + &led_number); + + led->led_number = led_number; + } + if (ret) { + dev_err(&priv->client->dev, + "led sourcing property missing\n"); + fwnode_handle_put(child); + goto child_out; + } + + if (led_number > priv->max_leds) { + dev_err(&priv->client->dev, + "led-sources property is invalid\n"); + ret = -EINVAL; + fwnode_handle_put(child); + goto child_out; + } + + init_data.fwnode = child; + init_data.devicename = priv->client->name; + init_data.default_label = ":"; + + fwnode_property_read_string(child, "linux,default-trigger", + &led->led_dev.default_trigger); + num_colors = 0; + + fwnode_for_each_child_node(child, led_node) { + ret = fwnode_property_read_u32(led_node, "color", + &color_id); + if (ret) + dev_err(&priv->client->dev, + "Cannot read color\n"); + + led->mc_cdev.available_colors[num_colors] = color_id; + num_colors++; + + } + + led->mc_cdev.ops = &lp50xx_mc_ops; + led->mc_cdev.sync_enabled = 1; + led->mc_cdev.num_leds = num_colors; + + led->priv = priv; + led_cdev = &led->mc_cdev.led_cdev; + ret = led_classdev_multicolor_register_ext(&priv->client->dev, + &led->mc_cdev, + &init_data); + if (ret) { + dev_err(&priv->client->dev, "led register err: %d\n", + ret); + fwnode_handle_put(child); + goto child_out; + } + i++; + } + +child_out: + return ret; +} + +static int lp50xx_probe(struct i2c_client *client, + const struct i2c_device_id *id) +{ + struct lp50xx *led; + int count; + int ret; + + count = device_get_child_node_count(&client->dev); + if (!count) { + dev_err(&client->dev, "LEDs are not defined in device tree!"); + return -ENODEV; + } + + led = devm_kzalloc(&client->dev, struct_size(led, leds, count), + GFP_KERNEL); + if (!led) + return -ENOMEM; + + mutex_init(&led->lock); + led->client = client; + led->dev = &client->dev; + led->model_id = id->driver_data; + i2c_set_clientdata(client, led); + + if (led->model_id == LP5018 || led->model_id == LP5024) + led->regmap = devm_regmap_init_i2c(client, + &lp5024_regmap_config); + else + led->regmap = devm_regmap_init_i2c(client, + &lp5036_regmap_config); + + if (IS_ERR(led->regmap)) { + ret = PTR_ERR(led->regmap); + dev_err(&client->dev, "Failed to allocate register map: %d\n", + ret); + return ret; + } + + ret = lp50xx_reset(led); + if (ret) + return ret; + + ret = lp50xx_probe_dt(led); + if (ret) + return ret; + + lp50xx_set_led_values(led); + + return lp50xx_enable_disable(led, LP50XX_CHIP_EN); +} + +static int lp50xx_remove(struct i2c_client *client) +{ + struct lp50xx *led = i2c_get_clientdata(client); + int ret; + + ret = lp50xx_enable_disable(led, LP50XX_CHIP_EN); + if (ret) { + dev_err(&led->client->dev, "Failed to disable regulator\n"); + return ret; + } + + if (led->enable_gpio) + gpiod_direction_output(led->enable_gpio, 0); + + if (led->regulator) { + ret = regulator_disable(led->regulator); + if (ret) + dev_err(&led->client->dev, + "Failed to disable regulator\n"); + } + + mutex_destroy(&led->lock); + + return 0; +} + +static const struct i2c_device_id lp50xx_id[] = { + { "lp5018", LP5018 }, + { "lp5024", LP5024 }, + { "lp5030", LP5030 }, + { "lp5036", LP5036 }, + { } +}; +MODULE_DEVICE_TABLE(i2c, lp50xx_id); + +static const struct of_device_id of_lp50xx_leds_match[] = { + { .compatible = "ti,lp5018", }, + { .compatible = "ti,lp5024", }, + { .compatible = "ti,lp5030", }, + { .compatible = "ti,lp5036", }, + {}, +}; +MODULE_DEVICE_TABLE(of, of_lp50xx_leds_match); + +static struct i2c_driver lp50xx_driver = { + .driver = { + .name = "lp50xx", + .of_match_table = of_lp50xx_leds_match, + }, + .probe = lp50xx_probe, + .remove = lp50xx_remove, + .id_table = lp50xx_id, +}; +module_i2c_driver(lp50xx_driver); + +MODULE_DESCRIPTION("Texas Instruments LP5024 LED driver"); +MODULE_AUTHOR("Dan Murphy "); +MODULE_LICENSE("GPL v2"); From patchwork Thu May 23 19:08:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Murphy X-Patchwork-Id: 165067 Delivered-To: patch@linaro.org Received: by 2002:a92:9e1a:0:0:0:0:0 with SMTP id q26csp2646013ili; Thu, 23 May 2019 12:51:36 -0700 (PDT) X-Google-Smtp-Source: APXvYqxRD4liLrPELSJKyXZf14OU8AD8FgQ7bhKjaevbASOC+tZT0u38DhlZ2qPln6gPke9Axixb X-Received: by 2002:a62:ee05:: with SMTP id e5mr104604368pfi.117.1558641095999; Thu, 23 May 2019 12:51:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1558641095; cv=none; d=google.com; s=arc-20160816; b=a8fr1d1ubSwjJ0FByAnck8n1T3H5FWm+7JbdMgd5KW2XeytlwxbJs7Bf1wjQQjFrk4 NNM1ZnKBg1QTNgIgFd7cMRzdAdh0cIybW6YIEj5D8YZXRTQ++w16vHljVP5lzZI8icQu 4PA95xkCQPMWE+c3P1lMltHrlbmtbJh36f94/ZEO9u2SOye5+UOggWNuawfnoeCzpbln NcE4B8xiKE+jgwTTqpCImMtBtkLnWEc5xwjmzGuESuej7Rk+Bq9Px5+WCDf6grARotEX fua4OdqsHEectE6tHZ4i+sZVp+m/5hgAD7WSsZip81DQ3NBkI3m9XSNhY/ERM0djThLV CUVQ== 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=GLtiVWFcme/Cn8dQa/wp+bSDn/qnr2+YqURpJOJAkAU=; b=qhjUfc1Q9O/wlePfFgGkUvCxxmwFEYUzA+KYPYA9KJ7ZGgNJ15OI/g58Ov9N5WRnNq +rxvW1W5mj+Fvz9+HqByvp/Sua16/vdpIoDWOo4bQOFnlvlPxlh0PLdO65FZqC2EvP94 34FL2maKWmGYEsUR/N4r+548GBoRlvTtJl7rKp0kgIJFigh0cx2/hUwkGMFaZqwz+PC/ NkiruveubVh4SMg+YGfVM7a0G/d3WjmAeFmv/Bzdt7xe8ms+VEWRa3qlaN6ZOXUnl0b9 l3x9u5NyxSv8/ZVlgYEZ0wyoNcL8KOtdNCcH6u2JDSZlY0WETQskhrzyqX7B76OWPYS/ 5baQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=SdxS59dX; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-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 y36si681823pgl.336.2019.05.23.12.51.35; Thu, 23 May 2019 12:51:35 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-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=SdxS59dX; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-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 S2388326AbfEWTvf (ORCPT + 30 others); Thu, 23 May 2019 15:51:35 -0400 Received: from lelv0142.ext.ti.com ([198.47.23.249]:42804 "EHLO lelv0142.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731850AbfEWTIn (ORCPT ); Thu, 23 May 2019 15:08:43 -0400 Received: from fllv0035.itg.ti.com ([10.64.41.0]) by lelv0142.ext.ti.com (8.15.2/8.15.2) with ESMTP id x4NJ8dML034797; Thu, 23 May 2019 14:08:39 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1558638519; bh=GLtiVWFcme/Cn8dQa/wp+bSDn/qnr2+YqURpJOJAkAU=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=SdxS59dXBokFmf1dyLBouAGfNjB9lGBSKC2Kr5XS8AwDXbkFiSE4KHIr6kixhAUkr eqzAd7uo1fs2gg0Loi2pDJGu2YyoZytg7yeVR513edQWQfQLvxzSmf47OnPI6XPQva wDQUZ/MsJTUJsRh/uPx/5eT32X42dRY1lL7XLL9M= Received: from DFLE111.ent.ti.com (dfle111.ent.ti.com [10.64.6.32]) by fllv0035.itg.ti.com (8.15.2/8.15.2) with ESMTPS id x4NJ8ciP079051 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 23 May 2019 14:08:39 -0500 Received: from DFLE109.ent.ti.com (10.64.6.30) by DFLE111.ent.ti.com (10.64.6.32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1713.5; Thu, 23 May 2019 14:08:38 -0500 Received: from fllv0039.itg.ti.com (10.64.41.19) by DFLE109.ent.ti.com (10.64.6.30) 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, 23 May 2019 14:08:38 -0500 Received: from localhost (ileax41-snat.itg.ti.com [10.172.224.153]) by fllv0039.itg.ti.com (8.15.2/8.15.2) with ESMTP id x4NJ8cUh027535; Thu, 23 May 2019 14:08:38 -0500 From: Dan Murphy To: , , CC: , , , Dan Murphy Subject: [PATCH v3 9/9] leds: Update the lp55xx to use the multi color framework Date: Thu, 23 May 2019 14:08:20 -0500 Message-ID: <20190523190820.29375-10-dmurphy@ti.com> X-Mailer: git-send-email 2.21.0.5.gaeb582a983 In-Reply-To: <20190523190820.29375-1-dmurphy@ti.com> References: <20190523190820.29375-1-dmurphy@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 | 133 ++++++++++++++++++---- drivers/leds/leds-lp55xx-common.h | 10 ++ include/linux/platform_data/leds-lp55xx.h | 5 + 4 files changed, 142 insertions(+), 19 deletions(-) -- 2.21.0.5.gaeb582a983 diff --git a/drivers/leds/leds-lp5523.c b/drivers/leds/leds-lp5523.c index fd64df5a57a5..dbcc4d100054 100644 --- a/drivers/leds/leds-lp5523.c +++ b/drivers/leds/leds-lp5523.c @@ -804,6 +804,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; @@ -870,6 +882,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 723f2f17497a..b54fbb8f78c6 100644 --- a/drivers/leds/leds-lp55xx-common.c +++ b/drivers/leds/leds-lp55xx-common.c @@ -38,6 +38,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; @@ -141,15 +146,36 @@ static int lp55xx_set_brightness(struct led_classdev *cdev, struct lp55xx_device_config *cfg = led->chip->cfg; led->brightness = (u8)brightness; + return cfg->brightness_fn(led); } +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 < ARRAY_SIZE(led->channel_color); i++) + if (led->channel_color[i] == color) + break; + + 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; + struct led_classdev *led_cdev; char name[32]; int ret; int max_channel = cfg->max_channel; @@ -162,10 +188,39 @@ 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_cdev = &led->mc_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; + memcpy(led->mc_cdev.available_colors, + pdata->led_config[chan].channel_color, + sizeof(led->mc_cdev.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", @@ -173,18 +228,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; @@ -541,6 +589,38 @@ 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; + 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) { @@ -548,6 +628,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); @@ -568,13 +650,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 abf1fb5da37d..cd28ec2c78a5 100644 --- a/drivers/leds/leds-lp55xx-common.h +++ b/drivers/leds/leds-lp55xx-common.h @@ -15,6 +15,8 @@ #ifndef _LEDS_LP55XX_COMMON_H #define _LEDS_LP55XX_COMMON_H +#include + enum lp55xx_engine_index { LP55XX_ENGINE_INVALID, LP55XX_ENGINE_1, @@ -112,6 +114,9 @@ struct lp55xx_device_config { /* access brightness register */ int (*brightness_fn)(struct lp55xx_led *led); + /* access 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); @@ -162,6 +167,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 @@ -170,9 +176,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[10]; + int grouped_channels[10]; struct lp55xx_chip *chip; }; diff --git a/include/linux/platform_data/leds-lp55xx.h b/include/linux/platform_data/leds-lp55xx.h index 624ff9edad6f..bde6827f1aea 100644 --- a/include/linux/platform_data/leds-lp55xx.h +++ b/include/linux/platform_data/leds-lp55xx.h @@ -15,6 +15,8 @@ #ifndef _LEDS_LP55XX_H #define _LEDS_LP55XX_H +#include + /* Clock configuration */ #define LP55XX_CLOCK_AUTO 0 #define LP55XX_CLOCK_INT 1 @@ -26,6 +28,9 @@ 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 channel_color[10]; + int grouped_channels[10]; }; struct lp55xx_predef_pattern {