From patchwork Thu Mar 21 14:28:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Murphy X-Patchwork-Id: 160795 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp870442jan; Thu, 21 Mar 2019 07:29:35 -0700 (PDT) X-Google-Smtp-Source: APXvYqzxT5IpqJ1R9PizEbCvvRKhcMDUp2A63UYwttxcZhL/3TPyulmHSE9pEAlQvbiYT67C9Nfc X-Received: by 2002:a63:158:: with SMTP id 85mr3598537pgb.351.1553178575821; Thu, 21 Mar 2019 07:29:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553178575; cv=none; d=google.com; s=arc-20160816; b=ooeBZKIgBKUJYOWgw9HcMTia8J+WI+T7LaOhA0mNx4lBBtZL7jkF9K5yqBrPgjoP2U B8qjVXuGdjJbf7j+7NNFTGkSxxOByVQhLHCxGmNI0ezfySjMV/pfTeSNtgj0s0fCkMbn wqal73VvcCXFwCt98NZE6Xgj20FJ4VTYncsUSkSWFJJwLLnw4dy+k46qDMGpxfK2F6aw jtS5+Da9qByAPCYlYkW7BxGq71xwwxqv64WlvtkcQYK/RnigbACQgjKMbenkGn98sYmo Ad/9L1KY8u6jOwqTCi2xkV9BPGC6EPkfShB0uWDYFT5ZFYhah+oUO4Q1NIzuQsx458K1 ayOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:message-id:date:subject:cc :to:from:dkim-signature; bh=e96MrENnQ5ufJW+BM0+s+6fRlxBxT80/ub6fLJwQmjE=; b=LPqagLMrjsa9/yExFy308Jl2aMpWV8VE+JYxBJ5y/yjA/0S/Lk6H8A0UC6r50kYr+t LeZs8ig0I6NRzaAcgxBYG7QIo59151gkSdZbSRb+H6brxlW/wPw6zz/37M9IiYZLIL0T OeeGtk1yLxtU9cWiU4lK4WqQJ+jJWYsLAXNT6o0H7wIwieyIKF4P++8RjFQuM5XZH+7l G26j6XTV83mypYBcoyiPZxk9NnUMf5ZBDtnrNmqwkPho8R5L0GHYiqPZcBBWv7d88gZ4 SRYzUQPinZ1jdw+7Z0ipD5Z7AMobg6QE7TMQ4YCN4qcJb8pkgADInbRL30DePyc0qXTX ZutQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=iv06r2c5; 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 b13si2950659pgl.331.2019.03.21.07.29.35; Thu, 21 Mar 2019 07:29:35 -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=iv06r2c5; 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 S1728484AbfCUO3d (ORCPT + 31 others); Thu, 21 Mar 2019 10:29:33 -0400 Received: from lelv0143.ext.ti.com ([198.47.23.248]:43202 "EHLO lelv0143.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728166AbfCUO3O (ORCPT ); Thu, 21 Mar 2019 10:29:14 -0400 Received: from lelv0266.itg.ti.com ([10.180.67.225]) by lelv0143.ext.ti.com (8.15.2/8.15.2) with ESMTP id x2LET44Z098197; Thu, 21 Mar 2019 09:29:04 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1553178544; bh=e96MrENnQ5ufJW+BM0+s+6fRlxBxT80/ub6fLJwQmjE=; h=From:To:CC:Subject:Date; b=iv06r2c5I0SqhaGz9WTnqgeuQcD9BnLuKRFAvMXQuFoOFDU3dMUk2+T2yhsWwQts0 zV+59eWmKkNUnUC7F5X+dPIbjZ3DDSYvSkMgduwi6KAh/jFriEEophPXvx9nuyU2Xf EpE1SyiorZNyRO0wQwicq8UkJSq5GjTAYjw2J09E= Received: from DLEE110.ent.ti.com (dlee110.ent.ti.com [157.170.170.21]) by lelv0266.itg.ti.com (8.15.2/8.15.2) with ESMTPS id x2LET41l008322 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 21 Mar 2019 09:29:04 -0500 Received: from DLEE100.ent.ti.com (157.170.170.30) by DLEE110.ent.ti.com (157.170.170.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1713.5; Thu, 21 Mar 2019 09:29:04 -0500 Received: from dflp33.itg.ti.com (10.64.6.16) by DLEE100.ent.ti.com (157.170.170.30) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1713.5 via Frontend Transport; Thu, 21 Mar 2019 09:29:03 -0500 Received: from localhost (ileax41-snat.itg.ti.com [10.172.224.153]) by dflp33.itg.ti.com (8.14.3/8.13.8) with ESMTP id x2LET3vN004965; Thu, 21 Mar 2019 09:29:03 -0500 From: Dan Murphy To: , , , , CC: , , , Dan Murphy Subject: [PATCH 1/4] dt: lm3532: Add lm3532 dt doc and update ti_lmu doc Date: Thu, 21 Mar 2019 09:28:35 -0500 Message-ID: <20190321142838.22985-1-dmurphy@ti.com> X-Mailer: git-send-email 2.12.2 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 lm3532 device tree documentation. Remove lm3532 device tree reference from the ti_lmu devicetree documentation. With the addition of the dedicated lm3532 documentation the device can be removed from the ti_lmu.txt. The reason for this is that the lm3532 dt documentation now defines the ability to control LED output strings against different control banks or groups multiple strings to be controlled by a single control bank. Another addition was for ALS lighting control and configuration. The LM3532 has a feature that can take in the ALS reading from 2 separate ALS devices and adjust the brightness on the strings that are configured to support this feature. Finally the device specific properties were moved to the parent node as these properties are not control bank configurable. These include the runtime ramp and the ALS configuration. Reviewed-by: Rob Herring Signed-off-by: Dan Murphy --- v5 - Moved ramping range to below property definition, updated keyboard label - https://lore.kernel.org/patchwork/patch/1050412/ v4 - Appended "ti," to TI specific properties, add enable gpio documentation, removed an example, moved ramp to optional parent properties - https://lore.kernel.org/patchwork/patch/1050122/ v3 - No changes - https://lore.kernel.org/patchwork/patch/1049026/ v2 - Fixed ramp-up and ramp-down properties, removed hard coded property values, added ranges for variable properties, I did not change the label - https://lore.kernel.org/patchwork/patch/1048805/ .../devicetree/bindings/leds/leds-lm3532.txt | 101 ++++++++++++++++++ .../devicetree/bindings/mfd/ti-lmu.txt | 20 ---- 2 files changed, 101 insertions(+), 20 deletions(-) create mode 100644 Documentation/devicetree/bindings/leds/leds-lm3532.txt -- 2.21.0.5.gaeb582a983 diff --git a/Documentation/devicetree/bindings/leds/leds-lm3532.txt b/Documentation/devicetree/bindings/leds/leds-lm3532.txt new file mode 100644 index 000000000000..5bd0c025850f --- /dev/null +++ b/Documentation/devicetree/bindings/leds/leds-lm3532.txt @@ -0,0 +1,101 @@ +* Texas Instruments - lm3532 White LED driver with ambient light sensing +capability. + +The LM3532 provides the 3 high-voltage, low-side current sinks. The device is +programmable over an I2C-compatible interface and has independent +current control for all three channels. The adaptive current regulation +method allows for different LED currents in each current sink thus allowing +for a wide variety of backlight and keypad applications. + +The main features of the LM3532 include dual ambient light sensor inputs +each with 32 internal voltage setting resistors, 8-bit logarithmic and linear +brightness control, dual external PWM brightness control inputs, and up to +1000:1 dimming ratio with programmable fade in and fade out settings. + +Required properties: + - compatible : "ti,lm3532" + - reg : I2C slave address + - #address-cells : 1 + - #size-cells : 0 + +Optional properties: + - enable-gpios : gpio pin to enable (active high)/disable the device. + - ramp-up-us - The Run time ramp rates/step are from one current + set-point to another after the device has reached its + initial target set point from turn-on + - ramp-down-us - The Run time ramp rates/step are from one current + set-point to another after the device has reached its + initial target set point from turn-on + Range for ramp settings: 8us - 65536us + +Optional properties if ALS mode is used: + - ti,als-vmin - Minimum ALS voltage defined in Volts + - ti,als-vmax - Maximum ALS voltage defined in Volts + Per the data sheet the max ALS voltage is 2V and the min is 0V + + - ti,als1-imp-sel - ALS1 impedance resistor selection in Ohms + - ti,als2-imp-sel - ALS2 impedance resistor selection in Ohms + Range for impedance select: 37000 Ohms - 1190 Ohms + Values above 37kohms will be set to the "High Impedance" setting + + - ti,als-avrg-time-us - Determines the length of time the device needs to + average the two ALS inputs. This is only used if + the input mode is LM3532_ALS_INPUT_AVRG. + Range: 17920us - 2293760us + - ti,als-input-mode - Determines how the device uses the attached ALS + devices. + 0x00 - ALS1 and ALS2 input average + 0x01 - ALS1 Input + 0x02 - ALS2 Input + 0x03 - Max of ALS1 and ALS2 + +Required child properties: + - reg : Indicates control bank the LED string is controlled by + - led-sources : see Documentation/devicetree/bindings/leds/common.txt + - ti,led-mode : Defines if the LED strings are manually controlled or + if the LED strings are controlled by the ALS. + 0x00 - LED strings are I2C controlled via full scale + brightness control register + 0x01 - LED strings are ALS controlled + +Optional LED child properties: + - label : see Documentation/devicetree/bindings/leds/common.txt + - linux,default-trigger : + see Documentation/devicetree/bindings/leds/common.txt + +Example: +led-controller@38 { + compatible = "ti,lm3532"; + #address-cells = <1>; + #size-cells = <0>; + reg = <0x38>; + + enable-gpios = <&gpio6 12 GPIO_ACTIVE_HIGH>; + ramp-up-us = <1024>; + ramp-down-us = <65536>; + + ti,als-vmin = <0>; + ti,als-vmax = <2000>; + ti,als1-imp-sel = <4110>; + ti,als2-imp-sel = <2180>; + ti,als-avrg-time-us = <17920>; + ti,als-input-mode = <0x00>; + + lcd_backlight: led@0 { + reg = <0>; + led-sources = <2>; + ti,led-mode = <1>; + label = "backlight"; + linux,default-trigger = "backlight"; + }; + + led@1 { + reg = <1>; + led-sources = <1>; + ti,led-mode = <0>; + label = "platform::kbd_backlight"; + }; +}; + +For more product information please see the links below: +http://www.ti.com/product/LM3532 diff --git a/Documentation/devicetree/bindings/mfd/ti-lmu.txt b/Documentation/devicetree/bindings/mfd/ti-lmu.txt index c885cf89b8ce..980394d701a7 100644 --- a/Documentation/devicetree/bindings/mfd/ti-lmu.txt +++ b/Documentation/devicetree/bindings/mfd/ti-lmu.txt @@ -4,7 +4,6 @@ TI LMU driver supports lighting devices below. Name Child nodes ------ --------------------------------- - LM3532 Backlight LM3631 Backlight and regulator LM3632 Backlight and regulator LM3633 Backlight, LED and fault monitor @@ -13,7 +12,6 @@ TI LMU driver supports lighting devices below. Required properties: - compatible: Should be one of: - "ti,lm3532" "ti,lm3631" "ti,lm3632" "ti,lm3633" @@ -23,7 +21,6 @@ Required properties: 0x11 for LM3632 0x29 for LM3631 0x36 for LM3633, LM3697 - 0x38 for LM3532 0x63 for LM3695 Optional property: @@ -47,23 +44,6 @@ Optional nodes: [2] ../leds/leds-lm3633.txt [3] ../regulator/lm363x-regulator.txt -lm3532@38 { - compatible = "ti,lm3532"; - reg = <0x38>; - - enable-gpios = <&pioC 2 GPIO_ACTIVE_HIGH>; - - backlight { - compatible = "ti,lm3532-backlight"; - - lcd { - led-sources = <0 1 2>; - ramp-up-msec = <30>; - ramp-down-msec = <0>; - }; - }; -}; - lm3631@29 { compatible = "ti,lm3631"; reg = <0x29>; From patchwork Thu Mar 21 14:28:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Murphy X-Patchwork-Id: 160796 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp870618jan; Thu, 21 Mar 2019 07:29:48 -0700 (PDT) X-Google-Smtp-Source: APXvYqxrjkIAMPt4XzJZ2wheEw7oXRPS6JmTGqQNO4dBzy7S/km2powh4+kU8xsGIpyFTdHLkHlF X-Received: by 2002:a62:5142:: with SMTP id f63mr3645623pfb.57.1553178588088; Thu, 21 Mar 2019 07:29:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553178588; cv=none; d=google.com; s=arc-20160816; b=TO/+cTWAcanL6AxbCC2BeYUWvc6viLPF636MZoBjy2V7Z3zTEoN6eydaGtBlYsA6ex +V61G5FQ07nAEk9247yA8LAfKsV0Zyt+8CsUXorj83Yk7sw0rOGNvAc63dVqNtkzZe6l slqsJDqDDabx0hHETHDUPTHcous7uDzPgepAYAaevBpo3thxnNvUe6aTyTWI7X4JdwcS bD+0GEY2coawMK02x87Wi4pheLJpDOV68jy6WsTO0uO73fQIMAv0yg8jXriZCmdSE9VB Zgv/tLgb7IA3AAQpikXjLEOIV5NXvXpAzwP658ynH65ziUFgGgMrw6X8jCbehztH2fKH nLQQ== 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=uFi+1SzGXHIF123ig+D8JoF8Hv2kpWsHuTGuksp3bkw=; b=mLMJXRKQ16LzavuL5bjASirpJhqT5IeUO/nlSCvMJnYGGkDu/tOFaqPGL1qh0E76ED P2EhBsLPaslEZy084TzqNNN4BIAwo+IR0VxoAn9iF/dhctxnvle0IkyBUtBY5cwT9cQw 2idrhDLyykwDvZCV9A06zExS5e7qkVFU23MOwTcoeUAOawqTDLtXXacTM5Npo2Z5P5z8 +mMfF0vjumb/sH1qb2iNQrKWg3yKbE5BDxGITNYKiNUcEoLODvrdON8KuaQMmq3ewTg/ aYW1nS2RLFYtQTQgpkpYv90S+PSRTGeJJAFhD99kuv54YM5uEfD43bQW/vD7Nl48e68U OL2w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=KimGcrND; 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 v11si4218384pgh.570.2019.03.21.07.29.47; Thu, 21 Mar 2019 07:29:48 -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=KimGcrND; 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 S1728515AbfCUO3p (ORCPT + 31 others); Thu, 21 Mar 2019 10:29:45 -0400 Received: from fllv0016.ext.ti.com ([198.47.19.142]:54373 "EHLO fllv0016.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727823AbfCUO3O (ORCPT ); Thu, 21 Mar 2019 10:29:14 -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 x2LET5PR047537; Thu, 21 Mar 2019 09:29:05 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1553178545; bh=uFi+1SzGXHIF123ig+D8JoF8Hv2kpWsHuTGuksp3bkw=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=KimGcrNDaUZgrwrXm8jWVMubPfS83kjTf+q35he7dvgHwSgAIBElgxKRotT+pkXxY edQ+EQsVKGsSGK1C4JHW0n+7VkJBEzawKlLAbTni/WibZEFwNEY3AqDhQdLbmq48rL mwOOBcTMVVJ/SlfzpBWsHosEQDkeAfqfFbmHncCI= Received: from DLEE112.ent.ti.com (dlee112.ent.ti.com [157.170.170.23]) by fllv0035.itg.ti.com (8.15.2/8.15.2) with ESMTPS id x2LET5Fe025808 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 21 Mar 2019 09:29:05 -0500 Received: from DLEE107.ent.ti.com (157.170.170.37) 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.1713.5; Thu, 21 Mar 2019 09:29:04 -0500 Received: from dlep33.itg.ti.com (157.170.170.75) 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.1713.5 via Frontend Transport; Thu, 21 Mar 2019 09:29:04 -0500 Received: from localhost (ileax41-snat.itg.ti.com [10.172.224.153]) by dlep33.itg.ti.com (8.14.3/8.13.8) with ESMTP id x2LET4u5031315; Thu, 21 Mar 2019 09:29:04 -0500 From: Dan Murphy To: , , , , CC: , , , Dan Murphy Subject: [PATCH 3/4] mfd: ti-lmu: Remove LM3532 backlight driver references Date: Thu, 21 Mar 2019 09:28:37 -0500 Message-ID: <20190321142838.22985-3-dmurphy@ti.com> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20190321142838.22985-1-dmurphy@ti.com> References: <20190321142838.22985-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 the LM3532 backlight driver references from the ti-lmu code as dedicated driver support is available. Signed-off-by: Dan Murphy --- v5 - No changes - https://lore.kernel.org/patchwork/patch/1050411/ v4 - No changes - https://lore.kernel.org/patchwork/patch/1050123/ v3 - No changes - https://lore.kernel.org/patchwork/patch/1049025/ v2 - Removed LM3532 register definitions from ti-lmu-register - https://lore.kernel.org/patchwork/patch/1048808/ drivers/mfd/ti-lmu.c | 11 -------- include/linux/mfd/ti-lmu-register.h | 44 ----------------------------- include/linux/mfd/ti-lmu.h | 1 - 3 files changed, 56 deletions(-) -- 2.21.0.5.gaeb582a983 diff --git a/drivers/mfd/ti-lmu.c b/drivers/mfd/ti-lmu.c index 37d0bdb291c3..b06cb908d1aa 100644 --- a/drivers/mfd/ti-lmu.c +++ b/drivers/mfd/ti-lmu.c @@ -54,14 +54,6 @@ static void ti_lmu_disable_hw(void *data) gpiod_set_value(lmu->en_gpio, 0); } -static const struct mfd_cell lm3532_devices[] = { - { - .name = "ti-lmu-backlight", - .id = LM3532, - .of_compatible = "ti,lm3532-backlight", - }, -}; - #define LM363X_REGULATOR(_id) \ { \ .name = "lm363x-regulator", \ @@ -141,7 +133,6 @@ static const struct ti_lmu_data chip##_data = \ .max_register = max_reg, \ } \ -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); @@ -211,7 +202,6 @@ static int ti_lmu_probe(struct i2c_client *cl, const struct i2c_device_id *id) } 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 }, @@ -222,7 +212,6 @@ static const struct of_device_id ti_lmu_of_match[] = { MODULE_DEVICE_TABLE(of, ti_lmu_of_match); static const struct i2c_device_id ti_lmu_ids[] = { - { "lm3532", LM3532 }, { "lm3631", LM3631 }, { "lm3632", LM3632 }, { "lm3633", LM3633 }, diff --git a/include/linux/mfd/ti-lmu-register.h b/include/linux/mfd/ti-lmu-register.h index 2125c7c02818..f09510561a55 100644 --- a/include/linux/mfd/ti-lmu-register.h +++ b/include/linux/mfd/ti-lmu-register.h @@ -15,50 +15,6 @@ #include -/* LM3532 */ -#define LM3532_REG_OUTPUT_CFG 0x10 -#define LM3532_ILED1_CFG_MASK 0x03 -#define LM3532_ILED2_CFG_MASK 0x0C -#define LM3532_ILED3_CFG_MASK 0x30 -#define LM3532_ILED1_CFG_SHIFT 0 -#define LM3532_ILED2_CFG_SHIFT 2 -#define LM3532_ILED3_CFG_SHIFT 4 - -#define LM3532_REG_RAMPUP 0x12 -#define LM3532_REG_RAMPDN LM3532_REG_RAMPUP -#define LM3532_RAMPUP_MASK 0x07 -#define LM3532_RAMPUP_SHIFT 0 -#define LM3532_RAMPDN_MASK 0x38 -#define LM3532_RAMPDN_SHIFT 3 - -#define LM3532_REG_ENABLE 0x1D - -#define LM3532_REG_PWM_A_CFG 0x13 -#define LM3532_PWM_A_MASK 0x05 /* zone 0 */ -#define LM3532_PWM_ZONE_0 BIT(2) - -#define LM3532_REG_PWM_B_CFG 0x14 -#define LM3532_PWM_B_MASK 0x09 /* zone 1 */ -#define LM3532_PWM_ZONE_1 BIT(3) - -#define LM3532_REG_PWM_C_CFG 0x15 -#define LM3532_PWM_C_MASK 0x11 /* zone 2 */ -#define LM3532_PWM_ZONE_2 BIT(4) - -#define LM3532_REG_ZONE_CFG_A 0x16 -#define LM3532_REG_ZONE_CFG_B 0x18 -#define LM3532_REG_ZONE_CFG_C 0x1A -#define LM3532_ZONE_MASK (BIT(2) | BIT(3) | BIT(4)) -#define LM3532_ZONE_0 0 -#define LM3532_ZONE_1 BIT(2) -#define LM3532_ZONE_2 BIT(3) - -#define LM3532_REG_BRT_A 0x70 /* zone 0 */ -#define LM3532_REG_BRT_B 0x76 /* zone 1 */ -#define LM3532_REG_BRT_C 0x7C /* zone 2 */ - -#define LM3532_MAX_REG 0x7E - /* LM3631 */ #define LM3631_REG_DEVCTRL 0x00 #define LM3631_LCD_EN_MASK BIT(1) diff --git a/include/linux/mfd/ti-lmu.h b/include/linux/mfd/ti-lmu.h index 1ef51ed36be5..7762c1bce55d 100644 --- a/include/linux/mfd/ti-lmu.h +++ b/include/linux/mfd/ti-lmu.h @@ -22,7 +22,6 @@ #define LMU_EVENT_MONITOR_DONE 0x01 enum ti_lmu_id { - LM3532, LM3631, LM3632, LM3633,