From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 29C3A367284 for ; Wed, 1 Jul 2026 16:15:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782922561; cv=none; b=S+VIYVGtyXXUZSt/Z0Tp3gfGTz4jA98te9kjv1O2keK9Q1PmYc9lWV6zp9LBoD8kMblJXT/53ytTtwDNmbHkS2lPyfdGp69pZH575aj7GpADoxXP34FxEb3smVQ/e5N7in7tm3GaaCq8F4HKkRBPVnxS4ExYPthXvl/hxWMR9qc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782922561; c=relaxed/simple; bh=1y47odj+NOJ9z0mS6+ykXCLNXopAlKlTgU+V3x/sXtk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Vx7yPBKEatT2wIwR7VmyfmU5Tuo6cGC6HEBD2i3O5zTCkNiALerwUn44hWjYda7dgrT1nKQzRK7d6E1kmEhzlJC2ER6+sp9bM9+WhemfOntbh+e0HJ4b5g72/DEi1c5oA5Qp/9YciZ/WcfaEA62AvcXtOvMTZERjNTN5DkDeeMs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=jUKwXRhr; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=fA+cAlGS; arc=none smtp.client-ip=205.220.180.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="jUKwXRhr"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="fA+cAlGS" Received: from pps.filterd (m0279869.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 661FoB1c1546202 for ; Wed, 1 Jul 2026 16:15:59 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= uUVrlO6McQy7XbenV1MuJ2C4u8WMipkYL6fUtxCmAXk=; b=jUKwXRhrs39O/E34 cVccw/zQEGmU9bz4i0WYwvlWEavdikbIHibgzbifbVMBdkpPE3IazUhWMgE0DDS9 uAtLiafhRVk80aKHZwkK/FReGZ48wSNSxDpl25Nuz+t/zApliIIGzG1QNQ7zC/B2 6LlMsJnjjJDb+VEHqO4q1UCiVe08K6t5cGilfk6e75BtErhqqYTJqNDqRXEfbmh1 VsEEWKm4HN5qShAfdttFNQYGyl7vqvNWAQrh6q977SFvZxjZPPRkOtv9IcWx7YhY gsNW1t220en5gEMQCIBDtjiHtucCp7Iw3jgvMeBIKTker6G05awCvujk8tIUKz8j xQF0Pw== Received: from mail-ua1-f72.google.com (mail-ua1-f72.google.com [209.85.222.72]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4f50sqsmv6-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 01 Jul 2026 16:15:59 +0000 (GMT) Received: by mail-ua1-f72.google.com with SMTP id a1e0cc1a2514c-969238a10c7so526917241.0 for ; Wed, 01 Jul 2026 09:15:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1782922558; x=1783527358; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=uUVrlO6McQy7XbenV1MuJ2C4u8WMipkYL6fUtxCmAXk=; b=fA+cAlGSlDOkNE8m6Q/duHNhvu8JleS1lRnYG/JpE83AjNheyuh7XjGxi0kxZnWTqa FUxESjZL0KGRc88JoXJnH5/w2RUxPEEGjbbrE02Tu/YvR/DMx1rlPFU3J1B7AxNFDqnt BeSzfsHSOEuR0r7Encp6QGsDcoJ3AeuxOyRqCrR0mQeZkObZ5zUHDs7AnkH9MUrtOOIi KHVZmbvMqTh12t5XK22WvuYWHmx/CcUCD6TOlMcheQ3rKETorPAQHkGWCyzOwgSXQoS6 08Fvyn5AHUJD/ryqeWavpKYJ7FSyss4sTX+LiGQDRQeksn4HgmuIbOZ/7O96yy5NGfo2 axjA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782922558; x=1783527358; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=uUVrlO6McQy7XbenV1MuJ2C4u8WMipkYL6fUtxCmAXk=; b=awEpiCuxYBsarhW655qD/rQcLkEiZ95B3gLSFjwAlPOCOl1f90xCbMehPD7IA7UcOv BDdoZNe1IcoUfUtkZMg814RxhBeLvN//BZobXUCBQABQW3SeT9p3YlsrrLKfPLtpUBjI t4qQRGZSRIS9iosW8pKoc97OrI+hPr2UFUp40Ys59btkT0j4/M4dws6QagnZFDsWPiWi tK54z2tRj18em4ElyRjMFsTat0ng/wq0MNxn10IMa0ybJTtHPnqLebUguA3h4MTF31Qo x4m+7ijlfRvfTSKDOxjn3PrHWU4yGZp98O/9eJ1opzHHrF3UjBHYhI2UxYccGsRZTuh3 U8dA== X-Forwarded-Encrypted: i=1; AHgh+Rr/Y6sE3pSZ51vkDtKzA06kCBhl5catsZ8EMOYSblDVWwUsatd/Q7tUUH6wW+BaSDsHvQk8qRS7U5O0Sgo=@vger.kernel.org X-Gm-Message-State: AOJu0YzlSfkWF39jHtY4EfExm8PrUXMzwdmefI7krkfldlCKC3s8w69O SonD6GmfCmiGach50uaO177MmMUiTjWBq1wofvwTjhjrr8VMJg3YQ4tWW6Mz/Ix6+BiBOjRCiW9 1lzASaNnTH+qqrgVp1j1sghTkxU4WLWg2e5Mb2NFJ/xkDaKsBt1HnQzQDcz1+asNOkKQ= X-Gm-Gg: AfdE7clB3G1NNWLowaU77hduCuj1lOjj8WeeaR9AgV8ka+9dq2UI0Jgluf3Pkgfs/xn Llq92720kiCP+6c+pEq2zCVKhmuZ6afX362/+W6wEBJvQe0UyjRlvO0MUFpFsnDIf87xMxlGjs3 th4OcQbAPzSwWjA0OONv+iO18G7+hyd6MmH6Kla7DgpDaZeyGiAKNMnfJ7t3IP3Y3h1Uf9MX/UX L6lxgCGMp2O/jUkbZRDC2PY+nzORrACbbrArDfFznA0GqhbsFhErqFaAbL4+sVom0ST09BbvIPV dsZZxMpso3CUwOWQTgqHLKtjzG5CFezpFvAwq+E0UhraRN3jKOgsbj3taq2c7q9hRhZpTp+UeqP kMxhclPw7p+n7WVnDtOQivZxnX192uwRcN7EW1IiK/Gs/DEtJdwcP0qPR6iw43LGVPBDc0ED6ke TDfK7u2QPcpaHWUzM74cNJH14HyZWysnC1cGYwNsd78Wgz36eW3HiS8PqcVVHaO5I= X-Received: by 2002:a67:f74f:0:b0:729:3df2:1aa0 with SMTP id ada2fe7eead31-73da95b0f95mr954421137.17.1782922558133; Wed, 01 Jul 2026 09:15:58 -0700 (PDT) X-Received: by 2002:a67:f74f:0:b0:729:3df2:1aa0 with SMTP id ada2fe7eead31-73da95b0f95mr954348137.17.1782922557510; Wed, 01 Jul 2026 09:15:57 -0700 (PDT) Received: from QCOM-eG0v1AUPpu.na.qualcomm.com ([2a01:e0a:830:450:809d:5d56:19d9:ff8b]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-c1288d1ea70sm299570266b.3.2026.07.01.09.15.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jul 2026 09:15:56 -0700 (PDT) From: Loic Poulain Date: Wed, 01 Jul 2026 18:15:52 +0200 Subject: [PATCH v2 2/3] leds: pca963x: add multicolor LED class support Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260701-monza-leds-v2-2-c1be0b472926@oss.qualcomm.com> References: <20260701-monza-leds-v2-0-c1be0b472926@oss.qualcomm.com> In-Reply-To: <20260701-monza-leds-v2-0-c1be0b472926@oss.qualcomm.com> To: Lee Jones , Pavel Machek , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Laurent Pinchart , Bjorn Andersson , Konrad Dybcio Cc: linux-leds@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, Loic Poulain X-Mailer: b4 0.14.2 X-Proofpoint-GUID: EOdvNFXPRmJf80JdHedAlnOb8SPr-3Kc X-Proofpoint-Spam-Info: AW1haW4tMjYwNzAxMDE3MiBTYWx0ZWRfX+3NMozwhxSfg wX7dSCxj6iv+wC3/yJqgJn519ncevHRnnAK56F9iIjj1+EAYuP8XODjEzD0shBct67ewiKSg6tj 13RWkXUWpNadqeKNioGhYSLAgsA9wVQ= X-Proofpoint-ORIG-GUID: EOdvNFXPRmJf80JdHedAlnOb8SPr-3Kc X-Authority-Analysis: v=2.4 cv=ceHiaHDM c=1 sm=1 tr=0 ts=6a453d3f cx=c_pps a=ULNsgckmlI/WJG3HAyAuOQ==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=RAioF0-LDSMA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=_glEPmIy2e8OvE2BGh3C:22 a=EUspDBNiAAAA:8 a=TXsEHxuGAXnH8Ii1pS8A:9 a=QEXdDO2ut3YA:10 a=1WsBpfsz9X-RYQiigVTh:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzAxMDE3MiBTYWx0ZWRfX5umbTOdrAiws 0kYP0vA/TyZjJlrRkJYVKjoUTtxGKVCCy5Hu2uTQEu/IBLIWJd6kCMa+LiRXpUmaGzcOPe/l0ny JVXrRk05kgvvgUkgD1itpqhgrEQTRRlACu4dMtyZB+IOUwtyq4e4Lmvp1YRRnqiKhNKN6wf/ZR3 g81TSGD19UsZvzUD8leohkWDO2oLW9zx8P+bPDSAw1iK16aBIYWTI3KKTYmxXpi+78YmyVKjHC2 USbPk5rKklOFmQX/W67M/n4hf3/S2i8yWuWteEkbFcUC+SEOQZw0p+qfcSbT0hplJHuw8iyLSvQ pftSTy7Sw3cb+SewpKTaSbv8u8PQmClie/eoVkClQfYY4E9tArbfDjVX9Y4YIqT/AJ87oKdqHPR dl6/1LlksnVsl1jfZBoSL6c1ou3A1qVc2uyxzAJhv2Ubb2Qb6SjDR5RTRrEHi3cUBbyc9CY1JIc +dVYQ4nBU6wsr/OvrXw== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.125,FMLib:17.12.100.49 definitions=2026-07-01_03,2026-06-26_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 adultscore=0 clxscore=1015 suspectscore=0 spamscore=0 malwarescore=0 priorityscore=1501 bulkscore=0 lowpriorityscore=0 phishscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607010172 Allow grouping of individual PCA963x PWM channels into a single multicolor LED device by adding support for the LED multicolor class. A child node with sub-children is treated as a multicolor group, others are treated as single leds, keeping full backwards compatibility. Signed-off-by: Loic Poulain --- drivers/leds/Kconfig | 1 + drivers/leds/leds-pca963x.c | 126 ++++++++++++++++++++++++++++++++++++++------ 2 files changed, 110 insertions(+), 17 deletions(-) diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig index f4a0a3c8c8705e0f10ba26584277dbb2d5eac5b5..14df88f92b12bbe43908b67f9480cf23056e27e2 100644 --- a/drivers/leds/Kconfig +++ b/drivers/leds/Kconfig @@ -596,6 +596,7 @@ config LEDS_PCA963X tristate "LED support for PCA963x I2C chip" depends on LEDS_CLASS depends on I2C + select LEDS_CLASS_MULTICOLOR help This option enables support for LEDs connected to the PCA963x LED driver chip accessed via the I2C bus. Supported diff --git a/drivers/leds/leds-pca963x.c b/drivers/leds/leds-pca963x.c index e3a81c60ee27c96e5050a829523dfd43e1f0663f..f6f6bafcc2bd5bad51a3184c4cb08fc50693a0a5 100644 --- a/drivers/leds/leds-pca963x.c +++ b/drivers/leds/leds-pca963x.c @@ -27,6 +27,7 @@ #include #include #include +#include #include #include #include @@ -101,8 +102,11 @@ struct pca963x; struct pca963x_led { struct pca963x *chip; struct led_classdev led_cdev; + struct led_classdev_mc mc_cdev; + struct mc_subled subleds[4]; int led_num; /* 0 .. 15 potentially */ bool blinking; + bool is_mc; u8 gdc; u8 gfrq; }; @@ -205,7 +209,7 @@ static int pca963x_power_state(struct pca963x_led *led) unsigned long *leds_on = &led->chip->leds_on; unsigned long cached_leds = *leds_on; - if (led->led_cdev.brightness) + if (led->is_mc ? led->mc_cdev.led_cdev.brightness : led->led_cdev.brightness) set_bit(led->led_num, leds_on); else clear_bit(led->led_num, leds_on); @@ -237,6 +241,28 @@ static int pca963x_led_set(struct led_classdev *led_cdev, return ret; } +static int pca963x_led_mc_set(struct led_classdev *led_cdev, + enum led_brightness value) +{ + struct led_classdev_mc *mc_cdev = lcdev_to_mccdev(led_cdev); + struct pca963x_led *led = container_of(mc_cdev, struct pca963x_led, mc_cdev); + unsigned int i; + int ret; + + led_mc_calc_color_components(mc_cdev, value); + + guard(mutex)(&led->chip->mutex); + + for (i = 0; i < mc_cdev->num_colors; i++) { + led->led_num = mc_cdev->subled_info[i].channel; + ret = pca963x_brightness(led, mc_cdev->subled_info[i].brightness); + if (ret < 0) + return ret; + } + + return pca963x_power_state(led); +} + static unsigned int pca963x_period_scale(struct pca963x_led *led, unsigned int val) { @@ -300,6 +326,84 @@ static int pca963x_blink_set(struct led_classdev *led_cdev, return 0; } +static int pca963x_register_single_led(struct device *dev, + struct pca963x_led *led, u32 reg, + struct fwnode_handle *fwnode, + bool hw_blink) +{ + struct led_init_data init_data = {}; + char default_label[32]; + struct i2c_client *client = led->chip->client; + + led->led_num = reg; + led->is_mc = false; + led->led_cdev.brightness_set_blocking = pca963x_led_set; + if (hw_blink) + led->led_cdev.blink_set = pca963x_blink_set; + + init_data.fwnode = fwnode; + init_data.devicename = "pca963x"; + snprintf(default_label, sizeof(default_label), "%d:%.2x:%u", + client->adapter->nr, client->addr, reg); + init_data.default_label = default_label; + + return devm_led_classdev_register_ext(dev, &led->led_cdev, &init_data); +} + +static int pca963x_register_mc_led(struct device *dev, + struct pca963x_led *led, u32 reg, + struct fwnode_handle *fwnode, + const struct pca963x_chipdef *chipdef) +{ + struct mc_subled *subleds = led->subleds; + unsigned int num_colors = 0; + struct led_init_data init_data = {}; + char default_label[32]; + struct i2c_client *client = led->chip->client; + int ret; + + fwnode_for_each_child_node_scoped(fwnode, sub) { + u32 color, subreg; + + if (num_colors >= ARRAY_SIZE(led->subleds)) { + dev_err(dev, "Too many sub-LEDs for node %pfw\n", fwnode); + return -EINVAL; + } + + ret = fwnode_property_read_u32(sub, "reg", &subreg); + if (ret || subreg >= chipdef->n_leds) { + dev_err(dev, "Invalid 'reg' for sub-LED %pfw\n", sub); + return -EINVAL; + } + + ret = fwnode_property_read_u32(sub, "color", &color); + if (ret) { + dev_err(dev, "Missing 'color' for sub-LED %pfw\n", sub); + return ret; + } + + subleds[num_colors].channel = subreg; + subleds[num_colors].color_index = color; + subleds[num_colors].intensity = LED_FULL; + num_colors++; + } + + led->led_num = reg; + led->is_mc = true; + led->mc_cdev.subled_info = subleds; + led->mc_cdev.num_colors = num_colors; + led->mc_cdev.led_cdev.max_brightness = LED_FULL; + led->mc_cdev.led_cdev.brightness_set_blocking = pca963x_led_mc_set; + + init_data.fwnode = fwnode; + init_data.devicename = "pca963x"; + snprintf(default_label, sizeof(default_label), "%d:%.2x:%u", + client->adapter->nr, client->addr, reg); + init_data.default_label = default_label; + + return devm_led_classdev_multicolor_register_ext(dev, &led->mc_cdev, &init_data); +} + static int pca963x_register_leds(struct i2c_client *client, struct pca963x *chip) { @@ -338,9 +442,6 @@ static int pca963x_register_leds(struct i2c_client *client, return ret; device_for_each_child_node_scoped(dev, child) { - struct led_init_data init_data = {}; - char default_label[32]; - ret = fwnode_property_read_u32(child, "reg", ®); if (ret || reg >= chipdef->n_leds) { dev_err(dev, "Invalid 'reg' property for node %pfw\n", @@ -348,22 +449,13 @@ static int pca963x_register_leds(struct i2c_client *client, return -EINVAL; } - led->led_num = reg; led->chip = chip; - led->led_cdev.brightness_set_blocking = pca963x_led_set; - if (hw_blink) - led->led_cdev.blink_set = pca963x_blink_set; led->blinking = false; - init_data.fwnode = child; - /* for backwards compatibility */ - init_data.devicename = "pca963x"; - snprintf(default_label, sizeof(default_label), "%d:%.2x:%u", - client->adapter->nr, client->addr, reg); - init_data.default_label = default_label; - - ret = devm_led_classdev_register_ext(dev, &led->led_cdev, - &init_data); + if (fwnode_get_child_node_count(child) > 0) + ret = pca963x_register_mc_led(dev, led, reg, child, chipdef); + else + ret = pca963x_register_single_led(dev, led, reg, child, hw_blink); if (ret) { dev_err(dev, "Failed to register LED for node %pfw\n", child); -- 2.34.1