Received: by 2002:a05:6a10:22f:0:0:0:0 with SMTP id 15csp1413914pxk; Thu, 10 Sep 2020 14:56:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzUvl/C9CtSty1UVXhJTshMHu8LDCWrOPSV58tzFT1RmN1XWHQeLu5SR3lBgBCHinRyE7cK X-Received: by 2002:a17:906:bb06:: with SMTP id jz6mr10773599ejb.275.1599775014356; Thu, 10 Sep 2020 14:56:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1599775014; cv=none; d=google.com; s=arc-20160816; b=DVk31Wl6d4yGpMnEMsNWqv7TAqw2xqHcMJPbVsa13pSzWZVsI3NImnE7qLDOdpwhYS kP16LOuyA0UD8vILxIXHbK8vVJVM66A9yZHd0QIhSQ93nMrlPozCegeRoj0SXijLoHtQ 9tAhNkGYmpjbhdZQiu5+grHp1Wi/3QMTfulmPu4Oejsnd03pdCtvBXpXfT9veLVOLroU 7qh7GYiqv+lgUNbHHu35vsqcjmBJ/iSvui4Uf1NreiQBwJLD3m/PrjFcVYkDJPdWBgRK JIqClPEmKxX5H5ZwS5/VO8X/48yHmj8Pmwq0kCmcREm9vS1+aUAoBeevcivYPa/lBtJt fijQ== 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 :content-language:in-reply-to:mime-version:user-agent:date :message-id:from:references:cc:to:subject:dkim-signature; bh=2JcBqAV4yNPpAz7ipU6iXeeP53yUk/YOp4f1v64ujfs=; b=G9+qg9y1eJ7jAkcegq6JMa6HTL7E0r/y8zZPpkGW7g8S9p0r4UOsCW72A1XG5y69vx On1UQH65gaqcEVkOJ2v9F7ILfcj4wykMDuCjgCfEBiaAITLHaAJ2/PpE5uL3b4w8mttr FQYAKoPKvgZX09EcGNV2iaIN3wTnUmgNOZVA0x01M8zcmWc9Bw+/B2TT61WP4HhUfCHd 3Yg4ZDur69N+5OcnZA/JoL2tzN3ueMwjIhDW0H4mZjsZBSaydyx6TeNNtyeLmXrs4N68 iemFCGxAbbUAFPcx+BMjNJCJ3svPmp2RVfbsmA+2fRDf+8FDK3/tEaKqHAXOrqFQxTot ZPQw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=MQQkPAcv; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id y19si4490105ejf.251.2020.09.10.14.56.31; Thu, 10 Sep 2020 14:56:54 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=MQQkPAcv; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725562AbgIJVzy (ORCPT + 99 others); Thu, 10 Sep 2020 17:55:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39120 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728512AbgIJVmf (ORCPT ); Thu, 10 Sep 2020 17:42:35 -0400 Received: from mail-ed1-x544.google.com (mail-ed1-x544.google.com [IPv6:2a00:1450:4864:20::544]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2147AC061573; Thu, 10 Sep 2020 14:42:34 -0700 (PDT) Received: by mail-ed1-x544.google.com with SMTP id w1so7905586edr.3; Thu, 10 Sep 2020 14:42:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=2JcBqAV4yNPpAz7ipU6iXeeP53yUk/YOp4f1v64ujfs=; b=MQQkPAcvGWnlJHnFJ30K34U0k6m83YbLSi4E2DFwlZadVaiJEQBTS91m6rl2EIr2LX x+qrippibyWrXTdYNk09z7+6m2ejNMf/Zfg4oH9+VL4QK4w5/aoedHyJlz/ihtFVRIgF EFt4v4Ybkzq/iX33qJokLi6qmSWDUoh8M6rP/QNPEd5cM1ZBHIZuMIs3OPwtMrFfkGbM aUsxao1jzmqncnDObGVVPW/c8lc6wcKb6ZVFyCY0120f1FsOTZS7vP9tbsPi7d2QalS5 dJOt3qE38ibTk3diT8KAbPnLp1lj+GkPSzHcnQM5WmW92eitS/fy/6sZSbGcuzXNh9Pf 4QCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=2JcBqAV4yNPpAz7ipU6iXeeP53yUk/YOp4f1v64ujfs=; b=hBSgFW4Gy/BqO0hm6lYJlzUmHzt8nW7TofHNKMfAv/KV2kFtm8IH/pItuUVvp1Pmrg +Za0S0mgKPGp7phrXRVYvzd5VnF5yMUJZhUo4PjFaAaX8ibczXlQx6S53hMKpjgGHujZ Fjqk6kcqnseofrLb8Tn+3m6JkQGXIoAsM0B/HvRyxOfb5pIElsV7odV/2UkQGLs2yl0H xh14L7eAhAa8ncTQR/gYzuvNBqbyuFE+e38llRe3NYNriBFFm7SBhGblkCtDBQ7pBKjM L0eudi2ZsEVG4F2XWGOr4FBafaPMkLbVvCn6HWTlcXIo8OaI5waTH4ZK2a6HtjOE27eL wpVw== X-Gm-Message-State: AOAM530m7znroL6lyT8r6EL7gjk8oPdMS1HbS1W0203fnIZ+d+o/ahxw 17QYklzjMhxEGzRwGNATM1E= X-Received: by 2002:a50:aaca:: with SMTP id r10mr11914738edc.307.1599774152428; Thu, 10 Sep 2020 14:42:32 -0700 (PDT) Received: from ?IPv6:2a01:110f:b59:fd00:a856:4fc0:9f1:73f6? ([2a01:110f:b59:fd00:a856:4fc0:9f1:73f6]) by smtp.gmail.com with ESMTPSA id s15sm70995eju.105.2020.09.10.14.42.30 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 10 Sep 2020 14:42:31 -0700 (PDT) Subject: Re: [PATCH v3 1/2] leds: mt6360: Add LED driver for MT6360 To: Gene Chen , pavel@ucw.cz, robh+dt@kernel.org, matthias.bgg@gmail.com Cc: dmurphy@ti.com, linux-leds@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org, gene_chen@richtek.com, Wilma.Wu@mediatek.com, shufan_lee@richtek.com, cy_huang@richtek.com, benjamin.chao@mediatek.com References: <1599474459-20853-1-git-send-email-gene.chen.richtek@gmail.com> <1599474459-20853-2-git-send-email-gene.chen.richtek@gmail.com> From: Jacek Anaszewski Message-ID: <559a568e-3a2e-33c6-43aa-547a18f8e26b@gmail.com> Date: Thu, 10 Sep 2020 23:42:29 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.12.0 MIME-Version: 1.0 In-Reply-To: <1599474459-20853-2-git-send-email-gene.chen.richtek@gmail.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Gene, Thanks for the update. On 9/7/20 12:27 PM, Gene Chen wrote: > From: Gene Chen > > Add MT6360 LED driver include 2-channel Flash LED with torch/strobe mode, > and 4-channel RGB LED support Register/Flash/Breath Mode > > Signed-off-by: Gene Chen > --- > drivers/leds/Kconfig | 11 + > drivers/leds/Makefile | 1 + > drivers/leds/leds-mt6360.c | 681 +++++++++++++++++++++++++++++++++++++++++++++ > 3 files changed, 693 insertions(+) > create mode 100644 drivers/leds/leds-mt6360.c > > diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig > index 1c181df..94a6d83 100644 > --- a/drivers/leds/Kconfig > +++ b/drivers/leds/Kconfig > @@ -271,6 +271,17 @@ config LEDS_MT6323 > This option enables support for on-chip LED drivers found on > Mediatek MT6323 PMIC. > > +config LEDS_MT6360 > + tristate "LED Support for Mediatek MT6360 PMIC" > + depends on LEDS_CLASS_FLASH && OF > + depends on V4L2_FLASH_LED_CLASS || !V4L2_FLASH_LED_CLASS > + depends on MFD_MT6360 > + help > + This option enables support for dual Flash LED drivers found on > + Mediatek MT6360 PMIC. > + Independent current sources supply for each flash LED support torch and strobe mode. > + Includes Low-VF and short protection. > + > config LEDS_S3C24XX > tristate "LED Support for Samsung S3C24XX GPIO LEDs" > depends on LEDS_CLASS > diff --git a/drivers/leds/Makefile b/drivers/leds/Makefile > index c2c7d7a..5596427 100644 > --- a/drivers/leds/Makefile > +++ b/drivers/leds/Makefile > @@ -66,6 +66,7 @@ obj-$(CONFIG_LEDS_MIKROTIK_RB532) += leds-rb532.o > obj-$(CONFIG_LEDS_MLXCPLD) += leds-mlxcpld.o > obj-$(CONFIG_LEDS_MLXREG) += leds-mlxreg.o > obj-$(CONFIG_LEDS_MT6323) += leds-mt6323.o > +obj-$(CONFIG_LEDS_MT6360) += leds-mt6360.o > obj-$(CONFIG_LEDS_NET48XX) += leds-net48xx.o > obj-$(CONFIG_LEDS_NETXBIG) += leds-netxbig.o > obj-$(CONFIG_LEDS_NIC78BX) += leds-nic78bx.o > diff --git a/drivers/leds/leds-mt6360.c b/drivers/leds/leds-mt6360.c > new file mode 100644 > index 0000000..bd6fa48 > --- /dev/null > +++ b/drivers/leds/leds-mt6360.c > @@ -0,0 +1,681 @@ > +// SPDX-License-Identifier: GPL-2.0-only > +// > +// Copyright (C) 2020 MediaTek Inc. > +// > +// Author: Gene Chen > + > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > + > +enum { > + MT6360_LED_ISNK1 = 0, > + MT6360_LED_ISNK2, > + MT6360_LED_ISNK3, > + MT6360_LED_ISNK4, > + MT6360_LED_FLASH1, > + MT6360_LED_FLASH2, > + MT6360_MAX_LEDS, > +}; > + > +#define MT6360_REG_RGBEN 0x380 > +#define MT6360_REG_ISNK(_led_no) (0x381 + (_led_no)) > +#define MT6360_ISNK_ENMASK(_led_no) BIT(7 - (_led_no)) > +#define MT6360_ISNK_MASK 0x1F > +#define MT6360_CHRINDSEL_MASK BIT(3) > + > +#define MT6360_REG_FLEDEN 0x37E > +#define MT6360_REG_STRBTO 0x373 > +#define MT6360_REG_FLEDBASE(_id) (0x372 + 4 * (_id - MT6360_LED_FLASH1)) > +#define MT6360_REG_FLEDISTRB(_id) (MT6360_REG_FLEDBASE(_id) + 2) > +#define MT6360_REG_FLEDITOR(_id) (MT6360_REG_FLEDBASE(_id) + 3) > +#define MT6360_REG_CHGSTAT2 0x3E1 > +#define MT6360_REG_FLEDSTAT1 0x3E9 > +#define MT6360_ITORCH_MASK GENMASK(4, 0) > +#define MT6360_ISTROBE_MASK GENMASK(6, 0) > +#define MT6360_STRBTO_MASK GENMASK(6, 0) > +#define MT6360_TORCHEN_MASK BIT(3) > +#define MT6360_STROBEN_MASK BIT(2) > +#define MT6360_FLCSEN_MASK(_id) BIT(MT6360_LED_FLASH2 - _id) > +#define MT6360_FLEDCHGVINOVP_MASK BIT(3) > +#define MT6360_FLED1STRBTO_MASK BIT(11) > +#define MT6360_FLED2STRBTO_MASK BIT(10) > +#define MT6360_FLED1STRB_MASK BIT(9) > +#define MT6360_FLED2STRB_MASK BIT(8) > +#define MT6360_FLED1SHORT_MASK BIT(7) > +#define MT6360_FLED2SHORT_MASK BIT(6) > +#define MT6360_FLEDLVF_MASK BIT(3) > + > +/* 0 means led_off, add one for dummy */ > +#define MT6360_ISNK1_MAXLEVEL 13 > +#define MT6360_ISNK4_MAXLEVEL 31 > + > +#define MT6360_ITORCH_MIN 25000 > +#define MT6360_ITORCH_STEP 12500 > +#define MT6360_ITORCH_MAX 400000 > +#define MT6360_ISTRB_MIN 50000 > +#define MT6360_ISTRB_STEP 12500 > +#define MT6360_ISTRB_MAX 1500000 > +#define MT6360_STRBTO_MIN 64000 > +#define MT6360_STRBTO_STEP 32000 > +#define MT6360_STRBTO_MAX 2432000 > + > +#define FLED_TORCH_FLAG_MASK 0x0c > +#define FLED_TORCH_FLAG_SHFT 2 > +#define FLED_STROBE_FLAG_MASK 0x03 > + > +#define STATE_OFF 0 > +#define STATE_KEEP 1 > +#define STATE_ON 2 > + > +struct mt6360_led { > + union { > + struct led_classdev isnk; > + struct led_classdev_flash flash; > + }; > + struct v4l2_flash *v4l2_flash; > + struct mt6360_priv *priv; > + u32 led_no; > + u32 default_state; > +}; > + > +struct mt6360_priv { > + struct device *dev; > + struct regmap *regmap; > + struct mt6360_led *leds[MT6360_MAX_LEDS]; > + unsigned int fled_strobe_used; > + unsigned int fled_torch_used; > +}; > + > +static int mt6360_isnk_brightness_set(struct led_classdev *lcdev, enum led_brightness level) > +{ > + struct mt6360_led *led = container_of(lcdev, struct mt6360_led, isnk); > + struct mt6360_priv *priv = led->priv; > + u32 enable_mask = MT6360_ISNK_ENMASK(led->led_no); > + u32 val = level ? MT6360_ISNK_ENMASK(led->led_no) : 0; > + int ret; > + > + dev_dbg(lcdev->dev, "[%d] brightness %d\n", led->led_no, level); > + > + if (level) { > + ret = regmap_update_bits(priv->regmap, MT6360_REG_ISNK(led->led_no), > + MT6360_ISNK_MASK, level - 1); > + if (ret) > + return ret; > + } > + > + ret = regmap_update_bits(priv->regmap, MT6360_REG_RGBEN, enable_mask, val); > + if (ret) > + return ret; > + > + return 0; > +} > + > +static int mt6360_torch_brightness_set(struct led_classdev *lcdev, enum led_brightness level) > +{ > + struct mt6360_led *led = container_of(lcdev, struct mt6360_led, flash.led_cdev); > + struct mt6360_priv *priv = led->priv; > + u32 enable_mask = MT6360_TORCHEN_MASK | MT6360_FLCSEN_MASK(led->led_no); > + u32 val = (level) ? MT6360_FLCSEN_MASK(led->led_no) : 0; > + u32 prev = priv->fled_torch_used, curr; > + int ret; > + > + dev_dbg(lcdev->dev, "[%d] brightness %d\n", led->led_no, level); > + if (priv->fled_strobe_used) { > + dev_warn(lcdev->dev, "Please disable strobe first [%d]\n", priv->fled_strobe_used); Doesn't hardware handle that? IOW, what happens when you have enabled both torch and flash? If flash just overrides torch mode, than you should not prevent enabling torch in this case. > + return -EINVAL; > + } > + > + if (level) > + curr = prev | BIT(led->led_no); > + else > + curr = prev & (~BIT(led->led_no)); > + > + if (curr) > + val |= MT6360_TORCHEN_MASK; > + > + if (level) { > + ret = regmap_update_bits(priv->regmap, MT6360_REG_FLEDITOR(led->led_no), > + MT6360_ITORCH_MASK, level - 1); > + if (ret) > + return ret; > + } > + > + ret = regmap_update_bits(priv->regmap, MT6360_REG_FLEDEN, enable_mask, val); > + if (ret) > + return ret; > + > + priv->fled_torch_used = curr; > + > + return 0; > +} > + > +static int mt6360_strobe_brightness_set(struct led_classdev_flash *fl_cdev, u32 brightness) s/strobe_brightness_set/flash_brightness_set/ Let's stick to the op name. > +{ > + struct mt6360_led *led = container_of(fl_cdev, struct mt6360_led, flash); > + struct led_classdev *lcdev = &fl_cdev->led_cdev; It would be good to add comment here explaining why this function doesn't do anything. > + dev_dbg(lcdev->dev, "[%d] strobe brightness %d\n", led->led_no, brightness); > + return 0; > +} > + > +static int _mt6360_strobe_brightness_set(struct led_classdev_flash *fl_cdev, u32 brightness) s/strobe_brightness_set/flash_brightness_set/ > +{ > + struct mt6360_led *led = container_of(fl_cdev, struct mt6360_led, flash); > + struct mt6360_priv *priv = led->priv; > + struct led_flash_setting *s = &fl_cdev->brightness; > + u32 val = (brightness - s->min) / s->step; > + > + return regmap_update_bits(priv->regmap, MT6360_REG_FLEDISTRB(led->led_no), > + MT6360_ISTROBE_MASK, val); > +} > + > +static int mt6360_strobe_set(struct led_classdev_flash *fl_cdev, bool state) > +{ > + struct mt6360_led *led = container_of(fl_cdev, struct mt6360_led, flash); > + struct mt6360_priv *priv = led->priv; > + struct led_classdev *lcdev = &fl_cdev->led_cdev; > + struct led_flash_setting *s = &fl_cdev->brightness; > + u32 enable_mask = MT6360_STROBEN_MASK | MT6360_FLCSEN_MASK(led->led_no); > + u32 val = state ? MT6360_FLCSEN_MASK(led->led_no) : 0; > + u32 prev = priv->fled_strobe_used, curr; > + int ret; > + > + dev_dbg(lcdev->dev, "[%d] strobe state %d\n", led->led_no, state); > + if (priv->fled_torch_used) { > + dev_warn(lcdev->dev, "Please disable torch first [0x%x]\n", priv->fled_torch_used); Similar comment as in case of enabling torch mode above. If flash overrides torch then we're OK without this guard. > + return -EINVAL; > + } > + > + if (state) > + curr = prev | BIT(led->led_no); > + else > + curr = prev & (~BIT(led->led_no)); > + > + if (curr) > + val |= MT6360_STROBEN_MASK; > + > + ret = regmap_update_bits(priv->regmap, MT6360_REG_FLEDEN, enable_mask, val); > + if (ret) { > + dev_err(lcdev->dev, "[%d] control current source %d fail\n", led->led_no, state); > + return ret; > + } > + > + /* used to prevent flash current spike when torch on */ > + ret = _mt6360_strobe_brightness_set(fl_cdev, state ? s->val : s->min); > + if (ret) > + return ret; > + > + if (!prev && curr) > + usleep_range(5000, 6000); > + else if (prev && !curr) > + udelay(500); > + > + priv->fled_strobe_used = curr; > + return 0; > +} > + > +static int mt6360_strobe_get(struct led_classdev_flash *fl_cdev, bool *state) > +{ > + struct mt6360_led *led = container_of(fl_cdev, struct mt6360_led, flash); > + struct mt6360_priv *priv = led->priv; > + > + *state = !!(priv->fled_strobe_used & BIT(led->led_no)); > + return 0; > +} > + > +static int mt6360_timeout_set(struct led_classdev_flash *fl_cdev, u32 timeout) > +{ > + struct mt6360_led *led = container_of(fl_cdev, struct mt6360_led, flash); > + struct mt6360_priv *priv = led->priv; > + struct led_flash_setting *s = &fl_cdev->timeout; > + u32 val = (timeout - s->min) / s->step; > + > + return regmap_update_bits(priv->regmap, MT6360_REG_STRBTO, MT6360_STRBTO_MASK, val); > + > +} > + > +static int mt6360_fault_get(struct led_classdev_flash *fl_cdev, u32 *fault) > +{ > + struct mt6360_led *led = container_of(fl_cdev, struct mt6360_led, flash); > + struct mt6360_priv *priv = led->priv; > + u16 fled_stat; > + unsigned int chg_stat, strobe_timeout_mask, fled_short_mask; > + u32 rfault = 0; > + int ret; > + > + ret = regmap_read(priv->regmap, MT6360_REG_CHGSTAT2, &chg_stat); > + if (ret) > + return ret; > + > + ret = regmap_raw_read(priv->regmap, MT6360_REG_FLEDSTAT1, &fled_stat, sizeof(fled_stat)); > + if (ret) > + return ret; > + > + if (led->led_no == MT6360_LED_FLASH1) { > + strobe_timeout_mask = MT6360_FLED1STRBTO_MASK; > + fled_short_mask = MT6360_FLED1SHORT_MASK; > + > + } else { > + strobe_timeout_mask = MT6360_FLED2STRBTO_MASK; > + fled_short_mask = MT6360_FLED2SHORT_MASK; > + } > + > + if (chg_stat & MT6360_FLEDCHGVINOVP_MASK) > + rfault |= LED_FAULT_INPUT_VOLTAGE; > + > + if (fled_stat & strobe_timeout_mask) > + rfault |= LED_FAULT_TIMEOUT; > + > + if (fled_stat & fled_short_mask) > + rfault |= LED_FAULT_SHORT_CIRCUIT; > + > + if (fled_stat & MT6360_FLEDLVF_MASK) > + rfault |= LED_FAULT_UNDER_VOLTAGE; > + > + *fault = rfault; > + return 0; > +} > + > +static const struct led_flash_ops mt6360_flash_ops = { > + .flash_brightness_set = mt6360_strobe_brightness_set, > + .strobe_set = mt6360_strobe_set, > + .strobe_get = mt6360_strobe_get, > + .timeout_set = mt6360_timeout_set, > + .fault_get = mt6360_fault_get, > +}; > + > +static int mt6360_isnk_init_default_state(struct mt6360_led *led) > +{ > + struct mt6360_priv *priv = led->priv; > + unsigned int regval; > + u32 level; > + int ret; > + > + ret = regmap_read(priv->regmap, MT6360_REG_ISNK(led->led_no), ®val); > + if (ret) > + return ret; > + level = regval & MT6360_ISNK_MASK; > + > + ret = regmap_read(priv->regmap, MT6360_REG_RGBEN, ®val); > + if (ret) > + return ret; > + > + if (regval & MT6360_ISNK_ENMASK(led->led_no)) > + level += 1; > + else > + level = LED_OFF; > + > + switch (led->default_state) { > + case STATE_ON: > + led->isnk.brightness = led->isnk.max_brightness; > + break; > + case STATE_KEEP: > + led->isnk.brightness = min(level, led->isnk.max_brightness); > + break; > + default: > + led->isnk.brightness = LED_OFF; > + } > + > + return mt6360_isnk_brightness_set(&led->isnk, led->isnk.brightness); > +} > + > +static int mt6360_isnk_register(struct device *parent, struct mt6360_led *led, > + struct led_init_data *init_data) > +{ > + struct mt6360_priv *priv = led->priv; > + int ret; > + > + if (led->led_no == MT6360_LED_ISNK1) { > + /* change isink to sw mode */ > + ret = regmap_update_bits(priv->regmap, MT6360_REG_RGBEN, MT6360_CHRINDSEL_MASK, > + MT6360_CHRINDSEL_MASK); > + if (ret) { > + dev_err(parent, "Failed to config ISNK1 to SW mode\n"); > + return ret; > + } > + } > + > + ret = mt6360_isnk_init_default_state(led); > + if (ret) { > + dev_err(parent, "Failed to init %d isnk state\n", led->led_no); > + return ret; > + } > + > + ret = devm_led_classdev_register_ext(parent, &led->isnk, init_data); > + if (ret) { > + dev_err(parent, "Couldn't register isink %d\n", led->led_no); > + return ret; > + } You probably want also to register V4L2 indicator sub-device. See drivers/leds/leds-as3645a.c and look for the v4l2_flash_indicator_init() for reference. > + return 0; > +} > + > +static int mt6360_flash_init_default_state(struct mt6360_led *led) > +{ > + struct led_classdev_flash *flash = &led->flash; > + struct mt6360_priv *priv = led->priv; > + u32 enable_mask = MT6360_TORCHEN_MASK | MT6360_FLCSEN_MASK(led->led_no); > + u32 level; > + unsigned int regval; > + int ret; > + > + ret = regmap_read(priv->regmap, MT6360_REG_FLEDITOR(led->led_no), ®val); > + if (ret) > + return ret; > + level = regval & MT6360_ITORCH_MASK; > + > + ret = regmap_read(priv->regmap, MT6360_REG_FLEDEN, ®val); > + if (ret) > + return ret; > + > + if ((regval & enable_mask) == enable_mask) > + level += 1; > + else > + level = LED_OFF; > + > + switch (led->default_state) { > + case STATE_ON: > + flash->led_cdev.brightness = flash->led_cdev.max_brightness; > + break; > + case STATE_KEEP: > + flash->led_cdev.brightness = min(level, flash->led_cdev.max_brightness); > + break; > + default: > + flash->led_cdev.brightness = LED_OFF; > + } > + > + return mt6360_torch_brightness_set(&flash->led_cdev, flash->led_cdev.brightness); > +} > + > +#if IS_ENABLED(CONFIG_V4L2_FLASH_LED_CLASS) > +static int mt6360_flash_external_strobe_set(struct v4l2_flash *v4l2_flash, bool enable) > +{ > + struct led_classdev_flash *flash = v4l2_flash->fled_cdev; > + struct mt6360_led *led = container_of(flash, struct mt6360_led, flash); > + struct mt6360_priv *priv = led->priv; > + u32 enable_mask = MT6360_FLCSEN_MASK(led->led_no); > + int ret; > + > + ret = regmap_update_bits(priv->regmap, MT6360_REG_FLEDEN, enable_mask, > + enable ? enable_mask : 0); > + if (ret) > + return ret; > + > + if (enable) > + priv->fled_strobe_used |= BIT(led->led_no); > + else > + priv->fled_strobe_used &= (~BIT(led->led_no)); > + > + return 0; > +} > + > +static const struct v4l2_flash_ops v4l2_flash_ops = { > + .external_strobe_set = mt6360_flash_external_strobe_set, > +}; > + > +static void mt6360_flash_init_v4l2_config(struct mt6360_led *led, struct v4l2_flash_config *config) > +{ > + struct led_classdev_flash *flash = &led->flash; > + struct led_classdev *lcdev = &flash->led_cdev; > + struct led_flash_setting *s = &config->intensity; > + > + snprintf(config->dev_name, sizeof(config->dev_name), "%s", lcdev->name); > + > + s->min = MT6360_ITORCH_MIN; > + s->step = MT6360_ITORCH_STEP; > + s->val = s->max = (s->min) + (lcdev->max_brightness - 1) * s->step; > + > + config->has_external_strobe = 1; > +} > +#else > +static const struct v4l2_flash_ops v4l2_flash_ops; > + > +static void mt6360_flash_init_v4l2_config(struct mt6360_led *led, struct v4l2_flash_config *config) > +{ > +} > +#endif > + > +static int mt6360_flash_register(struct device *parent, struct mt6360_led *led, > + struct led_init_data *init_data) > +{ > + struct v4l2_flash_config v4l2_config = {0}; > + int ret; > + > + ret = mt6360_flash_init_default_state(led); > + if (ret) { > + dev_err(parent, "Failed to init %d flash state\n", led->led_no); > + return ret; > + } > + > + ret = devm_led_classdev_flash_register_ext(parent, &led->flash, init_data); > + if (ret) { > + dev_err(parent, "Couldn't register flash %d\n", led->led_no); > + return ret; > + } > + > + mt6360_flash_init_v4l2_config(led, &v4l2_config); > + led->v4l2_flash = v4l2_flash_init(parent, init_data->fwnode, &led->flash, &v4l2_flash_ops, > + &v4l2_config); > + if (IS_ERR(led->v4l2_flash)) { > + dev_err(parent, "Failed to register %d v4l2 sd\n", led->led_no); > + return PTR_ERR(led->v4l2_flash); > + } > + > + return 0; > +} > + > +static int mt6360_init_isnk_properties(struct mt6360_led *led, struct led_init_data *init_data) > +{ > + struct led_classdev *isnk = &led->isnk; > + > + if (led->led_no == MT6360_LED_ISNK4) > + isnk->max_brightness = MT6360_ISNK4_MAXLEVEL; > + else > + isnk->max_brightness = MT6360_ISNK1_MAXLEVEL; > + > + isnk->brightness_set_blocking = mt6360_isnk_brightness_set; > + > + fwnode_property_read_string(init_data->fwnode, "linux,default-trigger", > + &isnk->default_trigger); > + > + return 0; > +} > + > +static void clamp_align(u32 *v, u32 min, u32 max, u32 step) > +{ > + *v = clamp_val(*v, min, max); > + if (step > 1) > + *v = (*v - min) / step * step + min; > +} > + > +static int mt6360_init_flash_properties(struct mt6360_led *led, struct led_init_data *init_data) > +{ > + struct led_classdev_flash *flash = &led->flash; > + struct led_classdev *lcdev = &flash->led_cdev; > + struct led_flash_setting *s; > + u32 val; > + int ret; > + > + ret = fwnode_property_read_u32(init_data->fwnode, "led-max-microamp", &val); > + if (ret) > + val = MT6360_ITORCH_MIN; In case of missing property I would print warning and inform the user that we're defaulting to min value. Same applies to similar occurrences below. > + else > + clamp_align(&val, MT6360_ITORCH_MIN, MT6360_ITORCH_MAX, MT6360_ITORCH_STEP); > + > + lcdev->max_brightness = (val - MT6360_ITORCH_MIN) / MT6360_ITORCH_STEP + 1; > + lcdev->brightness_set_blocking = mt6360_torch_brightness_set; > + lcdev->flags |= LED_DEV_CAP_FLASH; > + > + ret = fwnode_property_read_u32(init_data->fwnode, "flash-max-microamp", &val); > + if (ret) > + val = MT6360_ISTRB_MIN; > + else > + clamp_align(&val, MT6360_ISTRB_MIN, MT6360_ISTRB_MAX, MT6360_ISTRB_STEP); > + > + s = &flash->brightness; > + s->min = MT6360_ISTRB_MIN; > + s->step = MT6360_ISTRB_STEP; > + s->val = s->max = val; > + > + /* always configure as min level when off to prevent flash current spike */ > + ret = _mt6360_strobe_brightness_set(flash, s->min); > + if (ret) > + return ret; > + > + ret = fwnode_property_read_u32(init_data->fwnode, "flash-max-timeout-us", &val); > + if (ret) > + val = MT6360_STRBTO_MIN; > + else > + clamp_align(&val, MT6360_STRBTO_MIN, MT6360_STRBTO_MAX, MT6360_STRBTO_STEP); > + > + s = &flash->timeout; > + s->min = MT6360_STRBTO_MIN; > + s->step = MT6360_STRBTO_STEP; > + s->val = s->max = val; > + > + flash->ops = &mt6360_flash_ops; > + > + return 0; > +} > + > +static int mt6360_init_common_properties(struct mt6360_led *led, struct led_init_data *init_data) > +{ > + const char *str; > + > + if (!fwnode_property_read_string(init_data->fwnode, "default-state", &str)) { > + if (!strcmp(str, "on")) > + led->default_state = STATE_ON; > + else if (!strcmp(str, "keep")) > + led->default_state = STATE_KEEP; > + else > + led->default_state = STATE_OFF; > + } > + > + return 0; > +} > + > +static int mt6360_led_probe(struct platform_device *pdev) > +{ > + struct mt6360_priv *priv; > + struct fwnode_handle *child; > + int i, ret; > + > + ret = device_get_child_node_count(&pdev->dev); > + if (!ret || ret > MT6360_MAX_LEDS) > + return -EINVAL; > + > + priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL); > + if (!priv) > + return -ENOMEM; > + > + priv->dev = &pdev->dev; > + > + priv->regmap = dev_get_regmap(pdev->dev.parent, NULL); > + if (!priv->regmap) { > + dev_err(&pdev->dev, "Failed to get parent regmap\n"); > + return -ENODEV; > + } > + > + device_for_each_child_node(&pdev->dev, child) { > + struct mt6360_led *led; > + struct led_init_data init_data = { .fwnode = child, }; > + u32 reg; > + > + ret = fwnode_property_read_u32(child, "reg", ®); > + if (ret || reg >= MT6360_MAX_LEDS || priv->leds[reg]) { > + ret = -EINVAL; > + goto out; > + } > + > + led = devm_kzalloc(&pdev->dev, sizeof(*led), GFP_KERNEL); > + if (!led) { > + ret = -ENOMEM; > + goto out; > + } > + > + led->led_no = reg; > + led->priv = priv; > + > + ret = mt6360_init_common_properties(led, &init_data); > + if (ret) > + goto out; > + > + switch (reg) { > + case MT6360_LED_ISNK1 ... MT6360_LED_ISNK4: > + ret = mt6360_init_isnk_properties(led, &init_data); > + if (ret) > + goto out; > + > + ret = mt6360_isnk_register(&pdev->dev, led, &init_data); > + break; > + default: > + ret = mt6360_init_flash_properties(led, &init_data); > + if (ret) > + goto out; > + > + ret = mt6360_flash_register(&pdev->dev, led, &init_data); > + } > + > + if (ret) > + goto out; > + > + priv->leds[reg] = led; > + } > + > + platform_set_drvdata(pdev, priv); > + return 0; > +out: > + for (i = MT6360_LED_FLASH1; i <= MT6360_LED_FLASH2; i++) { > + struct mt6360_led *led = priv->leds[i]; > + > + if (led && led->v4l2_flash) > + v4l2_flash_release(led->v4l2_flash); > + > + } > + > + return ret; > +} > + > +static int mt6360_led_remove(struct platform_device *pdev) > +{ > + struct mt6360_priv *priv = platform_get_drvdata(pdev); > + int i; > + > + for (i = MT6360_LED_FLASH1; i <= MT6360_LED_FLASH2; i++) { > + struct mt6360_led *led = priv->leds[i]; > + > + if (led && led->v4l2_flash) > + v4l2_flash_release(led->v4l2_flash); > + > + } You're using this for loop twice, so it would be nice to wrap it with a function to avoid code redundancy. > + > + return 0; > +} > + > +static const struct of_device_id __maybe_unused mt6360_led_of_id[] = { > + { .compatible = "mediatek,mt6360-led", }, > + {}, > +}; > +MODULE_DEVICE_TABLE(of, mt6360_led_of_id); > + > +static struct platform_driver mt6360_led_driver = { > + .driver = { > + .name = "mt6360-led", > + .of_match_table = mt6360_led_of_id, > + }, > + .probe = mt6360_led_probe, > + .remove = mt6360_led_remove, > +}; > +module_platform_driver(mt6360_led_driver); > + > +MODULE_AUTHOR("Gene Chen "); > +MODULE_DESCRIPTION("MT6360 Led Driver"); > +MODULE_LICENSE("GPL v2"); > -- Best regards, Jacek Anaszewski