From patchwork Thu Sep 19 18:36:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Murphy X-Patchwork-Id: 174097 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp1378140ill; Thu, 19 Sep 2019 11:35:45 -0700 (PDT) X-Google-Smtp-Source: APXvYqzWU1MqhTSer4lejf5KiHGWRuQ/fOROehCDbEbGcucMn3XdQgnYZBIb4aKaTBb9RNYcBoMw X-Received: by 2002:aa7:d789:: with SMTP id s9mr17766564edq.62.1568918145684; Thu, 19 Sep 2019 11:35:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568918145; cv=none; d=google.com; s=arc-20160816; b=07INbL80GPlSoKsb06+hF+JlAv4XrnMyV4QSBQUoNddxoXqeyvNQzJMDBYFs+vl4y+ q5OifDkF+4b2Sl9ibuYlDppc68fY7OulJp7KkkUvMJ8k22gX+RlynCKaW/GUfp6EN/9R u4vBfZuzL1ghMfK5a9CEdaidh55tBe8ykDhzq0CU8O1J+k5mHW/ZsDOYlHpLXjLYZbnF VHzcmBmiaYZcaO7xC3TErWztcTbMVGwQDHfguJ+G0upnHjqMA01srrvsruIgXtECIwfo acqF8Tek1Du/uT4x/6OiE30ssQ5pyR5WHiVLWpvPRHWvOFGISnVl9F+XrTsP7JtVwI5k FDzg== 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=3r8NrvCOTUy6K4oFLHF2BYQC94/INWkCD7dFECGXy+E=; b=YQCf1UkG2aG2kvg0RT2MHlYW09G//2eExhqneOX5O6AC8zhY0JTcyp6BWN0AFb1VXj LZyEZ4EFpGNzOz3mHpoIHf+j0fRitsMCGdH001bF8aG5UB48wRp3xHUpWvg1O5CxlhiG 6z68+HdcrxLyEj2K2ZetH4c5q4+rU41K0yYdM56WAnzkm0JcxyxwnkYfBZwjulvazWsF ur+BOGZ8/hhjga/9EvvUiLiQeUwaegxhh35Rqdpx8ETYW3KS3OCTMdnOyo9YRnuVI290 ZzZfJwX3FSXv8tUI1r0rw7r7vdYpqSChJAg+m4N+RUM3UR4phWlBRuZbktN4dnV58GY8 myFQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=mbJUV2oQ; 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 u3si5213373edy.48.2019.09.19.11.35.45; Thu, 19 Sep 2019 11:35:45 -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=mbJUV2oQ; 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 S2403909AbfISSfo (ORCPT + 1 other); Thu, 19 Sep 2019 14:35:44 -0400 Received: from fllv0016.ext.ti.com ([198.47.19.142]:58384 "EHLO fllv0016.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732693AbfISSeL (ORCPT ); Thu, 19 Sep 2019 14:34:11 -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 x8JIY6dY087601; Thu, 19 Sep 2019 13:34:06 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1568918046; bh=3r8NrvCOTUy6K4oFLHF2BYQC94/INWkCD7dFECGXy+E=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=mbJUV2oQx7w6UiaVCX/wlRsQMfAled5A1HyV2Ny9AB7ByDxMqzMaxp3itiNeILoXy N0Qe9PB2CW65YuSPjuAxck7c7aAtKniT2wAfFVp6cJ4BxKIy1dqBOmiVlU6TOOX7o+ fQIVURUYg2rTt0x2wJMCK0WuDGDbTRYC1Qc2EVgI= Received: from DFLE115.ent.ti.com (dfle115.ent.ti.com [10.64.6.36]) by lelv0265.itg.ti.com (8.15.2/8.15.2) with ESMTPS id x8JIY6pU107046 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 19 Sep 2019 13:34:06 -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, 19 Sep 2019 13:34:02 -0500 Received: from fllv0039.itg.ti.com (10.64.41.19) 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, 19 Sep 2019 13:34:06 -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 x8JIY6H7034151; Thu, 19 Sep 2019 13:34:06 -0500 From: Dan Murphy To: , CC: , , Dan Murphy Subject: [PATCH v7 1/9] leds: multicolor: Add sysfs interface definition Date: Thu, 19 Sep 2019 13:36:49 -0500 Message-ID: <20190919183657.1339-2-dmurphy@ti.com> X-Mailer: git-send-email 2.22.0.214.g8dca754b1e In-Reply-To: <20190919183657.1339-1-dmurphy@ti.com> References: <20190919183657.1339-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 Add a documentation of LED Multicolor LED class specific sysfs attributes. Signed-off-by: Dan Murphy --- .../ABI/testing/sysfs-class-led-multicolor | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 Documentation/ABI/testing/sysfs-class-led-multicolor -- 2.22.0.214.g8dca754b1e diff --git a/Documentation/ABI/testing/sysfs-class-led-multicolor b/Documentation/ABI/testing/sysfs-class-led-multicolor new file mode 100644 index 000000000000..39fc73becfec --- /dev/null +++ b/Documentation/ABI/testing/sysfs-class-led-multicolor @@ -0,0 +1,43 @@ +What: /sys/class/leds//brightness +Date: Sept 2019 +KernelVersion: 5.5 +Contact: Dan Murphy +Description: read/write + Writing to this file will update all LEDs within the group to a + calculated percentage of what each color LED intensity is set + to. The percentage is calculated via the equation below: + + led_brightness = requested_value * led_color_intensity/led_color_max_intensity + + For additional details please refer to + Documentation/leds/leds-class-multicolor.rst. + + The value of the color is from 0 to + /sys/class/leds//max_brightness. + +What: /sys/class/leds//colors/_intensity +Date: Sept 2019 +KernelVersion: 5.5 +Contact: Dan Murphy +Description: read/write + The led_color directory is dynamically created based on the + colors defined by the registrar of the class. + The value for the led_color is defined in the + include/dt-bindings/leds/common.h. There is one directory per + color presented. The intensity file is created under each + led_color directory and controls the individual LED color + setting. + + The value of the color is from 0 to + /sys/class/leds//colors/_max_intensity. + +What: /sys/class/leds//colors/_max_intensity +Date: Sept 2019 +KernelVersion: 5.5 +Contact: Dan Murphy +Description: read only + Maximum intensity level for the LED color, default is + 255 (LED_FULL). + + If the LED does not support different intensity levels, this + should be 1. From patchwork Thu Sep 19 18:36:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Murphy X-Patchwork-Id: 174088 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp1376519ill; Thu, 19 Sep 2019 11:34:12 -0700 (PDT) X-Google-Smtp-Source: APXvYqwAZlyuLU2p4Stb3F71pWLTtWktiUwFHXYxTOShB733bTSegjCE6lr+FsNi3d3ntsH+Bq5m X-Received: by 2002:a50:e701:: with SMTP id a1mr17982350edn.108.1568918052676; Thu, 19 Sep 2019 11:34:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568918052; cv=none; d=google.com; s=arc-20160816; b=mbiUZnEnFvvheDOnO7jAdsXcNP5TDInbhTUDmaNoDfyLZq4Tv1z+LrHVE/ZfjMy0cT 6JsUPHlgbrfnUJwi6ZEaBhsfstCXz48LGWmHQMVQ2Rt84TQkGp+oN3mApgiET7n6yB4I 9vHrck/CwX3zKzS8bXe27VG70pCxWFyBcs0M5N2qxPZ7LrmcyeKCf7bCh/WiqVlwI/D+ 3uHuCqT+65sqq0tBvQf7kH2QHMkg8LhKTZXhu2sV9cmVg45wyZCO2UAa5Vn8LZWTD8Fx Btet7S8sm/ye9CF8F80Co630L8zrvgvrnKnE3uyad5c9OBHssII+P0ZRKbfcDoMiAlAr yQpQ== 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=Bww3DmLPInN+74zzf9x1fHcHAM7PHNA7A5KdfU8oS5o=; b=myridaEFrhx4ntoMvEGtK6ui3Xdlyp1FKHmYM9hItMvKd1p+bbzx2d6zTz+gHuTZ2I llxsrPbfcaOjWTdXgT8YczWMKv5YsQ+JG5wXXliTvlIeovr2jrU0txh+ZJcixmxzrdAT HW0Irbw7Vt1si3yDfmiiCeGbIoExXJCdQPwRKMYE4TcfUhnlOCoKT7X/2tCebN0a0nN/ emMqdtqZNvvWtpbWSoNXHnYqTQvzXbHH3YrGLCpwyii9Stsf/x48oEiYhm8rvkUNVBhl n/TdJYYyL1fNdZUhQwsuB7/J/8oN4feOsoW/mwD6JhJJ07h9GWv4BrN0w9kUt2tAdYib z5dg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=n4O1iT1Y; 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 gg17si4380335ejb.294.2019.09.19.11.34.12; Thu, 19 Sep 2019 11:34:12 -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=n4O1iT1Y; 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 S2392083AbfISSeM (ORCPT + 1 other); Thu, 19 Sep 2019 14:34:12 -0400 Received: from fllv0015.ext.ti.com ([198.47.19.141]:50534 "EHLO fllv0015.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732834AbfISSeL (ORCPT ); Thu, 19 Sep 2019 14:34:11 -0400 Received: from lelv0265.itg.ti.com ([10.180.67.224]) by fllv0015.ext.ti.com (8.15.2/8.15.2) with ESMTP id x8JIY7eo112792; Thu, 19 Sep 2019 13:34:07 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1568918047; bh=Bww3DmLPInN+74zzf9x1fHcHAM7PHNA7A5KdfU8oS5o=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=n4O1iT1YlS2WTKwziF0THN0iEeeF+N/P5gRPN6pQ28CvqCcC1rzr+88oBOiv4bc4L 7AwHGNO2ZhBnhIxbbN1I3Nb1o3uiSaGyieTz2JiUD2BRMKOB1TKdiFp3TvqvOZ4VWa dN2H6P2ihpvkcemt5PB7KL9EnOi41JBBYqwPneB4= Received: from DFLE115.ent.ti.com (dfle115.ent.ti.com [10.64.6.36]) by lelv0265.itg.ti.com (8.15.2/8.15.2) with ESMTPS id x8JIY7Yd107070 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 19 Sep 2019 13:34:07 -0500 Received: from DFLE109.ent.ti.com (10.64.6.30) 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, 19 Sep 2019 13:34:03 -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, 19 Sep 2019 13:34:03 -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 x8JIY6q6034168; Thu, 19 Sep 2019 13:34:07 -0500 From: Dan Murphy To: , CC: , , Dan Murphy Subject: [PATCH v7 3/9] dt: bindings: Add multicolor class dt bindings documention Date: Thu, 19 Sep 2019 13:36:51 -0500 Message-ID: <20190919183657.1339-4-dmurphy@ti.com> X-Mailer: git-send-email 2.22.0.214.g8dca754b1e In-Reply-To: <20190919183657.1339-1-dmurphy@ti.com> References: <20190919183657.1339-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 Add DT bindings for the LEDs multicolor class framework. Signed-off-by: Dan Murphy --- .../bindings/leds/leds-class-multicolor.txt | 95 +++++++++++++++++++ 1 file changed, 95 insertions(+) create mode 100644 Documentation/devicetree/bindings/leds/leds-class-multicolor.txt -- 2.22.0.214.g8dca754b1e 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..215d3c90f351 --- /dev/null +++ b/Documentation/devicetree/bindings/leds/leds-class-multicolor.txt @@ -0,0 +1,95 @@ +* Multicolor LED properties + +Monochrome LEDs can grouped into LED clusters. These clusters can provide a +visible output that have a wide range of colors and intensities. + +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@1 { + #address-cells = <1>; + #size-cells = <0>; + reg = <1>; + color = ; + function = LED_FUNCTION_STATUS; + + + 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>; + }; + }; + + 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 = ; + }; + }; + +}; From patchwork Thu Sep 19 18:36:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Murphy X-Patchwork-Id: 174091 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp1376750ill; Thu, 19 Sep 2019 11:34:24 -0700 (PDT) X-Google-Smtp-Source: APXvYqzVDTRnJ3/JlTna1IZ909TDdeNcWb4pHFhoE/fMndo89EUpZqgQepTD4o7lVCjuxml6iIpC X-Received: by 2002:a50:9512:: with SMTP id u18mr17234846eda.182.1568918064027; Thu, 19 Sep 2019 11:34:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568918064; cv=none; d=google.com; s=arc-20160816; b=T7NgL3v/Lu4BMR1bNhCK0qEINLEfXh/QAXX+qVaax/I5X22W4WT2LUxoxL3j5Hfyjb NPyVeWVHV65UceTO0e49uiWPLjY6gcimvM4IHaJ9q4yQka1fy0rxFGKS45ZFYeUTVdKn hmeHD3byYt89EbuNPhDvvFpRO/Vp9zNWVmaaDrmGqOvQlhyItNySvq3Ouv1/X7LmrHt2 skbVUU7NhwmmaFjvH2K9RC3BPglWyjhKJTdqfSYqwclIpjPf1gvcEulBZ16m92GUxmN7 Y3gL1fB/KYQVN8wbr01wDJE9F4peyqJeKepWDdik211DYBzJCdBAFokF9qA5gPliu/al qsAw== 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=IbyEubXtjrupSE6ZpBqV74zi00sNHXI2hyLvkDXzAq0=; b=N9Liois00FssHjnaRYjY7cDgI2owJdQc2K1rRqAkeZWsMf9XltYGUJWpxOw2KMcpyN 45+bqnsdmv5/NoksRWYG3ORBDF3OeeubP7th9GoA+cHiz07rryDGNHxnhB43ZqZNBhbE dZQys+6zITmkWcUkD+yo88PmiPyYc1LI8D9UsHNls28NPz+Ma/xUkhJcI/aihI2G82WP +UDpqcbrhBYF1wZpXuDZqHIY94Yuu8LIsc23wyoHP+SBzXAWV5ORfhBIRdps9u6375yI gBrJAzLxU2SGEMm/IsruTLDPO2ra8LSnN3X1tjWfaqUKZBQBS4enjLEr7hbqSTSpUKv7 /Nsw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=tb8Ke9Bm; 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 h43si5889356ede.142.2019.09.19.11.34.23; Thu, 19 Sep 2019 11:34:24 -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=tb8Ke9Bm; 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 S2403976AbfISSeX (ORCPT + 1 other); Thu, 19 Sep 2019 14:34:23 -0400 Received: from lelv0142.ext.ti.com ([198.47.23.249]:41364 "EHLO lelv0142.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732844AbfISSeM (ORCPT ); Thu, 19 Sep 2019 14:34:12 -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 x8JIY87a043192; Thu, 19 Sep 2019 13:34:08 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1568918048; bh=IbyEubXtjrupSE6ZpBqV74zi00sNHXI2hyLvkDXzAq0=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=tb8Ke9BmrSParTjaUHUIxCwXaxJ/cDnrwfjawffcW9OFC1QTnSURmb1I8j4BVK/MO 227eOxeR45xeVF3iPcbLVvWLCDnPVBHWr/km4RmU7FYH8S1/0YNcJLsY9j3WWf7YgG zTrlG/bupOdBUxIraqOp4ylq11lq/wtm99YNSBiY= Received: from DLEE113.ent.ti.com (dlee113.ent.ti.com [157.170.170.24]) by fllv0035.itg.ti.com (8.15.2/8.15.2) with ESMTP id x8JIY8wM100336; Thu, 19 Sep 2019 13:34:08 -0500 Received: from DLEE103.ent.ti.com (157.170.170.33) by DLEE113.ent.ti.com (157.170.170.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1713.5; Thu, 19 Sep 2019 13:34:04 -0500 Received: from lelv0327.itg.ti.com (10.180.67.183) by DLEE103.ent.ti.com (157.170.170.33) 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, 19 Sep 2019 13:34:04 -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 x8JIY83N030053; Thu, 19 Sep 2019 13:34:08 -0500 From: Dan Murphy To: , CC: , , Dan Murphy Subject: [PATCH v7 9/9] leds: Update the lp55xx to use the multi color framework Date: Thu, 19 Sep 2019 13:36:57 -0500 Message-ID: <20190919183657.1339-10-dmurphy@ti.com> X-Mailer: git-send-email 2.22.0.214.g8dca754b1e In-Reply-To: <20190919183657.1339-1-dmurphy@ti.com> References: <20190919183657.1339-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 | 131 ++++++++++++++++++---- drivers/leds/leds-lp55xx-common.h | 9 ++ include/linux/platform_data/leds-lp55xx.h | 6 + 4 files changed, 137 insertions(+), 22 deletions(-) -- 2.22.0.214.g8dca754b1e Reported-by: kbuild test robot diff --git a/drivers/leds/leds-lp5523.c b/drivers/leds/leds-lp5523.c index d0b931a136b9..8b2cdb98fed6 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, + .color_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..a5efe2407832 100644 --- a/drivers/leds/leds-lp55xx-common.c +++ b/drivers/leds/leds-lp55xx-common.c @@ -136,9 +136,26 @@ 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) { + led_mc_calc_brightness(&led->mc_cdev, + brightness, adj_value); + for (i = 0; i < led->mc_cdev.num_leds; i++) { + led->brightness = adj_value[i]; + ret = cfg->color_intensity_fn(led, + led->grouped_channels[i]); + if (ret) + break; + } + } else { + led->brightness = (u8)brightness; + ret = cfg->brightness_fn(led); + } - led->brightness = (u8)brightness; - return cfg->brightness_fn(led); + return ret; } static int lp55xx_init_led(struct lp55xx_led *led, @@ -147,9 +164,9 @@ static int lp55xx_init_led(struct lp55xx_led *led, 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 +176,35 @@ 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.groups = lp55xx_led_groups; + 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 +212,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].num_colors > 1) + ret = led_classdev_multicolor_register(dev, &led->mc_cdev); + else + ret = led_classdev_register(dev, &led->cdev); - 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; - } - - ret = led_classdev_register(dev, &led->cdev); if (ret) { dev_err(dev, "led register err: %d\n", ret); return ret; @@ -466,7 +501,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 +572,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; + set_bit(color_id, &cfg[chan_num].available_colors); + ret = of_property_read_u32(child, "reg", &led_number); + cfg[chan_num].grouped_channels[num_colors] = led_number; + num_colors++; + } + cfg[chan_num].num_colors = num_colors; + + return 0; +} + struct lp55xx_platform_data *lp55xx_of_populate_pdata(struct device *dev, struct device_node *np) { @@ -545,7 +611,10 @@ 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 channel_color; + u32 led_number; int i = 0; + int ret; pdata = devm_kzalloc(dev, sizeof(*pdata), GFP_KERNEL); if (!pdata) @@ -565,13 +634,31 @@ 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; + ret = of_property_read_u32(child, "color", &channel_color); + if (ret) { + dev_err(dev,"Missing color property setting white\n"); + channel_color = LED_COLOR_ID_WHITE; + } - 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); + if (channel_color == LED_COLOR_ID_MULTI) + 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..d9c114259dcb 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 (*color_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,12 @@ 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 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..0ac29f537ab6 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; + unsigned long available_colors; + u32 channel_color[LED_COLOR_ID_MAX]; + int grouped_channels[LED_COLOR_ID_MAX]; }; struct lp55xx_predef_pattern {