leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

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

As part of this process, remove the references to powerdomain data
from the GPIO "driver" and the OMAP PM no-op layer, both in plat-omap.
Change the DSPBridge code to point to the new location for the
powerdomain headers.  The DSPBridge code should not be including the
powerdomain headers; these should be removed.

Signed-off-by: Paul 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>
This commit is contained in:
Paul Walmsley 2010-12-21 21:05:16 -07:00
parent 1540f21406
commit 72e06d0872
27 changed files with 45 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-omap2/clockdomain.c
View File

@ -34,7 +34,7 @@
#include "prcm44xx.h"
#include <plat/clock.h>
#include <plat/powerdomain.h>
#include "powerdomain.h"
#include "clockdomain.h"
#include <plat/prcm.h>

2
arch/arm/mach-omap2/clockdomain.h
View File

@ -18,7 +18,7 @@
#include <linux/init.h>
#include <plat/powerdomain.h>
#include "powerdomain.h"
#include <plat/clock.h>
#include <plat/cpu.h>

2
arch/arm/mach-omap2/cpuidle34xx.c
View File

@ -27,7 +27,7 @@
#include <plat/prcm.h>
#include <plat/irqs.h>
#include <plat/powerdomain.h>
#include "powerdomain.h"
#include "clockdomain.h"
#include <plat/serial.h>

2
arch/arm/mach-omap2/io.c
View File

@ -39,7 +39,7 @@
#include "io.h"
#include <plat/omap-pm.h>
#include <plat/powerdomain.h>
#include "powerdomain.h"
#include "clockdomain.h"
#include <plat/omap_hwmod.h>

2
arch/arm/mach-omap2/omap_hwmod.c
View File

@ -140,7 +140,7 @@
#include <plat/common.h>
#include <plat/cpu.h>
#include "clockdomain.h"
#include <plat/powerdomain.h>
#include "powerdomain.h"
#include <plat/clock.h>
#include <plat/omap_hwmod.h>
#include <plat/prcm.h>

2
arch/arm/mach-omap2/pm-debug.c
View File

@ -29,7 +29,7 @@
#include <plat/clock.h>
#include <plat/board.h>
#include <plat/powerdomain.h>
#include "powerdomain.h"
#include "clockdomain.h"
#include <plat/dmtimer.h>

2
arch/arm/mach-omap2/pm.c
View File

@ -18,7 +18,7 @@
#include <plat/omap_device.h>
#include <plat/common.h>
#include <plat/powerdomain.h>
#include "powerdomain.h"
#include "clockdomain.h"
static struct omap_device_pm_latency *pm_lats;

2
arch/arm/mach-omap2/pm.h
View File

@ -11,7 +11,7 @@
#ifndef __ARCH_ARM_MACH_OMAP2_PM_H
#define __ARCH_ARM_MACH_OMAP2_PM_H
#include <plat/powerdomain.h>
#include "powerdomain.h"
extern void *omap3_secure_ram_storage;
extern void omap3_pm_off_mode_enable(int);

4
arch/arm/mach-omap2/pm24xx.c
View File

