From patchwork Tue Oct 23 17:06: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: 149459 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp953654ljp; Tue, 23 Oct 2018 10:07:16 -0700 (PDT) X-Google-Smtp-Source: ACcGV62mM5b2hL4u+h0KJalBfG8tammAs7N5r1J/Pkb3o/LgdxvD2H8r0y2zDpfx+RzcSriiuDIf X-Received: by 2002:a62:5547:: with SMTP id j68-v6mr50409323pfb.166.1540314436230; Tue, 23 Oct 2018 10:07:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1540314436; cv=none; d=google.com; s=arc-20160816; b=BqCmX7cg2du8m8YcHKiKqMV5NxHC755Iuf5oqogMuBg6WCTwjAdt2x3D2vryYloy3i gnr7W0zvgg3UqjxRUTaQx6+sIAsXfnR0sNkN0ExQ/m027flTtjF02pfenbl0NwZ/abNH Jy0brx2jv1c8gLd+kF6/oDYLl7C7so/SHAywGc0R5BxbasjDfW6mZqcB0zdKTUv5h+Hb A6O5gkLURib2N9MFuCNGYnJgKagd33EPFG0VyOXjAOOJmKe9k6X3odqMBTRN+i9FBxDf QAEjnjCc4Fd804hb/v1w8ZMDLWCdHbxS9vvWL+7VcSDtnX3ocWQBnpL2DWNKWiBDdntz XLQw== 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; bh=gYDaF9q/3Nfpj/0UB0RgOex577pomeDPP+lnTzUGz2w=; b=z3+myUa/qeHm2dzmWT+p+Sd/1blyDtbUziz/EF/VwKCJbWDO3+vWorwgMueseNrdzC 7KIvKFKdhAH/QWRY4ViofzoxAkcp3gYGtBw7/MZXb8/PlOAwjYrkIMFskfQXJawlMmue u8TlKKgyWCh6yUNhS7ec4DQ91Gz8C/Xx3jSQ3mSi7kfZPMACq56Xvgz63JrD4ZIOWVOF JKCvOkXhsxoYIPQiUNa6aeHUnkFuh9SnTt01g/H2vHq2SxnFunpixZ701VPg7/l5n4q2 N3DAFlrOV7oMDepiIlh2qxReepeXLj/nyRHbGKu1nEfp0DwRcJjXr1ECU8HZCP88EC2g 9hfA== ARC-Authentication-Results: i=1; mx.google.com; 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=fail (p=QUARANTINE sp=NONE dis=QUARANTINE) 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 i64-v6si1794068pli.285.2018.10.23.10.07.15; Tue, 23 Oct 2018 10:07:16 -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; 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=fail (p=QUARANTINE sp=NONE dis=QUARANTINE) header.from=ti.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728853AbeJXBb1 (ORCPT + 32 others); Tue, 23 Oct 2018 21:31:27 -0400 Received: from fllv0016.ext.ti.com ([198.47.19.142]:53578 "EHLO fllv0016.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728462AbeJXBa4 (ORCPT ); Tue, 23 Oct 2018 21:30:56 -0400 Received: from lelv0265.itg.ti.com ([10.180.67.224]) by fllv0016.ext.ti.com (8.15.2/8.15.2) with ESMTP id w9NH6XoM056803; Tue, 23 Oct 2018 12:06:33 -0500 Received: from DLEE112.ent.ti.com (dlee112.ent.ti.com [157.170.170.23]) by lelv0265.itg.ti.com (8.15.2/8.15.2) with ESMTPS id w9NH6XVL111380 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Tue, 23 Oct 2018 12:06:33 -0500 Received: from DLEE114.ent.ti.com (157.170.170.25) by DLEE112.ent.ti.com (157.170.170.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1466.3; Tue, 23 Oct 2018 12:06:33 -0500 Received: from dflp32.itg.ti.com (10.64.6.15) by DLEE114.ent.ti.com (157.170.170.25) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1466.3 via Frontend Transport; Tue, 23 Oct 2018 12:06:33 -0500 Received: from legion.dal.design.ti.com (legion.dal.design.ti.com [128.247.22.53]) by dflp32.itg.ti.com (8.14.3/8.13.8) with ESMTP id w9NH6WTq005531; Tue, 23 Oct 2018 12:06:32 -0500 Received: from localhost (a0272616local-lt.dhcp.ti.com [172.22.171.190]) by legion.dal.design.ti.com (8.11.7p1+Sun/8.11.7) with ESMTP id w9NH6Wx15352; Tue, 23 Oct 2018 12:06:32 -0500 (CDT) From: Dan Murphy To: , , CC: , , , , , Dan Murphy Subject: [PATCH v4 2/7] dt-bindings: ti-lmu: Modify dt bindings for the LM3697 Date: Tue, 23 Oct 2018 12:06:18 -0500 Message-ID: <20181023170623.31820-2-dmurphy@ti.com> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20181023170623.31820-1-dmurphy@ti.com> References: <20181023170623.31820-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 The LM3697 is a single function LED driver. The single function LED driver needs to reside in the LED directory as a dedicated LED driver and not as a MFD device. The device does have common brightness and ramp features and those can be accomodated by a TI LMU framework. The LM3697 dt binding needs to be moved from the ti-lmu.txt and a dedicated LED dt binding needs to be added. The new LM3697 LED dt binding will then reside in the Documentation/devicetree/bindings/leds directory and follow the current LED and general bindings guidelines. Signed-off-by: Dan Murphy --- v4 - Squashed removal and addition of the dt bindings into a single patch - https://lore.kernel.org/patchwork/patch/998703/ .../devicetree/bindings/leds/leds-lm3697.txt | 98 +++++++++++++++++++ .../devicetree/bindings/mfd/ti-lmu.txt | 26 +---- 2 files changed, 99 insertions(+), 25 deletions(-) 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 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 Tue Oct 23 17:06:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Murphy X-Patchwork-Id: 149457 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp953259ljp; Tue, 23 Oct 2018 10:06:57 -0700 (PDT) X-Google-Smtp-Source: ACcGV61gplyMdEJBu3K1xzKnwhZzchVd4NKMSvMYqn3q1r7q3IF/sxPy6n1tS4yG3PdnJ+/iUgIn X-Received: by 2002:a17:902:24b:: with SMTP id 69-v6mr50556027plc.280.1540314417437; Tue, 23 Oct 2018 10:06:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1540314417; cv=none; d=google.com; s=arc-20160816; b=V4HWtzIikS0ABR+kBEkwrijXIzol1tqA2clWuoXKRvu6fECoTRSEqQ6dz8JJkPDnkR FXgD7YiXWwsZPzsZJtq0+hoa23Ws8qp4pJZhzy6uU92EVywJeJB26kVV5BpUiqS1pynj 2/X2/OXc3UUmoHEntMneJwnjwt8g+2sdT0kdNE9TA7AIucDPuW/rlHPYOIVLQOu2S3Nh pM/sOVH6WAUelfhKkTNB/3M35AE4xtkZP8cMPzX38TOVVhpNTz+CEHrtHc0GHC9qnTIb 7d1b3mMrmDhy+UirjqXowI9EA6JXXFmoh0Nw3lYrIc2dFEl/R8IAijyDNfFBN5WhvX1/ xwYw== 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; bh=efEnbFYP4W1azU6WsZ4S4WhxUWcO5fXBAjaUL02VHZ4=; b=PbEvWORh1uiM5v0teJgyC+huFk3bn3IXGewtwkgCtHsZDBVxUTEKSirdE9qcsHxCEz JyUUHk6+Nb/LnZQV+/UXjuohkGL5jcygozvGb0aQzzvSrfB3rtSZOok4FSEYAN1/OeVC +47ZgPYRJMVq9bjqKg0XKoq9CNmMQ2TsCk+Zs2vTVCS4jFUjHQ+EITfM+Uk+brZkEpar i7IpwIK2aDCNgBpMU6dFD6Jxa6ugjyipkyNwFLDtclPYW5lgLJ7zpl+mlwJr3ZTvUTGT YC0C3mF3IwtPNd9O4Pxx8Z5PTX/DIbGkgNnOZ53KD0VTHSosYuZeiBHkb/2Txl+HvuTX ePpQ== ARC-Authentication-Results: i=1; mx.google.com; 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=fail (p=QUARANTINE sp=NONE dis=QUARANTINE) 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 t1-v6si1779625pgf.262.2018.10.23.10.06.57; Tue, 23 Oct 2018 10:06: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; 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=fail (p=QUARANTINE sp=NONE dis=QUARANTINE) header.from=ti.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728844AbeJXBbJ (ORCPT + 32 others); Tue, 23 Oct 2018 21:31:09 -0400 Received: from lelv0142.ext.ti.com ([198.47.23.249]:48046 "EHLO lelv0142.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728745AbeJXBa5 (ORCPT ); Tue, 23 Oct 2018 21:30:57 -0400 Received: from lelv0265.itg.ti.com ([10.180.67.224]) by lelv0142.ext.ti.com (8.15.2/8.15.2) with ESMTP id w9NH6X0v100387; Tue, 23 Oct 2018 12:06:33 -0500 Received: from DFLE110.ent.ti.com (dfle110.ent.ti.com [10.64.6.31]) by lelv0265.itg.ti.com (8.15.2/8.15.2) with ESMTPS id w9NH6Xbk111390 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Tue, 23 Oct 2018 12:06:33 -0500 Received: from DFLE109.ent.ti.com (10.64.6.30) by DFLE110.ent.ti.com (10.64.6.31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1466.3; Tue, 23 Oct 2018 12:06:33 -0500 Received: from dlep33.itg.ti.com (157.170.170.75) by DFLE109.ent.ti.com (10.64.6.30) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1466.3 via Frontend Transport; Tue, 23 Oct 2018 12:06:33 -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 w9NH6Xc6011921; Tue, 23 Oct 2018 12:06:33 -0500 Received: from localhost (a0272616local-lt.dhcp.ti.com [172.22.171.190]) by legion.dal.design.ti.com (8.11.7p1+Sun/8.11.7) with ESMTP id w9NH6Xx15356; Tue, 23 Oct 2018 12:06:33 -0500 (CDT) From: Dan Murphy To: , , CC: , , , , , Dan Murphy Subject: [PATCH v4 3/7] mfd: ti-lmu: Remove support for LM3697 Date: Tue, 23 Oct 2018 12:06:19 -0500 Message-ID: <20181023170623.31820-3-dmurphy@ti.com> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20181023170623.31820-1-dmurphy@ti.com> References: <20181023170623.31820-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/leds/Kconfig | 2 +- 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 - 5 files changed, 2 insertions(+), 64 deletions(-) -- 2.19.0 diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig index dc717b30d9d3..853014dbb1c2 100644 --- a/drivers/leds/Kconfig +++ b/drivers/leds/Kconfig @@ -762,7 +762,7 @@ config LEDS_TI_LMU_COMMON help Say Y to enable the LED driver for TI LMU devices. This supports common features between the TI LM3532, LM3631, LM3632, - LM3633, LM3695 and LM3697. + LM3633, and LM3695. comment "LED Triggers" source "drivers/leds/trigger/Kconfig" 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 Tue Oct 23 17:06:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Murphy X-Patchwork-Id: 149458 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp953486ljp; Tue, 23 Oct 2018 10:07:08 -0700 (PDT) X-Google-Smtp-Source: ACcGV60m+PBKhZX3+gfQpjRSEDDIsQXh58pWPQpn1tJbOBmKOuVsN4piXLXwiPFKwiE0amiIaPeE X-Received: by 2002:a17:902:292a:: with SMTP id g39-v6mr49413985plb.269.1540314428605; Tue, 23 Oct 2018 10:07:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1540314428; cv=none; d=google.com; s=arc-20160816; b=lEl4rHF3sz+vCVOYbHP6hukW+tbebi2X2hOLxXBhDDST7huXzp6k/YvI+HWWeWvvWJ +4r/W+cl/QBp6pJRHKR17dh+Ma27OY4N4DoCpbrpiVKT4H10FdnnzAC0pZgX8s0xj9l2 t+zbs2lsZIINUJUYQjvqG0pIFDSt7Sv8R+0Tyl9XzkjyykHDdgpaT4wNEyOSndYo4ei9 LEbQTIbTytOwfIVP+Jt8So34WNatGalO0IMUwr0Yi20M4LMRvfGfvJRTbLhtFdG9/rn7 v7mTE1npyTqwKqHsEZNkb28vDB4h33np2IcO4OBxIgOl5y9VO3bPggQKGFMat3mkZVkt v2Aw== 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; bh=l0EbTxtv2IJBLd1aWuj/2+sweimkKU/boggcSbYKGq8=; b=gbkDO4QDUsSbk061Xtxnm5/5TZwrfqKG24zfzEEDObyZahhzPoBsR2s768E5bYd2Gm LOBr/SgaY0rqyUN/tQwTIw2gEGsLRo90aTqtz63j10h9LLcx8OE6vPoqSyR7MCCq0qvy 3Lw3Wxhn4AOcCgnls1oNGvOjWmjVOPhSI7y0iI1jolRtMoCZfrl9cqZzYMgmCnWxcToE oMuuNrgtQpyc5cgpy4vPCDvVlTmHXbHkoADUfIAbWWP3U9xcQW1w0ysHCXg7cTSp6ImT zSiFAPiGRynTBe59NXQwFEd7l6eml9NCREKJo3JzYlhXR6bb9G8pU4HqLS+ubeSizr6j XAFg== ARC-Authentication-Results: i=1; mx.google.com; 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=fail (p=QUARANTINE sp=NONE dis=QUARANTINE) 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 m14-v6si1931103pgd.282.2018.10.23.10.07.08; Tue, 23 Oct 2018 10:07:08 -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; 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=fail (p=QUARANTINE sp=NONE dis=QUARANTINE) header.from=ti.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728772AbeJXBa5 (ORCPT + 32 others); Tue, 23 Oct 2018 21:30:57 -0400 Received: from fllv0016.ext.ti.com ([198.47.19.142]:53576 "EHLO fllv0016.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728065AbeJXBaz (ORCPT ); Tue, 23 Oct 2018 21:30:55 -0400 Received: from fllv0035.itg.ti.com ([10.64.41.0]) by fllv0016.ext.ti.com (8.15.2/8.15.2) with ESMTP id w9NH6Zxp056817; Tue, 23 Oct 2018 12:06:35 -0500 Received: from DFLE114.ent.ti.com (dfle114.ent.ti.com [10.64.6.35]) by fllv0035.itg.ti.com (8.15.2/8.15.2) with ESMTPS id w9NH6Z9P127603 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Tue, 23 Oct 2018 12:06:35 -0500 Received: from DFLE114.ent.ti.com (10.64.6.35) by DFLE114.ent.ti.com (10.64.6.35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1466.3; Tue, 23 Oct 2018 12:06:35 -0500 Received: from dflp32.itg.ti.com (10.64.6.15) by DFLE114.ent.ti.com (10.64.6.35) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1466.3 via Frontend Transport; Tue, 23 Oct 2018 12:06:35 -0500 Received: from legion.dal.design.ti.com (legion.dal.design.ti.com [128.247.22.53]) by dflp32.itg.ti.com (8.14.3/8.13.8) with ESMTP id w9NH6YZ1005566; Tue, 23 Oct 2018 12:06:34 -0500 Received: from localhost (a0272616local-lt.dhcp.ti.com [172.22.171.190]) by legion.dal.design.ti.com (8.11.7p1+Sun/8.11.7) with ESMTP id w9NH6Yx15370; Tue, 23 Oct 2018 12:06:34 -0500 (CDT) From: Dan Murphy To: , , CC: , , , , , Dan Murphy Subject: [PATCH v4 6/7] mfd: ti-lmu: Remove support for LM3633 Date: Tue, 23 Oct 2018 12:06:22 -0500 Message-ID: <20181023170623.31820-6-dmurphy@ti.com> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20181023170623.31820-1-dmurphy@ti.com> References: <20181023170623.31820-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 LM3633 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 | 21 --------------------- 2 files changed, 1 insertion(+), 22 deletions(-) -- 2.19.0 diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig index 9b04dd527c68..225cb3be350c 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, and LM3695. + TI LMU MFD supports LM3532, LM3631, LM3632, 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 b6bfa99a29dd..2cf8a23cba52 100644 --- a/drivers/mfd/ti-lmu.c +++ b/drivers/mfd/ti-lmu.c @@ -102,24 +102,6 @@ static struct mfd_cell lm3632_devices[] = { }, }; -static struct mfd_cell lm3633_devices[] = { - { - .name = "ti-lmu-backlight", - .id = LM3633, - .of_compatible = "ti,lm3633-backlight", - }, - { - .name = "lm3633-leds", - .of_compatible = "ti,lm3633-leds", - }, - /* Monitoring driver for open/short circuit detection */ - { - .name = "ti-lmu-fault-monitor", - .id = LM3633, - .of_compatible = "ti,lm3633-fault-monitor", - }, -}; - static struct mfd_cell lm3695_devices[] = { { .name = "ti-lmu-backlight", @@ -139,14 +121,12 @@ static const struct ti_lmu_data chip##_data = \ TI_LMU_DATA(lm3532, LM3532_MAX_REG); 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); static const struct of_device_id ti_lmu_of_match[] = { { .compatible = "ti,lm3532", .data = &lm3532_data }, { .compatible = "ti,lm3631", .data = &lm3631_data }, { .compatible = "ti,lm3632", .data = &lm3632_data }, - { .compatible = "ti,lm3633", .data = &lm3633_data }, { .compatible = "ti,lm3695", .data = &lm3695_data }, { } }; @@ -219,7 +199,6 @@ static const struct i2c_device_id ti_lmu_ids[] = { { "lm3532", LM3532 }, { "lm3631", LM3631 }, { "lm3632", LM3632 }, - { "lm3633", LM3633 }, { "lm3695", LM3695 }, { } };