Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 73c583e4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'omap-for-linus' of... 

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
  ...
parents 5ce00289 1f685b36

Documentation/arm/OMAP/omap_pm

0 → 100644
+129 −0
Original line number Original line Diff line number Diff line 


The OMAP PM interface

=====================



This document describes the temporary OMAP PM interface.  Driver

authors use these functions to communicate minimum latency or

throughput constraints to the kernel power management code.

Over time, the intention is to merge features from the OMAP PM

interface into the Linux PM QoS code.



Drivers need to express PM parameters which:



- support the range of power management parameters present in the TI SRF;



- separate the drivers from the underlying PM parameter

  implementation, whether it is the TI SRF or Linux PM QoS or Linux

  latency framework or something else;



- specify PM parameters in terms of fundamental units, such as

  latency and throughput, rather than units which are specific to OMAP

  or to particular OMAP variants;



- allow drivers which are shared with other architectures (e.g.,

  DaVinci) to add these constraints in a way which won't affect non-OMAP

  systems,



- can be implemented immediately with minimal disruption of other

  architectures.





This document proposes the OMAP PM interface, including the following

five power management functions for driver code:



1. Set the maximum MPU wakeup latency:

   (*pdata->set_max_mpu_wakeup_lat)(struct device *dev, unsigned long t)



2. Set the maximum device wakeup latency:

   (*pdata->set_max_dev_wakeup_lat)(struct device *dev, unsigned long t)



3. Set the maximum system DMA transfer start latency (CORE pwrdm):

   (*pdata->set_max_sdma_lat)(struct device *dev, long t)



4. Set the minimum bus throughput needed by a device:

   (*pdata->set_min_bus_tput)(struct device *dev, u8 agent_id, unsigned long r)



5. Return the number of times the device has lost context

   (*pdata->get_dev_context_loss_count)(struct device *dev)





Further documentation for all OMAP PM interface functions can be

found in arch/arm/plat-omap/include/mach/omap-pm.h.





The OMAP PM layer is intended to be temporary

---------------------------------------------



The intention is that eventually the Linux PM QoS layer should support

the range of power management features present in OMAP3.  As this

happens, existing drivers using the OMAP PM interface can be modified

to use the Linux PM QoS code; and the OMAP PM interface can disappear.





Driver usage of the OMAP PM functions

-------------------------------------



As the 'pdata' in the above examples indicates, these functions are

exposed to drivers through function pointers in driver .platform_data

structures.  The function pointers are initialized by the board-*.c

files to point to the corresponding OMAP PM functions:

.set_max_dev_wakeup_lat will point to

omap_pm_set_max_dev_wakeup_lat(), etc.  Other architectures which do

not support these functions should leave these function pointers set

to NULL.  Drivers should use the following idiom:



        if (pdata->set_max_dev_wakeup_lat)

            (*pdata->set_max_dev_wakeup_lat)(dev, t);



The most common usage of these functions will probably be to specify

the maximum time from when an interrupt occurs, to when the device

becomes accessible.  To accomplish this, driver writers should use the

set_max_mpu_wakeup_lat() function to to constrain the MPU wakeup

latency, and the set_max_dev_wakeup_lat() function to constrain the

device wakeup latency (from clk_enable() to accessibility).  For

example,



        /* Limit MPU wakeup latency */

        if (pdata->set_max_mpu_wakeup_lat)

            (*pdata->set_max_mpu_wakeup_lat)(dev, tc);



        /* Limit device powerdomain wakeup latency */

        if (pdata->set_max_dev_wakeup_lat)

            (*pdata->set_max_dev_wakeup_lat)(dev, td);



        /* total wakeup latency in this example: (tc + td) */



The PM parameters can be overwritten by calling the function again

with the new value.  The settings can be removed by calling the

function with a t argument of -1 (except in the case of

set_max_bus_tput(), which should be called with an r argument of 0).



The fifth function above, omap_pm_get_dev_context_loss_count(),

is intended as an optimization to allow drivers to determine whether the

device has lost its internal context.  If context has been lost, the

driver must restore its internal context before proceeding.





Other specialized interface functions

-------------------------------------



The five functions listed above are intended to be usable by any

device driver.  DSPBridge and CPUFreq have a few special requirements.

DSPBridge expresses target DSP performance levels in terms of OPP IDs.

CPUFreq expresses target MPU performance levels in terms of MPU

frequency.  The OMAP PM interface contains functions for these

specialized cases to convert that input information (OPPs/MPU

frequency) into the form that the underlying power management

implementation needs:



6. (*pdata->dsp_get_opp_table)(void)



7. (*pdata->dsp_set_min_opp)(u8 opp_id)



8. (*pdata->dsp_get_opp)(void)



