From patchwork Fri Apr 21 07:53:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maarten Zanders X-Patchwork-Id: 86167 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp903855vqo; Fri, 21 Apr 2023 01:16:51 -0700 (PDT) X-Google-Smtp-Source: AKy350bqOOX02A/NeqwVqNwye4JkndY0HmeHqTjHzEKU3Qj8xvmLu/W502hxQ7dj4ou1LjRa9nGT X-Received: by 2002:a05:6a21:2d8d:b0:ec:707f:7dc7 with SMTP id ty13-20020a056a212d8d00b000ec707f7dc7mr5029852pzb.33.1682065011325; Fri, 21 Apr 2023 01:16:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682065011; cv=none; d=google.com; s=arc-20160816; b=sEF81odR8eTZAoZ7XKDfGsVmo1YmCbmoemFIUo462gUL3piSt87QyuGnhaA4rYRXX/ QljcPCxytY1N9Evy8iy7PFis6Hnu+gD96LnBN2Jponeu7YsqIItz1hQOxqUlf/OaVqxb H6Pj8Xa7CLz4n4G9ZWwBaQCnFeYw8S1knnmHklXVEQV32u79BR8SZucT/QxuGk3xn3/H H4g4KgOtHPlqJ2tb7bO9UxUkJVUkmTYIlv3eKuXICkr2rpssSw/00mRCWB+PgOqWjPnI h33e0VPsQlpXcH4VqLJgGpv//ytOE8XknELLCDHfDH+WhUTJ0qNUHjZPDh3ZP5NQJo0b ihWQ== 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=P/ZpcQ9NIqFHjhvx0ngEtTv4dAJPVMJ7EISKXYvQAAs=; b=0EcYLedZlF+TErH7qY7ozuCI1PJ2zt55YDzUxtgvshoGgOzyhv7rIXVpWtLBPjJzxC 4jMVLLrNwrPYow57MCdz5JEiQOEF0dv/8s8L1bzeB9xwnBfMxJ8AG7/wERG//xdBu44a GCm9+uwfmEdsMWc7dNbe6EqClikTMGRHi7vnkIRIDtRZUWasoLGqJz6yyQwnmnGXkdpX 1hgz2/ggrMbh3gRW0E+rPFQ8DFcK1eW1e1B7UNN5RGiwXbj5Kg8Vs9VRMjdNZD+lloF/ t8NIYN/RTe8k+DAKiGt5R9rez2zNQ3bnHONa8dqeYHQjmyf6NMccuaskZeuKH4RppPFE QmNw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@mind.be header.s=google header.b=BHlMJvYJ; 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 u11-20020a6540cb000000b00513234112a7si3471282pgp.883.2023.04.21.01.16.36; Fri, 21 Apr 2023 01:16:51 -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=pass header.i=@mind.be header.s=google header.b=BHlMJvYJ; 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 S231446AbjDUHxV (ORCPT + 99 others); Fri, 21 Apr 2023 03:53:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59424 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231327AbjDUHxP (ORCPT ); Fri, 21 Apr 2023 03:53:15 -0400 Received: from mail-ed1-x52b.google.com (mail-ed1-x52b.google.com [IPv6:2a00:1450:4864:20::52b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DA179902E for ; Fri, 21 Apr 2023 00:53:11 -0700 (PDT) Received: by mail-ed1-x52b.google.com with SMTP id 4fb4d7f45d1cf-5050497df77so1966189a12.1 for ; Fri, 21 Apr 2023 00:53:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mind.be; s=google; t=1682063590; x=1684655590; 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=P/ZpcQ9NIqFHjhvx0ngEtTv4dAJPVMJ7EISKXYvQAAs=; b=BHlMJvYJT9gYXlzOIQmmVpfVb0CBhuWzkOwXRjI7ferZ2YvexT9oXFEF+ZX8pF0dHA arpdbDhrseUsOF7xgJK85M3MPneF8kWk1xmEA1bn9H7EtQC/EOzkWhTotFYPIceIBLRP aR7dWBQl3vvg91cf1yf7A9BdwnyAnS15sf+jL1dTpzTQ0mVMDop6yUxVTXZjC2mBdLXE tKXPMrMDPvt+a0ffDrcb5D6dHg9Ybnonf7mOLxhl/3CCP9LTHc+6EWeXKCQGi61nLDIf AF7+mY3RudNDaaHJyPFM0grCGO0OBU0i0Fzh3pbJ/6xiaWYlVaaAps15pgBl9/Ap8Tgs jozw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682063590; x=1684655590; 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=P/ZpcQ9NIqFHjhvx0ngEtTv4dAJPVMJ7EISKXYvQAAs=; b=PumitIkc8b3u1CbckAv7TJ4gQphDphq2v7ZeOIYXfjxW/2YoFUmP+Qpu1+xTXY8BEe iNRjg4InUfHFXr69VwNfnYbKRjimJyHwUl2rkwxyk20boO+T85B9k27ouROD8kOL97N7 exBeUY0yi8gzz7ppjAqh7zzNKw8doFNaLvRQbwS/RGImzk0IkCIoXf6N7A0PVfThYUUv h3JhCOjaSD/MDDUaMLlSLM2CelYKlB50b/meYEbNyNnepCDpFUixP9Gla+hlbbIAGX2A BOHosAJM3ERstGeeHEcRhrLbpic01EXYDxVtr4jxhPF60LAftGncxO16/quaeUZt2uK7 5HBw== X-Gm-Message-State: AAQBX9fWI4NSzx312FSHNJ7TMJxnf6QWhNjIEgWmz0GHN+s7FkuLGXpa S79cmVNDOC95AVeeBytypazDzw== X-Received: by 2002:a17:906:b6c4:b0:94a:4fc5:4c2e with SMTP id ec4-20020a170906b6c400b0094a4fc54c2emr1305414ejb.49.1682063590295; Fri, 21 Apr 2023 00:53:10 -0700 (PDT) Received: from dtpc.zanders.be (78-22-137-109.access.telenet.be. [78.22.137.109]) by smtp.gmail.com with ESMTPSA id vp3-20020a170907a48300b0094f14286f86sm1716329ejc.48.2023.04.21.00.53.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Apr 2023 00:53:09 -0700 (PDT) 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, Krzysztof Kozlowski Subject: [PATCH v8 1/2] dt-bindings: leds-lp55xx: add ti,charge-pump-mode Date: Fri, 21 Apr 2023 09:53:04 +0200 Message-Id: <20230421075305.37597-2-maarten.zanders@mind.be> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20230421075305.37597-1-maarten.zanders@mind.be> References: <20230421075305.37597-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,T_SCC_BODY_TEXT_LINE, URIBL_BLOCKED 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?1763773001683540612?= X-GMAIL-MSGID: =?utf-8?q?1763773001683540612?= 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 v6: change license type for leds-lp-55xx.h to preferred tag v8: documentation: add default & maximum constraints .../devicetree/bindings/leds/leds-lp55xx.yaml | 10 ++++++++++ include/dt-bindings/leds/leds-lp55xx.h | 10 ++++++++++ 2 files changed, 20 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..058be1fedbc8 100644 --- a/Documentation/devicetree/bindings/leds/leds-lp55xx.yaml +++ b/Documentation/devicetree/bindings/leds/leds-lp55xx.yaml @@ -66,6 +66,14 @@ properties: '#size-cells': const: 0 + ti,charge-pump-mode: + description: + Set the operating mode of the internal charge pump as defined in + . + $ref: /schemas/types.yaml#/definitions/uint32 + default: 3 # auto + maximum: 3 + patternProperties: '^multi-led@[0-8]$': type: object @@ -152,6 +160,7 @@ additionalProperties: false examples: - | #include + #include i2c { #address-cells = <1>; @@ -164,6 +173,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..a4fb4567715d --- /dev/null +++ b/include/dt-bindings/leds/leds-lp55xx.h @@ -0,0 +1,10 @@ +/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */ +#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 Fri Apr 21 07:53:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maarten Zanders X-Patchwork-Id: 86163 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp893207vqo; Fri, 21 Apr 2023 00:55:35 -0700 (PDT) X-Google-Smtp-Source: AKy350bxsK1DeqfHFJ4L9UbWq5KHer86o7Q3hAIv/Lg2IXlyK9R6EwyM20co9kSczDrauV4jFtJY X-Received: by 2002:a05:6a00:2e0e:b0:63f:1037:cc24 with SMTP id fc14-20020a056a002e0e00b0063f1037cc24mr4347615pfb.32.1682063734982; Fri, 21 Apr 2023 00:55:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682063734; cv=none; d=google.com; s=arc-20160816; b=ZkomYohvhirmRoF2SsdyMEvkn4WZJuHmaQu+RyWSe24Qg4JjuDgoyTKnGzDDWYfZ+X rpj+bwk5GgRWWFZctA9sLqz9mwI7hK64QufM7ItHlaKjAAAkPbJTt91hXiiXImYt6E3p NKsrgG12JN8/Trj3tYXqCF1TJUSOVLBTWZ2BIvr3MgoIYSaABw8JZe3VWcVUDcB0bLJA EkcnpP5ozg0ry1OXddZWLivT6G3Bm42eaXjvXUfE6v6HxCWtc5xl5e0IVvkoqnn3CXup P2UPchzyLqkCoSqLGouIDcnLgC2+ZjKZDkeNLi/UiQCr7L/jMYPuRY0U6fm6NgKYxkVE PBIQ== 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=l0j80qcSlu23/jmLhtBdxoy8KmFI9uUDrbf0yBZqqYw=; b=DakscSLwZ5Il2xtQj6Afzlx4mFH2yn34hDzVDcLdQPYsiNfixhRO69kOEMQOdtH3dT 0i/QU9STC9S88wtMBsOz7jq/p+iulFVCI3uEq67MaXrhkO5HjU8JLGzeo+t23zHQoxjU q3ow9T0bSyrb83dpLQyGSXcXAe/JkuF+LPQSClEWyuVazX/Mtn2NSZSm9tW733vG5SdD bn5o12MMDnayeCsLNcumSGR09Ht2fVnaAmUmWvDNEn/DlNy7hy2cv7DyeFO8r+s9CXmU CmzjGiIEOkB8riojPxltGEXXKx4INMTMH6G0/paOxRsALuf0GWJPEGOcGXJYLktvss9b Y6Nw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@mind.be header.s=google header.b=EGUq22nb; 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 i14-20020a056a00004e00b0063c7ed4cb0esi3700384pfk.170.2023.04.21.00.55.20; Fri, 21 Apr 2023 00:55:34 -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=pass header.i=@mind.be header.s=google header.b=EGUq22nb; 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 S231479AbjDUHxY (ORCPT + 99 others); Fri, 21 Apr 2023 03:53:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59444 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231440AbjDUHxQ (ORCPT ); Fri, 21 Apr 2023 03:53:16 -0400 Received: from mail-ej1-x635.google.com (mail-ej1-x635.google.com [IPv6:2a00:1450:4864:20::635]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BEB4C9038 for ; Fri, 21 Apr 2023 00:53:12 -0700 (PDT) Received: by mail-ej1-x635.google.com with SMTP id a640c23a62f3a-94eee951c70so183137866b.3 for ; Fri, 21 Apr 2023 00:53:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mind.be; s=google; t=1682063591; x=1684655591; 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=l0j80qcSlu23/jmLhtBdxoy8KmFI9uUDrbf0yBZqqYw=; b=EGUq22nbom73hmdLPgx2EWFvWEH43ZFXXhUsrQaBQNtDYfmb65oe5V/UX2xc8EdpPC 4taoPMs+y93fz1X0v8nXwUqpQyxXDTmfurkoB/z5pHy7ncqh18OV7anMrlpfCfqVvTzV VMtxWq2o2V3xcIGG72uo6yq26L7KBqIfh8hAPEnAaxWk9ozhNoUi10zPg4QlYwCG42i1 sRyrXy8HS6Ztb3ZXL5Efe8F60JmHh8f5bNdp6/dr+V7vOqt708RjpJW6lTJHWy4X564d sit6qklJqKqMQ5ixNOuVRfU+UDM+2Uv+XwpwBjH9d+CMWrNr6oxIPWm2S+3cKM/4ttav PiyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682063591; x=1684655591; 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=l0j80qcSlu23/jmLhtBdxoy8KmFI9uUDrbf0yBZqqYw=; b=RIaqBteRx8dp+pMuBZlHLSG1F+SVGhO2RR8eKObveBgc45Q+FnnZp5Iw5of+FedS2I Tj49O2oWyQoPPRDoKneizIlp83G0pwIjwLYrWF0G1TytkTH09ChgpnETG0Zv5Quq5baJ IFY/Udu25u04mh2fu2LvGzX5z/67L1PymqQz6+qHfNgLvJvW+h097Zg1/jqp5TNPwvw9 Om/6aVpdX9U67Ii54TBbtQQPjoNtfRPCcjLr+CU0BC+ojdRFiKTvdCTIdhYVWyrCUAtl CSa9M/mQispSiZa8wE98M25SOakptYAjlJtU/BMiJUivbK2Drl2uD3VfSA6ZSML4X3vC Eh4g== X-Gm-Message-State: AAQBX9dp34QDW4QBoJ+iVAh0MH8g+/jwEsIE36axJhSC9gyJkDNm2D9N sUuRajWhdHV7K3xwJDjfnxl8BQ== X-Received: by 2002:a17:907:80c5:b0:94a:a887:c29f with SMTP id io5-20020a17090780c500b0094aa887c29fmr1666414ejc.68.1682063591223; Fri, 21 Apr 2023 00:53:11 -0700 (PDT) Received: from dtpc.zanders.be (78-22-137-109.access.telenet.be. [78.22.137.109]) by smtp.gmail.com with ESMTPSA id vp3-20020a170907a48300b0094f14286f86sm1716329ejc.48.2023.04.21.00.53.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Apr 2023 00:53:10 -0700 (PDT) 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 v8 2/2] leds: lp55xx: configure internal charge pump Date: Fri, 21 Apr 2023 09:53:05 +0200 Message-Id: <20230421075305.37597-3-maarten.zanders@mind.be> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20230421075305.37597-1-maarten.zanders@mind.be> References: <20230421075305.37597-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,T_SCC_BODY_TEXT_LINE, URIBL_BLOCKED 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?1763771663129520836?= X-GMAIL-MSGID: =?utf-8?q?1763771663129520836?= 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 v6: cleanup parsing of DT paramter v7: formatting drivers/leds/leds-lp5521.c | 11 +++++------ drivers/leds/leds-lp5523.c | 14 +++++++++----- drivers/leds/leds-lp55xx-common.c | 9 +++++++++ drivers/leds/leds-lp8501.c | 8 +++++--- include/linux/platform_data/leds-lp55xx.h | 3 +++ 5 files changed, 31 insertions(+), 14 deletions(-) diff --git a/drivers/leds/leds-lp5521.c b/drivers/leds/leds-lp5521.c index a004af8e22c7..acd37d0f0e26 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,8 @@ 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 55da914b8e5c..a8df22938bdb 100644 --- a/drivers/leds/leds-lp5523.c +++ b/drivers/leds/leds-lp5523.c @@ -57,8 +57,11 @@ #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 +128,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 +137,10 @@ 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..77bb26906ea6 100644 --- a/drivers/leds/leds-lp55xx-common.c +++ b/drivers/leds/leds-lp55xx-common.c @@ -18,6 +18,7 @@ #include #include #include +#include #include "leds-lp55xx-common.h" @@ -691,6 +692,14 @@ struct lp55xx_platform_data *lp55xx_of_populate_pdata(struct device *dev, i++; } + if (of_property_read_u32(np, "ti,charge-pump-mode", &pdata->charge_pump_mode)) + pdata->charge_pump_mode = LP55XX_CP_AUTO; + + 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 165d6423a928..878d81dace8a 100644 --- a/drivers/leds/leds-lp8501.c +++ b/drivers/leds/leds-lp8501.c @@ -53,10 +53,10 @@ #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) +#define LP8501_DEFAULT_CFG (LP8501_PWM_PSAVE | LP8501_AUTO_INC | LP8501_PWR_SAVE) #define LP8501_REG_RESET 0x3D #define LP8501_RESET 0xFF @@ -102,6 +102,8 @@ 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;