提交 1540f214 编写于 作者: P Paul Walmsley

OMAP2+: clockdomain: move header file from plat-omap to mach-omap2

The OMAP clockdomain code and data is all OMAP2+-specific.  This seems
unlikely to change any time soon.  Move plat-omap/include/plat/clockdomain.h
to mach-omap2/clockdomain.h.  The primary point of doing this is to remove
the temptation for unrelated upper-layer code to access clockdomain code
and data directly.

DSPBridge also uses the clockdomain headers for some reason, so,
modify it also. The DSPBridge code should not be including the
clockdomain headers; these should be removed.
Signed-off-by: NPaul Walmsley <paul@pwsan.com>
Cc: Kevin Hilman <khilman@deeprootsystems.com>
Cc: Omar Ramirez Luna <omar.ramirez@ti.com>
Cc: Felipe Contreras <felipe.contreras@gmail.com>
Cc: Greg Kroah-Hartman <greg@kroah.com>
Tested-by: NRajendra Nayak <rnayak@ti.com>
Tested-by: NSantosh Shilimkar <santosh.shilimkar@ti.com>
上级 55ae3507
......@@ -24,7 +24,7 @@
#include <linux/bitops.h>
#include <plat/clock.h>
#include <plat/clockdomain.h>
#include "clockdomain.h"
#include <plat/cpu.h>
#include <plat/prcm.h>
......
......@@ -35,7 +35,7 @@
#include <plat/clock.h>
#include <plat/powerdomain.h>
#include <plat/clockdomain.h>
#include "clockdomain.h"
#include <plat/prcm.h>
/* clkdm_list contains all registered struct clockdomains */
......
......@@ -11,12 +11,10 @@
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*
* XXX This should be moved to mach-omap2/ at the earliest opportunity.
*/
#ifndef __ASM_ARM_ARCH_OMAP_CLOCKDOMAIN_H
#define __ASM_ARM_ARCH_OMAP_CLOCKDOMAIN_H
#ifndef __ARCH_ARM_MACH_OMAP2_CLOCKDOMAIN_H
#define __ARCH_ARM_MACH_OMAP2_CLOCKDOMAIN_H
#include <linux/init.h>
......
......@@ -35,7 +35,7 @@
#include <linux/kernel.h>
#include <linux/io.h>
#include <plat/clockdomain.h>
#include "clockdomain.h"
#include "prm2xxx_3xxx.h"
#include "cm2xxx_3xxx.h"
#include "cm-regbits-24xx.h"
......
......@@ -26,7 +26,7 @@
#include <linux/kernel.h>
#include <linux/io.h>
#include <plat/clockdomain.h>
#include "clockdomain.h"
#include "cm1_44xx.h"
#include "cm2_44xx.h"
......
......@@ -28,7 +28,7 @@
#include <plat/prcm.h>
#include <plat/irqs.h>
#include <plat/powerdomain.h>
#include <plat/clockdomain.h>
#include "clockdomain.h"
#include <plat/serial.h>
#include "pm.h"
......
......@@ -41,7 +41,7 @@
#include <plat/omap-pm.h>
#include <plat/powerdomain.h>
#include <plat/clockdomain.h>
#include "clockdomain.h"
#include <plat/omap_hwmod.h>
#include <plat/multi.h>
......
......@@ -139,7 +139,7 @@
#include <plat/common.h>
#include <plat/cpu.h>
#include <plat/clockdomain.h>
#include "clockdomain.h"
#include <plat/powerdomain.h>
#include <plat/clock.h>
#include <plat/omap_hwmod.h>
......
......@@ -30,7 +30,7 @@
#include <plat/clock.h>
#include <plat/board.h>
#include <plat/powerdomain.h>
#include <plat/clockdomain.h>
#include "clockdomain.h"
#include <plat/dmtimer.h>
#include "cm2xxx_3xxx.h"
......
......@@ -19,7 +19,7 @@
#include <plat/common.h>
#include <plat/powerdomain.h>
#include <plat/clockdomain.h>
#include "clockdomain.h"
static struct omap_device_pm_latency *pm_lats;
......
......@@ -51,7 +51,7 @@
#include "control.h"
#include <plat/powerdomain.h>
#include <plat/clockdomain.h>
#include "clockdomain.h"
#ifdef CONFIG_SUSPEND
static suspend_state_t suspend_state = PM_SUSPEND_ON;
......
......@@ -31,7 +31,7 @@
#include <linux/console.h>
#include <plat/sram.h>
#include <plat/clockdomain.h>
#include "clockdomain.h"
#include <plat/powerdomain.h>
#include <plat/serial.h>
#include <plat/sdrc.h>
......
......@@ -27,7 +27,7 @@
#include <plat/cpu.h>
#include <plat/powerdomain.h>
#include <plat/clockdomain.h>
#include "clockdomain.h"
#include <plat/prcm.h>
#include "pm.h"
......
......@@ -19,8 +19,13 @@
#ifndef _TIOMAP_
#define _TIOMAP_
/*
* XXX These powerdomain.h/clockdomain.h includes are wrong and should
* be removed. No driver should call pwrdm_* or clkdm_* functions
* directly; they should rely on OMAP core code to do this.
*/
#include <plat/powerdomain.h>
#include <plat/clockdomain.h>
#include <mach-omap2/clockdomain.h>
/*
* XXX These mach-omap2/ includes are wrong and should be removed. No
* driver should read or write to PRM/CM registers directly; they
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册