From patchwork Thu Feb 2 10:10:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maarten Zanders X-Patchwork-Id: 51832 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp152582wrn; Thu, 2 Feb 2023 02:18:28 -0800 (PST) X-Google-Smtp-Source: AK7set9+vHPrgIDWdaCsE8NyEj7G9KpLpYzazaBkWKj8ibA6zO0EZEF26WVxZG0/V3HCSOGKUdbe X-Received: by 2002:a17:906:ad96:b0:87b:d79f:9945 with SMTP id la22-20020a170906ad9600b0087bd79f9945mr6259915ejb.2.1675333108379; Thu, 02 Feb 2023 02:18:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675333108; cv=none; d=google.com; s=arc-20160816; b=CTmkT8yYeTiWyniLFfUgu2IKc2fRVoeyzL5ufOO6PnC9qC7XboYNOMgPmmG4QXv05+ wCv3EYxEvQXj3T09JdpcC8ANqkuDG+dSbXrzLfVgnI0k0fjEQmoVG3zsKU9WbBNFIdi1 AhuGfxNiihzcxWbjxDnnhSheU23b5epLldqpRMKTYkJvqV5dcPG8EegUqOXVqAPmN16m jHDdkE6QunudVnflJLasgaH7k6RxTaqco5+TjCYxWuE2ic5i9mRt9PQDeT8AFDCAlRIz hFncx9UyzofSHnXDdFckOwvD/z7rpxG6Jy65oKB1K6RZap4cq8ncSs+mRoROkxgmFwlH XvGA== 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=PZ/eU/DKOSJTbU1YDMmaQL1fq94Z2preFzmC+8H/Gjo=; b=A41bEQxpfX/DM67ly6ivfdllSTsmMGcTVkRaIglwTs/iR2p58quI2qsh/jE0ARnIZk PGCxQYGaGZ5bk9RtXYPhrOFOsBbZ0L/rYFpgUMIQiURt9b4Wdtbygnbvz/P+YN6E9QYU +aYnJY81/RnGCQFPfx7Ag9ABwfKmf+BHmJPpyh3ckN0emAEiJd2pFmDbthpkZwKx7UGd VXVSHD2N3tzMR/So8KrnKTkbtfWSABAaGXg5hNZPOG1uYXI7gMdLe+VqQ9kHbry1OS1k JbV+PfkK/NRHo6I1Mg1oUCcc07nSYeIREBtbA4lBuIrXlOjFduVMJAC8t8/LRDgv2sLP ryQQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@mind.be header.s=google header.b=dlq9Ei+i; 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 h21-20020aa7de15000000b004a25b52ae43si10512067edv.481.2023.02.02.02.18.04; Thu, 02 Feb 2023 02:18:28 -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=dlq9Ei+i; 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 S232618AbjBBKLA (ORCPT + 99 others); Thu, 2 Feb 2023 05:11:00 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48296 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232158AbjBBKKw (ORCPT ); Thu, 2 Feb 2023 05:10:52 -0500 Received: from mail-ed1-x536.google.com (mail-ed1-x536.google.com [IPv6:2a00:1450:4864:20::536]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A94FF875B7 for ; Thu, 2 Feb 2023 02:10:46 -0800 (PST) Received: by mail-ed1-x536.google.com with SMTP id v13so1416192eda.11 for ; Thu, 02 Feb 2023 02:10:46 -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=PZ/eU/DKOSJTbU1YDMmaQL1fq94Z2preFzmC+8H/Gjo=; b=dlq9Ei+ies+wC8rqHr4+iStcSSd1YBuNlbxPxpucw6pmy9CAs13nEOikZ5BWFHXrSt 4E383ZAN2OJF0+kvlbvckkXieElTtInDird2S1kQz5ZSa80t4XsOPqaKZGKoPZBCALjM 5aXtX82oWDSwIyM9l2GGvmx0aD6zoiE5MYwUC6lVHU2vYkKYLJF0Zppnkdp5bmzuMhN3 6sozw9E9vt4QmVqF5tIYvXPIhbReVYOvJzvOPWmpr16h2SzI8g2E/Xt47NBF3gBRgij3 rshmwuAwsuWwh/YZt3QOCDWXsnnL2QqwkSXHypFmmQpT5YFDPMjsy73hkk0yTK5KKsKr wILg== 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=PZ/eU/DKOSJTbU1YDMmaQL1fq94Z2preFzmC+8H/Gjo=; b=Wnau9GlDqn6UJADjPjt02xyX+AXXRq1IWHAz7EHUGRimP4Q8CfGGYxIP3UsQ3YU85i xD6tAzNbszClPMk7kQj9ia9BuGvVprwkNKHjUCvrnojiZQmg81fKtWG+hJ9YzQprX9Uh yo2k7/exm+19iYKloTxwJYlRAlF6ZK7GskAL5n2wsiRipvxzG9AS8Wewpnc2PzLOLiPq cPRc9o7vlDrfzEgXRhxEL7cxe37m1Y3iQaEXv9rkWpE4XV/V5PFaTHsM4NK4aROb8YYK IVmgnJ6WVLP6NXqh48JxKdvuqZg9JGviBuAR0I3PEPjBHPEsAiqNC9JcveEo2vSd3GFX tiAw== X-Gm-Message-State: AO0yUKXJl3hZmbTjWO31uwf/DbYldfKwrcx71I9WLiGkItVpf9lHKEM2 8BDqdlueheJKQvY3kF7D8dPcvw== X-Received: by 2002:a05:6402:1504:b0:499:70a8:f91a with SMTP id f4-20020a056402150400b0049970a8f91amr5501371edw.19.1675332645239; Thu, 02 Feb 2023 02:10:45 -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 t13-20020a50d70d000000b00458b41d9460sm11155816edi.92.2023.02.02.02.10.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Feb 2023 02:10:44 -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 v4 1/2] dt-bindings: leds-lp55xx: add ti,charge-pump-mode Date: Thu, 2 Feb 2023 11:10:31 +0100 Message-Id: <20230202101032.26737-2-maarten.zanders@mind.be> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20230202101032.26737-1-maarten.zanders@mind.be> References: <20230202101032.26737-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?1756714089635759686?= X-GMAIL-MSGID: =?utf-8?q?1756714089635759686?= Add a binding to configure the internal charge pump for lp55xx. 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 option by u8 constant, removing previous Reviewed-by tags as it's a complete rewrite of the patch. v4: added notes .../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..22e63d89d770 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/uint8 + 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 = /bits/ 8 ; 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..8f59c1c12dee --- /dev/null +++ b/include/dt-bindings/leds/leds-lp55xx.h @@ -0,0 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#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 Thu Feb 2 10:10:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maarten Zanders X-Patchwork-Id: 51831 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp152345wrn; Thu, 2 Feb 2023 02:17:49 -0800 (PST) X-Google-Smtp-Source: AK7set+ena8f18cj5U057+PEIzGJbaDJA8K28Yafg/ym/Pc1pcUEfA6CAkSBZ3+Mvq60VXZPJn46 X-Received: by 2002:a17:906:8559:b0:88c:a43d:81ba with SMTP id h25-20020a170906855900b0088ca43d81bamr5888572ejy.11.1675333069382; Thu, 02 Feb 2023 02:17:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675333069; cv=none; d=google.com; s=arc-20160816; b=bag/ClcBPyfKF6hGkkwZ8n9j4E0d0j6bOBOCn0gA+pscJaDf0Ld+bBMGNe8dPYInRE apGf13+75n0gLh/q5KY8Ty/5rUOmSwBVDd39IRjw8qlk2C4UogM5W3YI5xV0vEvS/CrW TVc9CPDXJliU00ILP6vmlEQpj4mddEqKAV9Nrc49YuKjksGtwyA193xlPI/07cfutPVH geQ+fXPQYFsmJS96wEFeQkdPRn63qpcJQPkIM2j9nk6RyQSjVeqkDF8Lo0aPeybqvLv7 hJjgP6BrKIIhqX0o9iZJaM7o4if4oN2jETekt+hmVR8gMzYrnTbrnk2MmkakncjfNDPq kEqA== 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=K4HLRKNflRqCTNPlJzTswnJ1JXDZOOu2u2qz+C4QTKY=; b=qNEmXDOmn01IlsJ1jo7aqjCqYFYsvAHnw6umPv5E5zPfLBSszRq7bt34BYURpbPrFq bvQnOWYJr6KJpUjVVeuwZQDqeDABr36SImIYIxBWJPa5L5Y+wyPBBZ0eyfEVHKwVhXXW Jq/iuSSDvPt/7oXxKC3CFq8oXGWYRph1XII+3D5QMToQ3gouEYN0MDQohQCdwv3WkCZl zDRhlMyIlGDuJVDjx0SbnhdMAntX0pp+4jT9rZykUvfW1x+/0qnON8LOncLLiQe36C4S nUMoGZwCSHfM9sPTjx3N0hWPOkgmtutXzrr4dRvZ5uzsGUzz5Afu17k6MrP9J4ganTls cIMQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@mind.be header.s=google header.b="DY2m/sZI"; 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 f4-20020a170906738400b00888161349e7si15829986ejl.659.2023.02.02.02.17.25; Thu, 02 Feb 2023 02:17:49 -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="DY2m/sZI"; 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 S232430AbjBBKK4 (ORCPT + 99 others); Thu, 2 Feb 2023 05:10:56 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48298 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232209AbjBBKKw (ORCPT ); Thu, 2 Feb 2023 05:10:52 -0500 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 8DA53875BB for ; Thu, 2 Feb 2023 02:10:47 -0800 (PST) Received: by mail-ed1-x52b.google.com with SMTP id x7so1496003edr.0 for ; Thu, 02 Feb 2023 02:10:47 -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=K4HLRKNflRqCTNPlJzTswnJ1JXDZOOu2u2qz+C4QTKY=; b=DY2m/sZIVwT9FGGXlYinT4V9gycSfe1u4B7QdE1mAVWRZABH4669zD9Sath2yzpJa3 V+3BQECotdQEFn1K6XUlhfrapjAVQgUqcRv/UzERQ5PjctofNPvM2WfFVuB2hIdx3+D9 wku18qYTw9h7Z2+sEn6GPDslLGh1A/6bkOVuJVAw2yVozYAiO4uraI3JWIPC4NGa4jv7 Y2IyUBihFGg1ZbuP0y5H6iYLPAlRWScqNZcqxC8aYKyeRkieNdvGmX+ZvmktrcOGChGc eZpKP9Vgo9T29qEX/MqzJeqO45UcHM5WI/XB71g8rs+dW6XTzcQJozmr9S2F3o+wtylW UgDw== 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=K4HLRKNflRqCTNPlJzTswnJ1JXDZOOu2u2qz+C4QTKY=; b=VLvz8cNcVslXkHXvdapncXtVSS0pNKa8uC2LLD5ZErkdC8ZdUIO1/pu4MJNAgeiz64 DUpEHNquWmbiDJ+PPBxcgw3WqonomlYCB4d94KLRbzzx3D75b6XH6J2vTVmhkYRf4SoE aOlQSNtw4QLDtvBdqU4ejNAUzsEUtyAgc+cPp5zpH1SGuJF57/xORcAg2WJclvd5ruMD qEP1Q++1znLJ9UnR5XFdAQ8m6wKwTOOEanarqBFi4XgrqPIhu30ZPt1uocRRGOF5zgDP Q9XWzaShdDA+ZCTzhzbjCIVJtAOs3e2KQNsjqzPlEiF85XdwH8oIxJaRcdWFbxtwC9e9 fKVw== X-Gm-Message-State: AO0yUKUUspPTAAJOK/pYgI2QffGmsR8hTBtd5aGnKKf03wKqpff0dEL6 htNZ76Vd93Tho+LuExAvzp+hXQ== X-Received: by 2002:a50:bb4d:0:b0:4a2:7833:e385 with SMTP id y71-20020a50bb4d000000b004a27833e385mr5508666ede.22.1675332646112; Thu, 02 Feb 2023 02:10:46 -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 t13-20020a50d70d000000b00458b41d9460sm11155816edi.92.2023.02.02.02.10.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Feb 2023 02:10:45 -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 v4 2/2] leds: lp55xx: configure internal charge pump Date: Thu, 2 Feb 2023 11:10:32 +0100 Message-Id: <20230202101032.26737-3-maarten.zanders@mind.be> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20230202101032.26737-1-maarten.zanders@mind.be> References: <20230202101032.26737-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?1756713988220873943?= X-GMAIL-MSGID: =?utf-8?q?1756714048907906542?= 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 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..086033860a6f 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_u8(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..9a738979e1ce 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 */ + u8 charge_pump_mode; + /* optional enable GPIO */ struct gpio_desc *enable_gpiod;