cpuidle: tegra: Squash Tegra114 driver into the common driver (14e086ba) · Commits · 戴 / test

arch/arm/mach-tegra/Makefile

+0 −7

Original line number	Diff line number	Diff line
		@@ -10,19 +10,12 @@ obj-y += sleep.o
		obj-y += tegra.o
		obj-y += sleep-tegra20.o
		obj-y += sleep-tegra30.o
		obj-$(CONFIG_CPU_IDLE) += cpuidle.o
		obj-$(CONFIG_ARCH_TEGRA_2x_SOC) += pm-tegra20.o
		obj-$(CONFIG_ARCH_TEGRA_3x_SOC) += pm-tegra30.o
		obj-$(CONFIG_SMP) += platsmp.o
		obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o

		obj-$(CONFIG_ARCH_TEGRA_114_SOC) += pm-tegra30.o
		ifeq ($(CONFIG_CPU_IDLE),y)
		obj-$(CONFIG_ARCH_TEGRA_114_SOC) += cpuidle-tegra114.o
		endif
		obj-$(CONFIG_ARCH_TEGRA_124_SOC) += pm-tegra30.o
		ifeq ($(CONFIG_CPU_IDLE),y)
		obj-$(CONFIG_ARCH_TEGRA_124_SOC) += cpuidle-tegra114.o
		endif

		obj-$(CONFIG_ARCH_TEGRA_2x_SOC) += board-paz00.o

arch/arm/mach-tegra/cpuidle-tegra114.c

deleted100644 → 0

+0 −90

Original line number	Diff line number	Diff line
		// SPDX-License-Identifier: GPL-2.0-only
		/*
		* Copyright (c) 2013, NVIDIA Corporation. All rights reserved.
		*/

		#include <asm/firmware.h>
		#include <linux/tick.h>
		#include <linux/cpuidle.h>
		#include <linux/cpu_pm.h>
		#include <linux/kernel.h>
		#include <linux/module.h>

		#include <linux/firmware/trusted_foundations.h>

		#include <soc/tegra/pm.h>

		#include <asm/cpuidle.h>
		#include <asm/smp_plat.h>
		#include <asm/suspend.h>
		#include <asm/psci.h>

		#include "cpuidle.h"
		#include "sleep.h"

		#ifdef CONFIG_PM_SLEEP
		#define TEGRA114_MAX_STATES 2
		#else
		#define TEGRA114_MAX_STATES 1
		#endif

		#ifdef CONFIG_PM_SLEEP
		static int tegra114_idle_power_down(struct cpuidle_device *dev,
		struct cpuidle_driver *drv,
		int index)
		{
		local_fiq_disable();

		tegra_pm_set_cpu_in_lp2();
		cpu_pm_enter();

		call_firmware_op(prepare_idle, TF_PM_MODE_LP2_NOFLUSH_L2);

		/* Do suspend by ourselves if the firmware does not implement it */
		if (call_firmware_op(do_idle, 0) == -ENOSYS)
		cpu_suspend(0, tegra30_pm_secondary_cpu_suspend);

		cpu_pm_exit();
		tegra_pm_clear_cpu_in_lp2();

		local_fiq_enable();

		return index;
		}

		static void tegra114_idle_enter_s2idle(struct cpuidle_device *dev,
		struct cpuidle_driver *drv,
		int index)
		{
		tegra114_idle_power_down(dev, drv, index);
		}
		#endif

		static struct cpuidle_driver tegra_idle_driver = {
		.name = "tegra_idle",
		.owner = THIS_MODULE,
		.state_count = TEGRA114_MAX_STATES,
		.states = {
		[0] = ARM_CPUIDLE_WFI_STATE_PWR(600),
		#ifdef CONFIG_PM_SLEEP
		[1] = {
		.enter = tegra114_idle_power_down,
		.enter_s2idle = tegra114_idle_enter_s2idle,
		.exit_latency = 500,
		.target_residency = 1000,
		.flags = CPUIDLE_FLAG_TIMER_STOP,
		.power_usage = 0,
		.name = "powered-down",
		.desc = "CPU power gated",
		},
		#endif
		},
		};

		int __init tegra114_cpuidle_init(void)
		{
		if (!psci_smp_available())
		return cpuidle_register(&tegra_idle_driver, NULL);

		return 0;
		}

arch/arm/mach-tegra/cpuidle.c

deleted100644 → 0

+0 −37

Original line number	Diff line number	Diff line
		// SPDX-License-Identifier: GPL-2.0-or-later
		/*
		* arch/arm/mach-tegra/cpuidle.c
		*
		* CPU idle driver for Tegra CPUs
		*
		* Copyright (c) 2010-2012, NVIDIA Corporation.
		* Copyright (c) 2011 Google, Inc.
		* Author: Colin Cross <ccross@android.com>
		* Gary King <gking@nvidia.com>
		*
		* Rework for 3.3 by Peter De Schrijver <pdeschrijver@nvidia.com>
		*/

		#include <linux/kernel.h>
		#include <linux/module.h>
		#include <linux/platform_device.h>

		#include <soc/tegra/fuse.h>

		#include "cpuidle.h"

		void __init tegra_cpuidle_init(void)
		{
		switch (tegra_get_chip_id()) {
		case TEGRA20:
		case TEGRA30:
		platform_device_register_simple("tegra-cpuidle", -1, NULL, 0);
		break;
		case TEGRA114:
		case TEGRA124:
		if (IS_ENABLED(CONFIG_ARCH_TEGRA_114_SOC) \|\|
		IS_ENABLED(CONFIG_ARCH_TEGRA_124_SOC))
		tegra114_cpuidle_init();
		break;
		}
		}

arch/arm/mach-tegra/cpuidle.h

deleted100644 → 0

+0 −16

Original line number	Diff line number	Diff line
		/* SPDX-License-Identifier: GPL-2.0-only */
		/*
		* Copyright (c) 2012, NVIDIA Corporation. All rights reserved.
		*/

		#ifndef __MACH_TEGRA_CPUIDLE_H
		#define __MACH_TEGRA_CPUIDLE_H

		#ifdef CONFIG_CPU_IDLE
		int tegra114_cpuidle_init(void);
		void tegra_cpuidle_init(void);
		#else
		static inline void tegra_cpuidle_init(void) {}
		#endif

		#endif

arch/arm/mach-tegra/tegra.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -36,11 +36,11 @@
		#include <asm/mach/arch.h>
		#include <asm/mach/time.h>
		#include <asm/mach-types.h>
		#include <asm/psci.h>
		#include <asm/setup.h>

		#include "board.h"
		#include "common.h"
		#include "cpuidle.h"
		#include "iomap.h"
		#include "pm.h"
		#include "reset.h"
		@@ -85,7 +85,6 @@ static void __init tegra_dt_init(void)
		static void __init tegra_dt_init_late(void)
		{
		tegra_init_suspend();
		tegra_cpuidle_init();

		if (IS_ENABLED(CONFIG_ARCH_TEGRA_2x_SOC) &&
		of_machine_is_compatible("compal,paz00"))
		@@ -94,6 +93,9 @@ static void __init tegra_dt_init_late(void)
		if (IS_ENABLED(CONFIG_ARCH_TEGRA_2x_SOC) &&
		of_machine_is_compatible("nvidia,tegra20"))
		platform_device_register_simple("tegra20-cpufreq", -1, NULL, 0);

		if (IS_ENABLED(CONFIG_ARM_TEGRA_CPUIDLE) && !psci_smp_available())
		platform_device_register_simple("tegra-cpuidle", -1, NULL, 0);
		}

		static const char * const tegra_dt_board_compat[] = {

Admin message