linux/arch/arm/plat-mxc/include/mach
Linus Torvalds a5ebba6b54 arm-soc: power management changes
These are various power management related changes, mainly concerning
 cpuidle on i.MX and OMAP, as well as a the move of the omap smartreflex
 driver to live in the power subsystem.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIVAwUAUA2dhWCrR//JCVInAQLuqRAA1FxxzAMTESs3/rpjnQmZUUKef4SuJwY2
 GBenXFLY5PlxgcrwTbKwepapu8IWfmw171+tRrrMWvQgtBwa+SefwFCaLcRkvRrs
 kNAHIVI+Gqm4/m6d+WC+ymJLOZdkcTHES+40eycxcjiIElGEMtiW5/qwh060GAgC
 YxtjoN9BKegjsDLPZdZghO855YUV8CKEg+q5kIYW0Q3Ci0POGvOhgvbI61K5w8z7
 fTdbFRDRBqy0BEx9noKTu8XIB/inwlyUY7N3bAv494TsU48kxMIb95FdSGiY/0yV
 1883wCacBYBNemWRvWBHNilSsDcuDmM3yNvdwi3JvQnzFBPc8uyze9wbPFOW4aQd
 Vhf+g8hjuHkw1xreWpO+nREysOjiiSzRUci2nT6aAQTcpWCacVTJ5sW7KOQ63nrH
 OQpe/fvm/qT8FKPDh/lcrqIUKrHfeFjZx7XlYjw7j0ZL+99mIpwuOql18mQee9G5
 OV6c0rfgeTnGLdc1kOlLPElkXe7SQ/GJK1JI1mA5BNYJlVKx+o0qVlcnRzY6bWaP
 dmSIA+9Bs/fglvmAQHT3u68zn5KfoTbnJWb0v5PQJfitEBdlugKG8nF9mVRIX70X
 EygOta8vApF9N20WhE2TLLaDhlrOmd4bOtRVdoO8pDVN/hsWIylnEu952ZBSZg3U
 9wF0Ydy2LP4=
 =tgT5
 -----END PGP SIGNATURE-----

Merge tag 'pm' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull arm-soc power management changes from Arnd Bergmann:
 "These are various power management related changes, mainly concerning
  cpuidle on i.MX and OMAP, as well as a the move of the omap
  smartreflex driver to live in the power subsystem."

Fix up conflicts in arch/arm/mach-{imx/mach-imx6q.c,omap2/prm2xxx_3xxx.h}

* tag 'pm' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (37 commits)
  ARM: OMAP2+: PM: fix IRQ_NOAUTOEN removal by mis-merge
  ARM: OMAP2+: do not allow SmartReflex to be built as a module
  ARM: OMAP2: Use hwmod to initialize mmc for 2420
  ARM: OMAP3: PM: cpuidle: optimize the clkdm idle latency in C1 state
  ARM: OMAP3: PM: cpuidle: optimize the PER latency in C1 state
  ARM: OMAP3: PM: cpuidle: default to C1 in next_valid_state
  ARM: OMAP3: PM: cleanup cam_pwrdm leftovers
  ARM: OMAP3: PM: call pre/post transition per powerdomain
  ARM: OMAP2+: powerdomain: allow pre/post transtion to be per pwrdm
  ARM: OMAP3: PM: Remove IO Daisychain control from cpuidle
  ARM: OMAP3PLUS: hwmod: reconfigure IO Daisychain during hwmod mux
  ARM: OMAP3+: PRM: Enable IO wake up
  ARM: OMAP4: PRM: Add IO Daisychain support
  ARM: OMAP3: PM: Move IO Daisychain function to omap3 prm file
  ARM: OMAP3: PM: correct enable/disable of daisy io chain
  ARM: OMAP2+: PRM: fix compile for OMAP4-only build
  W1: OMAP HDQ1W: use runtime PM
  ARM: OMAP2+: HDQ1W: use omap_device
  W1: OMAP HDQ1W: use 32-bit register accesses
  W1: OMAP HDQ1W: allow driver to be built on all OMAP2+
  ...
