Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6
* 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: (47 commits) OMAP clock: use debugfs_remove_recursive() for rewinding OMAP2/3/4 core: create omap_device layer OMAP: omap_hwmod: call omap_hwmod init at boot; create interconnects OMAP2/3/4: create omap_hwmod layer OMAP2/3 board-*.c files: read bootloader configuration earlier OMAP2/3/4 PRCM: add module IDLEST wait code OMAP2/3 PM: create the OMAP PM interface and add a default OMAP PM no-op layer OMAP3 clock: remove superfluous calls to omap2_init_clk_clkdm OMAP clock: associate MPU clocks with the mpu_clkdm OMAP3 clock: Fixed processing of bootarg 'mpurate' OMAP: SDRC: Add several new register definitions OMAP: powerdomain: Fix overflow when doing powerdomain deps lookups. OMAP: PM: Added suspend target state control to debugfs for OMAP3 OMAP: PM debug: Add PRCM register dump support OMAP: PM debug: make powerdomains use PM-debug counters OMAP: PM: Add pm-debug counters OMAP: PM: Add closures to clkdm_for_each and pwrdm_for_each. OMAP: PM: Hook into PM counters OMAP: PM counter infrastructure. OMAP3: PM: fix lockdep warning caused by omap3_pm_init ...
This commit is contained in:
Linus Torvalds
@@ -16,10 +16,8 @@
|
||||
|
||||
/* Different peripheral ids */
|
||||
#define OMAP_TAG_CLOCK 0x4f01
|
||||
#define OMAP_TAG_SERIAL_CONSOLE 0x4f03
|
||||
#define OMAP_TAG_LCD 0x4f05
|
||||
#define OMAP_TAG_GPIO_SWITCH 0x4f06
|
||||
#define OMAP_TAG_UART 0x4f07
|
||||
#define OMAP_TAG_FBMEM 0x4f08
|
||||
#define OMAP_TAG_STI_CONSOLE 0x4f09
|
||||
#define OMAP_TAG_CAMERA_SENSOR 0x4f0a
|
||||
|
||||
@@ -95,7 +95,8 @@ int clkdm_register(struct clockdomain *clkdm);
|
||||
int clkdm_unregister(struct clockdomain *clkdm);
|
||||
struct clockdomain *clkdm_lookup(const char *name);
|
||||
|
||||
int clkdm_for_each(int (*fn)(struct clockdomain *clkdm));
|
||||
int clkdm_for_each(int (*fn)(struct clockdomain *clkdm, void *user),
|
||||
void *user);
|
||||
struct powerdomain *clkdm_get_pwrdm(struct clockdomain *clkdm);
|
||||
|
||||
void omap2_clkdm_allow_idle(struct clockdomain *clkdm);
|
||||
|
||||
@@ -20,15 +20,15 @@
|
||||
|
||||
#ifndef __ASSEMBLY__
|
||||
#define OMAP242X_CTRL_REGADDR(reg) \
|
||||
IO_ADDRESS(OMAP242X_CTRL_BASE + (reg))
|
||||
OMAP2_IO_ADDRESS(OMAP242X_CTRL_BASE + (reg))
|
||||
#define OMAP243X_CTRL_REGADDR(reg) \
|
||||
IO_ADDRESS(OMAP243X_CTRL_BASE + (reg))
|
||||
OMAP2_IO_ADDRESS(OMAP243X_CTRL_BASE + (reg))
|
||||
#define OMAP343X_CTRL_REGADDR(reg) \
|
||||
IO_ADDRESS(OMAP343X_CTRL_BASE + (reg))
|
||||
OMAP2_IO_ADDRESS(OMAP343X_CTRL_BASE + (reg))
|
||||
#else
|
||||
#define OMAP242X_CTRL_REGADDR(reg) IO_ADDRESS(OMAP242X_CTRL_BASE + (reg))
|
||||
#define OMAP243X_CTRL_REGADDR(reg) IO_ADDRESS(OMAP243X_CTRL_BASE + (reg))
|
||||
#define OMAP343X_CTRL_REGADDR(reg) IO_ADDRESS(OMAP343X_CTRL_BASE + (reg))
|
||||
#define OMAP242X_CTRL_REGADDR(reg) OMAP2_IO_ADDRESS(OMAP242X_CTRL_BASE + (reg))
|
||||
#define OMAP243X_CTRL_REGADDR(reg) OMAP2_IO_ADDRESS(OMAP243X_CTRL_BASE + (reg))
|
||||
#define OMAP343X_CTRL_REGADDR(reg) OMAP2_IO_ADDRESS(OMAP343X_CTRL_BASE + (reg))
|
||||
#endif /* __ASSEMBLY__ */
|
||||
|
||||
/*
|
||||
|
||||
@@ -41,7 +41,7 @@
|
||||
.endm
|
||||
|
||||
.macro get_irqnr_and_base, irqnr, irqstat, base, tmp
|
||||
ldr \base, =IO_ADDRESS(OMAP_IH1_BASE)
|
||||
ldr \base, =OMAP1_IO_ADDRESS(OMAP_IH1_BASE)
|
||||
ldr \irqnr, [\base, #IRQ_ITR_REG_OFFSET]
|
||||
ldr \tmp, [\base, #IRQ_MIR_REG_OFFSET]
|
||||
mov \irqstat, #0xffffffff
|
||||
@@ -53,7 +53,7 @@
|
||||
cmp \irqnr, #0
|
||||
ldreq \irqnr, [\base, #IRQ_SIR_IRQ_REG_OFFSET]
|
||||
cmpeq \irqnr, #INT_IH2_IRQ
|
||||
ldreq \base, =IO_ADDRESS(OMAP_IH2_BASE)
|
||||
ldreq \base, =OMAP1_IO_ADDRESS(OMAP_IH2_BASE)
|
||||
ldreq \irqnr, [\base, #IRQ_SIR_IRQ_REG_OFFSET]
|
||||
addeqs \irqnr, \irqnr, #32
|
||||
1510:
|
||||
@@ -68,9 +68,9 @@
|
||||
|
||||
/* REVISIT: This should be set dynamically if CONFIG_MULTI_OMAP2 is selected */
|
||||
#if defined(CONFIG_ARCH_OMAP2420) || defined(CONFIG_ARCH_OMAP2430)
|
||||
#define OMAP2_VA_IC_BASE IO_ADDRESS(OMAP24XX_IC_BASE)
|
||||
#define OMAP2_VA_IC_BASE OMAP2_IO_ADDRESS(OMAP24XX_IC_BASE)
|
||||
#elif defined(CONFIG_ARCH_OMAP34XX)
|
||||
#define OMAP2_VA_IC_BASE IO_ADDRESS(OMAP34XX_IC_BASE)
|
||||
#define OMAP2_VA_IC_BASE OMAP2_IO_ADDRESS(OMAP34XX_IC_BASE)
|
||||
#endif
|
||||
#if defined(CONFIG_ARCH_OMAP4)
|
||||
#include <mach/omap44xx.h>
|
||||
|
||||
@@ -29,7 +29,7 @@
|
||||
#include <linux/io.h>
|
||||
#include <mach/irqs.h>
|
||||
|
||||
#define OMAP_MPUIO_BASE 0xfffb5000
|
||||
#define OMAP1_MPUIO_BASE 0xfffb5000
|
||||
|
||||
#if (defined(CONFIG_ARCH_OMAP730) || defined(CONFIG_ARCH_OMAP850))
|
||||
|
||||
|
||||
@@ -54,17 +54,33 @@
|
||||
* ----------------------------------------------------------------------------
|
||||
*/
|
||||
|
||||
#if defined(CONFIG_ARCH_OMAP1)
|
||||
#ifdef __ASSEMBLER__
|
||||
#define IOMEM(x) (x)
|
||||
#else
|
||||
#define IOMEM(x) ((void __force __iomem *)(x))
|
||||
#endif
|
||||
|
||||
#define IO_PHYS 0xFFFB0000
|
||||
#define IO_OFFSET 0x01000000 /* Virtual IO = 0xfefb0000 */
|
||||
#define IO_SIZE 0x40000
|
||||
#define IO_VIRT (IO_PHYS - IO_OFFSET)
|
||||
#define __IO_ADDRESS(pa) ((pa) - IO_OFFSET)
|
||||
#define __OMAP1_IO_ADDRESS(pa) ((pa) - IO_OFFSET)
|
||||
#define io_v2p(va) ((va) + IO_OFFSET)
|
||||
#define OMAP1_IO_OFFSET 0x01000000 /* Virtual IO = 0xfefb0000 */
|
||||
#define OMAP1_IO_ADDRESS(pa) IOMEM((pa) - OMAP1_IO_OFFSET)
|
||||
|
||||
#elif defined(CONFIG_ARCH_OMAP2)
|
||||
#define OMAP2_IO_OFFSET 0x90000000
|
||||
#define OMAP2_IO_ADDRESS(pa) IOMEM((pa) + OMAP2_IO_OFFSET) /* L3 and L4 */
|
||||
|
||||
/*
|
||||
* ----------------------------------------------------------------------------
|
||||
* Omap1 specific IO mapping
|
||||
* ----------------------------------------------------------------------------
|
||||
*/
|
||||
|
||||
#define OMAP1_IO_PHYS 0xFFFB0000
|
||||
#define OMAP1_IO_SIZE 0x40000
|
||||
#define OMAP1_IO_VIRT (OMAP1_IO_PHYS - OMAP1_IO_OFFSET)
|
||||
|
||||
/*
|
||||
* ----------------------------------------------------------------------------
|
||||
* Omap2 specific IO mapping
|
||||
* ----------------------------------------------------------------------------
|
||||
*/
|
||||
|
||||
/* We map both L3 and L4 on OMAP2 */
|
||||
#define L3_24XX_PHYS L3_24XX_BASE /* 0x68000000 */
|
||||
@@ -87,11 +103,6 @@
|
||||
#define OMAP243X_SMS_VIRT 0xFC000000
|
||||
#define OMAP243X_SMS_SIZE SZ_1M
|
||||
|
||||
#define IO_OFFSET 0x90000000
|
||||
#define __IO_ADDRESS(pa) ((pa) + IO_OFFSET) /* Works for L3 and L4 */
|
||||
#define __OMAP2_IO_ADDRESS(pa) ((pa) + IO_OFFSET) /* Works for L3 and L4 */
|
||||
#define io_v2p(va) ((va) - IO_OFFSET) /* Works for L3 and L4 */
|
||||
|
||||
/* DSP */
|
||||
#define DSP_MEM_24XX_PHYS OMAP2420_DSP_MEM_BASE /* 0x58000000 */
|
||||
#define DSP_MEM_24XX_VIRT 0xe0000000
|
||||
@@ -103,7 +114,11 @@
|
||||
#define DSP_MMU_24XX_VIRT 0xe2000000
|
||||
#define DSP_MMU_24XX_SIZE SZ_4K
|
||||
|
||||
#elif defined(CONFIG_ARCH_OMAP3)
|
||||
/*
|
||||
* ----------------------------------------------------------------------------
|
||||
* Omap3 specific IO mapping
|
||||
* ----------------------------------------------------------------------------
|
||||
*/
|
||||
|
||||
/* We map both L3 and L4 on OMAP3 */
|
||||
#define L3_34XX_PHYS L3_34XX_BASE /* 0x68000000 */
|
||||
@@ -143,12 +158,6 @@
|
||||
#define OMAP343X_SDRC_VIRT 0xFD000000
|
||||
#define OMAP343X_SDRC_SIZE SZ_1M
|
||||
|
||||
|
||||
#define IO_OFFSET 0x90000000
|
||||
#define __IO_ADDRESS(pa) ((pa) + IO_OFFSET)/* Works for L3 and L4 */
|
||||
#define __OMAP2_IO_ADDRESS(pa) ((pa) + IO_OFFSET)/* Works for L3 and L4 */
|
||||
#define io_v2p(va) ((va) - IO_OFFSET)/* Works for L3 and L4 */
|
||||
|
||||
/* DSP */
|
||||
#define DSP_MEM_34XX_PHYS OMAP34XX_DSP_MEM_BASE /* 0x58000000 */
|
||||
#define DSP_MEM_34XX_VIRT 0xe0000000
|
||||
@@ -160,8 +169,12 @@
|
||||
#define DSP_MMU_34XX_VIRT 0xe2000000
|
||||
#define DSP_MMU_34XX_SIZE SZ_4K
|
||||
|
||||
/*
|
||||
* ----------------------------------------------------------------------------
|
||||
* Omap4 specific IO mapping
|
||||
* ----------------------------------------------------------------------------
|
||||
*/
|
||||
|
||||
#elif defined(CONFIG_ARCH_OMAP4)
|
||||
/* We map both L3 and L4 on OMAP4 */
|
||||
#define L3_44XX_PHYS L3_44XX_BASE
|
||||
#define L3_44XX_VIRT 0xd4000000
|
||||
@@ -189,38 +202,24 @@
|
||||
#define OMAP44XX_GPMC_SIZE SZ_1M
|
||||
|
||||
|
||||
#define IO_OFFSET 0x90000000
|
||||
#define __IO_ADDRESS(pa) ((pa) + IO_OFFSET)/* Works for L3 and L4 */
|
||||
#define __OMAP2_IO_ADDRESS(pa) ((pa) + IO_OFFSET)/* Works for L3 and L4 */
|
||||
#define io_v2p(va) ((va) - IO_OFFSET)/* Works for L3 and L4 */
|
||||
/*
|
||||
* ----------------------------------------------------------------------------
|
||||
* Omap specific register access
|
||||
* ----------------------------------------------------------------------------
|
||||
*/
|
||||
|
||||
#endif
|
||||
|
||||
#define IO_ADDRESS(pa) IOMEM(__IO_ADDRESS(pa))
|
||||
#define OMAP1_IO_ADDRESS(pa) IOMEM(__OMAP1_IO_ADDRESS(pa))
|
||||
#define OMAP2_IO_ADDRESS(pa) IOMEM(__OMAP2_IO_ADDRESS(pa))
|
||||
|
||||
#ifdef __ASSEMBLER__
|
||||
#define IOMEM(x) (x)
|
||||
#else
|
||||
#define IOMEM(x) ((void __force __iomem *)(x))
|
||||
#ifndef __ASSEMBLER__
|
||||
|
||||
/*
|
||||
* Functions to access the OMAP IO region
|
||||
*
|
||||
* NOTE: - Use omap_read/write[bwl] for physical register addresses
|
||||
* - Use __raw_read/write[bwl]() for virtual register addresses
|
||||
* - Use IO_ADDRESS(phys_addr) to convert registers to virtual addresses
|
||||
* - DO NOT use hardcoded virtual addresses to allow changing the
|
||||
* IO address space again if needed
|
||||
* NOTE: Please use ioremap + __raw_read/write where possible instead of these
|
||||
*/
|
||||
#define omap_readb(a) __raw_readb(IO_ADDRESS(a))
|
||||
#define omap_readw(a) __raw_readw(IO_ADDRESS(a))
|
||||
#define omap_readl(a) __raw_readl(IO_ADDRESS(a))
|
||||
|
||||
#define omap_writeb(v,a) __raw_writeb(v, IO_ADDRESS(a))
|
||||
#define omap_writew(v,a) __raw_writew(v, IO_ADDRESS(a))
|
||||
#define omap_writel(v,a) __raw_writel(v, IO_ADDRESS(a))
|
||||
extern u8 omap_readb(u32 pa);
|
||||
extern u16 omap_readw(u32 pa);
|
||||
extern u32 omap_readl(u32 pa);
|
||||
extern void omap_writeb(u8 v, u32 pa);
|
||||
extern void omap_writew(u16 v, u32 pa);
|
||||
extern void omap_writel(u32 v, u32 pa);
|
||||
|
||||
struct omap_sdrc_params;
|
||||
|
||||
|
||||
@@ -95,7 +95,7 @@ struct iommu_functions {
|
||||
|
||||
void (*save_ctx)(struct iommu *obj);
|
||||
void (*restore_ctx)(struct iommu *obj);
|
||||
ssize_t (*dump_ctx)(struct iommu *obj, char *buf);
|
||||
ssize_t (*dump_ctx)(struct iommu *obj, char *buf, ssize_t len);
|
||||
};
|
||||
|
||||
struct iommu_platform_data {
|
||||
@@ -162,7 +162,7 @@ extern void uninstall_iommu_arch(const struct iommu_functions *ops);
|
||||
extern int foreach_iommu_device(void *data,
|
||||
int (*fn)(struct device *, void *));
|
||||
|
||||
extern ssize_t iommu_dump_ctx(struct iommu *obj, char *buf);
|
||||
extern size_t dump_tlb_entries(struct iommu *obj, char *buf);
|
||||
extern ssize_t iommu_dump_ctx(struct iommu *obj, char *buf, ssize_t len);
|
||||
extern size_t dump_tlb_entries(struct iommu *obj, char *buf, ssize_t len);
|
||||
|
||||
#endif /* __MACH_IOMMU_H */
|
||||
|
||||
@@ -25,7 +25,7 @@ typedef struct {
|
||||
} xip_omap_mpu_timer_regs_t;
|
||||
|
||||
#define xip_omap_mpu_timer_base(n) \
|
||||
((volatile xip_omap_mpu_timer_regs_t*)IO_ADDRESS(OMAP_MPU_TIMER_BASE + \
|
||||
((volatile xip_omap_mpu_timer_regs_t*)OMAP1_IO_ADDRESS(OMAP_MPU_TIMER_BASE + \
|
||||
(n)*OMAP_MPU_TIMER_OFFSET))
|
||||
|
||||
static inline unsigned long xip_omap_mpu_timer_read(int nr)
|
||||
|
||||
@@ -857,6 +857,37 @@ enum omap34xx_index {
|
||||
/* OMAP3 SDRC CKE signals to SDR/DDR ram chips */
|
||||
H16_34XX_SDRC_CKE0,
|
||||
H17_34XX_SDRC_CKE1,
|
||||
|
||||
/* MMC1 */
|
||||
N28_3430_MMC1_CLK,
|
||||
M27_3430_MMC1_CMD,
|
||||
N27_3430_MMC1_DAT0,
|
||||
N26_3430_MMC1_DAT1,
|
||||
N25_3430_MMC1_DAT2,
|
||||
P28_3430_MMC1_DAT3,
|
||||
P27_3430_MMC1_DAT4,
|
||||
P26_3430_MMC1_DAT5,
|
||||
R27_3430_MMC1_DAT6,
|
||||
R25_3430_MMC1_DAT7,
|
||||
|
||||
/* MMC2 */
|
||||
AE2_3430_MMC2_CLK,
|
||||
AG5_3430_MMC2_CMD,
|
||||
AH5_3430_MMC2_DAT0,
|
||||
AH4_3430_MMC2_DAT1,
|
||||
AG4_3430_MMC2_DAT2,
|
||||
AF4_3430_MMC2_DAT3,
|
||||
|
||||
/* MMC3 */
|
||||
AF10_3430_MMC3_CLK,
|
||||
AC3_3430_MMC3_CMD,
|
||||
AE11_3430_MMC3_DAT0,
|
||||
AH9_3430_MMC3_DAT1,
|
||||
AF13_3430_MMC3_DAT2,
|
||||
AF13_3430_MMC3_DAT3,
|
||||
|
||||
/* SYS_NIRQ T2 INT1 */
|
||||
AF26_34XX_SYS_NIRQ,
|
||||
};
|
||||
|
||||
struct omap_mux_cfg {
|
||||
|
||||
301
arch/arm/plat-omap/include/mach/omap-pm.h
Normal file
301
arch/arm/plat-omap/include/mach/omap-pm.h
Normal file
@@ -0,0 +1,301 @@
|
||||
/*
|
||||
* omap-pm.h - OMAP power management interface
|
||||
*
|
||||
* Copyright (C) 2008-2009 Texas Instruments, Inc.
|
||||
* Copyright (C) 2008-2009 Nokia Corporation
|
||||
* Paul Walmsley
|
||||
*
|
||||
* Interface developed by (in alphabetical order): Karthik Dasu, Jouni
|
||||
* Högander, Tony Lindgren, Rajendra Nayak, Sakari Poussa,
|
||||
* Veeramanikandan Raju, Anand Sawant, Igor Stoppa, Paul Walmsley,
|
||||
* Richard Woodruff
|
||||
*/
|
||||
|
||||
#ifndef ASM_ARM_ARCH_OMAP_OMAP_PM_H
|
||||
#define ASM_ARM_ARCH_OMAP_OMAP_PM_H
|
||||
|
||||
#include <linux/device.h>
|
||||
#include <linux/cpufreq.h>
|
||||
|
||||
#include "powerdomain.h"
|
||||
|
||||
/**
|
||||
* struct omap_opp - clock frequency-to-OPP ID table for DSP, MPU
|
||||
* @rate: target clock rate
|
||||
* @opp_id: OPP ID
|
||||
* @min_vdd: minimum VDD1 voltage (in millivolts) for this OPP
|
||||
*
|
||||
* Operating performance point data. Can vary by OMAP chip and board.
|
||||
*/
|
||||
struct omap_opp {
|
||||
unsigned long rate;
|
||||
u8 opp_id;
|
||||
u16 min_vdd;
|
||||
};
|
||||
|
||||
extern struct omap_opp *mpu_opps;
|
||||
extern struct omap_opp *dsp_opps;
|
||||
extern struct omap_opp *l3_opps;
|
||||
|
||||
/*
|
||||
* agent_id values for use with omap_pm_set_min_bus_tput():
|
||||
*
|
||||
* OCP_INITIATOR_AGENT is only valid for devices that can act as
|
||||
* initiators -- it represents the device's L3 interconnect
|
||||
* connection. OCP_TARGET_AGENT represents the device's L4
|
||||
* interconnect connection.
|
||||
*/
|
||||
#define OCP_TARGET_AGENT 1
|
||||
#define OCP_INITIATOR_AGENT 2
|
||||
|
||||
/**
|
||||
* omap_pm_if_early_init - OMAP PM init code called before clock fw init
|
||||
* @mpu_opp_table: array ptr to struct omap_opp for MPU
|
||||
* @dsp_opp_table: array ptr to struct omap_opp for DSP
|
||||
* @l3_opp_table : array ptr to struct omap_opp for CORE
|
||||
*
|
||||
* Initialize anything that must be configured before the clock
|
||||
* framework starts. The "_if_" is to avoid name collisions with the
|
||||
* PM idle-loop code.
|
||||
*/
|
||||
int __init omap_pm_if_early_init(struct omap_opp *mpu_opp_table,
|
||||
struct omap_opp *dsp_opp_table,
|
||||
struct omap_opp *l3_opp_table);
|
||||
|
||||
/**
|
||||
* omap_pm_if_init - OMAP PM init code called after clock fw init
|
||||
*
|
||||
* The main initialization code. OPP tables are passed in here. The
|
||||
* "_if_" is to avoid name collisions with the PM idle-loop code.
|
||||
*/
|
||||
int __init omap_pm_if_init(void);
|
||||
|
||||
/**
|
||||
* omap_pm_if_exit - OMAP PM exit code
|
||||
*
|
||||
* Exit code; currently unused. The "_if_" is to avoid name
|
||||
* collisions with the PM idle-loop code.
|
||||
*/
|
||||
void omap_pm_if_exit(void);
|
||||
|
||||
/*
|
||||
* Device-driver-originated constraints (via board-*.c files, platform_data)
|
||||
*/
|
||||
|
||||
|
||||
/**
|
||||
* omap_pm_set_max_mpu_wakeup_lat - set the maximum MPU wakeup latency
|
||||
* @dev: struct device * requesting the constraint
|
||||
* @t: maximum MPU wakeup latency in microseconds
|
||||
*
|
||||
* Request that the maximum interrupt latency for the MPU to be no
|
||||
* greater than 't' microseconds. "Interrupt latency" in this case is
|
||||
* defined as the elapsed time from the occurrence of a hardware or
|
||||
* timer interrupt to the time when the device driver's interrupt
|
||||
* service routine has been entered by the MPU.
|
||||
*
|
||||
* It is intended that underlying PM code will use this information to
|
||||
* determine what power state to put the MPU powerdomain into, and
|
||||
* possibly the CORE powerdomain as well, since interrupt handling
|
||||
* code currently runs from SDRAM. Advanced PM or board*.c code may
|
||||
* also configure interrupt controller priorities, OCP bus priorities,
|
||||
* CPU speed(s), etc.
|
||||
*
|
||||
* This function will not affect device wakeup latency, e.g., time
|
||||
* elapsed from when a device driver enables a hardware device with
|
||||
* clk_enable(), to when the device is ready for register access or
|
||||
* other use. To control this device wakeup latency, use
|
||||
* set_max_dev_wakeup_lat()
|
||||
*
|
||||
* Multiple calls to set_max_mpu_wakeup_lat() will replace the
|
||||
* previous t value. To remove the latency target for the MPU, call
|
||||
* with t = -1.
|
||||
*
|
||||
* No return value.
|
||||
*/
|
||||
void omap_pm_set_max_mpu_wakeup_lat(struct device *dev, long t);
|
||||
|
||||
|
||||
/**
|
||||
* omap_pm_set_min_bus_tput - set minimum bus throughput needed by device
|
||||
* @dev: struct device * requesting the constraint
|
||||
* @tbus_id: interconnect to operate on (OCP_{INITIATOR,TARGET}_AGENT)
|
||||
* @r: minimum throughput (in KiB/s)
|
||||
*
|
||||
* Request that the minimum data throughput on the OCP interconnect
|
||||
* attached to device 'dev' interconnect agent 'tbus_id' be no less
|
||||
* than 'r' KiB/s.
|
||||
*
|
||||
* It is expected that the OMAP PM or bus code will use this
|
||||
* information to set the interconnect clock to run at the lowest
|
||||
* possible speed that satisfies all current system users. The PM or
|
||||
* bus code will adjust the estimate based on its model of the bus, so
|
||||
* device driver authors should attempt to specify an accurate
|
||||
* quantity for their device use case, and let the PM or bus code
|
||||
* overestimate the numbers as necessary to handle request/response
|
||||
* latency, other competing users on the system, etc. On OMAP2/3, if
|
||||
* a driver requests a minimum L4 interconnect speed constraint, the
|
||||
* code will also need to add an minimum L3 interconnect speed
|
||||
* constraint,
|
||||
*
|
||||
* Multiple calls to set_min_bus_tput() will replace the previous rate
|
||||
* value for this device. To remove the interconnect throughput
|
||||
* restriction for this device, call with r = 0.
|
||||
*
|
||||
* No return value.
|
||||
*/
|
||||
void omap_pm_set_min_bus_tput(struct device *dev, u8 agent_id, unsigned long r);
|
||||
|
||||
|
||||
/**
|
||||
* omap_pm_set_max_dev_wakeup_lat - set the maximum device enable latency
|
||||
* @dev: struct device *
|
||||
* @t: maximum device wakeup latency in microseconds
|
||||
*
|
||||
* Request that the maximum amount of time necessary for a device to
|
||||
* become accessible after its clocks are enabled should be no greater
|
||||
* than 't' microseconds. Specifically, this represents the time from
|
||||
* when a device driver enables device clocks with clk_enable(), to
|
||||
* when the register reads and writes on the device will succeed.
|
||||
* This function should be called before clk_disable() is called,
|
||||
* since the power state transition decision may be made during
|
||||
* clk_disable().
|
||||
*
|
||||
* It is intended that underlying PM code will use this information to
|
||||
* determine what power state to put the powerdomain enclosing this
|
||||
* device into.
|
||||
*
|
||||
* Multiple calls to set_max_dev_wakeup_lat() will replace the
|
||||
* previous wakeup latency values for this device. To remove the wakeup
|
||||
* latency restriction for this device, call with t = -1.
|
||||
*
|
||||
* No return value.
|
||||
*/
|
||||
void omap_pm_set_max_dev_wakeup_lat(struct device *dev, long t);
|
||||
|
||||
|
||||
/**
|
||||
* omap_pm_set_max_sdma_lat - set the maximum system DMA transfer start latency
|
||||
* @dev: struct device *
|
||||
* @t: maximum DMA transfer start latency in microseconds
|
||||
*
|
||||
* Request that the maximum system DMA transfer start latency for this
|
||||
* device 'dev' should be no greater than 't' microseconds. "DMA
|
||||
* transfer start latency" here is defined as the elapsed time from
|
||||
* when a device (e.g., McBSP) requests that a system DMA transfer
|
||||
* start or continue, to the time at which data starts to flow into
|
||||
* that device from the system DMA controller.
|
||||
*
|
||||
* It is intended that underlying PM code will use this information to
|
||||
* determine what power state to put the CORE powerdomain into.
|
||||
*
|
||||
* Since system DMA transfers may not involve the MPU, this function
|
||||
* will not affect MPU wakeup latency. Use set_max_cpu_lat() to do
|
||||
* so. Similarly, this function will not affect device wakeup latency
|
||||
* -- use set_max_dev_wakeup_lat() to affect that.
|
||||
*
|
||||
* Multiple calls to set_max_sdma_lat() will replace the previous t
|
||||
* value for this device. To remove the maximum DMA latency for this
|
||||
* device, call with t = -1.
|
||||
*
|
||||
* No return value.
|
||||
*/
|
||||
void omap_pm_set_max_sdma_lat(struct device *dev, long t);
|
||||
|
||||
|
||||
/*
|
||||
* DSP Bridge-specific constraints
|
||||
*/
|
||||
|
||||
/**
|
||||
* omap_pm_dsp_get_opp_table - get OPP->DSP clock frequency table
|
||||
*
|
||||
* Intended for use by DSPBridge. Returns an array of OPP->DSP clock
|
||||
* frequency entries. The final item in the array should have .rate =
|
||||
* .opp_id = 0.
|
||||
*/
|
||||
const struct omap_opp *omap_pm_dsp_get_opp_table(void);
|
||||
|
||||
/**
|
||||
* omap_pm_dsp_set_min_opp - receive desired OPP target ID from DSP Bridge
|
||||
* @opp_id: target DSP OPP ID
|
||||
*
|
||||
* Set a minimum OPP ID for the DSP. This is intended to be called
|
||||
* only from the DSP Bridge MPU-side driver. Unfortunately, the only
|
||||
* information that code receives from the DSP/BIOS load estimator is the
|
||||
* target OPP ID; hence, this interface. No return value.
|
||||
*/
|
||||
void omap_pm_dsp_set_min_opp(u8 opp_id);
|
||||
|
||||
/**
|
||||
* omap_pm_dsp_get_opp - report the current DSP OPP ID
|
||||
*
|
||||
* Report the current OPP for the DSP. Since on OMAP3, the DSP and
|
||||
* MPU share a single voltage domain, the OPP ID returned back may
|
||||
* represent a higher DSP speed than the OPP requested via
|
||||
* omap_pm_dsp_set_min_opp().
|
||||
*
|
||||
* Returns the current VDD1 OPP ID, or 0 upon error.
|
||||
*/
|
||||
u8 omap_pm_dsp_get_opp(void);
|
||||
|
||||
|
||||
/*
|
||||
* CPUFreq-originated constraint
|
||||
*
|
||||
* In the future, this should be handled by custom OPP clocktype
|
||||
* functions.
|
||||
*/
|
||||
|
||||
/**
|
||||
* omap_pm_cpu_get_freq_table - return a cpufreq_frequency_table array ptr
|
||||
*
|
||||
* Provide a frequency table usable by CPUFreq for the current chip/board.
|
||||
* Returns a pointer to a struct cpufreq_frequency_table array or NULL
|
||||
* upon error.
|
||||
*/
|
||||
struct cpufreq_frequency_table **omap_pm_cpu_get_freq_table(void);
|
||||
|
||||
/**
|
||||
* omap_pm_cpu_set_freq - set the current minimum MPU frequency
|
||||
* @f: MPU frequency in Hz
|
||||
*
|
||||
* Set the current minimum CPU frequency. The actual CPU frequency
|
||||
* used could end up higher if the DSP requested a higher OPP.
|
||||
* Intended to be called by plat-omap/cpu_omap.c:omap_target(). No
|
||||
* return value.
|
||||
*/
|
||||
void omap_pm_cpu_set_freq(unsigned long f);
|
||||
|
||||
/**
|
||||
* omap_pm_cpu_get_freq - report the current CPU frequency
|
||||
*
|
||||
* Returns the current MPU frequency, or 0 upon error.
|
||||
*/
|
||||
unsigned long omap_pm_cpu_get_freq(void);
|
||||
|
||||
|
||||
/*
|
||||
* Device context loss tracking
|
||||
*/
|
||||
|
||||
/**
|
||||
* omap_pm_get_dev_context_loss_count - return count of times dev has lost ctx
|
||||
* @dev: struct device *
|
||||
*
|
||||
* This function returns the number of times that the device @dev has
|
||||
* lost its internal context. This generally occurs on a powerdomain
|
||||
* transition to OFF. Drivers use this as an optimization to avoid restoring
|
||||
* context if the device hasn't lost it. To use, drivers should initially
|
||||
* call this in their context save functions and store the result. Early in
|
||||
* the driver's context restore function, the driver should call this function
|
||||
* again, and compare the result to the stored counter. If they differ, the
|
||||
* driver must restore device context. If the number of context losses
|
||||
* exceeds the maximum positive integer, the function will wrap to 0 and
|
||||
* continue counting. Returns the number of context losses for this device,
|
||||
* or -EINVAL upon error.
|
||||
*/
|
||||
int omap_pm_get_dev_context_loss_count(struct device *dev);
|
||||
|
||||
|
||||
#endif
|
||||
@@ -33,14 +33,14 @@
|
||||
#define IRQ_SIR_IRQ 0x0040
|
||||
#define OMAP44XX_GIC_DIST_BASE 0x48241000
|
||||
#define OMAP44XX_GIC_CPU_BASE 0x48240100
|
||||
#define OMAP44XX_VA_GIC_CPU_BASE IO_ADDRESS(OMAP44XX_GIC_CPU_BASE)
|
||||
#define OMAP44XX_VA_GIC_CPU_BASE OMAP2_IO_ADDRESS(OMAP44XX_GIC_CPU_BASE)
|
||||
#define OMAP44XX_SCU_BASE 0x48240000
|
||||
#define OMAP44XX_VA_SCU_BASE IO_ADDRESS(OMAP44XX_SCU_BASE)
|
||||
#define OMAP44XX_VA_SCU_BASE OMAP2_IO_ADDRESS(OMAP44XX_SCU_BASE)
|
||||
#define OMAP44XX_LOCAL_TWD_BASE 0x48240600
|
||||
#define OMAP44XX_VA_LOCAL_TWD_BASE IO_ADDRESS(OMAP44XX_LOCAL_TWD_BASE)
|
||||
#define OMAP44XX_VA_LOCAL_TWD_BASE OMAP2_IO_ADDRESS(OMAP44XX_LOCAL_TWD_BASE)
|
||||
#define OMAP44XX_LOCAL_TWD_SIZE 0x00000100
|
||||
#define OMAP44XX_WKUPGEN_BASE 0x48281000
|
||||
#define OMAP44XX_VA_WKUPGEN_BASE IO_ADDRESS(OMAP44XX_WKUPGEN_BASE)
|
||||
#define OMAP44XX_VA_WKUPGEN_BASE OMAP2_IO_ADDRESS(OMAP44XX_WKUPGEN_BASE)
|
||||
|
||||
#endif /* __ASM_ARCH_OMAP44XX_H */
|
||||
|
||||
|
||||
141
arch/arm/plat-omap/include/mach/omap_device.h
Normal file
141
arch/arm/plat-omap/include/mach/omap_device.h
Normal file
@@ -0,0 +1,141 @@
|
||||
/*
|
||||
* omap_device headers
|
||||
*
|
||||
* Copyright (C) 2009 Nokia Corporation
|
||||
* Paul Walmsley
|
||||
*
|
||||
* Developed in collaboration with (alphabetical order): Benoit
|
||||
* Cousson, Kevin Hilman, Tony Lindgren, Rajendra Nayak, Vikram
|
||||
* Pandita, Sakari Poussa, Anand Sawant, Santosh Shilimkar, Richard
|
||||
* Woodruff
|
||||
*
|
||||
* 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.
|
||||
*
|
||||
* Eventually this type of functionality should either be
|
||||
* a) implemented via arch-specific pointers in platform_device
|
||||
* or
|
||||
* b) implemented as a proper omap_bus/omap_device in Linux, no more
|
||||
* platform_device
|
||||
*
|
||||
* omap_device differs from omap_hwmod in that it includes external
|
||||
* (e.g., board- and system-level) integration details. omap_hwmod
|
||||
* stores hardware data that is invariant for a given OMAP chip.
|
||||
*
|
||||
* To do:
|
||||
* - GPIO integration
|
||||
* - regulator integration
|
||||
*
|
||||
*/
|
||||
#ifndef __ARCH_ARM_PLAT_OMAP_INCLUDE_MACH_OMAP_DEVICE_H
|
||||
#define __ARCH_ARM_PLAT_OMAP_INCLUDE_MACH_OMAP_DEVICE_H
|
||||
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/platform_device.h>
|
||||
|
||||
#include <mach/omap_hwmod.h>
|
||||
|
||||
/* omap_device._state values */
|
||||
#define OMAP_DEVICE_STATE_UNKNOWN 0
|
||||
#define OMAP_DEVICE_STATE_ENABLED 1
|
||||
#define OMAP_DEVICE_STATE_IDLE 2
|
||||
#define OMAP_DEVICE_STATE_SHUTDOWN 3
|
||||
|
||||
/**
|
||||
* struct omap_device - omap_device wrapper for platform_devices
|
||||
* @pdev: platform_device
|
||||
* @hwmods: (one .. many per omap_device)
|
||||
* @hwmods_cnt: ARRAY_SIZE() of @hwmods
|
||||
* @pm_lats: ptr to an omap_device_pm_latency table
|
||||
* @pm_lats_cnt: ARRAY_SIZE() of what is passed to @pm_lats
|
||||
* @pm_lat_level: array index of the last odpl entry executed - -1 if never
|
||||
* @dev_wakeup_lat: dev wakeup latency in microseconds
|
||||
* @_dev_wakeup_lat_limit: dev wakeup latency limit in usec - set by OMAP PM
|
||||
* @_state: one of OMAP_DEVICE_STATE_* (see above)
|
||||
* @flags: device flags
|
||||
*
|
||||
* Integrates omap_hwmod data into Linux platform_device.
|
||||
*
|
||||
* Field names beginning with underscores are for the internal use of
|
||||
* the omap_device code.
|
||||
*
|
||||
*/
|
||||
struct omap_device {
|
||||
struct platform_device pdev;
|
||||
struct omap_hwmod **hwmods;
|
||||
struct omap_device_pm_latency *pm_lats;
|
||||
u32 dev_wakeup_lat;
|
||||
u32 _dev_wakeup_lat_limit;
|
||||
u8 pm_lats_cnt;
|
||||
s8 pm_lat_level;
|
||||
u8 hwmods_cnt;
|
||||
u8 _state;
|
||||
};
|
||||
|
||||
/* Device driver interface (call via platform_data fn ptrs) */
|
||||
|
||||
int omap_device_enable(struct platform_device *pdev);
|
||||
int omap_device_idle(struct platform_device *pdev);
|
||||
int omap_device_shutdown(struct platform_device *pdev);
|
||||
|
||||
/* Core code interface */
|
||||
|
||||
int omap_device_count_resources(struct omap_device *od);
|
||||
int omap_device_fill_resources(struct omap_device *od, struct resource *res);
|
||||
|
||||
struct omap_device *omap_device_build(const char *pdev_name, int pdev_id,
|
||||
struct omap_hwmod *oh, void *pdata,
|
||||
int pdata_len,
|
||||
struct omap_device_pm_latency *pm_lats,
|
||||
int pm_lats_cnt);
|
||||
|
||||
struct omap_device *omap_device_build_ss(const char *pdev_name, int pdev_id,
|
||||
struct omap_hwmod **oh, int oh_cnt,
|
||||
void *pdata, int pdata_len,
|
||||
struct omap_device_pm_latency *pm_lats,
|
||||
int pm_lats_cnt);
|
||||
|
||||
int omap_device_register(struct omap_device *od);
|
||||
|
||||
/* OMAP PM interface */
|
||||
int omap_device_align_pm_lat(struct platform_device *pdev,
|
||||
u32 new_wakeup_lat_limit);
|
||||
struct powerdomain *omap_device_get_pwrdm(struct omap_device *od);
|
||||
|
||||
/* Other */
|
||||
|
||||
int omap_device_idle_hwmods(struct omap_device *od);
|
||||
int omap_device_enable_hwmods(struct omap_device *od);
|
||||
|
||||
int omap_device_disable_clocks(struct omap_device *od);
|
||||
int omap_device_enable_clocks(struct omap_device *od);
|
||||
|
||||
|
||||
/*
|
||||
* Entries should be kept in latency order ascending
|
||||
*
|
||||
* deact_lat is the maximum number of microseconds required to complete
|
||||
* deactivate_func() at the device's slowest OPP.
|
||||
*
|
||||
* act_lat is the maximum number of microseconds required to complete
|
||||
* activate_func() at the device's slowest OPP.
|
||||
*
|
||||
* This will result in some suboptimal power management decisions at fast
|
||||
* OPPs, but avoids having to recompute all device power management decisions
|
||||
* if the system shifts from a fast OPP to a slow OPP (in order to meet
|
||||
* latency requirements).
|
||||
*
|
||||
* XXX should deactivate_func/activate_func() take platform_device pointers
|
||||
* rather than omap_device pointers?
|
||||
*/
|
||||
struct omap_device_pm_latency {
|
||||
u32 deactivate_lat;
|
||||
int (*deactivate_func)(struct omap_device *od);
|
||||
u32 activate_lat;
|
||||
int (*activate_func)(struct omap_device *od);
|
||||
};
|
||||
|
||||
|
||||
#endif
|
||||
|
||||
447
arch/arm/plat-omap/include/mach/omap_hwmod.h
Normal file
447
arch/arm/plat-omap/include/mach/omap_hwmod.h
Normal file
@@ -0,0 +1,447 @@
|
||||
/*
|
||||
* omap_hwmod macros, structures
|
||||
*
|
||||
* Copyright (C) 2009 Nokia Corporation
|
||||
* Paul Walmsley
|
||||
*
|
||||
* Created in collaboration with (alphabetical order): Benoit Cousson,
|
||||
* Kevin Hilman, Tony Lindgren, Rajendra Nayak, Vikram Pandita, Sakari
|
||||
* Poussa, Anand Sawant, Santosh Shilimkar, Richard Woodruff
|
||||
*
|
||||
* 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.
|
||||
*
|
||||
* These headers and macros are used to define OMAP on-chip module
|
||||
* data and their integration with other OMAP modules and Linux.
|
||||
*
|
||||
* References:
|
||||
* - OMAP2420 Multimedia Processor Silicon Revision 2.1.1, 2.2 (SWPU064)
|
||||
* - OMAP2430 Multimedia Device POP Silicon Revision 2.1 (SWPU090)
|
||||
* - OMAP34xx Multimedia Device Silicon Revision 3.1 (SWPU108)
|
||||
* - OMAP4430 Multimedia Device Silicon Revision 1.0 (SWPU140)
|
||||
* - Open Core Protocol Specification 2.2
|
||||
*
|
||||
* To do:
|
||||
* - add interconnect error log structures
|
||||
* - add pinmuxing
|
||||
* - init_conn_id_bit (CONNID_BIT_VECTOR)
|
||||
* - implement default hwmod SMS/SDRC flags?
|
||||
*
|
||||
*/
|
||||
#ifndef __ARCH_ARM_PLAT_OMAP_INCLUDE_MACH_OMAP_HWMOD_H
|
||||
#define __ARCH_ARM_PLAT_OMAP_INCLUDE_MACH_OMAP_HWMOD_H
|
||||
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/ioport.h>
|
||||
|
||||
#include <mach/cpu.h>
|
||||
|
||||
struct omap_device;
|
||||
|
||||
/* OCP SYSCONFIG bit shifts/masks */
|
||||
#define SYSC_MIDLEMODE_SHIFT 12
|
||||
#define SYSC_MIDLEMODE_MASK (0x3 << SYSC_MIDLEMODE_SHIFT)
|
||||
#define SYSC_CLOCKACTIVITY_SHIFT 8
|
||||
#define SYSC_CLOCKACTIVITY_MASK (0x3 << SYSC_CLOCKACTIVITY_SHIFT)
|
||||
#define SYSC_SIDLEMODE_SHIFT 3
|
||||
#define SYSC_SIDLEMODE_MASK (0x3 << SYSC_SIDLEMODE_SHIFT)
|
||||
#define SYSC_ENAWAKEUP_SHIFT 2
|
||||
#define SYSC_ENAWAKEUP_MASK (1 << SYSC_ENAWAKEUP_SHIFT)
|
||||
#define SYSC_SOFTRESET_SHIFT 1
|
||||
#define SYSC_SOFTRESET_MASK (1 << SYSC_SOFTRESET_SHIFT)
|
||||
|
||||
/* OCP SYSSTATUS bit shifts/masks */
|
||||
#define SYSS_RESETDONE_SHIFT 0
|
||||
#define SYSS_RESETDONE_MASK (1 << SYSS_RESETDONE_SHIFT)
|
||||
|
||||
/* Master standby/slave idle mode flags */
|
||||
#define HWMOD_IDLEMODE_FORCE (1 << 0)
|
||||
#define HWMOD_IDLEMODE_NO (1 << 1)
|
||||
#define HWMOD_IDLEMODE_SMART (1 << 2)
|
||||
|
||||
|
||||
/**
|
||||
* struct omap_hwmod_dma_info - MPU address space handled by the hwmod
|
||||
* @name: name of the DMA channel (module local name)
|
||||
* @dma_ch: DMA channel ID
|
||||
*
|
||||
* @name should be something short, e.g., "tx" or "rx". It is for use
|
||||
* by platform_get_resource_byname(). It is defined locally to the
|
||||
* hwmod.
|
||||
*/
|
||||
struct omap_hwmod_dma_info {
|
||||
const char *name;
|
||||
u16 dma_ch;
|
||||
};
|
||||
|
||||
/**
|
||||
* struct omap_hwmod_opt_clk - optional clocks used by this hwmod
|
||||
* @role: "sys", "32k", "tv", etc -- for use in clk_get()
|
||||
* @clkdev_dev_id: opt clock: clkdev dev_id string
|
||||
* @clkdev_con_id: opt clock: clkdev con_id string
|
||||
* @_clk: pointer to the struct clk (filled in at runtime)
|
||||
*
|
||||
* The module's interface clock and main functional clock should not
|
||||
* be added as optional clocks.
|
||||
*/
|
||||
struct omap_hwmod_opt_clk {
|
||||
const char *role;
|
||||
const char *clkdev_dev_id;
|
||||
const char *clkdev_con_id;
|
||||
struct clk *_clk;
|
||||
};
|
||||
|
||||
|
||||
/* omap_hwmod_omap2_firewall.flags bits */
|
||||
#define OMAP_FIREWALL_L3 (1 << 0)
|
||||
#define OMAP_FIREWALL_L4 (1 << 1)
|
||||
|
||||
/**
|
||||
* struct omap_hwmod_omap2_firewall - OMAP2/3 device firewall data
|
||||
* @l3_perm_bit: bit shift for L3_PM_*_PERMISSION_*
|
||||
* @l4_fw_region: L4 firewall region ID
|
||||
* @l4_prot_group: L4 protection group ID
|
||||
* @flags: (see omap_hwmod_omap2_firewall.flags macros above)
|
||||
*/
|
||||
struct omap_hwmod_omap2_firewall {
|
||||
u8 l3_perm_bit;
|
||||
u8 l4_fw_region;
|
||||
u8 l4_prot_group;
|
||||
u8 flags;
|
||||
};
|
||||
|
||||
|
||||
/*
|
||||
* omap_hwmod_addr_space.flags bits
|
||||
*
|
||||
* ADDR_MAP_ON_INIT: Map this address space during omap_hwmod init.
|
||||
* ADDR_TYPE_RT: Address space contains module register target data.
|
||||
*/
|
||||
#define ADDR_MAP_ON_INIT (1 << 0)
|
||||
#define ADDR_TYPE_RT (1 << 1)
|
||||
|
||||
/**
|
||||
* struct omap_hwmod_addr_space - MPU address space handled by the hwmod
|
||||
* @pa_start: starting physical address
|
||||
* @pa_end: ending physical address
|
||||
* @flags: (see omap_hwmod_addr_space.flags macros above)
|
||||
*
|
||||
* Address space doesn't necessarily follow physical interconnect
|
||||
* structure. GPMC is one example.
|
||||
*/
|
||||
struct omap_hwmod_addr_space {
|
||||
u32 pa_start;
|
||||
u32 pa_end;
|
||||
u8 flags;
|
||||
};
|
||||
|
||||
|
||||
/*
|
||||
* omap_hwmod_ocp_if.user bits: these indicate the initiators that use this
|
||||
* interface to interact with the hwmod. Used to add sleep dependencies
|
||||
* when the module is enabled or disabled.
|
||||
*/
|
||||
#define OCP_USER_MPU (1 << 0)
|
||||
#define OCP_USER_SDMA (1 << 1)
|
||||
|
||||
/* omap_hwmod_ocp_if.flags bits */
|
||||
#define OCPIF_HAS_IDLEST (1 << 0)
|
||||
#define OCPIF_SWSUP_IDLE (1 << 1)
|
||||
#define OCPIF_CAN_BURST (1 << 2)
|
||||
|
||||
/**
|
||||
* struct omap_hwmod_ocp_if - OCP interface data
|
||||
* @master: struct omap_hwmod that initiates OCP transactions on this link
|
||||
* @slave: struct omap_hwmod that responds to OCP transactions on this link
|
||||
* @addr: address space associated with this link
|
||||
* @clkdev_dev_id: interface clock: clkdev dev_id string
|
||||
* @clkdev_con_id: interface clock: clkdev con_id string
|
||||
* @_clk: pointer to the interface struct clk (filled in at runtime)
|
||||
* @fw: interface firewall data
|
||||
* @addr_cnt: ARRAY_SIZE(@addr)
|
||||
* @width: OCP data width
|
||||
* @thread_cnt: number of threads
|
||||
* @max_burst_len: maximum burst length in @width sized words (0 if unlimited)
|
||||
* @user: initiators using this interface (see OCP_USER_* macros above)
|
||||
* @flags: OCP interface flags (see OCPIF_* macros above)
|
||||
*
|
||||
* It may also be useful to add a tag_cnt field for OCP2.x devices.
|
||||
*
|
||||
* Parameter names beginning with an underscore are managed internally by
|
||||
* the omap_hwmod code and should not be set during initialization.
|
||||
*/
|
||||
struct omap_hwmod_ocp_if {
|
||||
struct omap_hwmod *master;
|
||||
struct omap_hwmod *slave;
|
||||
struct omap_hwmod_addr_space *addr;
|
||||
const char *clkdev_dev_id;
|
||||
const char *clkdev_con_id;
|
||||
struct clk *_clk;
|
||||
union {
|
||||
struct omap_hwmod_omap2_firewall omap2;
|
||||
} fw;
|
||||
u8 addr_cnt;
|
||||
u8 width;
|
||||
u8 thread_cnt;
|
||||
u8 max_burst_len;
|
||||
u8 user;
|
||||
u8 flags;
|
||||
};
|
||||
|
||||
|
||||
/* Macros for use in struct omap_hwmod_sysconfig */
|
||||
|
||||
/* Flags for use in omap_hwmod_sysconfig.idlemodes */
|
||||
#define MASTER_STANDBY_SHIFT 2
|
||||
#define SLAVE_IDLE_SHIFT 0
|
||||
#define SIDLE_FORCE (HWMOD_IDLEMODE_FORCE << SLAVE_IDLE_SHIFT)
|
||||
#define SIDLE_NO (HWMOD_IDLEMODE_NO << SLAVE_IDLE_SHIFT)
|
||||
#define SIDLE_SMART (HWMOD_IDLEMODE_SMART << SLAVE_IDLE_SHIFT)
|
||||
#define MSTANDBY_FORCE (HWMOD_IDLEMODE_FORCE << MASTER_STANDBY_SHIFT)
|
||||
#define MSTANDBY_NO (HWMOD_IDLEMODE_NO << MASTER_STANDBY_SHIFT)
|
||||
#define MSTANDBY_SMART (HWMOD_IDLEMODE_SMART << MASTER_STANDBY_SHIFT)
|
||||
|
||||
/* omap_hwmod_sysconfig.sysc_flags capability flags */
|
||||
#define SYSC_HAS_AUTOIDLE (1 << 0)
|
||||
#define SYSC_HAS_SOFTRESET (1 << 1)
|
||||
#define SYSC_HAS_ENAWAKEUP (1 << 2)
|
||||
#define SYSC_HAS_EMUFREE (1 << 3)
|
||||
#define SYSC_HAS_CLOCKACTIVITY (1 << 4)
|
||||
#define SYSC_HAS_SIDLEMODE (1 << 5)
|
||||
#define SYSC_HAS_MIDLEMODE (1 << 6)
|
||||
#define SYSS_MISSING (1 << 7)
|
||||
|
||||
/* omap_hwmod_sysconfig.clockact flags */
|
||||
#define CLOCKACT_TEST_BOTH 0x0
|
||||
#define CLOCKACT_TEST_MAIN 0x1
|
||||
#define CLOCKACT_TEST_ICLK 0x2
|
||||
#define CLOCKACT_TEST_NONE 0x3
|
||||
|
||||
/**
|
||||
* struct omap_hwmod_sysconfig - hwmod OCP_SYSCONFIG/OCP_SYSSTATUS data
|
||||
* @rev_offs: IP block revision register offset (from module base addr)
|
||||
* @sysc_offs: OCP_SYSCONFIG register offset (from module base addr)
|
||||
* @syss_offs: OCP_SYSSTATUS register offset (from module base addr)
|
||||
* @idlemodes: One or more of {SIDLE,MSTANDBY}_{OFF,FORCE,SMART}
|
||||
* @sysc_flags: SYS{C,S}_HAS* flags indicating SYSCONFIG bits supported
|
||||
* @clockact: the default value of the module CLOCKACTIVITY bits
|
||||
*
|
||||
* @clockact describes to the module which clocks are likely to be
|
||||
* disabled when the PRCM issues its idle request to the module. Some
|
||||
* modules have separate clockdomains for the interface clock and main
|
||||
* functional clock, and can check whether they should acknowledge the
|
||||
* idle request based on the internal module functionality that has
|
||||
* been associated with the clocks marked in @clockact. This field is
|
||||
* only used if HWMOD_SET_DEFAULT_CLOCKACT is set (see below)
|
||||
*
|
||||
*/
|
||||
struct omap_hwmod_sysconfig {
|
||||
u16 rev_offs;
|
||||
u16 sysc_offs;
|
||||
u16 syss_offs;
|
||||
u8 idlemodes;
|
||||
u8 sysc_flags;
|
||||
u8 clockact;
|
||||
};
|
||||
|
||||
/**
|
||||
* struct omap_hwmod_omap2_prcm - OMAP2/3-specific PRCM data
|
||||
* @module_offs: PRCM submodule offset from the start of the PRM/CM
|
||||
* @prcm_reg_id: PRCM register ID (e.g., 3 for CM_AUTOIDLE3)
|
||||
* @module_bit: register bit shift for AUTOIDLE, WKST, WKEN, GRPSEL regs
|
||||
* @idlest_reg_id: IDLEST register ID (e.g., 3 for CM_IDLEST3)
|
||||
* @idlest_idle_bit: register bit shift for CM_IDLEST slave idle bit
|
||||
* @idlest_stdby_bit: register bit shift for CM_IDLEST master standby bit
|
||||
*
|
||||
* @prcm_reg_id and @module_bit are specific to the AUTOIDLE, WKST,
|
||||
* WKEN, GRPSEL registers. In an ideal world, no extra information
|
||||
* would be needed for IDLEST information, but alas, there are some
|
||||
* exceptions, so @idlest_reg_id, @idlest_idle_bit, @idlest_stdby_bit
|
||||
* are needed for the IDLEST registers (c.f. 2430 I2CHS, 3430 USBHOST)
|
||||
*/
|
||||
struct omap_hwmod_omap2_prcm {
|
||||
s16 module_offs;
|
||||
u8 prcm_reg_id;
|
||||
u8 module_bit;
|
||||
u8 idlest_reg_id;
|
||||
u8 idlest_idle_bit;
|
||||
u8 idlest_stdby_bit;
|
||||
};
|
||||
|
||||
|
||||
/**
|
||||
* struct omap_hwmod_omap4_prcm - OMAP4-specific PRCM data
|
||||
* @module_offs: PRCM submodule offset from the start of the PRM/CM1/CM2
|
||||
* @device_offs: device register offset from @module_offs
|
||||
* @submodule_wkdep_bit: bit shift of the WKDEP range
|
||||
*/
|
||||
struct omap_hwmod_omap4_prcm {
|
||||
u32 module_offs;
|
||||
u16 device_offs;
|
||||
u8 submodule_wkdep_bit;
|
||||
};
|
||||
|
||||
|
||||
/*
|
||||
* omap_hwmod.flags definitions
|
||||
*
|
||||
* HWMOD_SWSUP_SIDLE: omap_hwmod code should manually bring module in and out
|
||||
* of idle, rather than relying on module smart-idle
|
||||
* HWMOD_SWSUP_MSTDBY: omap_hwmod code should manually bring module in and out
|
||||
* of standby, rather than relying on module smart-standby
|
||||
* HWMOD_INIT_NO_RESET: don't reset this module at boot - important for
|
||||
* SDRAM controller, etc.
|
||||
* HWMOD_INIT_NO_IDLE: don't idle this module at boot - important for SDRAM
|
||||
* controller, etc.
|
||||
* HWMOD_SET_DEFAULT_CLOCKACT: program CLOCKACTIVITY bits at startup
|
||||
*/
|
||||
#define HWMOD_SWSUP_SIDLE (1 << 0)
|
||||
#define HWMOD_SWSUP_MSTANDBY (1 << 1)
|
||||
#define HWMOD_INIT_NO_RESET (1 << 2)
|
||||
#define HWMOD_INIT_NO_IDLE (1 << 3)
|
||||
#define HWMOD_SET_DEFAULT_CLOCKACT (1 << 4)
|
||||
|
||||
/*
|
||||
* omap_hwmod._int_flags definitions
|
||||
* These are for internal use only and are managed by the omap_hwmod code.
|
||||
*
|
||||
* _HWMOD_NO_MPU_PORT: no path exists for the MPU to write to this module
|
||||
* _HWMOD_WAKEUP_ENABLED: set when the omap_hwmod code has enabled ENAWAKEUP
|
||||
* _HWMOD_SYSCONFIG_LOADED: set when the OCP_SYSCONFIG value has been cached
|
||||
*/
|
||||
#define _HWMOD_NO_MPU_PORT (1 << 0)
|
||||
#define _HWMOD_WAKEUP_ENABLED (1 << 1)
|
||||
#define _HWMOD_SYSCONFIG_LOADED (1 << 2)
|
||||
|
||||
/*
|
||||
* omap_hwmod._state definitions
|
||||
*
|
||||
* INITIALIZED: reset (optionally), initialized, enabled, disabled
|
||||
* (optionally)
|
||||
*
|
||||
*
|
||||
*/
|
||||
#define _HWMOD_STATE_UNKNOWN 0
|
||||
#define _HWMOD_STATE_REGISTERED 1
|
||||
#define _HWMOD_STATE_CLKS_INITED 2
|
||||
#define _HWMOD_STATE_INITIALIZED 3
|
||||
#define _HWMOD_STATE_ENABLED 4
|
||||
#define _HWMOD_STATE_IDLE 5
|
||||
#define _HWMOD_STATE_DISABLED 6
|
||||
|
||||
/**
|
||||
* struct omap_hwmod - integration data for OMAP hardware "modules" (IP blocks)
|
||||
* @name: name of the hwmod
|
||||
* @od: struct omap_device currently associated with this hwmod (internal use)
|
||||
* @mpu_irqs: ptr to an array of MPU IRQs (see also mpu_irqs_cnt)
|
||||
* @sdma_chs: ptr to an array of SDMA channel IDs (see also sdma_chs_cnt)
|
||||
* @prcm: PRCM data pertaining to this hwmod
|
||||
* @clkdev_dev_id: main clock: clkdev dev_id string
|
||||
* @clkdev_con_id: main clock: clkdev con_id string
|
||||
* @_clk: pointer to the main struct clk (filled in at runtime)
|
||||
* @opt_clks: other device clocks that drivers can request (0..*)
|
||||
* @masters: ptr to array of OCP ifs that this hwmod can initiate on
|
||||
* @slaves: ptr to array of OCP ifs that this hwmod can respond on
|
||||
* @sysconfig: device SYSCONFIG/SYSSTATUS register data
|
||||
* @dev_attr: arbitrary device attributes that can be passed to the driver
|
||||
* @_sysc_cache: internal-use hwmod flags
|
||||
* @_rt_va: cached register target start address (internal use)
|
||||
* @_mpu_port_index: cached MPU register target slave ID (internal use)
|
||||
* @msuspendmux_reg_id: CONTROL_MSUSPENDMUX register ID (1-6)
|
||||
* @msuspendmux_shift: CONTROL_MSUSPENDMUX register bit shift
|
||||
* @mpu_irqs_cnt: number of @mpu_irqs
|
||||
* @sdma_chs_cnt: number of @sdma_chs
|
||||
* @opt_clks_cnt: number of @opt_clks
|
||||
* @master_cnt: number of @master entries
|
||||
* @slaves_cnt: number of @slave entries
|
||||
* @response_lat: device OCP response latency (in interface clock cycles)
|
||||
* @_int_flags: internal-use hwmod flags
|
||||
* @_state: internal-use hwmod state
|
||||
* @flags: hwmod flags (documented below)
|
||||
* @omap_chip: OMAP chips this hwmod is present on
|
||||
* @node: list node for hwmod list (internal use)
|
||||
*
|
||||
* @clkdev_dev_id, @clkdev_con_id, and @clk all refer to this module's "main
|
||||
* clock," which for our purposes is defined as "the functional clock needed
|
||||
* for register accesses to complete." Modules may not have a main clock if
|
||||
* the interface clock also serves as a main clock.
|
||||
*
|
||||
* Parameter names beginning with an underscore are managed internally by
|
||||
* the omap_hwmod code and should not be set during initialization.
|
||||
*/
|
||||
struct omap_hwmod {
|
||||
const char *name;
|
||||
struct omap_device *od;
|
||||
u8 *mpu_irqs;
|
||||
struct omap_hwmod_dma_info *sdma_chs;
|
||||
union {
|
||||
struct omap_hwmod_omap2_prcm omap2;
|
||||
struct omap_hwmod_omap4_prcm omap4;
|
||||
} prcm;
|
||||
const char *clkdev_dev_id;
|
||||
const char *clkdev_con_id;
|
||||
struct clk *_clk;
|
||||
struct omap_hwmod_opt_clk *opt_clks;
|
||||
struct omap_hwmod_ocp_if **masters; /* connect to *_IA */
|
||||
struct omap_hwmod_ocp_if **slaves; /* connect to *_TA */
|
||||
struct omap_hwmod_sysconfig *sysconfig;
|
||||
void *dev_attr;
|
||||
u32 _sysc_cache;
|
||||
void __iomem *_rt_va;
|
||||
struct list_head node;
|
||||
u16 flags;
|
||||
u8 _mpu_port_index;
|
||||
u8 msuspendmux_reg_id;
|
||||
u8 msuspendmux_shift;
|
||||
u8 response_lat;
|
||||
u8 mpu_irqs_cnt;
|
||||
u8 sdma_chs_cnt;
|
||||
u8 opt_clks_cnt;
|
||||
u8 masters_cnt;
|
||||
u8 slaves_cnt;
|
||||
u8 hwmods_cnt;
|
||||
u8 _int_flags;
|
||||
u8 _state;
|
||||
const struct omap_chip_id omap_chip;
|
||||
};
|
||||
|
||||
int omap_hwmod_init(struct omap_hwmod **ohs);
|
||||
int omap_hwmod_register(struct omap_hwmod *oh);
|
||||
int omap_hwmod_unregister(struct omap_hwmod *oh);
|
||||
struct omap_hwmod *omap_hwmod_lookup(const char *name);
|
||||
int omap_hwmod_for_each(int (*fn)(struct omap_hwmod *oh));
|
||||
int omap_hwmod_late_init(void);
|
||||
|
||||
int omap_hwmod_enable(struct omap_hwmod *oh);
|
||||
int omap_hwmod_idle(struct omap_hwmod *oh);
|
||||
int omap_hwmod_shutdown(struct omap_hwmod *oh);
|
||||
|
||||
int omap_hwmod_enable_clocks(struct omap_hwmod *oh);
|
||||
int omap_hwmod_disable_clocks(struct omap_hwmod *oh);
|
||||
|
||||
int omap_hwmod_reset(struct omap_hwmod *oh);
|
||||
void omap_hwmod_ocp_barrier(struct omap_hwmod *oh);
|
||||
|
||||
void omap_hwmod_writel(u32 v, struct omap_hwmod *oh, u16 reg_offs);
|
||||
u32 omap_hwmod_readl(struct omap_hwmod *oh, u16 reg_offs);
|
||||
|
||||
int omap_hwmod_count_resources(struct omap_hwmod *oh);
|
||||
int omap_hwmod_fill_resources(struct omap_hwmod *oh, struct resource *res);
|
||||
|
||||
struct powerdomain *omap_hwmod_get_pwrdm(struct omap_hwmod *oh);
|
||||
|
||||
int omap_hwmod_add_initiator_dep(struct omap_hwmod *oh,
|
||||
struct omap_hwmod *init_oh);
|
||||
int omap_hwmod_del_initiator_dep(struct omap_hwmod *oh,
|
||||
struct omap_hwmod *init_oh);
|
||||
|
||||
int omap_hwmod_set_clockact_both(struct omap_hwmod *oh);
|
||||
int omap_hwmod_set_clockact_main(struct omap_hwmod *oh);
|
||||
int omap_hwmod_set_clockact_iclk(struct omap_hwmod *oh);
|
||||
int omap_hwmod_set_clockact_none(struct omap_hwmod *oh);
|
||||
|
||||
int omap_hwmod_enable_wakeup(struct omap_hwmod *oh);
|
||||
int omap_hwmod_disable_wakeup(struct omap_hwmod *oh);
|
||||
|
||||
#endif
|
||||
@@ -117,6 +117,13 @@ struct powerdomain {
|
||||
|
||||
struct list_head node;
|
||||
|
||||
int state;
|
||||
unsigned state_counter[4];
|
||||
|
||||
#ifdef CONFIG_PM_DEBUG
|
||||
s64 timer;
|
||||
s64 state_timer[4];
|
||||
#endif
|
||||
};
|
||||
|
||||
|
||||
@@ -126,7 +133,8 @@ int pwrdm_register(struct powerdomain *pwrdm);
|
||||
int pwrdm_unregister(struct powerdomain *pwrdm);
|
||||
struct powerdomain *pwrdm_lookup(const char *name);
|
||||
|
||||
int pwrdm_for_each(int (*fn)(struct powerdomain *pwrdm));
|
||||
int pwrdm_for_each(int (*fn)(struct powerdomain *pwrdm, void *user),
|
||||
void *user);
|
||||
|
||||
int pwrdm_add_clkdm(struct powerdomain *pwrdm, struct clockdomain *clkdm);
|
||||
int pwrdm_del_clkdm(struct powerdomain *pwrdm, struct clockdomain *clkdm);
|
||||
@@ -164,4 +172,9 @@ bool pwrdm_has_hdwr_sar(struct powerdomain *pwrdm);
|
||||
|
||||
int pwrdm_wait_transition(struct powerdomain *pwrdm);
|
||||
|
||||
int pwrdm_state_switch(struct powerdomain *pwrdm);
|
||||
int pwrdm_clkdm_state_switch(struct clockdomain *clkdm);
|
||||
int pwrdm_pre_transition(void);
|
||||
int pwrdm_post_transition(void);
|
||||
|
||||
#endif
|
||||
|
||||
@@ -21,19 +21,28 @@
|
||||
/* SDRC register offsets - read/write with sdrc_{read,write}_reg() */
|
||||
|
||||
#define SDRC_SYSCONFIG 0x010
|
||||
#define SDRC_CS_CFG 0x040
|
||||
#define SDRC_SHARING 0x044
|
||||
#define SDRC_ERR_TYPE 0x04C
|
||||
#define SDRC_DLLA_CTRL 0x060
|
||||
#define SDRC_DLLA_STATUS 0x064
|
||||
#define SDRC_DLLB_CTRL 0x068
|
||||
#define SDRC_DLLB_STATUS 0x06C
|
||||
#define SDRC_POWER 0x070
|
||||
#define SDRC_MCFG_0 0x080
|
||||
#define SDRC_MR_0 0x084
|
||||
#define SDRC_EMR2_0 0x08c
|
||||
#define SDRC_ACTIM_CTRL_A_0 0x09c
|
||||
#define SDRC_ACTIM_CTRL_B_0 0x0a0
|
||||
#define SDRC_RFR_CTRL_0 0x0a4
|
||||
#define SDRC_MANUAL_0 0x0a8
|
||||
#define SDRC_MCFG_1 0x0B0
|
||||
#define SDRC_MR_1 0x0B4
|
||||
#define SDRC_EMR2_1 0x0BC
|
||||
#define SDRC_ACTIM_CTRL_A_1 0x0C4
|
||||
#define SDRC_ACTIM_CTRL_B_1 0x0C8
|
||||
#define SDRC_RFR_CTRL_1 0x0D4
|
||||
#define SDRC_MANUAL_1 0x0D8
|
||||
|
||||
/*
|
||||
* These values represent the number of memory clock cycles between
|
||||
@@ -71,11 +80,11 @@
|
||||
*/
|
||||
|
||||
#define OMAP242X_SMS_REGADDR(reg) \
|
||||
(void __iomem *)IO_ADDRESS(OMAP2420_SMS_BASE + reg)
|
||||
(void __iomem *)OMAP2_IO_ADDRESS(OMAP2420_SMS_BASE + reg)
|
||||
#define OMAP243X_SMS_REGADDR(reg) \
|
||||
(void __iomem *)IO_ADDRESS(OMAP243X_SMS_BASE + reg)
|
||||
(void __iomem *)OMAP2_IO_ADDRESS(OMAP243X_SMS_BASE + reg)
|
||||
#define OMAP343X_SMS_REGADDR(reg) \
|
||||
(void __iomem *)IO_ADDRESS(OMAP343X_SMS_BASE + reg)
|
||||
(void __iomem *)OMAP2_IO_ADDRESS(OMAP343X_SMS_BASE + reg)
|
||||
|
||||
/* SMS register offsets - read/write with sms_{read,write}_reg() */
|
||||
|
||||
|
||||
@@ -13,6 +13,8 @@
|
||||
#ifndef __ASM_ARCH_SERIAL_H
|
||||
#define __ASM_ARCH_SERIAL_H
|
||||
|
||||
#include <linux/init.h>
|
||||
|
||||
#if defined(CONFIG_ARCH_OMAP1)
|
||||
/* OMAP1 serial ports */
|
||||
#define OMAP_UART1_BASE 0xfffb0000
|
||||
@@ -53,6 +55,7 @@
|
||||
})
|
||||
|
||||
#ifndef __ASSEMBLER__
|
||||
extern void __init omap_serial_early_init(void);
|
||||
extern void omap_serial_init(void);
|
||||
extern int omap_uart_can_sleep(void);
|
||||
extern void omap_uart_check_wakeup(void);
|
||||
|
||||
Reference in New Issue
Block a user