From patchwork Thu Oct 11 16:51: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: 148662 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp2359256lji; Thu, 11 Oct 2018 09:52:24 -0700 (PDT) X-Google-Smtp-Source: ACcGV61+gVfFKA5vHM4oWzN4QB/hauN6nKWsoDSchFW1Jyfv0wMiQP3ss0vzMWd4IUG0UofOPRaZ X-Received: by 2002:a63:f553:: with SMTP id e19-v6mr2078463pgk.417.1539276744037; Thu, 11 Oct 2018 09:52:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1539276744; cv=none; d=google.com; s=arc-20160816; b=l57QJ93z+7gxkr56Sk52HS4IvH9oayJIkSRU35am24A+/knVGdUBIPe5tFFWMUTZMX gFlaAntF725aEvBKjg95sSrf87EUB+gtIYDUHa+9nd2cPMOWfu7g0cfqDCJSpv/KomNL 50KKXuzdWCc39kZQGAg3tbm6KbYvTewHsUY5urYpY8xr7m7942uIFCGd5oJBaXLOgN6u ylfv9XFVzJ7WbdcKSP6c4BrXwMVeoHF7Pv0KuS5WX2kzoJw41Ch8af61o7RKcgijzMBH Cmsu+RAC9HgfL/TF4RQSFv/ejALIt1LGaGxwHRNP7Vdu8/QBbuE7AOSKVlwcZzy7H/5y FIWA== 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=efEnbFYP4W1azU6WsZ4S4WhxUWcO5fXBAjaUL02VHZ4=; b=udx/WQZb2A06QIJzJXmaVpF9VFWKByKprdS9Enu/X6OUSxM8a7xbIqDiMBSpt15Nf2 wWd7eRGVagoajGmg+at6RG9XgsU5O5RJWUpdc+TUHat9qrIC74dNFAkXuKa6qgaAK3S7 WYb4Pa7mcIE5Ba6fNdWftDzoaQZmxRd1DvJCEu93AwZ8OsB2exd0hncdAq1el18AMUDC nVSLOhqKoiId7mGNle4smStHEHgzG3VcXDjWDaz7EkU0b5xneGkDek2Sw0x1HGBhY2qP ydwv9X8k3qQ17QVxd/Y+6OfHpylwBpw6Ku52tbUKJB5XYEeUYwcpLIrDzicL/eZwsi5n Njhg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=LuyOg0am; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-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 m1-v6si1957579plt.246.2018.10.11.09.52.23; Thu, 11 Oct 2018 09:52:24 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of devicetree-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=LuyOg0am; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-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 S1730916AbeJLAUZ (ORCPT + 6 others); Thu, 11 Oct 2018 20:20:25 -0400 Received: from lelv0142.ext.ti.com ([198.47.23.249]:49798 "EHLO lelv0142.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730552AbeJLATj (ORCPT ); Thu, 11 Oct 2018 20:19:39 -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 w9BGpSBu076255; Thu, 11 Oct 2018 11:51:28 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1539276688; bh=efEnbFYP4W1azU6WsZ4S4WhxUWcO5fXBAjaUL02VHZ4=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=LuyOg0ameZPf2B1OQlSKqzeOWQRQEu2kfoiKDNDwAdVK+mBzNwYd2d2O28ppijabQ aQPw97+HBoSj7OShR+URWDXBJzhGnei3WVXkFN6gHVKTD0nHHVyUrodv7hxJeL0WHK 1obeO9hRTZUm7uv/fOqap7KGN8b4u3fQxd0CydYw= 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 w9BGpSBr030195; Thu, 11 Oct 2018 11:51:28 -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; Thu, 11 Oct 2018 11:51:28 -0500 Received: from dflp32.itg.ti.com (10.64.6.15) 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; Thu, 11 Oct 2018 11:51:28 -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 w9BGpSKG006945; Thu, 11 Oct 2018 11:51:28 -0500 Received: from localhost (a0272616local-lt.dhcp.ti.com [172.22.172.124]) by legion.dal.design.ti.com (8.11.7p1+Sun/8.11.7) with ESMTP id w9BGpRx20803; Thu, 11 Oct 2018 11:51:28 -0500 (CDT) From: Dan Murphy To: , , CC: , , , , , Dan Murphy Subject: [PATCH v3 3/9] mfd: ti-lmu: Remove support for LM3697 Date: Thu, 11 Oct 2018 11:51:17 -0500 Message-ID: <20181011165123.32198-4-dmurphy@ti.com> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20181011165123.32198-1-dmurphy@ti.com> References: <20181011165123.32198-1-dmurphy@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@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, };