renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-19 10:44:14 +08:00
Code

ARM: OMAP2+: PRCM: consolidate PRCM-related timeout macros

Browse Source 
Consolidate all of the copies of MAX_MODULE_HARDRESET_WAIT and
MAX_MODULE_SOFTRESET_WAIT into one place, arch/arm/mach-omap2/prm.h.

Signed-off-by: Paul Walmsley <paul@pwsan.com>
Tested-by: Vaibhav Hiremath <hvaibhav@ti.com>
This commit is contained in:
Paul Walmsley 2012-10-29 20:57:44 -06:00
parent d9a16f9ab9
commit b13159afb4
9 changed files with 25 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,6 +35,7 @@
#include "mux.h" #include "mux.h"
#include "control.h" #include "control.h"
#include "display.h" #include "display.h"
#include "prm.h"
#define DISPC_CONTROL 0x0040 #define DISPC_CONTROL 0x0040
#define DISPC_CONTROL2 0x0238 #define DISPC_CONTROL2 0x0238
@ -512,7 +513,6 @@ static void dispc_disable_outputs(void)
} }
} }
#define MAX_MODULE_SOFTRESET_WAIT 10000
int omap_dss_reset(struct omap_hwmod *oh) int omap_dss_reset(struct omap_hwmod *oh)
{ {
struct omap_hwmod_opt_clk *oc; struct omap_hwmod_opt_clk *oc;

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

@ -31,11 +31,9 @@
#include "omap_device.h" #include "omap_device.h"
#include "hdq1w.h" #include "hdq1w.h"
#include "prm.h"
#include "common.h" #include "common.h"
/* Maximum microseconds to wait for OMAP module to softreset */
#define MAX_MODULE_SOFTRESET_WAIT 10000
/** /**
* omap_hdq1w_reset - reset the OMAP HDQ1W module * omap_hdq1w_reset - reset the OMAP HDQ1W module
* @oh: struct omap_hwmod * * @oh: struct omap_hwmod *

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

@ -20,10 +20,11 @@
*/ */
#include "soc.h" #include "soc.h"
#include "common.h"
#include "omap_hwmod.h" #include "omap_hwmod.h"
#include "omap_device.h" #include "omap_device.h"
#include "prm.h"
#include "common.h"
#include "mux.h" #include "mux.h"
#include "i2c.h" #include "i2c.h"
@ -32,9 +33,6 @@
#define OMAP2_I2C_CON_OFFSET 0x24 #define OMAP2_I2C_CON_OFFSET 0x24
#define OMAP4_I2C_CON_OFFSET 0xA4 #define OMAP4_I2C_CON_OFFSET 0xA4
/* Maximum microseconds to wait for OMAP module to softreset */
#define MAX_MODULE_SOFTRESET_WAIT 10000
#define MAX_OMAP_I2C_HWMOD_NAME_LEN 16 #define MAX_OMAP_I2C_HWMOD_NAME_LEN 16
static void __init omap2_i2c_mux_pins(int bus_id) static void __init omap2_i2c_mux_pins(int bus_id)

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

@ -25,6 +25,7 @@
#include <linux/err.h> #include <linux/err.h>
#include <linux/platform_data/gpio-omap.h> #include <linux/platform_data/gpio-omap.h>
#include "prm.h"
#include "common.h" #include "common.h"
#include "control.h" #include "control.h"
#include "omap_hwmod.h" #include "omap_hwmod.h"
@ -43,9 +44,6 @@
#define MSDI_CON_CLKD_MASK (0x3f << 0) #define MSDI_CON_CLKD_MASK (0x3f << 0)
#define MSDI_CON_CLKD_SHIFT 0 #define MSDI_CON_CLKD_SHIFT 0
/* Maximum microseconds to wait for OMAP module to softreset */
#define MAX_MODULE_SOFTRESET_WAIT 10000
/* MSDI_TARGET_RESET_CLKD: clock divisor to use throughout the reset */ /* MSDI_TARGET_RESET_CLKD: clock divisor to use throughout the reset */
#define MSDI_TARGET_RESET_CLKD 0x3ff #define MSDI_TARGET_RESET_CLKD 0x3ff

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

@ -151,6 +151,7 @@
#include "cm3xxx.h" #include "cm3xxx.h"
#include "cminst44xx.h" #include "cminst44xx.h"
#include "cm33xx.h" #include "cm33xx.h"
#include "prm.h"
#include "prm3xxx.h" #include "prm3xxx.h"
#include "prm44xx.h" #include "prm44xx.h"
#include "prm33xx.h" #include "prm33xx.h"
@ -158,9 +159,6 @@
#include "mux.h" #include "mux.h"
#include "pm.h" #include "pm.h"
/* Maximum microseconds to wait for OMAP module to softreset */
#define MAX_MODULE_SOFTRESET_WAIT 10000
/* Name of the OMAP hwmod for the MPU */ /* Name of the OMAP hwmod for the MPU */
#define MPU_INITIATOR_NAME "mpu" #define MPU_INITIATOR_NAME "mpu"

6
arch/arm/mach-omap2/prcm-common.h
View File

@ -406,11 +406,6 @@
#define OMAP3430_EN_CORE_MASK (1 << 0) #define OMAP3430_EN_CORE_MASK (1 << 0)
/*
* MAX_MODULE_HARDRESET_WAIT: Maximum microseconds to wait for an OMAP
* submodule to exit hardreset
*/
#define MAX_MODULE_HARDRESET_WAIT 10000
/* /*
* Maximum time(us) it takes to output the signal WUCLKOUT of the last * Maximum time(us) it takes to output the signal WUCLKOUT of the last
@ -419,7 +414,6 @@
* microseconds on OMAP4, so this timeout may be too high. * microseconds on OMAP4, so this timeout may be too high.
*/ */
#define MAX_IOPAD_LATCH_TIME 100 #define MAX_IOPAD_LATCH_TIME 100
# ifndef __ASSEMBLER__ # ifndef __ASSEMBLER__
/** /**

17
arch/arm/mach-omap2/prm.h
View File

@ -20,6 +20,23 @@ extern void __iomem *prm_base;
extern void omap2_set_globals_prm(void __iomem *prm); extern void omap2_set_globals_prm(void __iomem *prm);
# endif # endif
/*
* MAX_MODULE_SOFTRESET_WAIT: Maximum microseconds to wait for OMAP
* module to softreset
*/
#define MAX_MODULE_SOFTRESET_WAIT 10000
/*
* MAX_MODULE_HARDRESET_WAIT: Maximum microseconds to wait for an OMAP
* submodule to exit hardreset
*/
#define MAX_MODULE_HARDRESET_WAIT 10000
/*
* Register bitfields
*/
/* /*
* 24XX: PM_PWSTST_CORE, PM_PWSTST_GFX, PM_PWSTST_MPU, PM_PWSTST_DSP * 24XX: PM_PWSTST_CORE, PM_PWSTST_GFX, PM_PWSTST_MPU, PM_PWSTST_DSP
* *

7
arch/arm/mach-omap2/prm2xxx_3xxx.h
View File

@ -241,11 +241,4 @@ extern int omap2_clkdm_clear_all_wkdeps(struct clockdomain *clkdm);
#define OMAP_LOGICRETSTATE_MASK (1 << 2) #define OMAP_LOGICRETSTATE_MASK (1 << 2)
/*
* MAX_MODULE_HARDRESET_WAIT: Maximum microseconds to wait for an OMAP
* submodule to exit hardreset
*/
#define MAX_MODULE_HARDRESET_WAIT 10000
#endif #endif

5
arch/arm/mach-omap2/wd_timer.c
View File

@ -1,6 +1,8 @@
/* /*
* OMAP2+ MPU WD_TIMER-specific code * OMAP2+ MPU WD_TIMER-specific code
* *
* Copyright (C) 2012 Texas Instruments, Inc.
*
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 2 of the License, or
@ -30,9 +32,6 @@
#define OMAP_WDT_WPS 0x34 #define OMAP_WDT_WPS 0x34
#define OMAP_WDT_SPR 0x48 #define OMAP_WDT_SPR 0x48
/* Maximum microseconds to wait for OMAP module to softreset */
#define MAX_MODULE_SOFTRESET_WAIT 10000
int omap2_wd_timer_disable(struct omap_hwmod *oh) int omap2_wd_timer_disable(struct omap_hwmod *oh)
{ {
void __iomem *base; void __iomem *base;