2012-07-23 17:43:53 -07:00
..
3ds_debugboard.h ARM: imx: pass gpio than irq number into mxc_expio_init 2012-07-01 21:58:08 +08:00
board-mx31lilly.h ARM: mxc: grammar fix 2010-06-24 15:40:36 +02:00
board-mx31lite.h ARM: mxc: grammar fix 2010-06-24 15:40:36 +02:00
board-mx31moboard.h ARM: mxc: grammar fix 2010-06-24 15:40:36 +02:00
board-pcm038.h ARM: mxc: grammar fix 2010-06-24 15:40:36 +02:00
clock.h ARM i.MX: prepare for common clock framework 2012-04-25 17:03:46 +02:00
common.h arm-soc: power management changes 2012-07-23 17:43:53 -07:00
cpuidle.h ARM: imx: Add common imx cpuidle init functionality. 2012-06-05 08:51:47 +02:00
debug-macro.S ARM: imx6: Add UART2 for low-level debug 2012-05-11 15:17:57 +08:00
devices-common.h dma: ipu: remove the use of ipu_platform_data 2012-07-01 21:57:43 +08:00
dma.h ARM: mxc: make imx_dma_is_general_purpose more generic for sdma 2012-02-27 15:17:58 +08:00
esdhc.h mmc: sdhci-esdhc-imx: extend card_detect and write_protect support for mx5 2011-07-27 09:31:14 +08:00
eukrea-baseboards.h mx5: add cpuimx51sd module and its baseboard 2010-10-19 18:45:00 +02:00
gpio.h Merge branch 'highbank/soc' into next/soc 2011-11-02 02:46:10 +01:00
hardware.h arm-soc: power management changes 2012-07-23 17:43:53 -07:00
i2c.h i2c-imx: remove init/exit hooks from platform data 2011-09-14 22:14:41 +01:00
iim.h
imx-uart.h Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm 2009-06-14 13:42:43 -07:00
imxfb.h ARM: imx: dynamically register imx-fb devices 2010-11-17 10:01:27 +01:00
iomux-mx1.h arm/imx/iomux-v1: rename header file 2010-02-24 10:07:15 +01:00
iomux-mx2x.h mx2/iomux: Set direction for CSPI2 pins 2011-03-25 08:21:34 +01:00
iomux-mx3.h ARM: imx: eliminate macro IOMUX_TO_IRQ() 2012-07-01 21:57:06 +08:00
iomux-mx21.h arm/imx/iomux-v1: rename header file 2010-02-24 10:07:15 +01:00
iomux-mx25.h iomux-mx25.h slew rate adjusted for LCD __LD pins 2012-03-13 13:57:07 +01:00
iomux-mx27.h arm/imx/iomux-v1: rename header file 2010-02-24 10:07:15 +01:00
iomux-mx35.h ARM: imx35: fix ATA_DATA3 pad control address 2011-03-07 19:29:09 +01:00
iomux-mx50.h ARM: imx50: correct iomux-mx50.h wrong daisy chain settings 2011-02-18 11:01:34 +01:00
iomux-mx51.h ARM: i.MX51 iomux: added missing pin definitions 2012-07-09 10:29:39 +02:00
iomux-mx53.h ARM: mx53: fix pad definitions for MX53_PAD_EIM_D28__I2C1_SDA and MX53_PAD_GPIO_8__CAN1_RXCAN 2012-05-02 10:28:36 +02:00
iomux-v1.h ARM: imx: eliminate macro IRQ_GPIOx() 2012-07-01 21:57:16 +08:00
iomux-v3.h Merge branch 'next/fixes' into next/cleanup 2011-10-31 23:25:41 +01:00
ipu.h dma: ipu: remove the use of ipu_platform_data 2012-07-01 21:57:43 +08:00
iram.h ARM: imx: Add iram allocator functions 2010-10-19 18:44:57 +02:00
irqs.h ARM: imx: enable SPARSE_IRQ for imx platform 2012-07-01 21:59:20 +08:00
mmc.h mxcmmc: add card detect through DAT3 possibility 2010-07-26 14:17:46 +02:00
mx1_camera.h
mx1.h ARM: imx: enable SPARSE_IRQ for imx platform 2012-07-01 21:59:20 +08:00
mx2_cam.h [media] Revert "[media] media: mx2_camera: Fix mbus format handling" 2012-06-18 08:17:42 -03:00
mx2x.h ARM: imx: enable SPARSE_IRQ for imx platform 2012-07-01 21:59:20 +08:00
mx3_camera.h ARM: mxc: remove paragraphs with old address of the FSF 2010-06-30 09:00:28 +02:00
mx3fb.h video i.MX IPU: Fix display connections 2011-12-08 12:59:03 +05:30
mx3x.h ARM: imx: enable SPARSE_IRQ for imx platform 2012-07-01 21:59:20 +08:00
mx6q.h ARM: imx6: Add UART2 for low-level debug 2012-05-11 15:17:57 +08:00
mx21-usbhost.h USB: MXC: Add i.MX21 specific USB host controller driver. 2010-03-02 14:52:55 -08:00
mx21.h ARM: imx: enable SPARSE_IRQ for imx platform 2012-07-01 21:59:20 +08:00
mx25.h ARM: imx: enable SPARSE_IRQ for imx platform 2012-07-01 21:59:20 +08:00
mx27.h ARM: imx: enable SPARSE_IRQ for imx platform 2012-07-01 21:59:20 +08:00
mx31.h ARM: imx: enable SPARSE_IRQ for imx platform 2012-07-01 21:59:20 +08:00
mx35.h ARM: imx: enable SPARSE_IRQ for imx platform 2012-07-01 21:59:20 +08:00
mx50.h ARM: imx: enable SPARSE_IRQ for imx platform 2012-07-01 21:59:20 +08:00
mx51.h ARM: imx: enable SPARSE_IRQ for imx platform 2012-07-01 21:59:20 +08:00
mx53.h ARM: imx: enable SPARSE_IRQ for imx platform 2012-07-01 21:59:20 +08:00
mxc_ehci.h ARM: imx: make ehci power/oc polarities configurable 2012-07-09 10:32:39 +02:00
mxc_nand.h Fix common misspellings 2011-03-31 11:26:23 -03:00
mxc.h ARM: mx5: use generic irq chip pm interface for pm functions on 2011-12-25 12:02:28 +08:00
sdma.h dmaengine: imx-sdma: use platform_device_id to identify sdma version 2011-07-27 09:31:45 +08:00
spi.h spi: add SPI driver for most known i.MX SoCs 2009-09-23 07:39:43 -07:00
ssi.h ASoC: imx-ssi.c: add new choices to platform configuration 2010-06-03 19:00:16 +01:00
timex.h ARM i.MX: define CLOCK_TICK_RATE to bogus value 2011-07-07 09:59:58 +02:00
ulpi.h usb: otg: ulpi: Start using struct usb_otg 2012-02-13 13:35:56 +02:00
uncompress.h enable uncompress log on cpuimx35sd 2011-12-19 12:26:09 +01:00
usb.h