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 E2F5A47D941 for ; Wed, 8 Jul 2026 14:19:11 +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=1783520353; cv=none; b=uFLQlj7WqfM4iRqtRVZGolLMixCSzOkXrPWljFopY9mQ0vs0LRTCpvdbVE0OVipUgcDN52Uo8y44sOInjHxgH5wY2cBFtikEwdyBWN8DguegpOC8I8VgkURU10zzF9ncbS06YPP2DyOGYByDWJhnUIDI8fG6DSPPL1mdCtJ0U8Q= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783520353; 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=sJ3Q5b95DBGxP05zYwRIaIoQ59Xudn1mccGH6hRJfMi2RyNC2b9tOMZ+aJXMFR0wSLU19Zk95VlRN5pInrgnwUBcnJWwuz8hb4TgKA7nsblP96YVkM7vzxlmBPzH+WTJjjMPmtKS6ZVUPKv92hWl+chKF2UBCw2QNfnJGNlr3X4= 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=dRKZpFZn; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=A1IS8TK0; 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="dRKZpFZn"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="A1IS8TK0" Received: from pps.filterd (m0279870.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 668C3iAS2715598 for ; Wed, 8 Jul 2026 14:19:11 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=dRKZpFZnXQNxXPa9 c9zZa7ppK4PBFfIcfHvh4OWrTqlbNfAwDO779yGux2XBqxnbYejrUC0lX2korZJ/ BnTyFcaH/eoJZmsk/mpsJqFgJV5nIMKQTutxkDGoMUQmwkOQj5wkgJ6BmiThX8Q2 i/grHNPtde0i1gCFwgBlWktqyxahcR6agJgC2UgRUOSMt22HaitrX6uROG2lkdt9 oIKVSUmQl65zIU7tyBw6/Wns7dx2L6HmC2FJh3IqwY/Bl2m72ywlpYXNrRxJVqrl Alml/BIB9gT5YUEjd7ru7Vqt0+X7Ahecd/14w1bW4T6tisubrqbExMjgZZhrJjpq qWBt6g== Received: from mail-ua1-f71.google.com (mail-ua1-f71.google.com [209.85.222.71]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4f95fd4ud3-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 08 Jul 2026 14:19:10 +0000 (GMT) Received: by mail-ua1-f71.google.com with SMTP id a1e0cc1a2514c-96feaeeeb3bso14212241.3 for ; Wed, 08 Jul 2026 07:19:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1783520350; x=1784125150; 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=A1IS8TK0lF6Sb+PdxpbCIwu/Z3Ax1dk9gO1sO6MKcEYR9YERoCphfubWibEKyChE7a x9giWbFUt6xPAZ5g2kITFzBJ0u0aIdXHi/Mia5fa94kzolqaPThq74h/xkQconnxuAu7 HwVNxNDou3T9ZN4rqGh1mvQH06e+8xDlKGDS410shsFrKgif7e0QiTOmyuaizHpt6Sif DR1zfHQjmZoBk2upmn1QYPJIFePsUp9ncH6PfkYijX/GUa2sTc6/ktY3XOr8w6QZ5FUP DJ5wHC1HsFtnMOpSpJIXeMFtiKwntTaKpnCQS+mKivxRhdwE6FDB/egkmMBhwCSQ6yUV 8kfQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783520350; x=1784125150; 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=A5+oNPq+q+n5+/o35A12I9WGwFD3NrT5FTG0qVtc+pWkFvO6ZdpWiIE/PqViOZr74I LT3oU0oKdf2aDF2hEm/hAbDIooI1NDR1KAaWLPD4G7+u4LHn2VTEIoHRFn7xrZf3r1yV P/JoH3HkHpVtRneTUTfb2lcCmOCR1w4UgaMtVOMWFHeIbCf/mMxfJJ9Fs+TVu5fze5UR go8j+2aS59tVtJFFI+rnnfF2LyhPZkxla1pyJXRfTNK9vhYKCp5Rg94PsQHrBBLrtuuV aPZVSqdjS/iIdSe3FXPSDkDHZpWGWKNn4Wfzy4K/9xvLET9zcKEBIso6i3wkavdW87KQ rBpQ== X-Forwarded-Encrypted: i=1; AHgh+RpM0lPGN5/N+0VldLzhhBKw+hzp6dVBIBBmFHbadYjOV4sgoJ7QyUqUV9VIk1oYaYyOyv6UTRmZ5IYduM8=@vger.kernel.org X-Gm-Message-State: AOJu0YzhHPIMvmC9ajjG0MJuX5MjkQA1nKGzYbexGF5dHp2ZU7rQ5zRr MD5InhLBQWOSmM9laRiVrdqcovK8yK4SRd2aQLtiFkwg+39sTC2fkujG8ypWe1VVpKKYDE71HT5 8BxmIWpQ2EAhsNvT4VOVrox52Om5+KUQ5EYLE0baqFm/NqqjC77zrcT8g/avsdZFtGbw= X-Gm-Gg: AfdE7ckIQKEzN7oCyDwLag1lRAMrvU0JE+mgC1TFq5/vyeFkj30MZxvSIn2FaxUkU4q M2a/p1/lq1vLd3mMcPKV0TQ9Y+jCuhOk3JZ5qfG6ZpiypgO0YJpuc8o11WcxpIr2DCr8xgxdCjw rhMULBl+qpYtxFmEqJWmF1p03MfudaPEblk+sC1G5k38bb/vbhs1eu4yXLMCxoQAmug545I/VoX lqLo436vyWHpj8Cd4v5zwprIHyTePl7KqBs6tIp8GT6bIY+sNBvGvj/VPVGii59AQUyyFgL4qVc cp1+kKcF7lM5HK1JpQizYhgA8y2UGtPRlkP6f78A6p/bsRuqPc3TmP/a2MXSkmBOZgvdod8AXKC ZWOQB85OfynsL9K7TTakpIZ6bsfsoF33+bxudgUFOoiyyYG2lbp7HZ/c3VqEzTI2ekZDALEQdPV edlVKxcQfRKHynmJUJgbhRJ85STvNOWlOkQRIutXVlyI8sAQFG2cOJET3pIx3NB9GubkdlNw8TW oUNRE9xMxNYe/fZWue2 X-Received: by 2002:a05:6102:3753:b0:604:f849:462e with SMTP id ada2fe7eead31-744dff2d5e5mr1341423137.25.1783520348342; Wed, 08 Jul 2026 07:19:08 -0700 (PDT) X-Received: by 2002:a05:6102:3753:b0:604:f849:462e with SMTP id ada2fe7eead31-744dff2d5e5mr1341396137.25.1783520347888; Wed, 08 Jul 2026 07:19:07 -0700 (PDT) Received: from QCOM-eG0v1AUPpu.na.qualcomm.com (82-64-236-198.subs.proxad.net. [82.64.236.198]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-69a9c4a4027sm3080829a12.29.2026.07.08.07.19.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jul 2026 07:19:07 -0700 (PDT) From: Loic Poulain Date: Wed, 08 Jul 2026 16:19:02 +0200 Subject: [PATCH v4 3/4] 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: <20260708-monza-leds-v4-3-a7acfc524c0b@oss.qualcomm.com> References: <20260708-monza-leds-v4-0-a7acfc524c0b@oss.qualcomm.com> In-Reply-To: <20260708-monza-leds-v4-0-a7acfc524c0b@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-Spam-Details-Enc: AW1haW4tMjYwNzA4MDE0MCBTYWx0ZWRfXzoQHiLstwRxi 6TZuhhBW9L8aaSpuSDVLzdlaB+5R9yldMAUS5VC7nhQS8yYtn9XpaauTb0vsYFCX48BQu32695Z VnJcrkwRjqLe2vu0U2oM/okCrn6hqUuVd48whqAINzxYBZjnNvAdDXBe4Zl9MCrRqq71g9kr0qM 4VTy+kQQD75N3tqQoTHRFj+rl90C88/A9TkpKp4FS6/3Gg1L9SUO+FyEmRjOwVOgrQJSXVf+u1D 6OSSAotyHuOoh1y1ZET0r2hgAXSXAE80zetW2mnzmgOOX9f/6A5hzBS0mEPXCm+fNx8ltHs4fhY Iqsyv8ZMRkeZWOHfRxRU1MFmg8ZycBlyAZamdUEZJhbVJhmTVmYudZqGajSfOXS5hfLxa+kRn8E uLMBW1NdX3RXFW8J5m1pqx7pZIftWPnJd4Fw6VlT0iuhb1LCzowqMsOy7eAyrnChHsMYqphvnF7 7cqdoI8Ywyp/by6bqFw== X-Authority-Analysis: v=2.4 cv=VZLH+lp9 c=1 sm=1 tr=0 ts=6a4e5c5e cx=c_pps a=KB4UBwrhAZV1kjiGHFQexw==:117 a=MDeckJw97qnk8wCBExTehA==:17 a=IkcTkHD0fZMA:10 a=RAioF0-LDSMA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=gowsoOTTUOVcmtlkKump:22 a=EUspDBNiAAAA:8 a=TXsEHxuGAXnH8Ii1pS8A:9 a=QEXdDO2ut3YA:10 a=o1xkdb1NAhiiM49bd1HK:22 X-Proofpoint-ORIG-GUID: p9E-pyNTegyY_JVgczDuv50CjZoRK2GT X-Proofpoint-Spam-Info: AW1haW4tMjYwNzA4MDE0MCBTYWx0ZWRfX0DSHdATGJx2G GjSo2EUhECluzS1E1zsdADmLOi8Kq+3ru+JjjitNsYQcjQDQeJh4ZAd/IETBr++YgF/et+KJl4O RVWrMcVoY0okL3mvOZGMEx6Zjd6pvog= X-Proofpoint-GUID: p9E-pyNTegyY_JVgczDuv50CjZoRK2GT X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-07-08_02,2026-07-08_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 bulkscore=0 priorityscore=1501 suspectscore=0 lowpriorityscore=0 spamscore=0 malwarescore=0 adultscore=0 clxscore=1015 phishscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607080140 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