@ -50,7 +50,7 @@
#include "pm.h"
#include "control.h"
#include <plat/powerdomain.h>
#include "powerdomain.h"
#include "clockdomain.h"
#ifdef CONFIG_SUSPEND
@ -120,7 +120,7 @@ static void omap2_enter_full_retention(void)
l = omap_ctrl_readl(OMAP2_CONTROL_DEVCONF0) | OMAP24XX_USBSTANDBYCTRL;
omap_ctrl_writel(l, OMAP2_CONTROL_DEVCONF0);
omap2_gpio_prepare_for_idle(PWRDM_POWER_RET);
omap2_gpio_prepare_for_idle(0);
if (omap2_pm_debug) {
omap2_pm_dump(0, 0, 0);

6
arch/arm/mach-omap2/pm34xx.c
View File

@ -32,7 +32,7 @@
#include <plat/sram.h>
#include "clockdomain.h"
#include <plat/powerdomain.h>
#include "powerdomain.h"
#include <plat/serial.h>
#include <plat/sdrc.h>
#include <plat/prcm.h>
@ -360,6 +360,7 @@ void omap_sram_idle(void)
int mpu_next_state = PWRDM_POWER_ON;
int per_next_state = PWRDM_POWER_ON;
int core_next_state = PWRDM_POWER_ON;
int per_going_off;
int core_prev_state, per_prev_state;
u32 sdrc_pwr = 0;
@ -411,9 +412,10 @@ void omap_sram_idle(void)
/* PER */
if (per_next_state < PWRDM_POWER_ON) {
per_going_off = (per_next_state == PWRDM_POWER_OFF) ? 1 : 0;
omap_uart_prepare_idle(2);
omap_uart_prepare_idle(3);
omap2_gpio_prepare_for_idle(per_next_state);
omap2_gpio_prepare_for_idle(per_going_off);
if (per_next_state == PWRDM_POWER_OFF)
omap3_per_save_context();
}

2
arch/arm/mach-omap2/pm44xx.c
View File

@ -16,7 +16,7 @@
#include <linux/err.h>
#include <linux/slab.h>
#include <plat/powerdomain.h>
#include "powerdomain.h"
#include <mach/omap4-common.h>
struct power_state {

1
arch/arm/mach-omap2/powerdomain-common.c
View File

@ -20,7 +20,6 @@
#include "cm-regbits-44xx.h"
#include "prm-regbits-34xx.h"
#include "prm-regbits-44xx.h"
#include "powerdomains.h"
/*
* OMAP3 and OMAP4 specific register bit initialisations

2
arch/arm/mach-omap2/powerdomain.c
View File

@ -26,7 +26,7 @@
#include "prm44xx.h"
#include <plat/cpu.h>
#include <plat/powerdomain.h>
#include "powerdomain.h"
#include "clockdomain.h"
#include <plat/prcm.h>

23
arch/arm/plat-omap/include/plat/powerdomain.h → arch/arm/mach-omap2/powerdomain.h
View File

@ -1,10 +1,10 @@
/*
* OMAP2/3/4 powerdomain control
*
* Copyright (C) 2007-2008 Texas Instruments, Inc.
* Copyright (C) 2007-2008, 2010 Texas Instruments, Inc.
* Copyright (C) 2007-2010 Nokia Corporation
*
* Written by Paul Walmsley
* Paul Walmsley
*
* 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
@ -14,13 +14,13 @@
* opportunity.
*/
#ifndef ASM_ARM_PLAT_OMAP_INCLUDE_PLAT_POWERDOMAIN
#define ASM_ARM_PLAT_OMAP_INCLUDE_PLAT_POWERDOMAIN
#ifndef __ARCH_ARM_MACH_OMAP2_POWERDOMAIN_H
#define __ARCH_ARM_MACH_OMAP2_POWERDOMAIN_H
#include <linux/types.h>
#include <linux/list.h>
#include <asm/atomic.h>
#include <linux/atomic.h>
#include <plat/cpu.h>
@ -216,4 +216,17 @@ extern void omap2xxx_powerdomains_init(void);
extern void omap3xxx_powerdomains_init(void);
extern void omap44xx_powerdomains_init(void);
extern struct pwrdm_ops omap2_pwrdm_operations;
extern struct pwrdm_ops omap3_pwrdm_operations;
extern struct pwrdm_ops omap4_pwrdm_operations;
/* Common Internal functions used across OMAP rev's */
extern u32 omap2_pwrdm_get_mem_bank_onstate_mask(u8 bank);
extern u32 omap2_pwrdm_get_mem_bank_retst_mask(u8 bank);
extern u32 omap2_pwrdm_get_mem_bank_stst_mask(u8 bank);
extern struct powerdomain wkup_omap2_pwrdm;
extern struct powerdomain gfx_omap2_pwrdm;
#endif

2
arch/arm/mach-omap2/powerdomain2xxx_3xxx.c
View File

@ -18,8 +18,8 @@
#include <plat/prcm.h>
#include "powerdomain.h"
#include "prm-regbits-34xx.h"
#include "powerdomains.h"
#include "prm.h"
#include "prm-regbits-24xx.h"
#include "prm-regbits-34xx.h"

3
arch/arm/mach-omap2/powerdomain44xx.c
View File

@ -16,13 +16,12 @@
#include <linux/errno.h>
#include <linux/delay.h>
#include <plat/powerdomain.h>
#include "powerdomain.h"
#include <plat/prcm.h>
#include "prm2xxx_3xxx.h"
#include "prm44xx.h"
#include "prminst44xx.h"
#include "prm-regbits-44xx.h"
#include "powerdomains.h"
static int omap4_pwrdm_set_next_pwrst(struct powerdomain *pwrdm, u8 pwrst)
{

30
arch/arm/mach-omap2/powerdomains.h
View File

@ -1,30 +0,0 @@
/*
* OMAP2+ powerdomain prototypes
*
* Copyright (C) 2010 Texas Instruments, Inc.
*
* Rajendra Nayak <rnayak@ti.com>
*
* 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.
*/
#ifndef ARCH_ARM_MACH_OMAP2_POWERDOMAINS_H
#define ARCH_ARM_MACH_OMAP2_POWERDOMAINS_H
#include <plat/powerdomain.h>
extern struct pwrdm_ops omap2_pwrdm_operations;
extern struct pwrdm_ops omap3_pwrdm_operations;
extern struct pwrdm_ops omap4_pwrdm_operations;
/* Common Internal functions used across OMAP rev's */
extern u32 omap2_pwrdm_get_mem_bank_onstate_mask(u8 bank);
extern u32 omap2_pwrdm_get_mem_bank_retst_mask(u8 bank);
extern u32 omap2_pwrdm_get_mem_bank_stst_mask(u8 bank);
extern struct powerdomain wkup_omap2_pwrdm;
extern struct powerdomain gfx_omap2_pwrdm;
#endif

4
arch/arm/mach-omap2/powerdomains2xxx_3xxx_data.c
View File

@ -45,13 +45,11 @@
* address offset is different between the C55 and C64 DSPs.
*/
#include <plat/powerdomain.h>
#include "powerdomain.h"
#include "prcm-common.h"
#include "prm.h"
#include "powerdomains.h"
/* OMAP2/3-common powerdomains */
/*

2
arch/arm/mach-omap2/powerdomains2xxx_3xxx_data.h
View File

@ -14,7 +14,7 @@
#ifndef __ARCH_ARM_MACH_OMAP2_POWERDOMAINS2XXX_3XXX_DATA_H
#define __ARCH_ARM_MACH_OMAP2_POWERDOMAINS2XXX_3XXX_DATA_H
#include <plat/powerdomain.h>
#include "powerdomain.h"
extern struct powerdomain gfx_omap2_pwrdm;
extern struct powerdomain wkup_omap2_pwrdm;

3
arch/arm/mach-omap2/powerdomains2xxx_data.c
View File

@ -14,9 +14,8 @@
#include <linux/kernel.h>
#include <linux/init.h>
#include <plat/powerdomain.h>
#include "powerdomain.h"
#include "powerdomains2xxx_3xxx_data.h"
#include "powerdomains.h"
#include "prcm-common.h"
#include "prm2xxx_3xxx.h"

3
arch/arm/mach-omap2/powerdomains3xxx_data.c
View File

@ -14,9 +14,8 @@
#include <linux/kernel.h>
#include <linux/init.h>
#include <plat/powerdomain.h>
#include "powerdomain.h"
#include "powerdomains2xxx_3xxx_data.h"
#include "powerdomains.h"
#include "prcm-common.h"
#include "prm2xxx_3xxx.h"

3
arch/arm/mach-omap2/powerdomains44xx_data.c
View File

@ -22,8 +22,7 @@
#include <linux/kernel.h>
#include <linux/init.h>
#include <plat/powerdomain.h>
#include "powerdomains.h"
#include "powerdomain.h"
#include "prcm-common.h"
#include "prcm44xx.h"

5
arch/arm/plat-omap/gpio.c
View File

@ -29,7 +29,6 @@
#include <mach/irqs.h>
#include <mach/gpio.h>
#include <asm/mach/irq.h>
#include <plat/powerdomain.h>
/*
* OMAP1510 GPIO registers
@ -1864,7 +1863,7 @@ static struct sys_device omap_gpio_device = {
static int workaround_enabled;
void omap2_gpio_prepare_for_idle(int power_state)
void omap2_gpio_prepare_for_idle(int off_mode)
{
int i, c = 0;
int min = 0;
@ -1880,7 +1879,7 @@ void omap2_gpio_prepare_for_idle(int power_state)
for (j = 0; j < hweight_long(bank->dbck_enable_mask); j++)
clk_disable(bank->dbck);
if (power_state > PWRDM_POWER_OFF)
if (!off_mode)
continue;
/* If going to OFF, remove triggering for all

2
arch/arm/plat-omap/include/plat/gpio.h
View File

@ -82,7 +82,7 @@ struct omap_gpio_platform_data {
/* TODO: Analyze removing gpio_bank_count usage from driver code */
extern int gpio_bank_count;
extern void omap2_gpio_prepare_for_idle(int power_state);
extern void omap2_gpio_prepare_for_idle(int off_mode);
extern void omap2_gpio_resume_after_idle(void);
extern void omap_set_gpio_debounce(int gpio, int enable);
extern void omap_set_gpio_debounce_time(int gpio, int enable);

2
arch/arm/plat-omap/include/plat/omap-pm.h
View File

@ -19,8 +19,6 @@
#include <linux/clk.h>
#include <linux/opp.h>
#include "powerdomain.h"
/*
* agent_id values for use with omap_pm_set_min_bus_tput():
*

2
arch/arm/plat-omap/omap-pm-noop.c
View File

@ -24,8 +24,6 @@
/* Interface documentation is in mach/omap-pm.h */
#include <plat/omap-pm.h>
#include <plat/powerdomain.h>
/*
* Device-driver-originated constraints (via board-*.c files)
*/

2
drivers/staging/tidspbridge/core/_tiomap.h
View File

@ -24,7 +24,7 @@
* 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 <mach-omap2/powerdomain.h>
#include <mach-omap2/clockdomain.h>
/*
* XXX These mach-omap2/ includes are wrong and should be removed. No