9. (*pdata->cpu_get_freq_table)(void)



10. (*pdata->cpu_set_freq)(unsigned long f)



11. (*pdata->cpu_get_freq)(void)

arch/arm/configs/n8x0_defconfig

0 → 100644
+1104 −0

File added.

Preview size limit exceeded, changes collapsed.

arch/arm/configs/omap3_beagle_defconfig

+32 −9
Original line number Original line Diff line number Diff line
@@ -128,6 +128,7 @@ CONFIG_DEFAULT_AS=y 
# CONFIG_DEFAULT_NOOP is not set

# CONFIG_DEFAULT_NOOP is not set

CONFIG_DEFAULT_IOSCHED="anticipatory"

CONFIG_DEFAULT_IOSCHED="anticipatory"

CONFIG_CLASSIC_RCU=y

CONFIG_CLASSIC_RCU=y

CONFIG_FREEZER=y





#

#

# System Type

# System Type
@@ -236,6 +237,7 @@ CONFIG_ARM_THUMB=y 
# CONFIG_CPU_BPREDICT_DISABLE is not set

# CONFIG_CPU_BPREDICT_DISABLE is not set

CONFIG_HAS_TLS_REG=y

CONFIG_HAS_TLS_REG=y

# CONFIG_OUTER_CACHE is not set

# CONFIG_OUTER_CACHE is not set

CONFIG_COMMON_CLKDEV=y





#

#

# Bus support

# Bus support
@@ -317,7 +319,12 @@ CONFIG_BINFMT_MISC=y 
#

#

# Power management options

# Power management options

#

#

# CONFIG_PM is not set

CONFIG_PM=y

# CONFIG_PM_DEBUG is not set

CONFIG_PM_SLEEP=y

CONFIG_SUSPEND=y

CONFIG_SUSPEND_FREEZER=y

# CONFIG_APM_EMULATION is not set

CONFIG_ARCH_SUSPEND_POSSIBLE=y

CONFIG_ARCH_SUSPEND_POSSIBLE=y

CONFIG_NET=y

CONFIG_NET=y
@@ -713,6 +720,7 @@ CONFIG_GPIOLIB=y 
# CONFIG_GPIO_MAX732X is not set

# CONFIG_GPIO_MAX732X is not set

# CONFIG_GPIO_PCA953X is not set

# CONFIG_GPIO_PCA953X is not set

# CONFIG_GPIO_PCF857X is not set

# CONFIG_GPIO_PCF857X is not set

CONFIG_GPIO_TWL4030=y





#

#

# PCI GPIO expanders:

# PCI GPIO expanders:
@@ -741,6 +749,7 @@ CONFIG_SSB_POSSIBLE=y 
# CONFIG_MFD_SM501 is not set

# CONFIG_MFD_SM501 is not set

# CONFIG_HTC_EGPIO is not set

# CONFIG_HTC_EGPIO is not set

# CONFIG_HTC_PASIC3 is not set

# CONFIG_HTC_PASIC3 is not set

CONFIG_TWL4030_CORE=y

# CONFIG_UCB1400_CORE is not set

# CONFIG_UCB1400_CORE is not set

# CONFIG_MFD_TMIO is not set

# CONFIG_MFD_TMIO is not set

# CONFIG_MFD_T7L66XB is not set

# CONFIG_MFD_T7L66XB is not set
@@ -787,7 +796,7 @@ CONFIG_DUMMY_CONSOLE=y 
CONFIG_USB_SUPPORT=y

CONFIG_USB_SUPPORT=y

CONFIG_USB_ARCH_HAS_HCD=y

CONFIG_USB_ARCH_HAS_HCD=y

CONFIG_USB_ARCH_HAS_OHCI=y

CONFIG_USB_ARCH_HAS_OHCI=y

# CONFIG_USB_ARCH_HAS_EHCI is not set

CONFIG_USB_ARCH_HAS_EHCI=y

CONFIG_USB=y

CONFIG_USB=y

# CONFIG_USB_DEBUG is not set

# CONFIG_USB_DEBUG is not set

# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set

# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
@@ -798,7 +807,8 @@ CONFIG_USB=y 
CONFIG_USB_DEVICEFS=y

CONFIG_USB_DEVICEFS=y

CONFIG_USB_DEVICE_CLASS=y

CONFIG_USB_DEVICE_CLASS=y

# CONFIG_USB_DYNAMIC_MINORS is not set

# CONFIG_USB_DYNAMIC_MINORS is not set

# CONFIG_USB_OTG is not set

CONFIG_USB_SUSPEND=y

CONFIG_USB_OTG=y

# CONFIG_USB_OTG_WHITELIST is not set

# CONFIG_USB_OTG_WHITELIST is not set

