From patchwork Mon Feb 13 10:20:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maarten Zanders X-Patchwork-Id: 56160 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2269583wrn; Mon, 13 Feb 2023 02:28:59 -0800 (PST) X-Google-Smtp-Source: AK7set9Er3Pc2rZSVgxXUCnxFut+gtfQf+2fGlL799shS4jhfVHT3WElhDp/p+hBM4MPHZtw9/+v X-Received: by 2002:a17:90b:1e11:b0:234:281:c19a with SMTP id pg17-20020a17090b1e1100b002340281c19amr2286149pjb.12.1676284139662; Mon, 13 Feb 2023 02:28:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676284139; cv=none; d=google.com; s=arc-20160816; b=XZoWqaTM5Ibq/Rzof2EHfAnLcrz+G1+kW1HucJmGa0ufAefXPQwMHpo1N6fRj0Jewb T7lkqsU5th4QiRSIR8RV344vUTtmGMSTp0yn+aDzvQeb0Ffv2pikJ75/9itOUu62TLvu +c9OuEufTF0aTMvrMs4BmG3afOxUQ1Q/Mq3qU/NXwk2arhKfzYwIA7unqVgci4mGgeXZ hQlyxvjVr9bS7qGhMOEIrYccW1wvwEEW+IC/NFNB815tTecOg5fUe9BOqg0nTjC4yoBY Jx92o4jqu1iOeQDGgNBPn6p1v4VPMDysETVkf1u5Cv5iqIG2GKrvlAe4zYq1SsNjUK1O oGeg== 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:cc:to:from :dkim-signature; bh=Hcdi8yudCq01YRZ7n/hBjJ5nuYzLbluvZbFoBNJpLKc=; b=QxJAVD1wIwPqq15WTaFTltqN2PKsmgaKk/SHzS8yJWT0xoikoJttDy/BMf8lG664BY Wcof8V+r4jMpbnMQR7hQPhhVV6HJE10UF5VIQyUrWqlnpGXK1VMmgAa0Qbm55TyqaQq0 aFtfBc8zHnpFl6RVsOBDqdmwV14IbaObSvD/8egWNfLXEq6ma2tJ3HfudcTF6jTdS4wW C2D+VgRIbDMevwFo3uQXngOWUXsrEYx+qjqaePxYzfhNFdabFrWsDFbQkSerzC3Te06n KO0xaE2Hw6kMLcnEbWGrRDnEiJkHI5XSRK+892ohAe2X+IXpoI+kDCTsV8riwXPUUVAD qYCw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@mind.be header.s=google header.b=IMHpDCxh; 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id p4-20020a63ab04000000b004fab583021fsi11456612pgf.479.2023.02.13.02.28.47; Mon, 13 Feb 2023 02:28:59 -0800 (PST) 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=pass header.i=@mind.be header.s=google header.b=IMHpDCxh; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231156AbjBMKU6 (ORCPT + 99 others); Mon, 13 Feb 2023 05:20:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57214 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231171AbjBMKUy (ORCPT ); Mon, 13 Feb 2023 05:20:54 -0500 Received: from mail-ej1-x62c.google.com (mail-ej1-x62c.google.com [IPv6:2a00:1450:4864:20::62c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4F6531027E for ; Mon, 13 Feb 2023 02:20:38 -0800 (PST) Received: by mail-ej1-x62c.google.com with SMTP id sa10so30499950ejc.9 for ; Mon, 13 Feb 2023 02:20:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mind.be; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Hcdi8yudCq01YRZ7n/hBjJ5nuYzLbluvZbFoBNJpLKc=; b=IMHpDCxhKL9WyyEsWWaDeFfXqqj+Jq/HX73Urr5gos5F+ufXCev3/IU6mtUmj401yE AZ2MdkBSz+2IroMqQ/kRteMJz+NxEywGH3pgSXdWocfiZbeq5SJCxY1lhZLBGEMT6HfJ gco0fl7eVDwOzyzXK/B8dcZWcMEgboPsltKHASG0Pc8XyZFwb+r4A6zzDVte+42Op/Vj k9Cm16iAbWkjpqnmcCQTG88tkRjLTln63ecq2U3o7L1QWpb/9TK9dA0trbHmbIXJaLzY 0zCGVLhHqVLMOV9S8IzZtxU6FbxV6K16dlZh7QOmUD2whUAsiXjCNq5iblqYPGJC1PJk SobA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Hcdi8yudCq01YRZ7n/hBjJ5nuYzLbluvZbFoBNJpLKc=; b=NYDCRmN/W2Wl8QYKjpqeTXocm82+VSy4JiQI017mMfinHekVFdHMZxNltGWk0h1gdx e09jA/AO92PHoc4gCxBYddGn89LKRp7qRsoPoEceYy7LgxksLg20+HZJ475BrDPbmGDl sJYX+LTOSIx6ToHkntzHtT6VQqe2IY5vznx2HCqt7vyotk+TeVj9MO+BDY1WySRtt0pV RC9RbJRP4w1a2EPB+driZX+Mb8YrWcrYeE5T4IA5hilZnzDcaPuCQpE7lTrPHdki09pd s+kJBxnsUjXWEFJtWlleHpJTnCmzWS4yL5rfxHAiOvvp2KH62dQx1L4ar8yBgcx2qFxr lATQ== X-Gm-Message-State: AO0yUKUoI6C9wK6iDOmX5L+fhgEX0nv82B2PWQYFhzltifhaLMlTedF4 pt1fFvkbWcss+HwjqVIsHfoTGg== X-Received: by 2002:a17:906:d051:b0:86f:3dfa:4016 with SMTP id bo17-20020a170906d05100b0086f3dfa4016mr22553813ejb.7.1676283633613; Mon, 13 Feb 2023 02:20:33 -0800 (PST) Received: from dtpc.zanders.be (78-22-137-109.access.telenet.be. [78.22.137.109]) by smtp.gmail.com with ESMTPSA id f13-20020a170906c08d00b00878003adeeesm6564552ejz.23.2023.02.13.02.20.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Feb 2023 02:20:33 -0800 (PST) From: Maarten Zanders To: Pavel Machek , Lee Jones , Rob Herring , Krzysztof Kozlowski , Jacek Anaszewski Cc: Maarten Zanders , linux-leds@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v5 1/2] dt-bindings: leds-lp55xx: add ti,charge-pump-mode Date: Mon, 13 Feb 2023 11:20:26 +0100 Message-Id: <20230213102027.29961-2-maarten.zanders@mind.be> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20230213102027.29961-1-maarten.zanders@mind.be> References: <20230213102027.29961-1-maarten.zanders@mind.be> MIME-Version: 1.0 X-Spam-Status: No, score=-1.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=no 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1757711318365084121?= X-GMAIL-MSGID: =?utf-8?q?1757711318365084121?= Add a binding to configure the internal charge pump for lp55xx. Signed-off-by: Maarten Zanders Reviewed-by: Krzysztof Kozlowski --- Notes: v1: implement as bool to disable charge pump v2: rewrite to use string configuration, supporting all modes v3: simplification by replacing string option by u8 constant, removing previous Reviewed-by tags as it's a complete rewrite of the patch. v4: added notes v5: dual license, change property type to u32 .../devicetree/bindings/leds/leds-lp55xx.yaml | 8 ++++++++ include/dt-bindings/leds/leds-lp55xx.h | 10 ++++++++++ 2 files changed, 18 insertions(+) create mode 100644 include/dt-bindings/leds/leds-lp55xx.h diff --git a/Documentation/devicetree/bindings/leds/leds-lp55xx.yaml b/Documentation/devicetree/bindings/leds/leds-lp55xx.yaml index ae607911f1db..ede9cb9ca175 100644 --- a/Documentation/devicetree/bindings/leds/leds-lp55xx.yaml +++ b/Documentation/devicetree/bindings/leds/leds-lp55xx.yaml @@ -66,6 +66,12 @@ properties: '#size-cells': const: 0 + ti,charge-pump-mode: + description: + Set the operating mode of the internal charge pump as defined in + . Defaults to auto. + $ref: /schemas/types.yaml#/definitions/uint32 + patternProperties: '^multi-led@[0-8]$': type: object @@ -152,6 +158,7 @@ additionalProperties: false examples: - | #include + #include i2c { #address-cells = <1>; @@ -164,6 +171,7 @@ examples: reg = <0x32>; clock-mode = /bits/ 8 <2>; pwr-sel = /bits/ 8 <3>; /* D1~9 connected to VOUT */ + ti,charge-pump-mode = ; led@0 { reg = <0>; diff --git a/include/dt-bindings/leds/leds-lp55xx.h b/include/dt-bindings/leds/leds-lp55xx.h new file mode 100644 index 000000000000..e2256312714b --- /dev/null +++ b/include/dt-bindings/leds/leds-lp55xx.h @@ -0,0 +1,10 @@ +/* SPDX-License-Identifier: (GPL-2.0-only OR MIT) */ +#ifndef _DT_BINDINGS_LEDS_LP55XX_H +#define _DT_BINDINGS_LEDS_LP55XX_H + +#define LP55XX_CP_OFF 0 +#define LP55XX_CP_BYPASS 1 +#define LP55XX_CP_BOOST 2 +#define LP55XX_CP_AUTO 3 + +#endif /* _DT_BINDINGS_LEDS_LP55XX_H */ From patchwork Mon Feb 13 10:20:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maarten Zanders X-Patchwork-Id: 56159 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2267783wrn; Mon, 13 Feb 2023 02:22:55 -0800 (PST) X-Google-Smtp-Source: AK7set/4GQV/fOCXyJBll/ZVHq6csjtsrlEpCPM4lMmzzUT7jtDEez7whCbLrYBvOixi984TWib1 X-Received: by 2002:a17:906:6448:b0:877:6713:7e99 with SMTP id l8-20020a170906644800b0087767137e99mr23579992ejn.58.1676283775413; Mon, 13 Feb 2023 02:22:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676283775; cv=none; d=google.com; s=arc-20160816; b=yEd86Brcv5IeXVw8HPKIINL6/cDTYuOT2E4W+8HCpfgaRuSDN8IbMKxBMKHlUhzlVr Wx4/ta74bqXumd51jBp/hoxzkrsp6sVj16c9wuPBUcXAfD4IkOBEllSneANUEckRTFtP Ha0MngDr9PDYUwCwaPkdhuYhtIC3CY7eop6xQrpd6w7ZeOnCb2iBKQLG5X2rtzybXPEE atxePAqqpoXNMILGdFDBkNRbjyBX4DBAh/DzfqQKSJA1NwWggTk17AUd6mICwy9D2m3J ROnhbUrZhKyzkCiXUu5D01qTR2jH2wKoV4uWfhUSgqgRCdR1r9cA3GFJik9sODgq1T96 fFwg== 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:cc:to:from :dkim-signature; bh=eTH03dFVUxbsNT5nwu+cvFkwrYKTr/GQYArutjDPIp0=; b=j/1WLEGnMVODbTngL5mv8nEOlJSVy56D5h9UMFqzYgYKhY2lHgV0vQ9vKVmvbQdOq9 kTugUAmE/chKKsFftt/ErYhZxb+4P+mecUF4RpiHU8kLWKTpqbHadpqGjOGpROEZDr9l Q+MrX5s5YDyKx9IrxsYCfCZCmtZ8icSX+qYjsndJgczmPKeeRbkA67al/3vw26amVPCJ eUIr1CzBaA3eOaDUsiaW9eKt+oDhp9fL9GSCiNZ9dysif1xWQEBcLC0NBT6O2Ry09ZLS ihE7FG8GNpkdsH3mMbLiDUu1Ad8P1qnfzFkkJPOys0EMmKHGzGydqInFxUI7XG8BcJG6 STMQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@mind.be header.s=google header.b=OdV3pGcF; 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id mq32-20020a170907832000b0087875900d27si11885626ejc.94.2023.02.13.02.22.31; Mon, 13 Feb 2023 02:22:55 -0800 (PST) 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=pass header.i=@mind.be header.s=google header.b=OdV3pGcF; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231206AbjBMKVC (ORCPT + 99 others); Mon, 13 Feb 2023 05:21:02 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57246 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231193AbjBMKUz (ORCPT ); Mon, 13 Feb 2023 05:20:55 -0500 Received: from mail-ej1-x636.google.com (mail-ej1-x636.google.com [IPv6:2a00:1450:4864:20::636]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 05EA510A9D for ; Mon, 13 Feb 2023 02:20:40 -0800 (PST) Received: by mail-ej1-x636.google.com with SMTP id dr8so30481851ejc.12 for ; Mon, 13 Feb 2023 02:20:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mind.be; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=eTH03dFVUxbsNT5nwu+cvFkwrYKTr/GQYArutjDPIp0=; b=OdV3pGcFVlGkuhhzLx3ciF5xoJZLnGnbwZ/w1SbNp6G+2QlZWrDJmxyd4hbOLNEL6Q Kcz9k39lGfGq3bGz9Q2WEXvk/P6/Mx2TiDu5q4DbYSaZUFtkFCpEcatxhTiIdHeDg3zB urMPlQ/Uunr5iosx3qlzpquCLk4wT9n6yPOe3nTHGf9M3QP1F0dE02AzM/a0E99EZA7p lddWWawOCxn5rmCSz+Lszng9S5OkDGCqzqYRYXFb8mH0EtbnS9NrSEWxjO/Qwi5zKPuF nSE0t2zSQFgmAvFiy4oG5O3qbJqONArgXTz/Fi9HotIOnjXmwlcHehSXXHfY7gvaXGAI GeAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=eTH03dFVUxbsNT5nwu+cvFkwrYKTr/GQYArutjDPIp0=; b=OUvO2IXsqf/7UQ60QeKXep2X+axtcYqKuHfGFlCO3F1+NU4UT5wVGfgsI+HD4hVWz3 s0JPsaEgAxb7NjJjQs7cSZsEVpioe6mrEYullm+NjnWYL7SyKxzyMNV+3fVD0SIoyzGA o+myCDsTB3Yjx1UDapqioAzMAXxg49+wKI20y7vE85vo3sLw2nCQq/VmDUlOeH4EqGKI gUUD0OIcj2cUvtWmHGbCVQsAVEO6xXC5szThrYOGKbULukJS/CK5wqBhbX//0bX/6oAL J174kv69+u/OLGG2HedqweW/kzcHQKSoapv0rz9qvqjTTFuWzBdhDH2+NpsqpspBJcoj DV/A== X-Gm-Message-State: AO0yUKUwrwk1+5E0JitAs5HkKA853CwH6L7kRvZyVNWO3lJLHSq3Y2p3 cTYOx3Ddp+dwVs4TsfPEeX7L7A== X-Received: by 2002:a17:906:a013:b0:878:4e5a:18b8 with SMTP id p19-20020a170906a01300b008784e5a18b8mr22823280ejy.66.1676283634453; Mon, 13 Feb 2023 02:20:34 -0800 (PST) Received: from dtpc.zanders.be (78-22-137-109.access.telenet.be. [78.22.137.109]) by smtp.gmail.com with ESMTPSA id f13-20020a170906c08d00b00878003adeeesm6564552ejz.23.2023.02.13.02.20.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Feb 2023 02:20:34 -0800 (PST) From: Maarten Zanders To: Pavel Machek , Lee Jones , Rob Herring , Krzysztof Kozlowski , Jacek Anaszewski Cc: Maarten Zanders , linux-leds@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v5 2/2] leds: lp55xx: configure internal charge pump Date: Mon, 13 Feb 2023 11:20:27 +0100 Message-Id: <20230213102027.29961-3-maarten.zanders@mind.be> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20230213102027.29961-1-maarten.zanders@mind.be> References: <20230213102027.29961-1-maarten.zanders@mind.be> MIME-Version: 1.0 X-Spam-Status: No, score=-1.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=no 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1757710935941294216?= X-GMAIL-MSGID: =?utf-8?q?1757710935941294216?= The LP55xx range of devices have an internal charge pump which can (automatically) increase the output voltage towards the LED's, boosting the output voltage to 4.5V. Implement this option from the devicetree. When the setting is not present it will operate in automatic mode as before. Tested on LP55231. Datasheet analysis shows that LP5521, LP5523 and LP8501 are identical in topology and are modified in the same way. Signed-off-by: Maarten Zanders --- Notes: v1: implement as bool to disable charge pump v2: rewrite to use string configuration, supporting all modes v3: simplification by replacing string from DTS by constant v4: added notes v5: property type to u32 drivers/leds/leds-lp5521.c | 12 ++++++------ drivers/leds/leds-lp5523.c | 18 +++++++++++++----- drivers/leds/leds-lp55xx-common.c | 14 ++++++++++++++ drivers/leds/leds-lp8501.c | 8 ++++++-- include/linux/platform_data/leds-lp55xx.h | 3 +++ 5 files changed, 42 insertions(+), 13 deletions(-) diff --git a/drivers/leds/leds-lp5521.c b/drivers/leds/leds-lp5521.c index 19478d9c19a7..76c6b81afb38 100644 --- a/drivers/leds/leds-lp5521.c +++ b/drivers/leds/leds-lp5521.c @@ -58,14 +58,11 @@ /* CONFIG register */ #define LP5521_PWM_HF 0x40 /* PWM: 0 = 256Hz, 1 = 558Hz */ #define LP5521_PWRSAVE_EN 0x20 /* 1 = Power save mode */ -#define LP5521_CP_MODE_OFF 0 /* Charge pump (CP) off */ -#define LP5521_CP_MODE_BYPASS 8 /* CP forced to bypass mode */ -#define LP5521_CP_MODE_1X5 0x10 /* CP forced to 1.5x mode */ -#define LP5521_CP_MODE_AUTO 0x18 /* Automatic mode selection */ +#define LP5521_CP_MODE_MASK 0x18 /* Charge pump mode */ +#define LP5521_CP_MODE_SHIFT 3 #define LP5521_R_TO_BATT 0x04 /* R out: 0 = CP, 1 = Vbat */ #define LP5521_CLK_INT 0x01 /* Internal clock */ -#define LP5521_DEFAULT_CFG \ - (LP5521_PWM_HF | LP5521_PWRSAVE_EN | LP5521_CP_MODE_AUTO) +#define LP5521_DEFAULT_CFG (LP5521_PWM_HF | LP5521_PWRSAVE_EN) /* Status */ #define LP5521_EXT_CLK_USED 0x08 @@ -310,6 +307,9 @@ static int lp5521_post_init_device(struct lp55xx_chip *chip) if (!lp55xx_is_extclk_used(chip)) val |= LP5521_CLK_INT; + val |= (chip->pdata->charge_pump_mode << LP5521_CP_MODE_SHIFT) & + LP5521_CP_MODE_MASK; + ret = lp55xx_write(chip, LP5521_REG_CONFIG, val); if (ret) return ret; diff --git a/drivers/leds/leds-lp5523.c b/drivers/leds/leds-lp5523.c index e08e3de1428d..b5d10d4252e6 100644 --- a/drivers/leds/leds-lp5523.c +++ b/drivers/leds/leds-lp5523.c @@ -57,8 +57,12 @@ #define LP5523_AUTO_INC 0x40 #define LP5523_PWR_SAVE 0x20 #define LP5523_PWM_PWR_SAVE 0x04 -#define LP5523_CP_AUTO 0x18 +#define LP5523_CP_MODE_MASK 0x18 +#define LP5523_CP_MODE_SHIFT 3 #define LP5523_AUTO_CLK 0x02 +#define LP5523_DEFAULT_CONFIG \ + (LP5523_AUTO_INC | LP5523_PWR_SAVE |\ + LP5523_AUTO_CLK | LP5523_PWM_PWR_SAVE) #define LP5523_EN_LEDTEST 0x80 #define LP5523_LEDTEST_DONE 0x80 @@ -125,6 +129,7 @@ static void lp5523_set_led_current(struct lp55xx_led *led, u8 led_current) static int lp5523_post_init_device(struct lp55xx_chip *chip) { int ret; + int val; ret = lp55xx_write(chip, LP5523_REG_ENABLE, LP5523_ENABLE); if (ret) @@ -133,10 +138,13 @@ static int lp5523_post_init_device(struct lp55xx_chip *chip) /* Chip startup time is 500 us, 1 - 2 ms gives some margin */ usleep_range(1000, 2000); - ret = lp55xx_write(chip, LP5523_REG_CONFIG, - LP5523_AUTO_INC | LP5523_PWR_SAVE | - LP5523_CP_AUTO | LP5523_AUTO_CLK | - LP5523_PWM_PWR_SAVE); + val = LP5523_DEFAULT_CONFIG; + + val |= (chip->pdata->charge_pump_mode << LP5523_CP_MODE_SHIFT) & + LP5523_CP_MODE_MASK; + + ret = lp55xx_write(chip, LP5523_REG_CONFIG, val); + if (ret) return ret; diff --git a/drivers/leds/leds-lp55xx-common.c b/drivers/leds/leds-lp55xx-common.c index c1940964067a..5a02c4a4ec98 100644 --- a/drivers/leds/leds-lp55xx-common.c +++ b/drivers/leds/leds-lp55xx-common.c @@ -19,6 +19,8 @@ #include #include +#include + #include "leds-lp55xx-common.h" /* External clock rate */ @@ -691,6 +693,18 @@ struct lp55xx_platform_data *lp55xx_of_populate_pdata(struct device *dev, i++; } + ret = of_property_read_u32(np, "ti,charge-pump-mode", + &pdata->charge_pump_mode); + if (ret) { + pdata->charge_pump_mode = LP55XX_CP_AUTO; + } else { + if (pdata->charge_pump_mode > LP55XX_CP_AUTO) { + dev_err(dev, "invalid charge pump mode %d\n", + pdata->charge_pump_mode); + return ERR_PTR(-EINVAL); + } + } + of_property_read_string(np, "label", &pdata->label); of_property_read_u8(np, "clock-mode", &pdata->clock_mode); diff --git a/drivers/leds/leds-lp8501.c b/drivers/leds/leds-lp8501.c index ae11a02c0ab2..f0e70e116919 100644 --- a/drivers/leds/leds-lp8501.c +++ b/drivers/leds/leds-lp8501.c @@ -53,10 +53,11 @@ #define LP8501_PWM_PSAVE BIT(7) #define LP8501_AUTO_INC BIT(6) #define LP8501_PWR_SAVE BIT(5) -#define LP8501_CP_AUTO 0x18 +#define LP8501_CP_MODE_MASK 0x18 +#define LP8501_CP_MODE_SHIFT 3 #define LP8501_INT_CLK BIT(0) #define LP8501_DEFAULT_CFG \ - (LP8501_PWM_PSAVE | LP8501_AUTO_INC | LP8501_PWR_SAVE | LP8501_CP_AUTO) + (LP8501_PWM_PSAVE | LP8501_AUTO_INC | LP8501_PWR_SAVE) #define LP8501_REG_RESET 0x3D #define LP8501_RESET 0xFF @@ -102,6 +103,9 @@ static int lp8501_post_init_device(struct lp55xx_chip *chip) if (chip->pdata->clock_mode != LP55XX_CLOCK_EXT) val |= LP8501_INT_CLK; + val |= (chip->pdata->charge_pump_mode << LP8501_CP_MODE_SHIFT) & + LP8501_CP_MODE_MASK; + ret = lp55xx_write(chip, LP8501_REG_CONFIG, val); if (ret) return ret; diff --git a/include/linux/platform_data/leds-lp55xx.h b/include/linux/platform_data/leds-lp55xx.h index 3441064713a3..3cc8db0b12b5 100644 --- a/include/linux/platform_data/leds-lp55xx.h +++ b/include/linux/platform_data/leds-lp55xx.h @@ -73,6 +73,9 @@ struct lp55xx_platform_data { /* Clock configuration */ u8 clock_mode; + /* Charge pump mode */ + u32 charge_pump_mode; + /* optional enable GPIO */ struct gpio_desc *enable_gpiod;