提交 89572c77 编写于 作者: P Prashant Gaikwad 提交者: Stephen Warren

ARM: tegra: move tegra_cpu_car.h to linux/clk/tegra.h

tegra_cpu_car_ops struct is going to be accessed from drivers/clk/tegra.
Move the tegra_cpu_car_ops to include/linux/clk/tegra.h.
Signed-off-by: NPrashant Gaikwad <pgaikwad@nvidia.com>
Signed-off-by: NStephen Warren <swarren@nvidia.com>
上级 c7736edf
...@@ -26,10 +26,10 @@ ...@@ -26,10 +26,10 @@
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/seq_file.h> #include <linux/seq_file.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/clk/tegra.h>
#include "board.h" #include "board.h"
#include "clock.h" #include "clock.h"
#include "tegra_cpu_car.h"
/* Global data of Tegra CPU CAR ops */ /* Global data of Tegra CPU CAR ops */
struct tegra_cpu_car_ops *tegra_cpu_car_ops; struct tegra_cpu_car_ops *tegra_cpu_car_ops;
......
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
#include <linux/cpuidle.h> #include <linux/cpuidle.h>
#include <linux/cpu_pm.h> #include <linux/cpu_pm.h>
#include <linux/clockchips.h> #include <linux/clockchips.h>
#include <linux/clk/tegra.h>
#include <asm/cpuidle.h> #include <asm/cpuidle.h>
#include <asm/proc-fns.h> #include <asm/proc-fns.h>
...@@ -32,7 +33,6 @@ ...@@ -32,7 +33,6 @@
#include "pm.h" #include "pm.h"
#include "sleep.h" #include "sleep.h"
#include "tegra_cpu_car.h"
#ifdef CONFIG_PM_SLEEP #ifdef CONFIG_PM_SLEEP
static int tegra30_idle_lp2(struct cpuidle_device *dev, static int tegra30_idle_lp2(struct cpuidle_device *dev,
......
...@@ -10,12 +10,12 @@ ...@@ -10,12 +10,12 @@
*/ */
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/smp.h> #include <linux/smp.h>
#include <linux/clk/tegra.h>
#include <asm/cacheflush.h> #include <asm/cacheflush.h>
#include <asm/smp_plat.h> #include <asm/smp_plat.h>
#include "sleep.h" #include "sleep.h"
#include "tegra_cpu_car.h"
static void (*tegra_hotplug_shutdown)(void); static void (*tegra_hotplug_shutdown)(void);
......
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
#include <linux/jiffies.h> #include <linux/jiffies.h>
#include <linux/smp.h> #include <linux/smp.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/clk/tegra.h>
#include <asm/cacheflush.h> #include <asm/cacheflush.h>
#include <asm/hardware/gic.h> #include <asm/hardware/gic.h>
...@@ -30,7 +31,6 @@ ...@@ -30,7 +31,6 @@
#include "fuse.h" #include "fuse.h"
#include "flowctrl.h" #include "flowctrl.h"
#include "reset.h" #include "reset.h"
#include "tegra_cpu_car.h"
#include "common.h" #include "common.h"
#include "iomap.h" #include "iomap.h"
......
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
#include <linux/cpu_pm.h> #include <linux/cpu_pm.h>
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/err.h> #include <linux/err.h>
#include <linux/clk/tegra.h>
#include <asm/smp_plat.h> #include <asm/smp_plat.h>
#include <asm/cacheflush.h> #include <asm/cacheflush.h>
...@@ -36,7 +37,6 @@ ...@@ -36,7 +37,6 @@
#include "reset.h" #include "reset.h"
#include "flowctrl.h" #include "flowctrl.h"
#include "sleep.h" #include "sleep.h"
#include "tegra_cpu_car.h"
#define TEGRA_POWER_CPU_PWRREQ_OE (1 << 16) /* CPU pwr req enable */ #define TEGRA_POWER_CPU_PWRREQ_OE (1 << 16) /* CPU pwr req enable */
......
...@@ -26,12 +26,12 @@ ...@@ -26,12 +26,12 @@
#include <linux/io.h> #include <linux/io.h>
#include <linux/clkdev.h> #include <linux/clkdev.h>
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/clk/tegra.h>
#include "clock.h" #include "clock.h"
#include "fuse.h" #include "fuse.h"
#include "iomap.h" #include "iomap.h"
#include "tegra2_emc.h" #include "tegra2_emc.h"
#include "tegra_cpu_car.h"
#define RST_DEVICES 0x004 #define RST_DEVICES 0x004
#define RST_DEVICES_SET 0x300 #define RST_DEVICES_SET 0x300
......
...@@ -26,12 +26,12 @@ ...@@ -26,12 +26,12 @@
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/clk/tegra.h>
#include "clock.h" #include "clock.h"
#include "fuse.h" #include "fuse.h"
#include "tegra2_emc.h" #include "tegra2_emc.h"
#include "tegra20_clocks.h" #include "tegra20_clocks.h"
#include "tegra_cpu_car.h"
/* Clock definitions */ /* Clock definitions */
......
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/cpufreq.h> #include <linux/cpufreq.h>
#include <linux/syscore_ops.h> #include <linux/syscore_ops.h>
#include <linux/clk/tegra.h>
#include <asm/clkdev.h> #include <asm/clkdev.h>
...@@ -36,7 +37,6 @@ ...@@ -36,7 +37,6 @@
#include "clock.h" #include "clock.h"
#include "fuse.h" #include "fuse.h"
#include "iomap.h" #include "iomap.h"
#include "tegra_cpu_car.h"
#define USE_PLL_LOCK_BITS 0 #define USE_PLL_LOCK_BITS 0
......
...@@ -28,11 +28,11 @@ ...@@ -28,11 +28,11 @@
#include <linux/io.h> #include <linux/io.h>
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/cpufreq.h> #include <linux/cpufreq.h>
#include <linux/clk/tegra.h>
#include "clock.h" #include "clock.h"
#include "fuse.h" #include "fuse.h"
#include "tegra30_clocks.h" #include "tegra30_clocks.h"
#include "tegra_cpu_car.h"
#define DEFINE_CLK_TEGRA(_name, _rate, _ops, _flags, \ #define DEFINE_CLK_TEGRA(_name, _rate, _ops, _flags, \
_parent_names, _parents, _parent) \ _parent_names, _parents, _parent) \
......
...@@ -14,8 +14,8 @@ ...@@ -14,8 +14,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef __MACH_TEGRA_CPU_CAR_H #ifndef __LINUX_CLK_TEGRA_H_
#define __MACH_TEGRA_CPU_CAR_H #define __LINUX_CLK_TEGRA_H_
/* /*
* Tegra CPU clock and reset control ops * Tegra CPU clock and reset control ops
...@@ -121,4 +121,4 @@ static inline void tegra_cpu_clock_resume(void) ...@@ -121,4 +121,4 @@ static inline void tegra_cpu_clock_resume(void)
void tegra20_cpu_car_ops_init(void); void tegra20_cpu_car_ops_init(void);
void tegra30_cpu_car_ops_init(void); void tegra30_cpu_car_ops_init(void);
#endif /* __MACH_TEGRA_CPU_CAR_H */ #endif /* __LINUX_CLK_TEGRA_H_ */
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册