# CONFIG_USB_OTG_BLACKLIST_HUB is not set

# CONFIG_USB_OTG_BLACKLIST_HUB is not set

CONFIG_USB_MON=y

CONFIG_USB_MON=y
@@ -806,6 +816,8 @@ CONFIG_USB_MON=y 
#

#

# USB Host Controller Drivers

# USB Host Controller Drivers

#

#

CONFIG_USB_EHCI_HCD=y

CONFIG_USB_EHCI_ROOT_HUB_TT=y

# CONFIG_USB_C67X00_HCD is not set

# CONFIG_USB_C67X00_HCD is not set

# CONFIG_USB_ISP116X_HCD is not set

# CONFIG_USB_ISP116X_HCD is not set

# CONFIG_USB_ISP1760_HCD is not set

# CONFIG_USB_ISP1760_HCD is not set
@@ -818,10 +830,10 @@ CONFIG_USB_MUSB_SOC=y 
#

#

# OMAP 343x high speed USB support

# OMAP 343x high speed USB support

#

#

CONFIG_USB_MUSB_HOST=y

# CONFIG_USB_MUSB_HOST is not set

# CONFIG_USB_MUSB_PERIPHERAL is not set

# CONFIG_USB_MUSB_PERIPHERAL is not set

# CONFIG_USB_MUSB_OTG is not set

CONFIG_USB_MUSB_OTG=y

# CONFIG_USB_GADGET_MUSB_HDRC is not set

CONFIG_USB_GADGET_MUSB_HDRC=y

CONFIG_USB_MUSB_HDRC_HCD=y

CONFIG_USB_MUSB_HDRC_HCD=y

# CONFIG_MUSB_PIO_ONLY is not set

# CONFIG_MUSB_PIO_ONLY is not set

CONFIG_USB_INVENTRA_DMA=y

CONFIG_USB_INVENTRA_DMA=y
@@ -887,8 +899,8 @@ CONFIG_USB_GADGET_SELECTED=y 
# CONFIG_USB_GADGET_FSL_USB2 is not set

# CONFIG_USB_GADGET_FSL_USB2 is not set

# CONFIG_USB_GADGET_NET2280 is not set

# CONFIG_USB_GADGET_NET2280 is not set

# CONFIG_USB_GADGET_PXA25X is not set

# CONFIG_USB_GADGET_PXA25X is not set

CONFIG_USB_GADGET_M66592=y

# CONFIG_USB_GADGET_M66592 is not set

CONFIG_USB_M66592=y

# CONFIG_USB_M66592 is not set

# CONFIG_USB_GADGET_PXA27X is not set

# CONFIG_USB_GADGET_PXA27X is not set

# CONFIG_USB_GADGET_GOKU is not set

# CONFIG_USB_GADGET_GOKU is not set

# CONFIG_USB_GADGET_LH7A40X is not set

# CONFIG_USB_GADGET_LH7A40X is not set
@@ -906,6 +918,15 @@ CONFIG_USB_ETH_RNDIS=y 
# CONFIG_USB_MIDI_GADGET is not set

# CONFIG_USB_MIDI_GADGET is not set

# CONFIG_USB_G_PRINTER is not set

# CONFIG_USB_G_PRINTER is not set

# CONFIG_USB_CDC_COMPOSITE is not set

# CONFIG_USB_CDC_COMPOSITE is not set



#

# OTG and related infrastructure

#

CONFIG_USB_OTG_UTILS=y

# CONFIG_USB_GPIO_VBUS is not set

# CONFIG_ISP1301_OMAP is not set

CONFIG_TWL4030_USB=y

# CONFIG_NOP_USB_XCEIV is not set

CONFIG_MMC=y

CONFIG_MMC=y

# CONFIG_MMC_DEBUG is not set

# CONFIG_MMC_DEBUG is not set

# CONFIG_MMC_UNSAFE_RESUME is not set

# CONFIG_MMC_UNSAFE_RESUME is not set
@@ -923,6 +944,7 @@ CONFIG_MMC_BLOCK_BOUNCE=y 
#

#

# CONFIG_MMC_SDHCI is not set

# CONFIG_MMC_SDHCI is not set

# CONFIG_MMC_OMAP is not set

# CONFIG_MMC_OMAP is not set

CONFIG_MMC_OMAP_HS=y

# CONFIG_MEMSTICK is not set

# CONFIG_MEMSTICK is not set

# CONFIG_ACCESSIBILITY is not set

# CONFIG_ACCESSIBILITY is not set

# CONFIG_NEW_LEDS is not set

# CONFIG_NEW_LEDS is not set
@@ -981,10 +1003,11 @@ CONFIG_RTC_INTF_DEV=y 
#

#

# Voltage and Current regulators

