From patchwork Mon Mar 25 14:24:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Murphy X-Patchwork-Id: 161117 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp4034930jan; Mon, 25 Mar 2019 07:24:59 -0700 (PDT) X-Google-Smtp-Source: APXvYqzY46K2CU7PGx1TGpbC370iVAgp9jU0iEgS7q6aIvDR9KwIHu+t6yqe/3iPLaX8E5GmM/ZI X-Received: by 2002:a17:902:b43:: with SMTP id 61mr25253227plq.83.1553523899255; Mon, 25 Mar 2019 07:24:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553523899; cv=none; d=google.com; s=arc-20160816; b=gCFbOeAZlkUdMzSoXxRVBJ5WsyVExXLVXJp+p+M8GOPMgaBSXz2OCyjaLtK1JbkxCW nwj4GqME5z+SGhJdlkV9ClcgLCZyw57TcIjHpwmDFqLeAFFMQEs9kr2nKvHR/mHDxPD4 pmSkXgLavYbecK3qXmwB0PxPiSp59EtTVyMsPap/fKoY4zTnV5Hl4rCoH2eIam2kf6da lSe/hK5bwxfPPfC52EOXq7gyGxnrZCs4jHpFa50BIhXRnA/vQ03U2ULQMihqunLGWiTT sQJBRd757kU9Ku5VT/6uPFOq+zhJjaZPknEdHBkSLufLmnyNyEWwyKHziUr5eELDHqeU r80g== 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=J2uvelxDsPpZtJL/cGz42C2yVq/yUZNB6Lzrw9xP4Zg=; b=IhFzVXCNiwc8uVHJuuY5T/v2YaMdWihxCH42Dpw1h2UxuC4m/aGlt5ndxS4yU3ssxU EJbbWz9VMaRppSiRpF82WRyVzoo3ioe9tLpljugvqEU9bV/wR/wTbLnCpo43lCb+Ws3R 1miU/wzRCSAB/iBaHDsGyn2qij8OLHyzJPXyBVI2T0dyX1XnUa/Lj0iiuq8ReVwtfrUn uP6wvMqIMvI4BhtgBPcrOCUfXqOlmvwhDIC3ajIi26UcIV6fiBOqYRFrFvPuR0/oWPNg GFjxkBHiamLL0nNjdPVsAIW32jNWfgPI4aRnpAvj21wEMNhst6aHPXpXb/wxIsfenGrv M+7w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=R5tHY0Ox; 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 o16si14330581pgc.327.2019.03.25.07.24.58; Mon, 25 Mar 2019 07:24:59 -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=R5tHY0Ox; 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 S1726237AbfCYOY5 (ORCPT + 31 others); Mon, 25 Mar 2019 10:24:57 -0400 Received: from lelv0143.ext.ti.com ([198.47.23.248]:54630 "EHLO lelv0143.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726243AbfCYOYj (ORCPT ); Mon, 25 Mar 2019 10:24:39 -0400 Received: from fllv0034.itg.ti.com ([10.64.40.246]) by lelv0143.ext.ti.com (8.15.2/8.15.2) with ESMTP id x2PEOYdT084127; Mon, 25 Mar 2019 09:24:34 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1553523874; bh=J2uvelxDsPpZtJL/cGz42C2yVq/yUZNB6Lzrw9xP4Zg=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=R5tHY0OxCpZN5Vx6TFfdjx6KoshZCgItcSuAcrB1I3v1lFBbpepU01FlGrrwOepq5 y+xVW2QeFas4YoWCicPgvP+0q9rhhmxud8IIkDblK0+47UQlWwZRICNY4gCeiFLfl0 mLrtiXteSlwZIo3KoiWZ9LmzDie7F8NnpLnfCPo8= Received: from DLEE115.ent.ti.com (dlee115.ent.ti.com [157.170.170.26]) by fllv0034.itg.ti.com (8.15.2/8.15.2) with ESMTPS id x2PEOYS1023294 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Mon, 25 Mar 2019 09:24:34 -0500 Received: from DLEE104.ent.ti.com (157.170.170.34) 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.1713.5; Mon, 25 Mar 2019 09:24:33 -0500 Received: from dflp32.itg.ti.com (10.64.6.15) by DLEE104.ent.ti.com (157.170.170.34) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1713.5 via Frontend Transport; Mon, 25 Mar 2019 09:24:33 -0500 Received: from localhost (ileax41-snat.itg.ti.com [10.172.224.153]) by dflp32.itg.ti.com (8.14.3/8.13.8) with ESMTP id x2PEOXb9000857; Mon, 25 Mar 2019 09:24:33 -0500 From: Dan Murphy To: , , CC: , , Dan Murphy Subject: [PATCH 4/5] mfd: ti-lmu: Remove support for LM3697 Date: Mon, 25 Mar 2019 09:24:02 -0500 Message-ID: <20190325142403.30447-5-dmurphy@ti.com> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20190325142403.30447-1-dmurphy@ti.com> References: <20190325142403.30447-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 3ae24eaf4cde..735009e73414 100644 --- a/drivers/leds/Kconfig +++ b/drivers/leds/Kconfig @@ -782,7 +782,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 0ce2d8dfc5f1..fa70ea209ec6 100644 --- a/drivers/mfd/Kconfig +++ b/drivers/mfd/Kconfig @@ -1312,7 +1312,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 b06cb908d1aa..89b1c5b584af 100644 --- a/drivers/mfd/ti-lmu.c +++ b/drivers/mfd/ti-lmu.c @@ -111,20 +111,6 @@ static const struct mfd_cell lm3695_devices[] = { }, }; -static const 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 = \ { \ @@ -137,7 +123,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 int ti_lmu_probe(struct i2c_client *cl, const struct i2c_device_id *id) { @@ -206,7 +191,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); @@ -216,7 +200,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 f09510561a55..76998b01764b 100644 --- a/include/linux/mfd/ti-lmu-register.h +++ b/include/linux/mfd/ti-lmu-register.h @@ -189,48 +189,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 7762c1bce55d..54e9d272e81c 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, };