Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp1588758pxb; Mon, 22 Feb 2021 06:06:39 -0800 (PST) X-Google-Smtp-Source: ABdhPJxSXOB9U2ZCvYquBxhe4MpGvhagI8/IipeOMA5PHOEkgv8VvgxHLNA8euiRnsQavasI0ffj X-Received: by 2002:aa7:ca57:: with SMTP id j23mr23083710edt.293.1614002799688; Mon, 22 Feb 2021 06:06:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1614002799; cv=none; d=google.com; s=arc-20160816; b=LJCjyD7SwDVzfwwS+Hfw/Zn+Mr6vY8n5l5RjECRx8VRhUC1JtigEuqZrjflXm8sWGt 6N9J6ch96gkcH7zmt7Dy0GVeU+tTLoX1cqGoiilkEpJNCNLRHFiju455FtGYZQXDkC1a szvQy/tyvH4SJD++txdqxosPiBz8kjMPulGRzjzXc/gp6ULjyDZ2cvqGUWDUNxx85lA8 L1c/9HY0rzL27QBYS2LzELW6aYnZ15QohCbFDXHC4CyNUXHfXHpcMxBztsGWj6QAytwT UlQOjd/Y7iy2j82HmAElpTCR7SclaKUjbfGI3E3dCdehBFdzaMCicbU7Ti085+EHS7c/ ledw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=lNQEF/e7HRtFmBF7/uDejBBe9+Y0iuGhAtdZ8+fnUk4=; b=Qu35o7FDIJGpU8BAe7ODfgLxxkqyfLF9mYxVoOiCExVAMaBh5wG9G3pHUoAzuS4kfD zHzmBV2ysXt2PVQlX7vjUgre8tctGSNiT4+99UjpP63iHyH+kXjk5DywT3j91x7J6bPQ sG7sCpnhrRlNo9WfKIp9rf9Y6UBawoJVLdc7ehZZCRoQOHuDqApPTp+4yIVdu80rlLPG Zb8Wi+AINvSxStZu1ufm33UURrVBy0b24CsGJPduc9MvAZe6ehMyAXdEnF2bhZ8gsoo/ YFC6U+Hgd5haUKkNOQJV2ZJMovpqVhDnQzpDl+aor2W25LK8r4+yHqSR6to28nRpj2HS 3swA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b="mZ/MV4GM"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id y26si10928723edw.372.2021.02.22.06.06.16; Mon, 22 Feb 2021 06:06:39 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b="mZ/MV4GM"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231225AbhBVOFi (ORCPT + 99 others); Mon, 22 Feb 2021 09:05:38 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41470 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232033AbhBVNIm (ORCPT ); Mon, 22 Feb 2021 08:08:42 -0500 Received: from mail-wm1-x32c.google.com (mail-wm1-x32c.google.com [IPv6:2a00:1450:4864:20::32c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8CC7FC061794; Mon, 22 Feb 2021 05:07:57 -0800 (PST) Received: by mail-wm1-x32c.google.com with SMTP id v62so14261054wmg.4; Mon, 22 Feb 2021 05:07:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=lNQEF/e7HRtFmBF7/uDejBBe9+Y0iuGhAtdZ8+fnUk4=; b=mZ/MV4GMOcL9JxgczXB43ck2r9ILCHKlQI3FR592gf0PDVAoC6u7VJF/qhB3nNWqbd stkpFcVCDZLHsqNCDRzQG0rlRYju3+kO1nZ8cimWlW9BrngqHTnT1rzIdrEKk5zfh/2l 4OHXTHDXfLyAIOzRVObrqZQEGKvqIn8Op4/VcSB1oEq7ugr7eIQV6gfyLxOa8W2+dNb5 6EM0fKC/01itCPWLJECVHSjWWYt7Vm2VwPQ0g4gutV9i/37JqGChcEm/qEiAgZiDfpVP kWxsy7u4KLkZ0II7q4m6Y8e+Hjvy+vO2Db3GGNSVHW7hiao4W1aI2ODc69qtB6dwrC9z 5HHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=lNQEF/e7HRtFmBF7/uDejBBe9+Y0iuGhAtdZ8+fnUk4=; b=MUtKLFwcpgLEW7lOLCLcZ/liJGbD4t05LVWvf2FBt3c3Ya76oAmD7HQP5VdznIuEsB RZl2UfKG6xvmPLA/dxujeLJwmoUZQspnelCTfPq1vLqNniU76m40UhZ5Rp76/tSrjvEm elO/Y2ofnxsjt3J3QGTl3XBy7TeZ4zGOdCjRJ1XZBy8LL8rlEtaacQdrf+wFB8zLHfWW Wna1yAm2QwVDBNoFLQkzkGTsZxanKMT/gXtImVHthoTuxIIN1mOtckfxhiZg04iOO0rT 6N52mwctDQVn6qCOFzhCf06/3LOFMABNhtkzvm7AeYIeANwP16pIZo8Hh8KuKsrzk2CX Qs6g== X-Gm-Message-State: AOAM532VAPjrjfqz932X8sU0kdgQbutgKZp6rXXdluWRLE8XCC1yw+eF I2EJ7KIfPqkduP+MRtthN84= X-Received: by 2002:a1c:1dcc:: with SMTP id d195mr20632901wmd.42.1613999276320; Mon, 22 Feb 2021 05:07:56 -0800 (PST) Received: from valhalla.home ([2.31.224.123]) by smtp.gmail.com with ESMTPSA id t198sm26575828wmt.7.2021.02.22.05.07.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Feb 2021 05:07:55 -0800 (PST) From: Daniel Scally To: tfiga@chromium.org, sakari.ailus@linux.intel.com, rajmohan.mani@intel.com, rjw@rjwysocki.net, lenb@kernel.org, mika.westerberg@linux.intel.com, linus.walleij@linaro.org, bgolaszewski@baylibre.com, wsa@kernel.org, lee.jones@linaro.org Cc: andy.shevchenko@linux.intel.com, kieran.bingham+renesas@ideasonboard.com, laurent.pinchart@ideasonboard.com, hdegoede@redhat.com, mgross@linux.intel.com, luzmaximilian@gmail.com, robert.moore@intel.com, erik.kaneda@intel.com, me@fabwu.ch, linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, linux-gpio@vger.kernel.org, linux-i2c@vger.kernel.org, platform-driver-x86@vger.kernel.org, devel@acpica.org Subject: [PATCH v3 6/6] mfd: tps68470: Remove tps68470 MFD driver Date: Mon, 22 Feb 2021 13:07:35 +0000 Message-Id: <20210222130735.1313443-7-djrscally@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210222130735.1313443-1-djrscally@gmail.com> References: <20210222130735.1313443-1-djrscally@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This driver only covered one scenario in which ACPI devices with _HID INT3472 are found, and its functionality has been taken over by the intel-skl-int3472 module, so remove it. Reviewed-by: Laurent Pinchart Signed-off-by: Daniel Scally --- Changes in v3: - Replaced Kconfig dependencies with INTEL_SKL_INT3472 for the tps68470 OpRegion and GPIO drivers. drivers/acpi/pmic/Kconfig | 2 +- drivers/gpio/Kconfig | 2 +- drivers/mfd/Kconfig | 18 -------- drivers/mfd/Makefile | 1 - drivers/mfd/tps68470.c | 97 --------------------------------------- 5 files changed, 2 insertions(+), 118 deletions(-) delete mode 100644 drivers/mfd/tps68470.c diff --git a/drivers/acpi/pmic/Kconfig b/drivers/acpi/pmic/Kconfig index 56bbcb2ce61b..f84b8f6038dc 100644 --- a/drivers/acpi/pmic/Kconfig +++ b/drivers/acpi/pmic/Kconfig @@ -52,7 +52,7 @@ endif # PMIC_OPREGION config TPS68470_PMIC_OPREGION bool "ACPI operation region support for TPS68470 PMIC" - depends on MFD_TPS68470 + depends on INTEL_SKL_INT3472 help This config adds ACPI operation region support for TI TPS68470 PMIC. TPS68470 device is an advanced power management unit that powers diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig index c70f46e80a3b..998898c72af8 100644 --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig @@ -1343,7 +1343,7 @@ config GPIO_TPS65912 config GPIO_TPS68470 bool "TPS68470 GPIO" - depends on MFD_TPS68470 + depends on INTEL_SKL_INT3472 help Select this option to enable GPIO driver for the TPS68470 chip family. diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig index bdfce7b15621..9a1f648efde0 100644 --- a/drivers/mfd/Kconfig +++ b/drivers/mfd/Kconfig @@ -1520,24 +1520,6 @@ config MFD_TPS65217 This driver can also be built as a module. If so, the module will be called tps65217. -config MFD_TPS68470 - bool "TI TPS68470 Power Management / LED chips" - depends on ACPI && PCI && I2C=y - depends on I2C_DESIGNWARE_PLATFORM=y - select MFD_CORE - select REGMAP_I2C - help - If you say yes here you get support for the TPS68470 series of - Power Management / LED chips. - - These include voltage regulators, LEDs and other features - that are often used in portable devices. - - This option is a bool as it provides an ACPI operation - region, which must be available before any of the devices - using this are probed. This option also configures the - designware-i2c driver to be built-in, for the same reason. - config MFD_TI_LP873X tristate "TI LP873X Power Management IC" depends on I2C diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile index 14fdb188af02..5994e812f479 100644 --- a/drivers/mfd/Makefile +++ b/drivers/mfd/Makefile @@ -105,7 +105,6 @@ obj-$(CONFIG_MFD_TPS65910) += tps65910.o obj-$(CONFIG_MFD_TPS65912) += tps65912-core.o obj-$(CONFIG_MFD_TPS65912_I2C) += tps65912-i2c.o obj-$(CONFIG_MFD_TPS65912_SPI) += tps65912-spi.o -obj-$(CONFIG_MFD_TPS68470) += tps68470.o obj-$(CONFIG_MFD_TPS80031) += tps80031.o obj-$(CONFIG_MENELAUS) += menelaus.o diff --git a/drivers/mfd/tps68470.c b/drivers/mfd/tps68470.c deleted file mode 100644 index 4a4df4ffd18c..000000000000 --- a/drivers/mfd/tps68470.c +++ /dev/null @@ -1,97 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* - * TPS68470 chip Parent driver - * - * Copyright (C) 2017 Intel Corporation - * - * Authors: - * Rajmohan Mani - * Tianshu Qiu - * Jian Xu Zheng - * Yuning Pu - */ - -#include -#include -#include -#include -#include -#include -#include - -static const struct mfd_cell tps68470s[] = { - { .name = "tps68470-gpio" }, - { .name = "tps68470_pmic_opregion" }, -}; - -static const struct regmap_config tps68470_regmap_config = { - .reg_bits = 8, - .val_bits = 8, - .max_register = TPS68470_REG_MAX, -}; - -static int tps68470_chip_init(struct device *dev, struct regmap *regmap) -{ - unsigned int version; - int ret; - - /* Force software reset */ - ret = regmap_write(regmap, TPS68470_REG_RESET, TPS68470_REG_RESET_MASK); - if (ret) - return ret; - - ret = regmap_read(regmap, TPS68470_REG_REVID, &version); - if (ret) { - dev_err(dev, "Failed to read revision register: %d\n", ret); - return ret; - } - - dev_info(dev, "TPS68470 REVID: 0x%x\n", version); - - return 0; -} - -static int tps68470_probe(struct i2c_client *client) -{ - struct device *dev = &client->dev; - struct regmap *regmap; - int ret; - - regmap = devm_regmap_init_i2c(client, &tps68470_regmap_config); - if (IS_ERR(regmap)) { - dev_err(dev, "devm_regmap_init_i2c Error %ld\n", - PTR_ERR(regmap)); - return PTR_ERR(regmap); - } - - i2c_set_clientdata(client, regmap); - - ret = tps68470_chip_init(dev, regmap); - if (ret < 0) { - dev_err(dev, "TPS68470 Init Error %d\n", ret); - return ret; - } - - ret = devm_mfd_add_devices(dev, PLATFORM_DEVID_NONE, tps68470s, - ARRAY_SIZE(tps68470s), NULL, 0, NULL); - if (ret < 0) { - dev_err(dev, "devm_mfd_add_devices failed: %d\n", ret); - return ret; - } - - return 0; -} - -static const struct acpi_device_id tps68470_acpi_ids[] = { - {"INT3472"}, - {}, -}; - -static struct i2c_driver tps68470_driver = { - .driver = { - .name = "tps68470", - .acpi_match_table = tps68470_acpi_ids, - }, - .probe_new = tps68470_probe, -}; -builtin_i2c_driver(tps68470_driver); -- 2.25.1