| Message ID | 20200218171321.30990-4-robh@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Removing Calxeda platform support | expand |
On 18/02/2020 18:13, Rob Herring wrote: > Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net> > Cc: Daniel Lezcano <daniel.lezcano@linaro.org> > Cc: linux-pm@vger.kernel.org > Signed-off-by: Rob Herring <robh@kernel.org> Acked-by: Daniel Lezcano <daniel.lezcano@linaro.org> > --- > Do not apply yet. > > drivers/cpuidle/Kconfig.arm | 7 --- > drivers/cpuidle/Makefile | 1 - > drivers/cpuidle/cpuidle-calxeda.c | 72 ------------------------------- > 3 files changed, 80 deletions(-) > delete mode 100644 drivers/cpuidle/cpuidle-calxeda.c > > diff --git a/drivers/cpuidle/Kconfig.arm b/drivers/cpuidle/Kconfig.arm > index 62272ecfa771..c2830d2ed44a 100644 > --- a/drivers/cpuidle/Kconfig.arm > +++ b/drivers/cpuidle/Kconfig.arm > @@ -42,13 +42,6 @@ config ARM_CLPS711X_CPUIDLE > help > Select this to enable cpuidle on Cirrus Logic CLPS711X SOCs. > > -config ARM_HIGHBANK_CPUIDLE > - bool "CPU Idle Driver for Calxeda processors" > - depends on ARM_PSCI && !ARM64 > - select ARM_CPU_SUSPEND > - help > - Select this to enable cpuidle on Calxeda processors. > - > config ARM_KIRKWOOD_CPUIDLE > bool "CPU Idle Driver for Marvell Kirkwood SoCs" > depends on (MACH_KIRKWOOD || COMPILE_TEST) && !ARM64 > diff --git a/drivers/cpuidle/Makefile b/drivers/cpuidle/Makefile > index cc8c769d7fa9..eee5f276edf7 100644 > --- a/drivers/cpuidle/Makefile > +++ b/drivers/cpuidle/Makefile > @@ -14,7 +14,6 @@ obj-$(CONFIG_HALTPOLL_CPUIDLE) += cpuidle-haltpoll.o > obj-$(CONFIG_ARM_MVEBU_V7_CPUIDLE) += cpuidle-mvebu-v7.o > obj-$(CONFIG_ARM_BIG_LITTLE_CPUIDLE) += cpuidle-big_little.o > obj-$(CONFIG_ARM_CLPS711X_CPUIDLE) += cpuidle-clps711x.o > -obj-$(CONFIG_ARM_HIGHBANK_CPUIDLE) += cpuidle-calxeda.o > obj-$(CONFIG_ARM_KIRKWOOD_CPUIDLE) += cpuidle-kirkwood.o > obj-$(CONFIG_ARM_ZYNQ_CPUIDLE) += cpuidle-zynq.o > obj-$(CONFIG_ARM_U8500_CPUIDLE) += cpuidle-ux500.o > diff --git a/drivers/cpuidle/cpuidle-calxeda.c b/drivers/cpuidle/cpuidle-calxeda.c > deleted file mode 100644 > index b17d9a8418b0..000000000000 > --- a/drivers/cpuidle/cpuidle-calxeda.c > +++ /dev/null > @@ -1,72 +0,0 @@ > -// SPDX-License-Identifier: GPL-2.0-only > -/* > - * Copyright 2012 Calxeda, Inc. > - * > - * Based on arch/arm/plat-mxc/cpuidle.c: #v3.7 > - * Copyright 2012 Freescale Semiconductor, Inc. > - * Copyright 2012 Linaro Ltd. > - * > - * Maintainer: Rob Herring <rob.herring@calxeda.com> > - */ > - > -#include <linux/cpuidle.h> > -#include <linux/cpu_pm.h> > -#include <linux/init.h> > -#include <linux/mm.h> > -#include <linux/platform_device.h> > -#include <linux/psci.h> > - > -#include <asm/cpuidle.h> > -#include <asm/suspend.h> > - > -#include <uapi/linux/psci.h> > - > -#define CALXEDA_IDLE_PARAM \ > - ((0 << PSCI_0_2_POWER_STATE_ID_SHIFT) | \ > - (0 << PSCI_0_2_POWER_STATE_AFFL_SHIFT) | \ > - (PSCI_POWER_STATE_TYPE_POWER_DOWN << PSCI_0_2_POWER_STATE_TYPE_SHIFT)) > - > -static int calxeda_idle_finish(unsigned long val) > -{ > - return psci_ops.cpu_suspend(CALXEDA_IDLE_PARAM, __pa(cpu_resume)); > -} > - > -static int calxeda_pwrdown_idle(struct cpuidle_device *dev, > - struct cpuidle_driver *drv, > - int index) > -{ > - cpu_pm_enter(); > - cpu_suspend(0, calxeda_idle_finish); > - cpu_pm_exit(); > - > - return index; > -} > - > -static struct cpuidle_driver calxeda_idle_driver = { > - .name = "calxeda_idle", > - .states = { > - ARM_CPUIDLE_WFI_STATE, > - { > - .name = "PG", > - .desc = "Power Gate", > - .exit_latency = 30, > - .power_usage = 50, > - .target_residency = 200, > - .enter = calxeda_pwrdown_idle, > - }, > - }, > - .state_count = 2, > -}; > - > -static int calxeda_cpuidle_probe(struct platform_device *pdev) > -{ > - return cpuidle_register(&calxeda_idle_driver, NULL); > -} > - > -static struct platform_driver calxeda_cpuidle_plat_driver = { > - .driver = { > - .name = "cpuidle-calxeda", > - }, > - .probe = calxeda_cpuidle_probe, > -}; > -builtin_platform_driver(calxeda_cpuidle_plat_driver); > -- > 2.20.1 >
diff --git a/drivers/cpuidle/Kconfig.arm b/drivers/cpuidle/Kconfig.arm index 62272ecfa771..c2830d2ed44a 100644 --- a/drivers/cpuidle/Kconfig.arm +++ b/drivers/cpuidle/Kconfig.arm @@ -42,13 +42,6 @@ config ARM_CLPS711X_CPUIDLE help Select this to enable cpuidle on Cirrus Logic CLPS711X SOCs. -config ARM_HIGHBANK_CPUIDLE - bool "CPU Idle Driver for Calxeda processors" - depends on ARM_PSCI && !ARM64 - select ARM_CPU_SUSPEND - help - Select this to enable cpuidle on Calxeda processors. - config ARM_KIRKWOOD_CPUIDLE bool "CPU Idle Driver for Marvell Kirkwood SoCs" depends on (MACH_KIRKWOOD || COMPILE_TEST) && !ARM64 diff --git a/drivers/cpuidle/Makefile b/drivers/cpuidle/Makefile index cc8c769d7fa9..eee5f276edf7 100644 --- a/drivers/cpuidle/Makefile +++ b/drivers/cpuidle/Makefile @@ -14,7 +14,6 @@ obj-$(CONFIG_HALTPOLL_CPUIDLE) += cpuidle-haltpoll.o obj-$(CONFIG_ARM_MVEBU_V7_CPUIDLE) += cpuidle-mvebu-v7.o obj-$(CONFIG_ARM_BIG_LITTLE_CPUIDLE) += cpuidle-big_little.o obj-$(CONFIG_ARM_CLPS711X_CPUIDLE) += cpuidle-clps711x.o -obj-$(CONFIG_ARM_HIGHBANK_CPUIDLE) += cpuidle-calxeda.o obj-$(CONFIG_ARM_KIRKWOOD_CPUIDLE) += cpuidle-kirkwood.o obj-$(CONFIG_ARM_ZYNQ_CPUIDLE) += cpuidle-zynq.o obj-$(CONFIG_ARM_U8500_CPUIDLE) += cpuidle-ux500.o diff --git a/drivers/cpuidle/cpuidle-calxeda.c b/drivers/cpuidle/cpuidle-calxeda.c deleted file mode 100644 index b17d9a8418b0..000000000000 --- a/drivers/cpuidle/cpuidle-calxeda.c +++ /dev/null @@ -1,72 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-only -/* - * Copyright 2012 Calxeda, Inc. - * - * Based on arch/arm/plat-mxc/cpuidle.c: #v3.7 - * Copyright 2012 Freescale Semiconductor, Inc. - * Copyright 2012 Linaro Ltd. - * - * Maintainer: Rob Herring <rob.herring@calxeda.com> - */ - -#include <linux/cpuidle.h> -#include <linux/cpu_pm.h> -#include <linux/init.h> -#include <linux/mm.h> -#include <linux/platform_device.h> -#include <linux/psci.h> - -#include <asm/cpuidle.h> -#include <asm/suspend.h> - -#include <uapi/linux/psci.h> - -#define CALXEDA_IDLE_PARAM \ - ((0 << PSCI_0_2_POWER_STATE_ID_SHIFT) | \ - (0 << PSCI_0_2_POWER_STATE_AFFL_SHIFT) | \ - (PSCI_POWER_STATE_TYPE_POWER_DOWN << PSCI_0_2_POWER_STATE_TYPE_SHIFT)) - -static int calxeda_idle_finish(unsigned long val) -{ - return psci_ops.cpu_suspend(CALXEDA_IDLE_PARAM, __pa(cpu_resume)); -} - -static int calxeda_pwrdown_idle(struct cpuidle_device *dev, - struct cpuidle_driver *drv, - int index) -{ - cpu_pm_enter(); - cpu_suspend(0, calxeda_idle_finish); - cpu_pm_exit(); - - return index; -} - -static struct cpuidle_driver calxeda_idle_driver = { - .name = "calxeda_idle", - .states = { - ARM_CPUIDLE_WFI_STATE, - { - .name = "PG", - .desc = "Power Gate", - .exit_latency = 30, - .power_usage = 50, - .target_residency = 200, - .enter = calxeda_pwrdown_idle, - }, - }, - .state_count = 2, -}; - -static int calxeda_cpuidle_probe(struct platform_device *pdev) -{ - return cpuidle_register(&calxeda_idle_driver, NULL); -} - -static struct platform_driver calxeda_cpuidle_plat_driver = { - .driver = { - .name = "cpuidle-calxeda", - }, - .probe = calxeda_cpuidle_probe, -}; -builtin_platform_driver(calxeda_cpuidle_plat_driver);
Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net> Cc: Daniel Lezcano <daniel.lezcano@linaro.org> Cc: linux-pm@vger.kernel.org Signed-off-by: Rob Herring <robh@kernel.org> --- Do not apply yet. drivers/cpuidle/Kconfig.arm | 7 --- drivers/cpuidle/Makefile | 1 - drivers/cpuidle/cpuidle-calxeda.c | 72 ------------------------------- 3 files changed, 80 deletions(-) delete mode 100644 drivers/cpuidle/cpuidle-calxeda.c -- 2.20.1