From patchwork Tue Feb 18 17:13:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Rob Herring (Arm)" X-Patchwork-Id: 11389099 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E693C17F0 for ; Tue, 18 Feb 2020 17:14:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BE798208C4 for ; Tue, 18 Feb 2020 17:14:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582046084; bh=FnKR5zpBy7wE5NA3ChCpJ+1zmGg+KAGqKyEyd/Piv6U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=tUvS39qCpdBD6DpubYjMTuktUY9M2Zf9f1ISuM7kWAN2Jr79clFgTUa0BnCJh7wcT aZ7O5HRY1uLkGXfT6hV38xEvCfqGLKz8Bs5Yd2514M4aB5Qr46F+hiyDWwXprBZPGu 170Jlis533s5P8G9RPmIjMpxO28WB3sTIXq6z0OI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727274AbgBRRNc (ORCPT ); Tue, 18 Feb 2020 12:13:32 -0500 Received: from mail-ot1-f66.google.com ([209.85.210.66]:41625 "EHLO mail-ot1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727158AbgBRRNb (ORCPT ); Tue, 18 Feb 2020 12:13:31 -0500 Received: by mail-ot1-f66.google.com with SMTP id r27so20205893otc.8; Tue, 18 Feb 2020 09:13:30 -0800 (PST) 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=JusgAl5N6MihYqm5uluXtGjWepTJgZcRc57DbXhWS1c=; b=Ht/DRUApfdDEJwkI1CWe6zG+5n/5CBDzitD9S6yyarok+Kp9wAB63tuZrGMMLIH/N9 wXAmamgg+ZjM2qhR6wf+pFSm5K3Xki266YKNrmeYG5oLxNR3sqgmTePHN78ZmxZkkNf1 8ngs5kPjsvEzzmsYq5DWckIUjYReme5RxQYZ5eNwpIkJDlL5Xe4ZqeF9lRAVvOSyfaDT sX3Ze8goOk8ZtOs/ifo3lUN/FzP9OnrOv9l9Xs+shxHSxuypi4+5V7tSqxyGgqreaqHb gIZGPfzd97pX3LtbUTHTdemQWCQG9SAe9nuwu7N6XyYOXUNAJciheIVU0aejiRHJ9lLP ccdQ== X-Gm-Message-State: APjAAAVCh8Q2BvG+RaklQs0qBtDyP+RC/J+LULd4j245+6Zc5NyrRzVo JO0IFO8czX3c3VJiKIBK0Q== X-Google-Smtp-Source: APXvYqxtfwdO5ZrwB57qMGPOEsnz4rhk/PhIK9UqQ1I24Sd3few+yqThLV3He9kZDSP4GnJqg66xxQ== X-Received: by 2002:a05:6830:1042:: with SMTP id b2mr16287928otp.306.1582046010353; Tue, 18 Feb 2020 09:13:30 -0800 (PST) Received: from xps15.herring.priv (24-155-109-49.dyn.grandenetworks.net. [24.155.109.49]) by smtp.googlemail.com with ESMTPSA id y25sm1545755oto.27.2020.02.18.09.13.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Feb 2020 09:13:29 -0800 (PST) From: Rob Herring To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, soc@kernel.org, Andre Przywara , Robert Richter , Jon Loeliger , Alexander Graf , Matthias Brugger , Mark Langsdorf Cc: Alex Williamson , Borislav Petkov , Cornelia Huck , Daniel Lezcano , "David S. Miller" , devicetree@vger.kernel.org, Eric Auger , iommu@lists.linux-foundation.org, James Morse , Jens Axboe , Joerg Roedel , kvm@vger.kernel.org, linux-clk@vger.kernel.org, linux-edac@vger.kernel.org, linux-ide@vger.kernel.org, linux-pm@vger.kernel.org, Mauro Carvalho Chehab , netdev@vger.kernel.org, "Rafael J. Wysocki" , Robin Murphy , Stephen Boyd , Tony Luck , Viresh Kumar , Will Deacon Subject: [RFC PATCH 04/11] cpufreq: Remove Calxeda driver Date: Tue, 18 Feb 2020 11:13:14 -0600 Message-Id: <20200218171321.30990-5-robh@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200218171321.30990-1-robh@kernel.org> References: <20200218171321.30990-1-robh@kernel.org> MIME-Version: 1.0 Sender: linux-edac-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-edac@vger.kernel.org Cc: "Rafael J. Wysocki" Cc: Viresh Kumar Cc: linux-pm@vger.kernel.org Signed-off-by: Rob Herring Acked-by: Viresh Kumar Acked-by: Mark Langsdorf --- Do not apply yet. drivers/cpufreq/Kconfig.arm | 10 --- drivers/cpufreq/Makefile | 3 +- drivers/cpufreq/cpufreq-dt-platdev.c | 3 - drivers/cpufreq/highbank-cpufreq.c | 106 --------------------------- 4 files changed, 1 insertion(+), 121 deletions(-) delete mode 100644 drivers/cpufreq/highbank-cpufreq.c -- 2.20.1 diff --git a/drivers/cpufreq/Kconfig.arm b/drivers/cpufreq/Kconfig.arm index 3858d86cf409..27fdd5ac21da 100644 --- a/drivers/cpufreq/Kconfig.arm +++ b/drivers/cpufreq/Kconfig.arm @@ -79,16 +79,6 @@ config ARM_BRCMSTB_AVS_CPUFREQ Say Y, if you have a Broadcom SoC with AVS support for DFS or DVFS. -config ARM_HIGHBANK_CPUFREQ - tristate "Calxeda Highbank-based" - depends on ARCH_HIGHBANK && CPUFREQ_DT && REGULATOR - default m - help - This adds the CPUFreq driver for Calxeda Highbank SoC - based boards. - - If in doubt, say N. - config ARM_IMX6Q_CPUFREQ tristate "Freescale i.MX6 cpufreq support" depends on ARCH_MXC diff --git a/drivers/cpufreq/Makefile b/drivers/cpufreq/Makefile index f6670c4abbb0..47d773b9312a 100644 --- a/drivers/cpufreq/Makefile +++ b/drivers/cpufreq/Makefile @@ -5,7 +5,7 @@ obj-$(CONFIG_CPU_FREQ) += cpufreq.o freq_table.o # CPUfreq stats obj-$(CONFIG_CPU_FREQ_STAT) += cpufreq_stats.o -# CPUfreq governors +# CPUfreq governors obj-$(CONFIG_CPU_FREQ_GOV_PERFORMANCE) += cpufreq_performance.o obj-$(CONFIG_CPU_FREQ_GOV_POWERSAVE) += cpufreq_powersave.o obj-$(CONFIG_CPU_FREQ_GOV_USERSPACE) += cpufreq_userspace.o @@ -52,7 +52,6 @@ obj-$(CONFIG_ARM_ARMADA_8K_CPUFREQ) += armada-8k-cpufreq.o obj-$(CONFIG_ARM_BRCMSTB_AVS_CPUFREQ) += brcmstb-avs-cpufreq.o obj-$(CONFIG_ACPI_CPPC_CPUFREQ) += cppc_cpufreq.o obj-$(CONFIG_ARCH_DAVINCI) += davinci-cpufreq.o -obj-$(CONFIG_ARM_HIGHBANK_CPUFREQ) += highbank-cpufreq.o obj-$(CONFIG_ARM_IMX6Q_CPUFREQ) += imx6q-cpufreq.o obj-$(CONFIG_ARM_IMX_CPUFREQ_DT) += imx-cpufreq-dt.o obj-$(CONFIG_ARM_KIRKWOOD_CPUFREQ) += kirkwood-cpufreq.o diff --git a/drivers/cpufreq/cpufreq-dt-platdev.c b/drivers/cpufreq/cpufreq-dt-platdev.c index f2ae9cd455c1..274294f83e7c 100644 --- a/drivers/cpufreq/cpufreq-dt-platdev.c +++ b/drivers/cpufreq/cpufreq-dt-platdev.c @@ -102,9 +102,6 @@ static const struct of_device_id whitelist[] __initconst = { static const struct of_device_id blacklist[] __initconst = { { .compatible = "allwinner,sun50i-h6", }, - { .compatible = "calxeda,highbank", }, - { .compatible = "calxeda,ecx-2000", }, - { .compatible = "fsl,imx7d", }, { .compatible = "fsl,imx8mq", }, { .compatible = "fsl,imx8mm", }, diff --git a/drivers/cpufreq/highbank-cpufreq.c b/drivers/cpufreq/highbank-cpufreq.c deleted file mode 100644 index 5a7f6dafcddb..000000000000 --- a/drivers/cpufreq/highbank-cpufreq.c +++ /dev/null @@ -1,106 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-only -/* - * Copyright (C) 2012 Calxeda, Inc. - * - * This driver provides the clk notifier callbacks that are used when - * the cpufreq-dt driver changes to frequency to alert the highbank - * EnergyCore Management Engine (ECME) about the need to change - * voltage. The ECME interfaces with the actual voltage regulators. - */ - -#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - -#include -#include -#include -#include -#include -#include -#include -#include - -#define HB_CPUFREQ_CHANGE_NOTE 0x80000001 -#define HB_CPUFREQ_IPC_LEN 7 -#define HB_CPUFREQ_VOLT_RETRIES 15 - -static int hb_voltage_change(unsigned int freq) -{ - u32 msg[HB_CPUFREQ_IPC_LEN] = {HB_CPUFREQ_CHANGE_NOTE, freq / 1000000}; - - return pl320_ipc_transmit(msg); -} - -static int hb_cpufreq_clk_notify(struct notifier_block *nb, - unsigned long action, void *hclk) -{ - struct clk_notifier_data *clk_data = hclk; - int i = 0; - - if (action == PRE_RATE_CHANGE) { - if (clk_data->new_rate > clk_data->old_rate) - while (hb_voltage_change(clk_data->new_rate)) - if (i++ > HB_CPUFREQ_VOLT_RETRIES) - return NOTIFY_BAD; - } else if (action == POST_RATE_CHANGE) { - if (clk_data->new_rate < clk_data->old_rate) - while (hb_voltage_change(clk_data->new_rate)) - if (i++ > HB_CPUFREQ_VOLT_RETRIES) - return NOTIFY_BAD; - } - - return NOTIFY_DONE; -} - -static struct notifier_block hb_cpufreq_clk_nb = { - .notifier_call = hb_cpufreq_clk_notify, -}; - -static int hb_cpufreq_driver_init(void) -{ - struct platform_device_info devinfo = { .name = "cpufreq-dt", }; - struct device *cpu_dev; - struct clk *cpu_clk; - struct device_node *np; - int ret; - - if ((!of_machine_is_compatible("calxeda,highbank")) && - (!of_machine_is_compatible("calxeda,ecx-2000"))) - return -ENODEV; - - cpu_dev = get_cpu_device(0); - if (!cpu_dev) { - pr_err("failed to get highbank cpufreq device\n"); - return -ENODEV; - } - - np = of_node_get(cpu_dev->of_node); - if (!np) { - pr_err("failed to find highbank cpufreq node\n"); - return -ENOENT; - } - - cpu_clk = clk_get(cpu_dev, NULL); - if (IS_ERR(cpu_clk)) { - ret = PTR_ERR(cpu_clk); - pr_err("failed to get cpu0 clock: %d\n", ret); - goto out_put_node; - } - - ret = clk_notifier_register(cpu_clk, &hb_cpufreq_clk_nb); - if (ret) { - pr_err("failed to register clk notifier: %d\n", ret); - goto out_put_node; - } - - /* Instantiate cpufreq-dt */ - platform_device_register_full(&devinfo); - -out_put_node: - of_node_put(np); - return ret; -} -module_init(hb_cpufreq_driver_init); - -MODULE_AUTHOR("Mark Langsdorf "); -MODULE_DESCRIPTION("Calxeda Highbank cpufreq driver"); -MODULE_LICENSE("GPL");