# Voltage and Current regulators

#

#

# CONFIG_REGULATOR is not set

CONFIG_REGULATOR=y

# CONFIG_REGULATOR_FIXED_VOLTAGE is not set

# CONFIG_REGULATOR_FIXED_VOLTAGE is not set

# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set

# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set

# CONFIG_REGULATOR_BQ24022 is not set

# CONFIG_REGULATOR_BQ24022 is not set

CONFIG_REGULATOR_TWL4030=y

# CONFIG_UIO is not set

# CONFIG_UIO is not set





#

#

arch/arm/configs/omap_3430sdp_defconfig

+10 −10
Original line number Original line Diff line number Diff line 
#

#

# Automatically generated make config: don't edit

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.29-rc8

# Linux kernel version: 2.6.30-omap1

# Fri Mar 13 14:17:01 2009

# Tue Jun 23 10:36:45 2009

#

#

CONFIG_ARM=y

CONFIG_ARM=y

CONFIG_SYS_SUPPORTS_APM_EMULATION=y

CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -197,9 +197,9 @@ CONFIG_OMAP_MCBSP=y 
CONFIG_OMAP_32K_TIMER=y

CONFIG_OMAP_32K_TIMER=y

CONFIG_OMAP_32K_TIMER_HZ=128

CONFIG_OMAP_32K_TIMER_HZ=128

CONFIG_OMAP_DM_TIMER=y

CONFIG_OMAP_DM_TIMER=y

# CONFIG_OMAP_LL_DEBUG_UART1 is not set

CONFIG_OMAP_LL_DEBUG_UART1=y

# CONFIG_OMAP_LL_DEBUG_UART2 is not set

# CONFIG_OMAP_LL_DEBUG_UART2 is not set

CONFIG_OMAP_LL_DEBUG_UART3=y

# CONFIG_OMAP_LL_DEBUG_UART3 is not set

CONFIG_OMAP_SERIAL_WAKE=y

CONFIG_OMAP_SERIAL_WAKE=y

CONFIG_ARCH_OMAP34XX=y

CONFIG_ARCH_OMAP34XX=y

CONFIG_ARCH_OMAP3430=y

CONFIG_ARCH_OMAP3430=y
@@ -207,10 +207,10 @@ CONFIG_ARCH_OMAP3430=y 
#

#

# OMAP Board Type

# OMAP Board Type

#

#

CONFIG_MACH_OMAP3_BEAGLE=y

# CONFIG_MACH_OMAP3_BEAGLE is not set

CONFIG_MACH_OMAP_LDP=y

# CONFIG_MACH_OMAP_LDP is not set

CONFIG_MACH_OVERO=y

# CONFIG_MACH_OVERO is not set

CONFIG_MACH_OMAP3_PANDORA=y

# CONFIG_MACH_OMAP3_PANDORA is not set

CONFIG_MACH_OMAP_3430SDP=y

CONFIG_MACH_OMAP_3430SDP=y





#

#
@@ -950,7 +950,7 @@ CONFIG_SPI_OMAP24XX=y 
# CONFIG_SPI_TLE62X0 is not set

# CONFIG_SPI_TLE62X0 is not set

CONFIG_ARCH_REQUIRE_GPIOLIB=y

CONFIG_ARCH_REQUIRE_GPIOLIB=y

CONFIG_GPIOLIB=y

CONFIG_GPIOLIB=y

CONFIG_DEBUG_GPIO=y

# CONFIG_DEBUG_GPIO is not set

CONFIG_GPIO_SYSFS=y

CONFIG_GPIO_SYSFS=y





#

#
@@ -1370,7 +1370,7 @@ CONFIG_SND_OMAP_SOC=y 
CONFIG_SND_OMAP_SOC_MCBSP=y

CONFIG_SND_OMAP_SOC_MCBSP=y

# CONFIG_SND_OMAP_SOC_OVERO is not set

# CONFIG_SND_OMAP_SOC_OVERO is not set

CONFIG_SND_OMAP_SOC_SDP3430=y

CONFIG_SND_OMAP_SOC_SDP3430=y

CONFIG_SND_OMAP_SOC_OMAP3_PANDORA=y

# CONFIG_SND_OMAP_SOC_OMAP3_PANDORA is not set

CONFIG_SND_SOC_I2C_AND_SPI=y

CONFIG_SND_SOC_I2C_AND_SPI=y

# CONFIG_SND_SOC_ALL_CODECS is not set

# CONFIG_SND_SOC_ALL_CODECS is not set

CONFIG_SND_SOC_TWL4030=y

CONFIG_SND_SOC_TWL4030=y

arch/arm/configs/omap_zoom2_defconfig

+408 −76

File changed.

Preview size limit exceeded, changes collapsed.