From patchwork Wed Sep 26 13:09:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Murphy X-Patchwork-Id: 147587 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp704340lji; Wed, 26 Sep 2018 06:09:57 -0700 (PDT) X-Google-Smtp-Source: ACcGV62zfPan+DskgAp/iz7wj/9QGKYuIcyCPOqTBElMYaGTXGUhHW6GXuSM5XEQOEid47qWxHN3 X-Received: by 2002:a63:4083:: with SMTP id n125-v6mr5776167pga.116.1537967397748; Wed, 26 Sep 2018 06:09:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537967397; cv=none; d=google.com; s=arc-20160816; b=0ZnBbuscaORQjI1zhrmSprM2TAozZzBGWJrwMDA1vl5+npH556C6q3TJ4Dnqlxh4oa 22k1ZjSAHL66qpJpK6oTFrQtxoD+sqgdgOWx4TDmUXuRilQDZ3F+OGVFCrJbo77bhOCO 0/YNJ3seDYDRVQYCXYeMFUWyR5E9Z7EaBf075XjyYXvxX6rdD9WPXVtWnpvyiNASbSrv KAcQnenZ5igzEB20WV3yYo0eymbqHklxXXjeWsH+y8iRltz7pfqIOhgVpyeZOEaNPKRZ 5ocsnCK9FxIV030hkMiC69Jj3R+bJH1hsGhgK6o7Z/Ei9zM+2YD5h402jtxVAr+qNQ0U hw8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=ZOnPfn3gmnGM8pf25w5xGWX9wLNw0zSaYadOc1AOrAs=; b=DImS1DrsyO5xaiyLrxhShiwQuPq2DxWUWQjBULjv/zHvCJ20DG4yn0caUWbSKK0Xn8 5ZJtAcpIbHzzY+xAGXs3mtKNSaU3RrqNGVg9Zlm9AY7dXX0mztrVSs6+A8i7DaWmCz4C MuWct9hmeNTye1XLUiQgqfH6HqGcSK0zdzfpx6So8JeGZ+w4tRYIaOvVtC9IOYHm5i4p IjBwutX8Flnw/x7R0/qXZzSL24NY4lJ6eWyND00QC4wJtUbrdR718DDN6IdxVrkRVM66 dDQwqXJna61ELknEa2MyBJia3WsYSiK3Oq/ZnrYjZYMNE3r9wAdtt/W14qM+bDGfkuo+ X5AQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=ViKZRkDK; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id r23-v6si5161313pgi.409.2018.09.26.06.09.57; Wed, 26 Sep 2018 06:09:57 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=ViKZRkDK; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728583AbeIZTWs (ORCPT + 32 others); Wed, 26 Sep 2018 15:22:48 -0400 Received: from lelv0142.ext.ti.com ([198.47.23.249]:55110 "EHLO lelv0142.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728459AbeIZTWr (ORCPT ); Wed, 26 Sep 2018 15:22:47 -0400 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by lelv0142.ext.ti.com (8.15.2/8.15.2) with ESMTP id w8QD9lu6014962; Wed, 26 Sep 2018 08:09:47 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1537967387; bh=ZOnPfn3gmnGM8pf25w5xGWX9wLNw0zSaYadOc1AOrAs=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=ViKZRkDKzOs04XWAlhcW31u7ksx0E5tHbUB9Eq4VmemCKMVJnuvUcqVSMD16qpa68 x3RmKVkDNQt2GeEbSaLHRkvAB7Mo2Wq4G36m+iDpO9GC+Mz6WH+SH0zBzER6XNQkZu j+sKOjuE4jvlYWvjMDJaXGTfZUQCCjK9Em7zPqzs= Received: from DLEE108.ent.ti.com (dlee108.ent.ti.com [157.170.170.38]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id w8QD9lXf021291; Wed, 26 Sep 2018 08:09:47 -0500 Received: from DLEE108.ent.ti.com (157.170.170.38) by DLEE108.ent.ti.com (157.170.170.38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1466.3; Wed, 26 Sep 2018 08:09:47 -0500 Received: from dlep32.itg.ti.com (157.170.170.100) by DLEE108.ent.ti.com (157.170.170.38) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1466.3 via Frontend Transport; Wed, 26 Sep 2018 08:09:47 -0500 Received: from legion.dal.design.ti.com (legion.dal.design.ti.com [128.247.22.53]) by dlep32.itg.ti.com (8.14.3/8.13.8) with ESMTP id w8QD9l4J003530; Wed, 26 Sep 2018 08:09:47 -0500 Received: from localhost (a0272616local-lt.dhcp.ti.com [172.22.176.238]) by legion.dal.design.ti.com (8.11.7p1+Sun/8.11.7) with ESMTP id w8QD9kx11631; Wed, 26 Sep 2018 08:09:46 -0500 (CDT) From: Dan Murphy To: , , CC: , , , , , Dan Murphy Subject: [RFC PATCH 2/9] dt-bindings: ti-lmu: Remove LM3697 Date: Wed, 26 Sep 2018 08:09:14 -0500 Message-ID: <20180926130921.12329-3-dmurphy@ti.com> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20180926130921.12329-1-dmurphy@ti.com> References: <20180926130921.12329-1-dmurphy@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Remove support for the LM3697 LED device from the ti-lmu. The LM3697 will be supported via a stand alone LED driver. Signed-off-by: Dan Murphy --- .../devicetree/bindings/mfd/ti-lmu.txt | 26 +------------------ 1 file changed, 1 insertion(+), 25 deletions(-) -- 2.19.0 diff --git a/Documentation/devicetree/bindings/mfd/ti-lmu.txt b/Documentation/devicetree/bindings/mfd/ti-lmu.txt index c885cf89b8ce..920f910be4e9 100644 --- a/Documentation/devicetree/bindings/mfd/ti-lmu.txt +++ b/Documentation/devicetree/bindings/mfd/ti-lmu.txt @@ -9,7 +9,6 @@ TI LMU driver supports lighting devices below. LM3632 Backlight and regulator LM3633 Backlight, LED and fault monitor LM3695 Backlight - LM3697 Backlight and fault monitor Required properties: - compatible: Should be one of: @@ -18,11 +17,10 @@ Required properties: "ti,lm3632" "ti,lm3633" "ti,lm3695" - "ti,lm3697" - reg: I2C slave address. 0x11 for LM3632 0x29 for LM3631 - 0x36 for LM3633, LM3697 + 0x36 for LM3633 0x38 for LM3532 0x63 for LM3695 @@ -38,7 +36,6 @@ Optional nodes: Required properties: - compatible: Should be one of: "ti,lm3633-fault-monitor" - "ti,lm3697-fault-monitor" - leds: LED properties for LM3633. Please refer to [2]. - regulators: Regulator properties for LM3631 and LM3632. Please refer to [3]. @@ -220,24 +217,3 @@ lm3695@63 { }; }; }; - -lm3697@36 { - compatible = "ti,lm3697"; - reg = <0x36>; - - enable-gpios = <&pioC 2 GPIO_ACTIVE_HIGH>; - - backlight { - compatible = "ti,lm3697-backlight"; - - lcd { - led-sources = <0 1 2>; - ramp-up-msec = <200>; - ramp-down-msec = <200>; - }; - }; - - fault-monitor { - compatible = "ti,lm3697-fault-monitor"; - }; -}; From patchwork Wed Sep 26 13:09:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Murphy X-Patchwork-Id: 147595 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp705557lji; Wed, 26 Sep 2018 06:10:52 -0700 (PDT) X-Google-Smtp-Source: ACcGV606t60u8h+j2iZPRJzdp2xjkqvK5d+CzLVytXgDKz29dkjANO9EIzTzpPK6PXfnuBXq/zIj X-Received: by 2002:a17:902:b10c:: with SMTP id q12-v6mr2512407plr.37.1537967452715; Wed, 26 Sep 2018 06:10:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537967452; cv=none; d=google.com; s=arc-20160816; b=ByH1GhJvVrmt5GTiKQ/fjqrEGchjZKcWhk5TlYealZn29Vy+CJBEzCFrX80UKysDAV HH1e1CBWecFmggyL81PoX9haOnXdOmiy+cY/9H2bSYcPYFAsYmAVl9sPoXsq6B9n6O+0 J0SJHTPVpppvaRnIJi6frU7I22BQyQt9kDtg4XIfpRs433Oz9AirPJomkUIDgkug3esp JA3n29l71QFk41nLaagNDU2T1HYZW+IRxGp0/VhCPjzMjc8exVmYyW4T67YqPxayAfg7 0ZhgAqtiNra5kxXlx4jY9W3k3nbNflXf+8y52/1djkjS7wGX+SoRFWtxIFYNG/T5LZDv yoMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=OtCiIwkynXOu9gjT1n1TJgIb45eFR7aChLIQ5ojHiko=; b=nDw1v6Sq6tKI1zViRP6rsmABPh39pwCyUwsBn2f8cXilI72xanzG61GX3OYoT/QYKO EL/Qi41MGsBh5jF8qO56pEPatAjWIbSW4oq7oSuQSOPyGd06+Rp55LeY9KmdU+27vZM2 0E2DL7ReyPwVZ225104sTOx7OouloSBOqpvh8aDA3X5vjQKzrEUQnfOdYXw6ZNYmkEr0 c+up/SJkSnT6fxxK+6OM9QxA4CI/ppeCDxu3x+cnVs7/KY7Mz8Vgn+Ko4Vhspa3NeuOM qMDAaYCn5KNvxl3eFfzb/wFdOKzf+XApJs66RTSeXTNxr/RQeougH/hRHmav8pmX6A48 jkSw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=Ir9JxcdK; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b14-v6si5058387pgb.543.2018.09.26.06.10.52; Wed, 26 Sep 2018 06:10:52 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=Ir9JxcdK; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728726AbeIZTXo (ORCPT + 32 others); Wed, 26 Sep 2018 15:23:44 -0400 Received: from lelv0142.ext.ti.com ([198.47.23.249]:55112 "EHLO lelv0142.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728397AbeIZTWr (ORCPT ); Wed, 26 Sep 2018 15:22:47 -0400 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by lelv0142.ext.ti.com (8.15.2/8.15.2) with ESMTP id w8QD9m8c014970; Wed, 26 Sep 2018 08:09:48 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1537967388; bh=OtCiIwkynXOu9gjT1n1TJgIb45eFR7aChLIQ5ojHiko=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=Ir9JxcdKfLk335xPzcowPIOMfXhCJ/kM9RH0C247fNMN2JrdjRPPDzDVz5jO60DiY Hb7b4sIvOzm5aX+0dpbQe3hX+TXcwxafKewO2KWuHMyjp3ohx2tXLf1S+L3T+7O2Fg /9z4AEHnbh+IlyKTw9TQSWGTCiUMx9CF9KEMV2iQ= Received: from DLEE108.ent.ti.com (dlee108.ent.ti.com [157.170.170.38]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id w8QD9mCT021300; Wed, 26 Sep 2018 08:09:48 -0500 Received: from DLEE107.ent.ti.com (157.170.170.37) by DLEE108.ent.ti.com (157.170.170.38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1466.3; Wed, 26 Sep 2018 08:09:48 -0500 Received: from dflp33.itg.ti.com (10.64.6.16) by DLEE107.ent.ti.com (157.170.170.37) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1466.3 via Frontend Transport; Wed, 26 Sep 2018 08:09:48 -0500 Received: from legion.dal.design.ti.com (legion.dal.design.ti.com [128.247.22.53]) by dflp33.itg.ti.com (8.14.3/8.13.8) with ESMTP id w8QD9lFu023695; Wed, 26 Sep 2018 08:09:47 -0500 Received: from localhost (a0272616local-lt.dhcp.ti.com [172.22.176.238]) by legion.dal.design.ti.com (8.11.7p1+Sun/8.11.7) with ESMTP id w8QD9lx11635; Wed, 26 Sep 2018 08:09:47 -0500 (CDT) From: Dan Murphy To: , , CC: , , , , , Dan Murphy Subject: [RFC PATCH 3/9] mfd: ti-lmu: Remove support for LM3697 Date: Wed, 26 Sep 2018 08:09:15 -0500 Message-ID: <20180926130921.12329-4-dmurphy@ti.com> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20180926130921.12329-1-dmurphy@ti.com> References: <20180926130921.12329-1-dmurphy@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Remove support for the LM3697 from the ti-lmu driver in favor of a dedicated LED driver. Signed-off-by: Dan Murphy --- drivers/mfd/Kconfig | 2 +- drivers/mfd/ti-lmu.c | 17 ----------- include/linux/mfd/ti-lmu-register.h | 44 ----------------------------- include/linux/mfd/ti-lmu.h | 1 - 4 files changed, 1 insertion(+), 63 deletions(-) -- 2.19.0 diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig index 11841f4b7b2b..9b04dd527c68 100644 --- a/drivers/mfd/Kconfig +++ b/drivers/mfd/Kconfig @@ -1293,7 +1293,7 @@ config MFD_TI_LMU help Say yes here to enable support for TI LMU chips. - TI LMU MFD supports LM3532, LM3631, LM3632, LM3633, LM3695 and LM3697. + TI LMU MFD supports LM3532, LM3631, LM3632, LM3633, and LM3695. It consists of backlight, LED and regulator driver. It provides consistent device controls for lighting functions. diff --git a/drivers/mfd/ti-lmu.c b/drivers/mfd/ti-lmu.c index cfb411cde51c..b6bfa99a29dd 100644 --- a/drivers/mfd/ti-lmu.c +++ b/drivers/mfd/ti-lmu.c @@ -128,20 +128,6 @@ static struct mfd_cell lm3695_devices[] = { }, }; -static struct mfd_cell lm3697_devices[] = { - { - .name = "ti-lmu-backlight", - .id = LM3697, - .of_compatible = "ti,lm3697-backlight", - }, - /* Monitoring driver for open/short circuit detection */ - { - .name = "ti-lmu-fault-monitor", - .id = LM3697, - .of_compatible = "ti,lm3697-fault-monitor", - }, -}; - #define TI_LMU_DATA(chip, max_reg) \ static const struct ti_lmu_data chip##_data = \ { \ @@ -155,7 +141,6 @@ TI_LMU_DATA(lm3631, LM3631_MAX_REG); TI_LMU_DATA(lm3632, LM3632_MAX_REG); TI_LMU_DATA(lm3633, LM3633_MAX_REG); TI_LMU_DATA(lm3695, LM3695_MAX_REG); -TI_LMU_DATA(lm3697, LM3697_MAX_REG); static const struct of_device_id ti_lmu_of_match[] = { { .compatible = "ti,lm3532", .data = &lm3532_data }, @@ -163,7 +148,6 @@ static const struct of_device_id ti_lmu_of_match[] = { { .compatible = "ti,lm3632", .data = &lm3632_data }, { .compatible = "ti,lm3633", .data = &lm3633_data }, { .compatible = "ti,lm3695", .data = &lm3695_data }, - { .compatible = "ti,lm3697", .data = &lm3697_data }, { } }; MODULE_DEVICE_TABLE(of, ti_lmu_of_match); @@ -237,7 +221,6 @@ static const struct i2c_device_id ti_lmu_ids[] = { { "lm3632", LM3632 }, { "lm3633", LM3633 }, { "lm3695", LM3695 }, - { "lm3697", LM3697 }, { } }; MODULE_DEVICE_TABLE(i2c, ti_lmu_ids); diff --git a/include/linux/mfd/ti-lmu-register.h b/include/linux/mfd/ti-lmu-register.h index 2125c7c02818..99711ff4b809 100644 --- a/include/linux/mfd/ti-lmu-register.h +++ b/include/linux/mfd/ti-lmu-register.h @@ -233,48 +233,4 @@ #define LM3695_REG_BRT_MSB 0x14 #define LM3695_MAX_REG 0x14 - -/* LM3697 */ -#define LM3697_REG_HVLED_OUTPUT_CFG 0x10 -#define LM3697_HVLED1_CFG_MASK BIT(0) -#define LM3697_HVLED2_CFG_MASK BIT(1) -#define LM3697_HVLED3_CFG_MASK BIT(2) -#define LM3697_HVLED1_CFG_SHIFT 0 -#define LM3697_HVLED2_CFG_SHIFT 1 -#define LM3697_HVLED3_CFG_SHIFT 2 - -#define LM3697_REG_BL0_RAMP 0x11 -#define LM3697_REG_BL1_RAMP 0x12 -#define LM3697_RAMPUP_MASK 0xF0 -#define LM3697_RAMPUP_SHIFT 4 -#define LM3697_RAMPDN_MASK 0x0F -#define LM3697_RAMPDN_SHIFT 0 - -#define LM3697_REG_RAMP_CONF 0x14 -#define LM3697_RAMP_MASK 0x0F -#define LM3697_RAMP_EACH 0x05 - -#define LM3697_REG_PWM_CFG 0x1C -#define LM3697_PWM_A_MASK BIT(0) -#define LM3697_PWM_B_MASK BIT(1) - -#define LM3697_REG_IMAX_A 0x17 -#define LM3697_REG_IMAX_B 0x18 - -#define LM3697_REG_FEEDBACK_ENABLE 0x19 - -#define LM3697_REG_BRT_A_LSB 0x20 -#define LM3697_REG_BRT_A_MSB 0x21 -#define LM3697_REG_BRT_B_LSB 0x22 -#define LM3697_REG_BRT_B_MSB 0x23 - -#define LM3697_REG_ENABLE 0x24 - -#define LM3697_REG_OPEN_FAULT_STATUS 0xB0 - -#define LM3697_REG_SHORT_FAULT_STATUS 0xB2 - -#define LM3697_REG_MONITOR_ENABLE 0xB4 - -#define LM3697_MAX_REG 0xB4 #endif diff --git a/include/linux/mfd/ti-lmu.h b/include/linux/mfd/ti-lmu.h index 09d5f30384e5..bc9272f08f47 100644 --- a/include/linux/mfd/ti-lmu.h +++ b/include/linux/mfd/ti-lmu.h @@ -26,7 +26,6 @@ enum ti_lmu_id { LM3632, LM3633, LM3695, - LM3697, LMU_MAX_ID, }; From patchwork Wed Sep 26 13:09:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Murphy X-Patchwork-Id: 147594 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp705410lji; Wed, 26 Sep 2018 06:10:46 -0700 (PDT) X-Google-Smtp-Source: ACcGV613H0AXJf3gSxdxMTzms+99iC2I9uFE4HYixkYoAe3rRx4oh9cUc6pRd61pGXMxA2kxqUxp X-Received: by 2002:a17:902:163:: with SMTP id 90-v6mr6115302plb.322.1537967445956; Wed, 26 Sep 2018 06:10:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537967445; cv=none; d=google.com; s=arc-20160816; b=a0k+bqV7laNxiXzVREyZdYBivMagWJK5DTLMmYXHAEfl+w/CVPWFa+zkC8zqboHdof zRYQL2KfqFSppbnnGmBYz9rHdsmwg0kpPXAzlV0ANVNNw0iAFqv3+yJo73zgBtE1r1cV qCDkf6MKR6WmYxnsVi2DkFx/uI5drrdGAoRxos1qQfttfWUxqOp0j0o3Rw5g7UNcpP2e 2YsvEhY+mB0wf4Oz7vwOkJ3m9HrOGGpR5o48iVSn1bCsDd3GtLJv/4vHPTaFgb1xwfzf rW+EMx9x4wuLDg84ADdnXnGzhif3RyWPbbVrXGNpbCe+MCAdSZtw3xri5b8AFDEjR5FM 7n5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=pSmD2M/O+yZuviPXrMoZZB16/Jfgp2hSP7dtvrq1WXQ=; b=RnWNd+LkoyeLk5jNAk+BgM65qnEOR64o/U9y8d+/fUMGTYW3z89GjDsCv4Tmu5yyqd DGcJuzQXBYGnEiE6HoIbpRXwpue/Qtl5ZhG73vkTTYSQ3oDEWIRxq+hrWG0CTJIIJxoR DJggEookDdKLI1H/8xkwBfZa62VqmpJQwzuKMb2jHZNm8ken0QCbBc+e3CL6gyp36n6q glPCfL6CVNTR6RLpGiihYJid4cUcN3sKaKdF66hAnyh2x47KK4jmu76UhlUf64INwE8+ 2vOeDshjIm/TSazveuN4onLcB4pR+N/RoQkFaJn8i2S5xrsxq262OTmRZPghv9yBEIxS hPlA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=AM8dZOgA; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p7-v6si5380843plo.159.2018.09.26.06.10.45; Wed, 26 Sep 2018 06:10:45 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=AM8dZOgA; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728698AbeIZTXb (ORCPT + 32 others); Wed, 26 Sep 2018 15:23:31 -0400 Received: from lelv0142.ext.ti.com ([198.47.23.249]:55118 "EHLO lelv0142.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728469AbeIZTWr (ORCPT ); Wed, 26 Sep 2018 15:22:47 -0400 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by lelv0142.ext.ti.com (8.15.2/8.15.2) with ESMTP id w8QD9mF2014975; Wed, 26 Sep 2018 08:09:48 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1537967388; bh=pSmD2M/O+yZuviPXrMoZZB16/Jfgp2hSP7dtvrq1WXQ=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=AM8dZOgAr5VexWlSN2iXV1OYlm2E+m7jcR2JHiQvyKYSDcc/OBJX3dPHrrY0O/hhr IACRfDXMhImSxt+jEANBV0w6FBxsCfZs41suHGuIRhz609RAW9q59HXHmaUqQHIQxk v7lK6qyCtunN6u6kmsOYtE6dUskcL/ep2XniA2YI= Received: from DFLE113.ent.ti.com (dfle113.ent.ti.com [10.64.6.34]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id w8QD9mXF021315; Wed, 26 Sep 2018 08:09:48 -0500 Received: from DFLE103.ent.ti.com (10.64.6.24) by DFLE113.ent.ti.com (10.64.6.34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1466.3; Wed, 26 Sep 2018 08:09:48 -0500 Received: from dlep32.itg.ti.com (157.170.170.100) by DFLE103.ent.ti.com (10.64.6.24) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1466.3 via Frontend Transport; Wed, 26 Sep 2018 08:09:48 -0500 Received: from legion.dal.design.ti.com (legion.dal.design.ti.com [128.247.22.53]) by dlep32.itg.ti.com (8.14.3/8.13.8) with ESMTP id w8QD9mNs003545; Wed, 26 Sep 2018 08:09:48 -0500 Received: from localhost (a0272616local-lt.dhcp.ti.com [172.22.176.238]) by legion.dal.design.ti.com (8.11.7p1+Sun/8.11.7) with ESMTP id w8QD9mx11639; Wed, 26 Sep 2018 08:09:48 -0500 (CDT) From: Dan Murphy To: , , CC: , , , , , Dan Murphy Subject: [RFC PATCH 4/9] dt-bindings: leds: Add bindings for lm3697 driver Date: Wed, 26 Sep 2018 08:09:16 -0500 Message-ID: <20180926130921.12329-5-dmurphy@ti.com> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20180926130921.12329-1-dmurphy@ti.com> References: <20180926130921.12329-1-dmurphy@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add the device tree bindings for the lm3697 LED driver for backlighting and display. Signed-off-by: Dan Murphy --- .../devicetree/bindings/leds/leds-lm3697.txt | 98 +++++++++++++++++++ 1 file changed, 98 insertions(+) create mode 100644 Documentation/devicetree/bindings/leds/leds-lm3697.txt -- 2.19.0 diff --git a/Documentation/devicetree/bindings/leds/leds-lm3697.txt b/Documentation/devicetree/bindings/leds/leds-lm3697.txt new file mode 100644 index 000000000000..4bb2ed51025b --- /dev/null +++ b/Documentation/devicetree/bindings/leds/leds-lm3697.txt @@ -0,0 +1,98 @@ +* Texas Instruments - LM3697 Highly Efficient White LED Driver + +The LM3697 11-bit LED driver provides high- +performance backlight dimming for 1, 2, or 3 series +LED strings while delivering up to 90% efficiency. + +This device is suitable for display and keypad Lighting + +Required properties: + - compatible: + "ti,lm3697" + - reg : I2C slave address + - #address-cells : 1 + - #size-cells : 0 + +Optional properties: + - enable-gpios : GPIO pin to enable/disable the device + - vled-supply : LED supply + +Required child properties: + - reg : 0 - LED is Controlled by bank A + 1 - LED is Controlled by bank B + - led-sources : Indicates which HVLED string is associated to which + control bank. Each element in the array is associated + with a specific HVLED string. Element 0 is HVLED1, + element 1 is HVLED2 and element 2 HVLED3. + Additional information is contained + in Documentation/devicetree/bindings/leds/common.txt + 0 - HVLED is not active in this control bank + 1 - HVLED string is controlled by this control bank + +Optional child properties: + - runtime-ramp-up-msec: Current ramping from one brightness level to + the a higher brightness level. + Range from 2048 us - 117.44 s + - runtime-ramp-down-msec: Current ramping from one brightness level to + the a lower brightness level. + Range from 2048 us - 117.44 s + - label : see Documentation/devicetree/bindings/leds/common.txt + - linux,default-trigger : + see Documentation/devicetree/bindings/leds/common.txt + +Example: + +HVLED string 1 and 3 are controlled by control bank A and HVLED 2 string is +controlled by control bank B. + +led-controller@36 { + compatible = "ti,lm3697"; + reg = <0x36>; + #address-cells = <1>; + #size-cells = <0>; + + enable-gpios = <&gpio1 28 GPIO_ACTIVE_HIGH>; + vled-supply = <&vbatt>; + + led@0 { + reg = <0>; + led-sources = <1 0 1>; + runtime-ramp-up-msec = <5000>; + runtime-ramp-down-msec = <1000>; + label = "white:first_backlight_cluster"; + linux,default-trigger = "backlight"; + }; + + led@1 { + reg = <1>; + led-sources = <0 1 0>; + runtime-ramp-up-msec = <500>; + runtime-ramp-down-msec = <1000>; + label = "white:second_backlight_cluster"; + linux,default-trigger = "backlight"; + }; +} + +All HVLED strings controlled by control bank A + +led-controller@36 { + compatible = "ti,lm3697"; + reg = <0x36>; + #address-cells = <1>; + #size-cells = <0>; + + enable-gpios = <&gpio1 28 GPIO_ACTIVE_HIGH>; + vled-supply = <&vbatt>; + + led@0 { + reg = <0>; + led-sources = <1 1 1>; + runtime-ramp-up-msec = <500>; + runtime-ramp-down-msec = <1000>; + label = "white:backlight_cluster"; + linux,default-trigger = "backlight"; + }; +} + +For more product information please see the link below: +http://www.ti.com/lit/ds/symlink/lm3697.pdf From patchwork Wed Sep 26 13:09:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Murphy X-Patchwork-Id: 147593 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp705274lji; Wed, 26 Sep 2018 06:10:40 -0700 (PDT) X-Google-Smtp-Source: ACcGV61rMDszhQft8xS9V03Byr0t/8YbYF8W4/xCW6Vsnax2Bo7dTF6HwROFcqTgvyNp+ZKnTuZW X-Received: by 2002:a62:8559:: with SMTP id u86-v6mr6393243pfd.32.1537967440259; Wed, 26 Sep 2018 06:10:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537967440; cv=none; d=google.com; s=arc-20160816; b=NX4W2m/PW2eeV/wxGL7uv+Bb5Gg1mhmdzDSeJk9tKk5l9AuX12yJz/F0mzVT2MWgKx AdgvMyp8vqDhiNYzYjJ83340G86IqnCVLFSQBHPbVaKNSQ2kN0lQJP3AjyguMUAZfUPX AF02OemV7pe3lt1ru+HrdxO40nvpJ/DfGW9y69b6xJbje/kFTxskDXW5HwgCmkM+XoGo jSxRu3rIaAWiYZHvneIPQ9F8sUDNkAS78Ryvdoc6xnqB/ht4pYmvJl9BUqBRTLIUypUf MH/lbNYDzQAjjth9mQ46GAue1aVIB/LiBwTO8avu1lxbB8RvvDI36tmDPUVCi7QIKq4+ haSA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=TRpN8ga6jqsmtzjG7eLKq+swM2zf+8UIsoELYdZl+EQ=; b=u5e9J+uAiKHiPIf1qLYQNB3p3GurytRLZbJQIzMyyIWLuFb+ACTHLQnu1erY3sOdh/ tC3tG3tCObJu9jN3aJKCe2AKZmC/CUmiuGv3OG41FTnsss5o6apblVo4lENkuHCgd5V+ ota2RqY6goBDm75KVU75RVmOeexwjoHneo23YCuER1CSStOf1aCrzXuGGnn1wOUq0gx6 3gXuR5nW03wybnVJFk6gMTAO37Wlv3Y2i1i8bsA4UYzfqKntwvLtAAKMTxLlJhGVKA4m MqEA2l2ebi/N80vH0ASfkadBZ1XDN7oUbkyomtU898fxQM1bSG2VquRptwpJklVumevT 4aIw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=yUUHzFGE; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d66-v6si5052558pfa.186.2018.09.26.06.10.39; Wed, 26 Sep 2018 06:10:40 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=yUUHzFGE; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728722AbeIZTXb (ORCPT + 32 others); Wed, 26 Sep 2018 15:23:31 -0400 Received: from fllv0015.ext.ti.com ([198.47.19.141]:37562 "EHLO fllv0015.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726768AbeIZTWr (ORCPT ); Wed, 26 Sep 2018 15:22:47 -0400 Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by fllv0015.ext.ti.com (8.15.2/8.15.2) with ESMTP id w8QD9nX2007648; Wed, 26 Sep 2018 08:09:49 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1537967389; bh=TRpN8ga6jqsmtzjG7eLKq+swM2zf+8UIsoELYdZl+EQ=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=yUUHzFGEOS0wryDAZk3zbQpLd01ehk1LzU8zC1RaAe4mIQoFOGLlwGXavhidaON+G i9sYN0Pt/BrqitVDhNGsQ7QsuWiJug7Z5dWjTimJq93KxhfxovxwEEaguqYSmqJgp/ C32eaa8O5el5GwwT4sforzx1qny9kOE62DanIAcA= Received: from DFLE109.ent.ti.com (dfle109.ent.ti.com [10.64.6.30]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id w8QD9nKG020243; Wed, 26 Sep 2018 08:09:49 -0500 Received: from DFLE100.ent.ti.com (10.64.6.21) by DFLE109.ent.ti.com (10.64.6.30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1466.3; Wed, 26 Sep 2018 08:09:48 -0500 Received: from dlep32.itg.ti.com (157.170.170.100) by DFLE100.ent.ti.com (10.64.6.21) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1466.3 via Frontend Transport; Wed, 26 Sep 2018 08:09:48 -0500 Received: from legion.dal.design.ti.com (legion.dal.design.ti.com [128.247.22.53]) by dlep32.itg.ti.com (8.14.3/8.13.8) with ESMTP id w8QD9mCA003552; Wed, 26 Sep 2018 08:09:48 -0500 Received: from localhost (a0272616local-lt.dhcp.ti.com [172.22.176.238]) by legion.dal.design.ti.com (8.11.7p1+Sun/8.11.7) with ESMTP id w8QD9mx11643; Wed, 26 Sep 2018 08:09:48 -0500 (CDT) From: Dan Murphy To: , , CC: , , , , , Dan Murphy Subject: [RFC PATCH 5/9] leds: lm3697: Introduce the lm3697 driver Date: Wed, 26 Sep 2018 08:09:17 -0500 Message-ID: <20180926130921.12329-6-dmurphy@ti.com> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20180926130921.12329-1-dmurphy@ti.com> References: <20180926130921.12329-1-dmurphy@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Introduce the lm3697 LED driver for backlighting and display. Datasheet location: http://www.ti.com/lit/ds/symlink/lm3697.pdf Signed-off-by: Dan Murphy --- drivers/leds/Kconfig | 8 +- drivers/leds/Makefile | 1 + drivers/leds/leds-lm3697.c | 389 +++++++++++++++++++++++++++++++++++++ 3 files changed, 397 insertions(+), 1 deletion(-) create mode 100644 drivers/leds/leds-lm3697.c -- 2.19.0 diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig index dc717b30d9d3..1de4cbb13bd2 100644 --- a/drivers/leds/Kconfig +++ b/drivers/leds/Kconfig @@ -756,9 +756,15 @@ config LEDS_NIC78BX To compile this driver as a module, choose M here: the module will be called leds-nic78bx. +config LEDS_LM3697 + tristate "LED driver for LM3697" + depends on LEDS_TI_LMU_COMMON + help + Say Y to enable the LED driver for TI LMU devices. + This supports the LED device LM3697. + config LEDS_TI_LMU_COMMON tristate "LED driver for TI LMU" - depends on REGMAP help Say Y to enable the LED driver for TI LMU devices. This supports common features between the TI LM3532, LM3631, LM3632, diff --git a/drivers/leds/Makefile b/drivers/leds/Makefile index e09bb27bc7ea..6fbce7cfc41c 100644 --- a/drivers/leds/Makefile +++ b/drivers/leds/Makefile @@ -78,6 +78,7 @@ obj-$(CONFIG_LEDS_MT6323) += leds-mt6323.o obj-$(CONFIG_LEDS_LM3692X) += leds-lm3692x.o obj-$(CONFIG_LEDS_SC27XX_BLTC) += leds-sc27xx-bltc.o obj-$(CONFIG_LEDS_LM3601X) += leds-lm3601x.o +obj-$(CONFIG_LEDS_LM3697) += leds-lm3697.o obj-$(CONFIG_LEDS_TI_LMU_COMMON) += ti-lmu-led-common.o # LED SPI Drivers diff --git a/drivers/leds/leds-lm3697.c b/drivers/leds/leds-lm3697.c new file mode 100644 index 000000000000..9d3d39c6c649 --- /dev/null +++ b/drivers/leds/leds-lm3697.c @@ -0,0 +1,389 @@ +// SPDX-License-Identifier: GPL-2.0 +// TI LM3697 LED chip family driver +// Copyright (C) 2018 Texas Instruments Incorporated - http://www.ti.com/ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "ti-lmu-led-common.h" + +#define LM3697_REV 0x0 +#define LM3697_RESET 0x1 +#define LM3697_OUTPUT_CONFIG 0x10 +#define LM3697_CTRL_A_RAMP 0x11 +#define LM3697_CTRL_B_RAMP 0x12 +#define LM3697_CTRL_A_B_RT_RAMP 0x13 +#define LM3697_CTRL_A_B_RAMP_CFG 0x14 +#define LM3697_CTRL_A_B_BRT_CFG 0x16 +#define LM3697_CTRL_A_FS_CURR_CFG 0x17 +#define LM3697_CTRL_B_FS_CURR_CFG 0x18 +#define LM3697_PWM_CFG 0x1c +#define LM3697_CTRL_A_BRT_LSB 0x20 +#define LM3697_CTRL_A_BRT_MSB 0x21 +#define LM3697_CTRL_B_BRT_LSB 0x22 +#define LM3697_CTRL_B_BRT_MSB 0x23 +#define LM3697_CTRL_ENABLE 0x24 + +#define LM3697_SW_RESET BIT(0) + +#define LM3697_CTRL_A_EN BIT(0) +#define LM3697_CTRL_B_EN BIT(1) +#define LM3697_CTRL_A_B_EN (LM3697_CTRL_A_EN | LM3697_CTRL_B_EN) + +#define LM3697_MAX_LED_STRINGS 3 + +#define LM3697_CONTROL_A 0 +#define LM3697_CONTROL_B 1 +#define LM3697_MAX_CONTROL_BANKS 2 + +#define LM3697_HVLED_ASSIGNMENT 1 + +/** + * struct lm3697_led - + * @hvled_strings - Array of LED strings associated with a control bank + * @label - LED label + * @led_dev - LED class device + * @priv - Pointer to the device struct + * @control_bank - Control bank the LED is associated to. 0 is control bank A + * 1 is control bank B + */ +struct lm3697_led { + u32 hvled_strings[LM3697_MAX_LED_STRINGS]; + char label[LED_MAX_NAME_SIZE]; + struct led_classdev led_dev; + struct lm3697 *priv; + struct ti_lmu_bank lmu_data; + int control_bank; +}; + +/** + * struct lm3697 - + * @enable_gpio - Hardware enable gpio + * @regulator - LED supply regulator pointer + * @client - Pointer to the I2C client + * @regmap - Devices register map + * @dev - Pointer to the devices device struct + * @lock - Lock for reading/writing the device + * @leds - Array of LED strings + */ +struct lm3697 { + struct gpio_desc *enable_gpio; + struct regulator *regulator; + struct i2c_client *client; + struct regmap *regmap; + struct device *dev; + struct mutex lock; + struct lm3697_led leds[]; +}; + +static const struct reg_default lm3697_reg_defs[] = { + {LM3697_OUTPUT_CONFIG, 0x6}, + {LM3697_CTRL_A_RAMP, 0x0}, + {LM3697_CTRL_B_RAMP, 0x0}, + {LM3697_CTRL_A_B_RT_RAMP, 0x0}, + {LM3697_CTRL_A_B_RAMP_CFG, 0x0}, + {LM3697_CTRL_A_B_BRT_CFG, 0x0}, + {LM3697_CTRL_A_FS_CURR_CFG, 0x13}, + {LM3697_CTRL_B_FS_CURR_CFG, 0x13}, + {LM3697_PWM_CFG, 0xc}, + {LM3697_CTRL_A_BRT_LSB, 0x0}, + {LM3697_CTRL_A_BRT_MSB, 0x0}, + {LM3697_CTRL_B_BRT_LSB, 0x0}, + {LM3697_CTRL_B_BRT_MSB, 0x0}, + {LM3697_CTRL_ENABLE, 0x0}, +}; + +static const struct regmap_config lm3697_regmap_config = { + .reg_bits = 8, + .val_bits = 8, + + .max_register = LM3697_CTRL_ENABLE, + .reg_defaults = lm3697_reg_defs, + .num_reg_defaults = ARRAY_SIZE(lm3697_reg_defs), + .cache_type = REGCACHE_FLAT, +}; + +static int lm3697_brightness_set(struct led_classdev *led_cdev, + enum led_brightness brt_val) +{ + struct lm3697_led *led = container_of(led_cdev, struct lm3697_led, + led_dev); + int ctrl_en_val; + int ret; + + mutex_lock(&led->priv->lock); + + if (led->control_bank == LM3697_CONTROL_A) { + led->lmu_data.msb_brightness_reg = LM3697_CTRL_A_BRT_MSB; + led->lmu_data.lsb_brightness_reg = LM3697_CTRL_A_BRT_LSB; + ctrl_en_val = LM3697_CTRL_A_EN; + } else { + led->lmu_data.msb_brightness_reg = LM3697_CTRL_B_BRT_MSB; + led->lmu_data.lsb_brightness_reg = LM3697_CTRL_B_BRT_LSB; + ctrl_en_val = LM3697_CTRL_B_EN; + } + + if (brt_val == LED_OFF) + ret = regmap_update_bits(led->priv->regmap, LM3697_CTRL_ENABLE, + ctrl_en_val, ~ctrl_en_val); + else + ret = regmap_update_bits(led->priv->regmap, LM3697_CTRL_ENABLE, + ctrl_en_val, ctrl_en_val); + + ret = ti_lmu_common_set_brightness(&led->lmu_data, brt_val); + if (ret) + dev_err(&led->priv->client->dev, "Cannot write brightness\n"); + + mutex_unlock(&led->priv->lock); + return ret; +} + +static int lm3697_set_control_bank(struct lm3697 *priv) +{ + u8 control_bank_config = 0; + struct lm3697_led *led; + int ret, i; + + led = &priv->leds[0]; + if (led->control_bank == LM3697_CONTROL_A) + led = &priv->leds[1]; + + for (i = 0; i < LM3697_MAX_LED_STRINGS; i++) + if (led->hvled_strings[i] == LM3697_HVLED_ASSIGNMENT) + control_bank_config |= 1 << i; + + ret = regmap_write(priv->regmap, LM3697_OUTPUT_CONFIG, + control_bank_config); + if (ret) + dev_err(&priv->client->dev, "Cannot write OUTPUT config\n"); + + return ret; +} + +static int lm3697_init(struct lm3697 *priv) +{ + struct lm3697_led *led; + int i, ret; + + if (priv->enable_gpio) { + gpiod_direction_output(priv->enable_gpio, 1); + } else { + ret = regmap_write(priv->regmap, LM3697_RESET, LM3697_SW_RESET); + if (ret) { + dev_err(&priv->client->dev, "Cannot reset the device\n"); + goto out; + } + } + + ret = regmap_write(priv->regmap, LM3697_CTRL_ENABLE, 0x0); + if (ret) { + dev_err(&priv->client->dev, "Cannot write ctrl enable\n"); + goto out; + } + + ret = lm3697_set_control_bank(priv); + if (ret) + dev_err(&priv->client->dev, "Setting the CRTL bank failed\n"); + + for (i = 0; i < LM3697_MAX_CONTROL_BANKS; i++) { + led = &priv->leds[i]; + ti_lmu_common_set_ramp(&led->lmu_data); + if (ret) + dev_err(&priv->client->dev, "Setting the ramp rate failed\n"); + } +out: + return ret; +} + +static int lm3697_probe_dt(struct lm3697 *priv) +{ + struct fwnode_handle *child = NULL; + struct lm3697_led *led; + const char *name; + int control_bank; + size_t i = 0; + int ret; + + priv->enable_gpio = devm_gpiod_get_optional(&priv->client->dev, + "enable", GPIOD_OUT_LOW); + if (IS_ERR(priv->enable_gpio)) { + ret = PTR_ERR(priv->enable_gpio); + dev_err(&priv->client->dev, "Failed to get enable gpio: %d\n", + ret); + return ret; + } + + priv->regulator = devm_regulator_get(&priv->client->dev, "vled"); + if (IS_ERR(priv->regulator)) + priv->regulator = NULL; + + device_for_each_child_node(priv->dev, child) { + ret = fwnode_property_read_u32(child, "reg", &control_bank); + if (ret) { + dev_err(&priv->client->dev, "reg property missing\n"); + fwnode_handle_put(child); + goto child_out; + } + + if (control_bank > LM3697_CONTROL_B) { + dev_err(&priv->client->dev, "reg property is invalid\n"); + ret = -EINVAL; + fwnode_handle_put(child); + goto child_out; + } + + led = &priv->leds[i]; + + led->control_bank = control_bank; + led->lmu_data.bank_id = control_bank; + led->lmu_data.enable_reg = LM3697_CTRL_ENABLE; + led->lmu_data.regmap = priv->regmap; + if (control_bank == LM3697_CONTROL_A) + led->lmu_data.runtime_ramp_reg = LM3697_CTRL_A_RAMP; + else + led->lmu_data.runtime_ramp_reg = LM3697_CTRL_B_RAMP; + + ret = fwnode_property_read_u32_array(child, "led-sources", + led->hvled_strings, + LM3697_MAX_LED_STRINGS); + if (ret) { + dev_err(&priv->client->dev, "led-sources property missing\n"); + fwnode_handle_put(child); + goto child_out; + } + + ret = ti_lmu_common_get_ramp_params(&priv->client->dev, child, &led->lmu_data); + if (ret) + dev_warn(&priv->client->dev, "runtime-ramp properties missing\n"); + + fwnode_property_read_string(child, "linux,default-trigger", + &led->led_dev.default_trigger); + + ret = fwnode_property_read_string(child, "label", &name); + if (ret) + snprintf(led->label, sizeof(led->label), + "%s::", priv->client->name); + else + snprintf(led->label, sizeof(led->label), + "%s:%s", priv->client->name, name); + + led->priv = priv; + led->led_dev.name = led->label; + led->led_dev.brightness_set_blocking = lm3697_brightness_set; + + ret = devm_led_classdev_register(priv->dev, &led->led_dev); + if (ret) { + dev_err(&priv->client->dev, "led register err: %d\n", + ret); + fwnode_handle_put(child); + goto child_out; + } + + i++; + } + +child_out: + return ret; +} + +static int lm3697_probe(struct i2c_client *client, + const struct i2c_device_id *id) +{ + struct lm3697 *led; + int count; + int ret; + + count = device_get_child_node_count(&client->dev); + if (!count) { + dev_err(&client->dev, "LEDs are not defined in device tree!"); + return -ENODEV; + } + + led = devm_kzalloc(&client->dev, struct_size(led, leds, count), + GFP_KERNEL); + if (!led) + return -ENOMEM; + + mutex_init(&led->lock); + i2c_set_clientdata(client, led); + + led->client = client; + led->dev = &client->dev; + led->regmap = devm_regmap_init_i2c(client, &lm3697_regmap_config); + if (IS_ERR(led->regmap)) { + ret = PTR_ERR(led->regmap); + dev_err(&client->dev, "Failed to allocate register map: %d\n", + ret); + return ret; + } + + ret = lm3697_probe_dt(led); + if (ret) + return ret; + + return lm3697_init(led); +} + +static int lm3697_remove(struct i2c_client *client) +{ + struct lm3697 *led = i2c_get_clientdata(client); + int ret; + + ret = regmap_update_bits(led->regmap, LM3697_CTRL_ENABLE, + LM3697_CTRL_A_B_EN, 0); + if (ret) { + dev_err(&led->client->dev, "Failed to disable the device\n"); + return ret; + } + + if (led->enable_gpio) + gpiod_direction_output(led->enable_gpio, 0); + + if (led->regulator) { + ret = regulator_disable(led->regulator); + if (ret) + dev_err(&led->client->dev, + "Failed to disable regulator\n"); + } + + mutex_destroy(&led->lock); + + return 0; +} + +static const struct i2c_device_id lm3697_id[] = { + { "lm3697", 0 }, + { } +}; +MODULE_DEVICE_TABLE(i2c, lm3697_id); + +static const struct of_device_id of_lm3697_leds_match[] = { + { .compatible = "ti,lm3697", }, + {}, +}; +MODULE_DEVICE_TABLE(of, of_lm3697_leds_match); + +static struct i2c_driver lm3697_driver = { + .driver = { + .name = "lm3697", + .of_match_table = of_lm3697_leds_match, + }, + .probe = lm3697_probe, + .remove = lm3697_remove, + .id_table = lm3697_id, +}; +module_i2c_driver(lm3697_driver); + +MODULE_DESCRIPTION("Texas Instruments LM3697 LED driver"); +MODULE_AUTHOR("Dan Murphy "); +MODULE_LICENSE("GPL v2"); From patchwork Wed Sep 26 13:09:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Murphy X-Patchwork-Id: 147590 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp704715lji; Wed, 26 Sep 2018 06:10:13 -0700 (PDT) X-Google-Smtp-Source: ACcGV63EnfcsTz/RSFInDVNqv3iQB9/hsCL0HDbhNnf1L2bHi0yARJdwTSbygqpje95aRIqJlybV X-Received: by 2002:a17:902:4d46:: with SMTP id o6-v6mr6067094plh.59.1537967413286; Wed, 26 Sep 2018 06:10:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537967413; cv=none; d=google.com; s=arc-20160816; b=ne4c9W5yuVdTJ/3BDQJmuPimm6huiyvJB2xhY8pv5+dXSwCbQrd8ylAisvfwOatCcL l0M3VibKa8i5xI7XgavZKUUwjruDAdpXyC2X2wW5AOb5BePmXzXRAzmNlWD/bz0pVqX+ ifCXgT+ZZhVSq3utBG1YcA69jUrWf8CU8q8pIB3jizSeFT+yfi4H5bRiHgmN9yMdeu0C gQeOKAxHPlddYwNztEkeYFn/4Rad+7X0yADhmkXjyU+F8vGEJA7LDWbJ0Ftiib6cHGlI gwF5bZXnI36TtOv2Dfx6ff4MxFtwSt27NDGGgsRaLUZW/ciRJvfcuP8tk6a0c0Dcg/e8 h6Ow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=SLaNrTbr5c0JIt7MHA43+1lR4bMOb4vjZXUhHH7B4oU=; b=zZXAab/Ohd7HYSWGMvU/Tpi8vTBFL6lEHRremxkD/VFZIQNhpMUbMtpCsMdYJREgBA gMwTFJ7cXJ5emnqpKzVAbpE97Rg6m9MSRmESh+ak8RE+Zx7/TZ4WjM0x/AtdmaLS/M1c PvTb1N7/9YsmcnjlmXigk0UNo1ziJzMmipPlwGE2j+m99Sv18ckw9SQjRM0e0xPpkPUW 33O6tbV7gx8YIyAgcAWmZ2W5QkT5Sighbo6Q2j/cH+fQf8k0nvvFyNIiLHr4CNukzx+2 wNzgKzwvE54VfQxHQ1iWaCzIK+5i+5JRALM5s4POtFf/F1Bkgnvf43Bj9Y27PBbpwfBb JNVA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=lK3Yv9cR; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id r21-v6si5262674pgl.257.2018.09.26.06.10.12; Wed, 26 Sep 2018 06:10:13 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=lK3Yv9cR; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728636AbeIZTXE (ORCPT + 32 others); Wed, 26 Sep 2018 15:23:04 -0400 Received: from lelv0143.ext.ti.com ([198.47.23.248]:41820 "EHLO lelv0143.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728475AbeIZTWs (ORCPT ); Wed, 26 Sep 2018 15:22:48 -0400 Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by lelv0143.ext.ti.com (8.15.2/8.15.2) with ESMTP id w8QD9oot059961; Wed, 26 Sep 2018 08:09:50 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1537967390; bh=SLaNrTbr5c0JIt7MHA43+1lR4bMOb4vjZXUhHH7B4oU=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=lK3Yv9cR6pA8ITyE6rN3dwA9Zunai1tDVk2TJyhgz55Qbxjr4X3cHiAgHw8Nb0vDd mR6SXjI72dDVsA4Z8J/s+rFOHrh1pZYHwf0N2QQ780g7sFQpwbjOR27l/lTHrh0q8/ hSRvH/5lvQgErEsWk82O5qjv/PYgmXLzl9oAz5XU= Received: from DFLE109.ent.ti.com (dfle109.ent.ti.com [10.64.6.30]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id w8QD9o49020255; Wed, 26 Sep 2018 08:09:50 -0500 Received: from DFLE100.ent.ti.com (10.64.6.21) by DFLE109.ent.ti.com (10.64.6.30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1466.3; Wed, 26 Sep 2018 08:09:49 -0500 Received: from dlep32.itg.ti.com (157.170.170.100) by DFLE100.ent.ti.com (10.64.6.21) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1466.3 via Frontend Transport; Wed, 26 Sep 2018 08:09:49 -0500 Received: from legion.dal.design.ti.com (legion.dal.design.ti.com [128.247.22.53]) by dlep32.itg.ti.com (8.14.3/8.13.8) with ESMTP id w8QD9n6I003567; Wed, 26 Sep 2018 08:09:49 -0500 Received: from localhost (a0272616local-lt.dhcp.ti.com [172.22.176.238]) by legion.dal.design.ti.com (8.11.7p1+Sun/8.11.7) with ESMTP id w8QD9mx11647; Wed, 26 Sep 2018 08:09:49 -0500 (CDT) From: Dan Murphy To: , , CC: , , , , , Dan Murphy Subject: [RFC PATCH 6/9] dt-bindings: leds: Add support for the LM3633 Date: Wed, 26 Sep 2018 08:09:18 -0500 Message-ID: <20180926130921.12329-7-dmurphy@ti.com> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20180926130921.12329-1-dmurphy@ti.com> References: <20180926130921.12329-1-dmurphy@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add support for the TI LM3633 LED driver. This device has 9 control banks 3 high voltage LED channels and 6 low voltage LED channels. Data sheet: http://www.ti.com/lit/ds/symlink/lm3633.pdf Signed-off-by: Dan Murphy --- .../devicetree/bindings/leds/leds-lm3633.txt | 69 +++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 Documentation/devicetree/bindings/leds/leds-lm3633.txt -- 2.19.0 diff --git a/Documentation/devicetree/bindings/leds/leds-lm3633.txt b/Documentation/devicetree/bindings/leds/leds-lm3633.txt new file mode 100644 index 000000000000..19571ad251ea --- /dev/null +++ b/Documentation/devicetree/bindings/leds/leds-lm3633.txt @@ -0,0 +1,69 @@ +* Texas Instruments - LM3633 Lighting Power Solution for Smartphone Handsets + +The LM3633 is a complete power source for +backlight, keypad, and indicator LEDs in smartphone +handsets. + +This device is suitable for display and keypad Lighting + +Required properties: + - compatible: + "ti,lm3633" + - reg : I2C slave address + - #address-cells : 1 + - #size-cells : 0 + +Optional properties: + - enable-gpios : GPIO pin to enable/disable the device + - vled-supply : LED supply + +Required child properties: + - reg : 0 - HVLED is Controlled by bank A + 1 - HVLED is Controlled by bank B + 2,3,4 - LVLED1, 2 and 3 are Controlled by bank C, D and E + 5,6,7 - LVLED4, 5 and 6 are Controlled by bank F, G and H + - led-sources : Indicates which LED string is associated to which + control bank. + 0 - LED is not active in this control bank + 1 - LED string is controlled by this control bank + +Optional child properties: + - label : see Documentation/devicetree/bindings/leds/common.txt + - linux,default-trigger : + see Documentation/devicetree/bindings/leds/common.txt + +Example: + +led-controller@36 { + compatible = "ti,lm3633"; + reg = <0x36>; + #address-cells = <1>; + #size-cells = <0>; + + enable-gpios = <&gpio1 28 GPIO_ACTIVE_HIGH>; + vled-supply = <&vbatt>; + + led@0 { + reg = <0>; + led-sources = <1 0 1>; + label = "white:first_backlight_cluster"; + linux,default-trigger = "backlight"; + }; + + led@1 { + reg = <1>; + led-sources = <0 1 0>; + label = "white:second_backlight_cluster"; + linux,default-trigger = "backlight"; + }; + + led@2 { + reg = <2>; + led-sources = <0 1 0>; + label = "white:indicator1"; + }; + +} + +For more product information please see the link below: +http://www.ti.com/lit/ds/symlink/lm3633.pdf From patchwork Wed Sep 26 13:09:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Murphy X-Patchwork-Id: 147592 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp704920lji; Wed, 26 Sep 2018 06:10:22 -0700 (PDT) X-Google-Smtp-Source: ACcGV62H/poiAdK+KaX4XqvSQZENM/Tdu0bTfulGIprgiCmX2WYOUUD8gycVUnBAO0l231q6gDlr X-Received: by 2002:a62:cdcf:: with SMTP id o198-v6mr6377974pfg.12.1537967422241; Wed, 26 Sep 2018 06:10:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537967422; cv=none; d=google.com; s=arc-20160816; b=qzopdyQVIKE81qsjBU6nK8MoMDKw0AVpa3sK1oSRgGJyg3SRepx7le5hC/i/hv/Kgy KeRJ6JQC07RofISn8OS4Yeuwb9cXFwW8v6+MjFJTRzhv+XzW9Utg7b2OQT4Lr/8gi3y2 VJ6Qrr2j9SEvRWBz8iXiNnnqul6iCyUnChCiXvfJdGYkvWjVLda7zVlgx8MXGrNYBFcF ByNFZZ0v5oPOUfBPadp0BTVANgFI645nnucFIlPJOUaI9fqo+FTa6YKyGS4JLbTmjew/ 5vUPVqbtLJWNLCFlVzk2VhXGqacsRvU1Eol4LN+Vu785p0/6xFQB022DaGOoKgwtwcim a8cg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=4HhnUTHee9Xjhob+0dNdMrGz/S1MYMjSYmFeZeYcDwE=; b=VSR/aroLvaDts5Hsf6MScqSdSEpddUg+rXKMDQyQQZvZt7TbPRs/x5ZatH0Cw9eCJX qRQSirakDW0ZqC1YSmzbNFejRIF0AdoaFw5+tIA40d+TskaWMiwuEejyM1aPCJHpAjao FiBa83Q18mKizOzqClslWApTb0L6ucA2omh2WAt3FkfvcIqD4YucZDST46ZB95UU36nu BY/lultKdrrYoKyR85Vaa9ejNQLP89ql9jSihziVmntpnQU/0s82kRIA6pumYS5TCddX fGH8oHy7KmVILfrGjhVIJkSh4rHHr8p+7Nksy1l5DOOdBzX/LSQSegOH1E4R+k9dDn3i nNTQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=SzSRE+Ya; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id w9-v6si4934357pfg.234.2018.09.26.06.10.21; Wed, 26 Sep 2018 06:10:22 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=SzSRE+Ya; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728658AbeIZTXN (ORCPT + 32 others); Wed, 26 Sep 2018 15:23:13 -0400 Received: from fllv0015.ext.ti.com ([198.47.19.141]:37564 "EHLO fllv0015.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727201AbeIZTWs (ORCPT ); Wed, 26 Sep 2018 15:22:48 -0400 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by fllv0015.ext.ti.com (8.15.2/8.15.2) with ESMTP id w8QD9peQ007653; Wed, 26 Sep 2018 08:09:51 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1537967391; bh=4HhnUTHee9Xjhob+0dNdMrGz/S1MYMjSYmFeZeYcDwE=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=SzSRE+Yah58aTzuxSLK6bOqPOTkn92UqiVRS4PyObZS43SJvza0g1NLLZuU6hzc4F ecfCuolAyD5qmmQ6DjtJsBDS//pYylVBT6+l+Yhr1NQI3I/grahpZN3yyjpkXYZoid wJd09iESO93gVyiWTY53pUHMK6DlEPh5tKqrFGck= Received: from DLEE115.ent.ti.com (dlee115.ent.ti.com [157.170.170.26]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id w8QD9pvq021367; Wed, 26 Sep 2018 08:09:51 -0500 Received: from DLEE109.ent.ti.com (157.170.170.41) by DLEE115.ent.ti.com (157.170.170.26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1466.3; Wed, 26 Sep 2018 08:09:51 -0500 Received: from dflp33.itg.ti.com (10.64.6.16) by DLEE109.ent.ti.com (157.170.170.41) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1466.3 via Frontend Transport; Wed, 26 Sep 2018 08:09:50 -0500 Received: from legion.dal.design.ti.com (legion.dal.design.ti.com [128.247.22.53]) by dflp33.itg.ti.com (8.14.3/8.13.8) with ESMTP id w8QD9ohh023742; Wed, 26 Sep 2018 08:09:50 -0500 Received: from localhost (a0272616local-lt.dhcp.ti.com [172.22.176.238]) by legion.dal.design.ti.com (8.11.7p1+Sun/8.11.7) with ESMTP id w8QD9ox11655; Wed, 26 Sep 2018 08:09:50 -0500 (CDT) From: Dan Murphy To: , , CC: , , , , , Dan Murphy Subject: [RFC PATCH 8/9] dt-bindings: leds: Add the LM3632 LED dt binding Date: Wed, 26 Sep 2018 08:09:20 -0500 Message-ID: <20180926130921.12329-9-dmurphy@ti.com> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20180926130921.12329-1-dmurphy@ti.com> References: <20180926130921.12329-1-dmurphy@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add the TI LM3632 LED binding. Signed-off-by: Dan Murphy --- .../devicetree/bindings/leds/leds-lm3632.txt | 53 +++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 Documentation/devicetree/bindings/leds/leds-lm3632.txt -- 2.19.0 diff --git a/Documentation/devicetree/bindings/leds/leds-lm3632.txt b/Documentation/devicetree/bindings/leds/leds-lm3632.txt new file mode 100644 index 000000000000..1befd17174ac --- /dev/null +++ b/Documentation/devicetree/bindings/leds/leds-lm3632.txt @@ -0,0 +1,53 @@ +* Texas Instruments - lm3632 Single-Chip Backlight and 1.5-A Flash LED Driver + +The LM3632A integrates LED drivers for both +the backlight of the LCD panel and the camera flash +along with the bias power for the LCD panel into one +device. + +Required properties: + - compatible : Can be one of the following + "ti,lm3632" + - reg : I2C slave address + - #address-cells : 1 + - #size-cells : 0 + +Required child properties: + - reg : 0 - Indicates a backlight mode + 1 - Indicates a Torch/Strobe (white LED) mode + +Required properties for flash LED child nodes: + See Documentation/devicetree/bindings/leds/common.txt + - flash-max-microamp : Range from 100mA - 1.5A + - flash-max-timeout-us : Range from 32ms - 1024ms + - led-max-microamp : Range from 25mA - 375mA + +Optional child properties: + - label : see Documentation/devicetree/bindings/leds/common.txt + - linux,default-trigger : + see Documentation/devicetree/bindings/leds/common.txt + +Example: +led-controller@11 { + compatible = "ti,lm3632"; + #address-cells = <1>; + #size-cells = <0>; + reg = <0x11>; + + led@0 { + reg = <0>; + label = "white:backlight"; + linux,default-trigger = "backlight"; + }; + + led@1 { + reg = <1>; + label = "white:torch"; + led-max-microamp = <375000>; + flash-max-microamp = <1500000>; + flash-max-timeout-us = <1000000>; + }; +} + +For more product information please see the links below: +http://www.ti.com/product/LM3632 From patchwork Wed Sep 26 13:09:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Murphy X-Patchwork-Id: 147589 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp704427lji; Wed, 26 Sep 2018 06:10:01 -0700 (PDT) X-Google-Smtp-Source: ACcGV621SgKocksbJT7/ERwB4Yhjnu+hI9vH+qNrREhaIABrp3+rxr8SNxQkViW47oBva/Xzty9F X-Received: by 2002:a17:902:bd4a:: with SMTP id b10-v6mr6142202plx.209.1537967401638; Wed, 26 Sep 2018 06:10:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537967401; cv=none; d=google.com; s=arc-20160816; b=CXsUBLwOJPxC0hfbxsGKt4sC6AJ06st4JiwRUkXeYD1kqDeiKzMdhgv/b5PhTRcPxJ +yAnIsWD+xw0724SSsXGKXEE3J8lYoXX25v20USQ16BFywaUpjwDoY6/sUlR9fLC1dks RZTylUAIQi6G2I0uD3k3wpdt8dtlpW22BTA3P2pGqVCon2AyB/ZR6B7YlHoZYBXdz920 smcLQvoGk5yoUuzqvhcDNyLGwRfooc05aYHxiWtqfpGh4fUgD0iYdfEv1whiq6C3TY2Q bILLZ8hLOUE4sGZ+POrWoxb/Qyax7pRhvUQUzMVHcr1BGYo0agD/dfwX5FuzGWu5f8HM ynxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=CcJYYkHEfaI49ZoD6ClXM8EAb9M+pWlXnzqBAuApOLg=; b=ReCHe1yukaLQjkN+Clnw72yS4lXiiqZy1N9fvUHHmnFRBf5McCcf9u2rg/1AeQ9ocb dr1oBUwDRwUvrlXT5z6Exh0kduguhs1Kq83OTk33ionGZth/c8meVL1lNg3YcQDxlLZp L8/lK9YHDJoTLi374fstHO0hD2JVsDDQTnnMLu8MFf1dpU8CfzzYxhYNj0aHjr5+8Scv FB9UHEqzPrcsJ6gNGn4AlM95GpaB6gqlkirg/KeALpBdviFpKZcL0vI167FIayl+bXLz TnTLJqoG4yPwZ53z2EFaDG0zuV9xkHp+Di+gfA1yDYeZm4nelc5/c/2gq21YSRWA2m7F e5rQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=gEX69S8k; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id s5-v6si4697443pgm.448.2018.09.26.06.10.01; Wed, 26 Sep 2018 06:10:01 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=gEX69S8k; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728625AbeIZTWw (ORCPT + 32 others); Wed, 26 Sep 2018 15:22:52 -0400 Received: from lelv0142.ext.ti.com ([198.47.23.249]:55124 "EHLO lelv0142.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728550AbeIZTWt (ORCPT ); Wed, 26 Sep 2018 15:22:49 -0400 Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by lelv0142.ext.ti.com (8.15.2/8.15.2) with ESMTP id w8QD9ptD014989; Wed, 26 Sep 2018 08:09:51 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1537967391; bh=CcJYYkHEfaI49ZoD6ClXM8EAb9M+pWlXnzqBAuApOLg=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=gEX69S8kXmZdxZDmHwNN4c7YHP9gG6x/eUYr7lnVLl2XYMPsEEQtuFjtl1Uj9vzQo eAJ8XTpNUWIdanTBX/kMT6gfO9lAtodPekBNFCsrHpR0t/cj/eY0DQipqjr8x7eg0f 8S/1pUz7Usm6PSQzirNsiWR1EW8adV1oQ1c5lPk8= Received: from DLEE115.ent.ti.com (dlee115.ent.ti.com [157.170.170.26]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id w8QD9pYZ020280; Wed, 26 Sep 2018 08:09:51 -0500 Received: from DLEE109.ent.ti.com (157.170.170.41) by DLEE115.ent.ti.com (157.170.170.26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1466.3; Wed, 26 Sep 2018 08:09:51 -0500 Received: from dlep33.itg.ti.com (157.170.170.75) by DLEE109.ent.ti.com (157.170.170.41) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1466.3 via Frontend Transport; Wed, 26 Sep 2018 08:09:51 -0500 Received: from legion.dal.design.ti.com (legion.dal.design.ti.com [128.247.22.53]) by dlep33.itg.ti.com (8.14.3/8.13.8) with ESMTP id w8QD9p89013925; Wed, 26 Sep 2018 08:09:51 -0500 Received: from localhost (a0272616local-lt.dhcp.ti.com [172.22.176.238]) by legion.dal.design.ti.com (8.11.7p1+Sun/8.11.7) with ESMTP id w8QD9ox11659; Wed, 26 Sep 2018 08:09:51 -0500 (CDT) From: Dan Murphy To: , , CC: , , , , , Dan Murphy Subject: [RFC PATCH 9/9] leds: lm3632: Introduce the TI LM3632 driver Date: Wed, 26 Sep 2018 08:09:21 -0500 Message-ID: <20180926130921.12329-10-dmurphy@ti.com> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20180926130921.12329-1-dmurphy@ti.com> References: <20180926130921.12329-1-dmurphy@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add the dedicated TI LM3632 LED driver. This LED device is capable of driving a backlight display. In addition to the backlight the device has control of a strobe and torch output. Data sheet: http://www.ti.com/lit/ds/symlink/lm3632a.pdf Signed-off-by: Dan Murphy --- drivers/leds/Kconfig | 9 +- drivers/leds/Makefile | 1 + drivers/leds/leds-lm3632.c | 547 +++++++++++++++++++++++++++++++++++++ 3 files changed, 556 insertions(+), 1 deletion(-) create mode 100644 drivers/leds/leds-lm3632.c -- 2.19.0 diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig index 1a78588d9806..7879b9048332 100644 --- a/drivers/leds/Kconfig +++ b/drivers/leds/Kconfig @@ -764,8 +764,15 @@ config LEDS_LM3697 This supports the LED device LM3697. config LEDS_LM3633 - tristate "LED driver for LM3633" + tristate "LED driver for LM3632" depends on LEDS_TI_LMU_COMMON + help + Say Y to enable the LED driver for TI LMU devices. + This supports the LED device LM3632. + +config LEDS_LM3632 + tristate "LED driver for LM3632" + depends on LEDS_TI_LMU_COMMON help Say Y to enable the LED driver for TI LMU devices. This supports the LED device LM3633. diff --git a/drivers/leds/Makefile b/drivers/leds/Makefile index 6ec006892fc0..53d02d7f1a0b 100644 --- a/drivers/leds/Makefile +++ b/drivers/leds/Makefile @@ -79,6 +79,7 @@ obj-$(CONFIG_LEDS_LM3692X) += leds-lm3692x.o obj-$(CONFIG_LEDS_SC27XX_BLTC) += leds-sc27xx-bltc.o obj-$(CONFIG_LEDS_LM3601X) += leds-lm3601x.o obj-$(CONFIG_LEDS_LM3697) += leds-lm3697.o +obj-$(CONFIG_LEDS_LM3632) += leds-lm3632.o obj-$(CONFIG_LEDS_LM3633) += leds-lm3633.o obj-$(CONFIG_LEDS_TI_LMU_COMMON) += ti-lmu-led-common.o diff --git a/drivers/leds/leds-lm3632.c b/drivers/leds/leds-lm3632.c new file mode 100644 index 000000000000..7d487cf423bc --- /dev/null +++ b/drivers/leds/leds-lm3632.c @@ -0,0 +1,547 @@ +// SPDX-License-Identifier: GPL-2.0 +// Flash and torch driver for Texas Instruments LM3632 LED +// Flash driver chip family +// Copyright (C) 2018 Texas Instruments Incorporated - http://www.ti.com/ + +#include +#include +#include +#include +#include +#include +#include +#include + +#include "ti-lmu-led-common.h" + +#define LM3632_MODE_BL 0x0 +#define LM3632_MODE_TORCH 0x1 + +/* Registers */ +#define LM3632_REV_REG 0x01 +#define LM3632_CFG1_REG 0x02 +#define LM3632_CFG2_REG 0x03 +#define LM3633_BL_BRT_LSB 0x04 +#define LM3633_BL_BRT_MSB 0x05 +#define LM3632_FLASH_TORCH_BRT 0x06 +#define LM3632_FLASH_CFG 0x07 +#define LM3632_ENABLE_REG 0x0a +#define LM3632_FLAGS1_REG 0x0b +#define LM3632_FLAGS2_REG 0x10 + +/* Enable Mode bits */ +#define LM3632_BL_EN BIT(0) +#define LM3632_STROBE_EN BIT(1) +#define LM3632_FLASH_MODE BIT(2) +#define LM3632_BLED1_2_EN BIT(3) +#define LM3632_BLED1_EN BIT(4) +#define LM3632_BL_OVP_EN BIT(6) +#define LM3632_SW_RESET BIT(7) + +/* Flags 1 Mask */ +#define LM3632_THERM_SHUTDOWN BIT(0) +#define LM3632_FLASH_TIME_OUT BIT(1) +#define LM3632_FLED_SHORT_FAULT BIT(2) +#define LM3632_VINM_SHORT_FAULT BIT(4) +#define LM3632_FOUT_SHORT_FAULT BIT(5) +#define LM3632_FLASH_OVP_FAULT BIT(6) +#define LM3632_BL_OVP_FAULT BIT(7) + +/* Flags 2 Mask */ +#define LM3632_BL_OCP_FAULT BIT(0) +#define LM3632_FLASH_OCP_FAULT BIT(1) +#define LM3632_VNEG_SHORT_FAULT BIT(2) +#define LM3632_VPOS_SHORT_FAULT BIT(3) +#define LM3632_VNEG_OVP_FAULT BIT(4) +#define LM3632_LCM_OVP_FAULT BIT(5) + +#define LM3632_TORCH_BRT_SHIFT 4 +#define LM3632_STROBE_REG_DIV 16 +#define LM3632_STROBE_STEP_UA 100000 + +#define LM3632_MAX_TORCH_I_UA 375000 +#define LM3632_MIN_TORCH_I_UA 2500 + +#define LM3632_MAX_STROBE_I_UA 1500000 +#define LM3632_MIN_STROBE_I_UA 10000 + +#define LM3632_TIMEOUT_MASK 0x1e +#define LM3632_ENABLE_MASK (LM3632_BL_EN | LM3632_STROBE_EN) + +#define LM3632_TIMEOUT_STEP_US 32000 +#define LM3632_MIN_TIMEOUT_US 32000 +#define LM3632_MAX_TIMEOUT_US 1024000 + +#define LM3632_TORCH_BRT_MASK 0x0f +#define LM3632_FLASH_BRT_MASK 0xf0 + +/** + * struct lm3632_led - + * @fled_cdev: flash LED class device pointer + * @led_name - LED label + * @led_dev - LED class device + * @priv - Pointer to the lm3632 struct + * @lmu_data - Register and setting values for common code + * @led_name: LED label for the Torch or IR LED + * @flash_timeout: the timeout for the flash + * @last_flag: last known flags register value + * @torch_current_max: maximum current for the torch + * @flash_current_max: maximum current for the flash + * @max_flash_timeout: maximum timeout for the flash + */ +struct lm3632_led { + struct led_classdev_flash fled_cdev; + char led_name[LED_MAX_NAME_SIZE]; + struct led_classdev led_dev; + struct ti_lmu_bank lmu_data; + struct lm3632 *priv; + + unsigned int flash_timeout; + unsigned int last_flag; + + u32 torch_current_max; + u32 flash_current_max; + u32 max_flash_timeout; +}; + +/** + * struct lm3632 - + * @client: Pointer to the I2C client + * @regmap: Devices register map + * @lock: Lock for reading/writing the device + * @leds - Array of LED strings + */ +struct lm3632 { + struct i2c_client *client; + struct regmap *regmap; + struct device *dev; + struct mutex lock; + + struct lm3632_led leds[]; +}; + +static const struct reg_default lm3632_regmap_defs[] = { + { LM3632_CFG1_REG, 0x30 }, + { LM3632_CFG2_REG, 0x0d }, + { LM3632_FLASH_CFG, 0x2f }, + { LM3632_ENABLE_REG, 0x00 }, +}; + +static bool lm3632_volatile_reg(struct device *dev, unsigned int reg) +{ + switch (reg) { + case LM3632_FLAGS1_REG: + case LM3632_FLAGS2_REG: + return true; + default: + return false; + } +} + +static const struct regmap_config lm3632_regmap = { + .reg_bits = 8, + .val_bits = 8, + + .max_register = LM3632_FLAGS2_REG, + .reg_defaults = lm3632_regmap_defs, + .num_reg_defaults = ARRAY_SIZE(lm3632_regmap_defs), + .cache_type = REGCACHE_RBTREE, + .volatile_reg = lm3632_volatile_reg, +}; + +static struct lm3632_led *fled_cdev_to_led(struct led_classdev_flash *fled_cdev) +{ + return container_of(fled_cdev, struct lm3632_led, fled_cdev); +} + +static int lm3632_read_faults(struct lm3632_led *led) +{ + struct lm3632 *priv = led->priv; + int flags_val; + int ret; + + ret = regmap_read(priv->regmap, LM3632_FLAGS1_REG, &flags_val); + if (ret < 0) + return -EIO; + + led->last_flag = 0; + + if (flags_val & LM3632_FLASH_OVP_FAULT) + led->last_flag |= LED_FAULT_OVER_VOLTAGE; + + if (flags_val & LM3632_THERM_SHUTDOWN) + led->last_flag |= LED_FAULT_OVER_TEMPERATURE; + + if (flags_val & (LM3632_FLED_SHORT_FAULT | LM3632_VINM_SHORT_FAULT | + LM3632_FOUT_SHORT_FAULT)) + led->last_flag |= LED_FAULT_SHORT_CIRCUIT; + + if (flags_val & LM3632_THERM_SHUTDOWN) + led->last_flag |= LED_FAULT_LED_OVER_TEMPERATURE; + + if (flags_val & LM3632_FLASH_TIME_OUT) + led->last_flag |= LED_FAULT_TIMEOUT; + + ret = regmap_read(priv->regmap, LM3632_FLAGS2_REG, &flags_val); + if (ret < 0) + return -EIO; + + if (flags_val & (LM3632_BL_OCP_FAULT | LM3632_FLASH_OCP_FAULT)) + led->last_flag |= LED_FAULT_OVER_CURRENT; + + if (flags_val & LM3632_FLASH_OCP_FAULT) + led->last_flag |= LED_FAULT_OVER_CURRENT; + + return led->last_flag; +} + +static int lm3632_backlight_brightness_set(struct led_classdev *cdev, + enum led_brightness brightness) +{ + struct lm3632_led *led = container_of(cdev, struct lm3632_led, + led_dev); + struct lm3632 *priv = led->priv; + int ret; + + mutex_lock(&priv->lock); + + ret = ti_lmu_common_set_brightness(&led->lmu_data, brightness); + if (ret) + dev_err(&priv->client->dev, "Cannot write brightness\n"); + + mutex_unlock(&priv->lock); + return ret; +} + +static int lm3632_strobe_flash_brightness_set(struct lm3632_led *led, + u8 brightness_val) +{ + struct lm3632 *priv = led->priv; + int ret; + + if (brightness_val == LED_OFF) { + ret = regmap_update_bits(priv->regmap, LM3632_ENABLE_REG, + LM3632_STROBE_EN, LED_OFF); + return ret; + } + + ret = regmap_update_bits(priv->regmap, LM3632_FLASH_TORCH_BRT, + LM3632_TORCH_BRT_MASK, brightness_val); + if (ret < 0) + return ret; + + return regmap_update_bits(priv->regmap, LM3632_ENABLE_REG, + LM3632_STROBE_EN, + LM3632_STROBE_EN); +} + +static int lm3632_torch_brightness_set(struct led_classdev *cdev, + enum led_brightness brightness) +{ + struct led_classdev_flash *fled_cdev = lcdev_to_flcdev(cdev); + struct lm3632_led *led = fled_cdev_to_led(fled_cdev); + struct lm3632 *priv = led->priv; + int ret, brightness_val; + + mutex_lock(&priv->lock); + + ret = lm3632_read_faults(led); + if (ret < 0) + goto out; + + brightness_val = (brightness / 16); + + ret = lm3632_strobe_flash_brightness_set(led, brightness_val); + +out: + mutex_unlock(&priv->lock); + return ret; +} + +static int lm3632_strobe_set(struct led_classdev_flash *fled_cdev, + bool state) +{ + struct lm3632_led *led = fled_cdev_to_led(fled_cdev); + struct lm3632 *priv = led->priv; + int timeout_reg_val; + int current_timeout; + int ret; + + mutex_lock(&priv->lock); + + ret = regmap_read(priv->regmap, LM3632_FLASH_CFG, ¤t_timeout); + if (ret < 0) + goto out; + + if (led->flash_timeout != current_timeout) + ret = regmap_update_bits(priv->regmap, LM3632_FLASH_CFG, + LM3632_TIMEOUT_MASK, timeout_reg_val); + + if (state) + ret = regmap_update_bits(priv->regmap, LM3632_ENABLE_REG, + LM3632_STROBE_EN, LM3632_STROBE_EN); + else + ret = regmap_update_bits(priv->regmap, LM3632_ENABLE_REG, + LM3632_STROBE_EN, LED_OFF); + + ret = lm3632_read_faults(led); +out: + mutex_unlock(&priv->lock); + return ret; +} + +static int lm3632_flash_brightness_set(struct led_classdev_flash *fled_cdev, + u32 brightness) +{ + struct lm3632_led *led = fled_cdev_to_led(fled_cdev); + struct lm3632 *priv = led->priv; + u8 brightness_val; + int ret; + + mutex_lock(&priv->lock); + ret = lm3632_read_faults(led); + if (ret < 0) + goto out; + + brightness_val = (brightness / 16) << LM3632_TORCH_BRT_SHIFT; + + ret = lm3632_strobe_flash_brightness_set(led, brightness_val); +out: + mutex_unlock(&priv->lock); + return ret; +} + +static int lm3632_flash_timeout_set(struct led_classdev_flash *fled_cdev, + u32 timeout) +{ + struct lm3632_led *led = fled_cdev_to_led(fled_cdev); + struct lm3632 *priv = led->priv; + + mutex_lock(&priv->lock); + + led->flash_timeout = timeout; + + mutex_unlock(&priv->lock); + + return 0; +} + +static int lm3632_strobe_get(struct led_classdev_flash *fled_cdev, bool *state) +{ + struct lm3632_led *led = fled_cdev_to_led(fled_cdev); + struct lm3632 *priv = led->priv; + int strobe_state; + int ret; + + mutex_lock(&priv->lock); + + ret = regmap_read(priv->regmap, LM3632_ENABLE_REG, &strobe_state); + if (ret < 0) + goto out; + + *state = strobe_state & LM3632_STROBE_EN; + +out: + mutex_unlock(&priv->lock); + return ret; +} + +static int lm3632_flash_fault_get(struct led_classdev_flash *fled_cdev, + u32 *fault) +{ + struct lm3632_led *led = fled_cdev_to_led(fled_cdev); + + lm3632_read_faults(led); + + *fault = led->last_flag; + + return 0; +} + +static const struct led_flash_ops flash_ops = { + .flash_brightness_set = lm3632_flash_brightness_set, + .strobe_set = lm3632_strobe_set, + .strobe_get = lm3632_strobe_get, + .timeout_set = lm3632_flash_timeout_set, + .fault_get = lm3632_flash_fault_get, +}; + +static int lm3632_register_strobe_leds(struct lm3632_led *led) +{ + struct led_classdev *led_cdev; + struct led_flash_setting *setting; + + led->fled_cdev.ops = &flash_ops; + + setting = &led->fled_cdev.timeout; + setting->min = LM3632_MIN_TIMEOUT_US; + setting->max = led->max_flash_timeout; + setting->step = LM3632_TIMEOUT_STEP_US; + setting->val = led->max_flash_timeout; + + setting = &led->fled_cdev.brightness; + setting->min = LM3632_MIN_STROBE_I_UA; + setting->max = led->flash_current_max; + setting->step = LM3632_STROBE_STEP_UA; + setting->val = led->flash_current_max; + + led_cdev = &led->fled_cdev.led_cdev; + led_cdev->name = led->led_name; + led_cdev->brightness_set_blocking = lm3632_torch_brightness_set; + led_cdev->max_brightness = led->torch_current_max; + + led_cdev->flags |= LED_DEV_CAP_FLASH; + + return led_classdev_flash_register(&led->priv->client->dev, &led->fled_cdev); +} + +static int lm3632_parse_node(struct lm3632 *priv) +{ + struct fwnode_handle *child = NULL; + struct lm3632_led *led; + int ret = -ENODEV; + const char *name; + u32 led_mode; + int i; + + device_for_each_child_node(priv->dev, child) { + ret = fwnode_property_read_u32(child, "reg", &led_mode); + if (ret) { + dev_err(&priv->client->dev, "reg DT property missing\n"); + goto out_err; + } + + if (led_mode < LM3632_MODE_TORCH || + led_mode > LM3632_MODE_BL) { + dev_warn(&priv->client->dev, "Invalid led mode requested\n"); + ret = -EINVAL; + goto out_err; + } + + led = &priv->leds[i]; + led->priv = priv; + + ret = fwnode_property_read_string(child, "label", &name); + if (ret) { + if (led_mode == LM3632_MODE_TORCH) + name = "torch"; + else + name = "backlight"; + } + + snprintf(led->led_name, sizeof(led->led_name), + "%s:%s", priv->client->name, name); + + if (led_mode == LM3632_MODE_TORCH) { + ret = fwnode_property_read_u32(child, "led-max-microamp", + &led->torch_current_max); + if (ret) { + dev_warn(&priv->client->dev, + "led-max-microamp DT property missing\n"); + goto out_err; + } + + ret = fwnode_property_read_u32(child, "flash-max-microamp", + &led->flash_current_max); + if (ret) { + dev_warn(&priv->client->dev, + "flash-max-microamp DT property missing\n"); + goto out_err; + } + + ret = fwnode_property_read_u32(child, "flash-max-timeout-us", + &led->max_flash_timeout); + if (ret) { + dev_warn(&priv->client->dev, + "flash-max-timeout-us DT property missing\n"); + goto out_err; + } + + ret = lm3632_register_strobe_leds(led); + if (ret) { + dev_warn(&priv->client->dev, + "Failed to register flash LEDs\n"); + goto out_err; + } + + } else { + led->led_dev.name = led->led_name; + led->led_dev.brightness_set_blocking = lm3632_backlight_brightness_set; + led->lmu_data.regmap = priv->regmap; + led->lmu_data.max_brightness = MAX_BRIGHTNESS_11BIT; + led->lmu_data.lsb_brightness_reg = LM3633_BL_BRT_LSB; + led->lmu_data.msb_brightness_reg = LM3633_BL_BRT_MSB; + + ret = devm_led_classdev_register(priv->dev, &led->led_dev); + } + + i++; + } +out_err: + fwnode_handle_put(child); + return ret; +} + +static int lm3632_probe(struct i2c_client *client) +{ + struct lm3632 *led; + int ret; + + led = devm_kzalloc(&client->dev, sizeof(*led), GFP_KERNEL); + if (!led) + return -ENOMEM; + + led->client = client; + led->dev = &client->dev; + i2c_set_clientdata(client, led); + + led->regmap = devm_regmap_init_i2c(client, &lm3632_regmap); + if (IS_ERR(led->regmap)) { + ret = PTR_ERR(led->regmap); + dev_err(&client->dev, + "Failed to allocate register map: %d\n", ret); + return ret; + } + + mutex_init(&led->lock); + + return lm3632_parse_node(led); +} + +static int lm3632_remove(struct i2c_client *client) +{ + struct lm3632 *led = i2c_get_clientdata(client); + +/* led_classdev_flash_unregister(&led->fled_cdev);*/ + mutex_destroy(&led->lock); + + return regmap_update_bits(led->regmap, LM3632_ENABLE_REG, + LM3632_ENABLE_MASK, 0x00); +} + +static const struct i2c_device_id lm3632_id[] = { + { "LM3632", 0 }, + { } +}; +MODULE_DEVICE_TABLE(i2c, lm3632_id); + +static const struct of_device_id of_lm3632_leds_match[] = { + { .compatible = "ti,lm3632", }, + { } +}; +MODULE_DEVICE_TABLE(of, of_lm3632_leds_match); + +static struct i2c_driver lm3632_i2c_driver = { + .driver = { + .name = "lm3632", + .of_match_table = of_lm3632_leds_match, + }, + .probe_new = lm3632_probe, + .remove = lm3632_remove, + .id_table = lm3632_id, +}; +module_i2c_driver(lm3632_i2c_driver); + +MODULE_DESCRIPTION("Texas Instruments Flash Lighting driver for LM3632"); +MODULE_AUTHOR("Dan Murphy "); +MODULE_LICENSE("GPL v2");