Received: by 2002:a6b:fb09:0:0:0:0:0 with SMTP id h9csp4191054iog; Tue, 28 Jun 2022 10:47:54 -0700 (PDT) X-Google-Smtp-Source: AGRyM1u+xuRETmqxG6OI5kmnCYFluZeLDwpYjyZ5sFAurgx269q1Q0vOXTgJzX3GrcANdnw35Me7 X-Received: by 2002:a63:4913:0:b0:40d:8235:2d1c with SMTP id w19-20020a634913000000b0040d82352d1cmr18226628pga.584.1656438474702; Tue, 28 Jun 2022 10:47:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1656438474; cv=none; d=google.com; s=arc-20160816; b=uKqk73vpt1VZef38wm5dRx4Vl6hAb7sUB2Lh46jkRyF3PUnEw/fhMMv+Zo/sv7P1bT wVRpYuN0ovOn+trz994kAgzuUvKB/NNK/Yj/yeM6NK1l9MERPEfYeS4E6tKiWNZwuLgA gZKR7vGcgt+ec1SeMZcTGBuk6ML1niw8E30udtqDnADEC618hYIH5mACNodagHXdjST6 hKhkYHyI22387kQF+zAuc1SbpoNcoBNR7JSpjP68haIiJPSJDwNCCnD/re9njp1qaXwh h4O57xGAWm2IMezR2RBpaa25Sk4wWIS0bvAIa4LJJKx9kVZBT8CPQ4qGTmbojINIz69w GP0w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=4u3ecQmJL+wJsL/4pCN0SIo3OWdSc/wEYHUk0twnQYc=; b=URy+m++2e9MEYdHBtWjDHojSMt7Cs9AwKgb2lUm9uHv/PRZdX9PY5+Hg1acllKOGc0 m3DW7dNptsfPUs2S3DRCkwTToLrv00YZmDSwQKeuc0npHN033E4qi2BbKT/6uNgWxr1c 8L6d62aovWnCPk+jK28ft82cKCZZz6jw5C/S7TO2oJi+vlHDxYiHQ000fllSU2SG86Xu Pcq1Wrzv+hJBkrFhX2+9lAQC1fLVIB8FriEjJZAcD97KGD9D2Abzym419TCYx7Cm/Kml taOekogDIC7+BzSfyOzqm1d70m1IYqtdQ2S6FTUwJCXcN9qeo5Rb0iYunaKpaDZYFHSB 77pg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@mailoo.org header.s=mailo header.b=imUyTVqY; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=mailoo.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id i22-20020a17090a7e1600b001df3fb83daesi203551pjl.157.2022.06.28.10.47.41; Tue, 28 Jun 2022 10:47:54 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=fail header.i=@mailoo.org header.s=mailo header.b=imUyTVqY; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=mailoo.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232727AbiF1Rq5 (ORCPT + 99 others); Tue, 28 Jun 2022 13:46:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34040 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232437AbiF1Rqv (ORCPT ); Tue, 28 Jun 2022 13:46:51 -0400 Received: from msg-2.mailo.com (msg-2.mailo.com [213.182.54.12]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C141F65F4; Tue, 28 Jun 2022 10:46:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=mailoo.org; s=mailo; t=1656438399; bh=EPRbWh0tzKYymsptHWHi5nsOsq0gpHqDa+CF9plfPgs=; h=X-EA-Auth:From:To:Subject:Date:Message-Id:X-Mailer:In-Reply-To: References:MIME-Version:Content-Type:Content-Transfer-Encoding; b=imUyTVqYGKnUVJQKMNJ1bG/g8428+f9XBNmOpXqoTHMJ3R+uFWyB9VRSNb8W5j3qt 0WC9MZjTWxanQ6MC5DQ0H7WKb9Uvu+NcST4u7d7tTepnc0cVrVFwe7mAIZH6+M+zPB mEcubgfOO3AJvDTvxTGH5fUPSFk1jlzOXtT2ZotE= Received: by b-3.in.mailobj.net [192.168.90.13] with ESMTP via [213.182.55.207] Tue, 28 Jun 2022 19:46:39 +0200 (CEST) X-EA-Auth: sh9W1sAdXwfmnTdT9wndjcgl5+W4R8IT0um8lrr+Y9VsELb9bOxQIfY98mqsTnh/uKudJUsISKhGcMrsKyNesEoJmA6j9XMtUKhDVxdiDQI= From: Vincent Knecht To: Pavel Machek , Rob Herring , Krzysztof Kozlowski , Vincent Knecht , linux-leds@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v1 7/7] leds: is31fl319x: Add support for is31fl319{0,1,3} chips Date: Tue, 28 Jun 2022 19:46:24 +0200 Message-Id: <20220628174627.2821722-3-vincent.knecht@mailoo.org> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20220628174627.2821722-1-vincent.knecht@mailoo.org> References: <20220628174124.2819238-1-vincent.knecht@mailoo.org> <20220628174627.2821722-1-vincent.knecht@mailoo.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Set specific chipset structs values for is31fl319{0,1,3} so that those chips can actually work. Datasheets: https://lumissil.com/assets/pdf/core/IS31FL3190_DS.pdf https://lumissil.com/assets/pdf/core/IS31FL3191_DS.pdf https://lumissil.com/assets/pdf/core/IS31FL3193_DS.pdf https://lumissil.com/assets/pdf/core/IS31FL3196_DS.pdf https://lumissil.com/assets/pdf/core/IS31FL3199_DS.pdf Signed-off-by: Vincent Knecht --- drivers/leds/leds-is31fl319x.c | 164 ++++++++++++++++++++++++++++++--- 1 file changed, 150 insertions(+), 14 deletions(-) diff --git a/drivers/leds/leds-is31fl319x.c b/drivers/leds/leds-is31fl319x.c index eb8601a203a8..0260c28de96a 100644 --- a/drivers/leds/leds-is31fl319x.c +++ b/drivers/leds/leds-is31fl319x.c @@ -21,6 +21,31 @@ /* register numbers */ #define IS31FL319X_SHUTDOWN 0x00 + +/* registers for 3190, 3191 and 3193 */ +#define IS31FL3190_BREATHING 0x01 +#define IS31FL3190_LEDMODE 0x02 +#define IS31FL3190_CURRENT 0x03 +#define IS31FL3190_PWM(channel) (0x04 + channel) +#define IS31FL3190_DATA_UPDATE 0x07 +#define IS31FL3190_T0(channel) (0x0a + channel) +#define IS31FL3190_T1T2(channel) (0x10 + channel) +#define IS31FL3190_T3T4(channel) (0x16 + channel) +#define IS31FL3190_TIME_UPDATE 0x1c +#define IS31FL3190_LEDCONTROL 0x1d +#define IS31FL3190_RESET 0x2f + +#define IS31FL3190_CURRENT_MIN ((u32)5000) +#define IS31FL3190_CURRENT_DEFAULT ((u32)42000) +#define IS31FL3190_CURRENT_MAX ((u32)42000) +#define IS31FL3190_CURRENT_MASK GENMASK(4, 2) +#define IS31FL3190_CURRENT_5_mA 0x02 +#define IS31FL3190_CURRENT_10_mA 0x01 +#define IS31FL3190_CURRENT_17dot5_mA 0x04 +#define IS31FL3190_CURRENT_30_mA 0x03 +#define IS31FL3190_CURRENT_42_mA 0x00 + +/* registers for 3196 and 3199 */ #define IS31FL3196_CTRL1 0x01 #define IS31FL3196_CTRL2 0x02 #define IS31FL3196_CONFIG1 0x03 @@ -92,6 +117,37 @@ static bool is31fl319x_readable_reg(struct device *dev, unsigned int reg) return false; } +static bool is31fl3190_volatile_reg(struct device *dev, unsigned int reg) +{ /* volatile registers are not cached */ + switch (reg) { + case IS31FL3190_DATA_UPDATE: + case IS31FL3190_TIME_UPDATE: + case IS31FL3190_RESET: + return true; /* always write-through */ + default: + return false; + } +} + +static const struct reg_default is31fl3190_reg_defaults[] = { + { IS31FL3190_LEDMODE, 0x00}, + { IS31FL3190_CURRENT, 0x00}, + { IS31FL3190_PWM(0), 0x00}, + { IS31FL3190_PWM(1), 0x00}, + { IS31FL3190_PWM(2), 0x00}, +}; + +static struct regmap_config is31fl3190_regmap_config = { + .reg_bits = 8, + .val_bits = 8, + .max_register = IS31FL3190_RESET, + .cache_type = REGCACHE_FLAT, + .readable_reg = is31fl319x_readable_reg, + .volatile_reg = is31fl3190_volatile_reg, + .reg_defaults = is31fl3190_reg_defaults, + .num_reg_defaults = ARRAY_SIZE(is31fl3190_reg_defaults), +}; + static bool is31fl3196_volatile_reg(struct device *dev, unsigned int reg) { /* volatile registers are not cached */ switch (reg) { @@ -129,6 +185,63 @@ static struct regmap_config is31fl3196_regmap_config = { .num_reg_defaults = ARRAY_SIZE(is31fl3196_reg_defaults), }; +static int is31fl3190_brightness_set(struct led_classdev *cdev, + enum led_brightness brightness) +{ + struct is31fl319x_led *led = container_of(cdev, struct is31fl319x_led, + cdev); + struct is31fl319x_chip *is31 = led->chip; + int chan = led - is31->leds; + int ret; + int i; + u8 ctrl = 0; + + dev_dbg(&is31->client->dev, "%s %d: %d\n", __func__, chan, brightness); + + mutex_lock(&is31->lock); + + /* update PWM register */ + ret = regmap_write(is31->regmap, IS31FL3190_PWM(chan), brightness); + if (ret < 0) + goto out; + + /* read current brightness of all PWM channels */ + for (i = 0; i < is31->cdef->num_leds; i++) { + unsigned int pwm_value; + bool on; + + /* + * since neither cdev nor the chip can provide + * the current setting, we read from the regmap cache + */ + + ret = regmap_read(is31->regmap, IS31FL3190_PWM(i), &pwm_value); + dev_dbg(&is31->client->dev, "%s read %d: ret=%d: %d\n", + __func__, i, ret, pwm_value); + on = ret >= 0 && pwm_value > LED_OFF; + + ctrl |= on << i; + } + + if (ctrl > 0) { + dev_dbg(&is31->client->dev, "power up %02x\n", ctrl); + regmap_write(is31->regmap, IS31FL3190_LEDCONTROL, ctrl); + /* update PWMs */ + regmap_write(is31->regmap, IS31FL3190_DATA_UPDATE, 0x00); + /* enable chip from shut down and enable all channels */ + ret = regmap_write(is31->regmap, IS31FL319X_SHUTDOWN, 0x20); + } else { + dev_dbg(&is31->client->dev, "power down\n"); + /* shut down (no need to clear LEDCONTROL) */ + ret = regmap_write(is31->regmap, IS31FL319X_SHUTDOWN, 0x01); + } + +out: + mutex_unlock(&is31->lock); + + return ret; +} + static int is31fl3196_brightness_set(struct led_classdev *cdev, enum led_brightness brightness) { @@ -195,24 +308,24 @@ static int is31fl3196_brightness_set(struct led_classdev *cdev, static const struct is31fl319x_chipdef is31fl3190_cdef = { .num_leds = 1, - .reset_reg = IS31FL3196_RESET, - .is31fl319x_regmap_config = &is31fl3196_regmap_config, - .brightness_set = is31fl3196_brightness_set, - .current_default = IS31FL3196_CURRENT_DEFAULT, - .current_min = IS31FL3196_CURRENT_MIN, - .current_max = IS31FL3196_CURRENT_MAX, - .is_3196or3199 = true, + .reset_reg = IS31FL3190_RESET, + .is31fl319x_regmap_config = &is31fl3190_regmap_config, + .brightness_set = is31fl3190_brightness_set, + .current_default = IS31FL3190_CURRENT_DEFAULT, + .current_min = IS31FL3190_CURRENT_MIN, + .current_max = IS31FL3190_CURRENT_MAX, + .is_3196or3199 = false, }; static const struct is31fl319x_chipdef is31fl3193_cdef = { .num_leds = 3, - .reset_reg = IS31FL3196_RESET, - .is31fl319x_regmap_config = &is31fl3196_regmap_config, - .brightness_set = is31fl3196_brightness_set, - .current_default = IS31FL3196_CURRENT_DEFAULT, - .current_min = IS31FL3196_CURRENT_MIN, - .current_max = IS31FL3196_CURRENT_MAX, - .is_3196or3199 = true, + .reset_reg = IS31FL3190_RESET, + .is31fl319x_regmap_config = &is31fl3190_regmap_config, + .brightness_set = is31fl3190_brightness_set, + .current_default = IS31FL3190_CURRENT_DEFAULT, + .current_min = IS31FL3190_CURRENT_MIN, + .current_max = IS31FL3190_CURRENT_MAX, + .is_3196or3199 = false, }; static const struct is31fl319x_chipdef is31fl3196_cdef = { @@ -360,6 +473,26 @@ static int is31fl319x_parse_dt(struct device *dev, return ret; } +static inline int is31fl3190_microamp_to_cs(struct device *dev, u32 microamp) +{ + switch (microamp) { + case 5000: + return IS31FL3190_CURRENT_5_mA; + case 10000: + return IS31FL3190_CURRENT_10_mA; + case 17500: + return IS31FL3190_CURRENT_17dot5_mA; + case 30000: + return IS31FL3190_CURRENT_30_mA; + case 42000: + return IS31FL3190_CURRENT_42_mA; + default: + dev_warn(dev, "Unsupported current value: %d, using 5000 µA!\n", microamp); + } + + return IS31FL3190_CURRENT_5_mA; +} + static inline int is31fl3196_microamp_to_cs(struct device *dev, u32 microamp) { /* round down to nearest supported value (range check done by caller) */ u32 step = microamp / IS31FL3196_CURRENT_STEP; @@ -436,6 +569,9 @@ static int is31fl319x_probe(struct i2c_client *client, regmap_write(is31->regmap, IS31FL3196_CONFIG2, is31fl3196_microamp_to_cs(dev, aggregated_led_microamp) | is31fl3196_db_to_gain(is31->audio_gain_db)); + else + regmap_update_bits(is31->regmap, IS31FL3190_CURRENT, IS31FL3190_CURRENT_MASK, + is31fl3190_microamp_to_cs(dev, aggregated_led_microamp)); for (i = 0; i < is31->cdef->num_leds; i++) { struct is31fl319x_led *led = &is31->leds[i]; -- 2.35.3