redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity
alistair23-linux/arch/arm/mach-omap2
History
Linus Torvalds a0a4194c94 Merge branch 'for-next' of git://git.infradead.org/users/sameo/mfd-2.6 
* 'for-next' of git://git.infradead.org/users/sameo/mfd-2.6: (80 commits)
  mfd: Fix missing abx500 header file updates
  mfd: Add missing <linux/io.h> include to intel_msic
  x86, mrst: add platform support for MSIC MFD driver
  mfd: Expose TurnOnStatus in ab8500 sysfs
  mfd: Remove support for early drop ab8500 chip
  mfd: Add support for ab8500 v3.3
  mfd: Add ab8500 interrupt disable hook
  mfd: Convert db8500-prcmu panic() into pr_crit()
  mfd: Refactor db8500-prcmu request_clock() function
  mfd: Rename db8500-prcmu init function
  mfd: Fix db5500-prcmu defines
  mfd: db8500-prcmu voltage domain consumers additions
  mfd: db8500-prcmu reset code retrieval
  mfd: db8500-prcmu tweak for modem wakeup
  mfd: Add db8500-pcmu watchdog accessor functions for watchdog
  mfd: hwacc power state db8500-prcmu accessor
  mfd: Add db8500-prcmu accessors for PLL and SGA clock
  mfd: Move to the new db500 PRCMU API
  mfd: Create a common interface for dbx500 PRCMU drivers
  mfd: Initialize DB8500 PRCMU regs
  ...

Fix up trivial conflicts in
	arch/arm/mach-imx/mach-mx31moboard.c
	arch/arm/mach-omap2/board-omap3beagle.c
	arch/arm/mach-u300/include/mach/irqs.h
	drivers/mfd/wm831x-spi.c
2011-11-03 09:40:51 -07:00
..
include/mach Merge branch 'ppi-irq-core-for-rmk' of git://github.com/mzyngier/arm-platforms into devel-stable 2011-10-23 14:42:30 +01:00
board-2430sdp.c Merge branch 'depends/rmk/memory_h' into next/cleanup2 2011-11-01 13:47:27 +01:00
board-3430sdp.c Merge branch 'depends/rmk/memory_h' into next/cleanup2 2011-11-01 13:47:27 +01:00
board-3630sdp.c Merge branch 'depends/rmk/memory_h' into next/cleanup2 2011-11-01 13:47:27 +01:00
board-4430sdp.c Merge branch 'next/fixes' of git://git.linaro.org/people/arnd/arm-soc 2011-11-01 19:55:06 -07:00
board-am3517crane.c Merge branch 'depends/rmk/memory_h' into next/cleanup2 2011-11-01 13:47:27 +01:00
board-am3517evm.c Merge branch 'depends/rmk/memory_h' into next/cleanup2 2011-11-01 13:47:27 +01:00
board-apollon.c Merge branch 'depends/rmk/memory_h' into next/cleanup2 2011-11-01 13:47:27 +01:00
board-cm-t35.c Merge branch 'depends/rmk/memory_h' into next/cleanup2 2011-11-01 13:47:27 +01:00
board-cm-t3517.c Merge branch 'depends/rmk/memory_h' into next/cleanup2 2011-11-01 13:47:27 +01:00
board-devkit8000.c Merge branch 'depends/rmk/memory_h' into next/cleanup2 2011-11-01 13:47:27 +01:00
board-flash.c ARM: OMAP2+: Fix missing inline functions for Makefile cleanup 2011-09-20 15:57:39 -07:00
board-flash.h ARM: OMAP2+: Fix missing inline functions for Makefile cleanup 2011-09-20 15:57:39 -07:00
board-generic.c Merge branch 'next/soc' of git://git.linaro.org/people/arnd/arm-soc 2011-11-01 21:08:03 -07:00
board-h4.c Merge branch 'highbank/soc' into next/soc 2011-11-02 02:46:10 +01:00
board-igep0020.c Merge branch 'depends/rmk/memory_h' into next/cleanup2 2011-11-01 13:47:27 +01:00
board-ldp.c Merge branch 'highbank/soc' into next/soc 2011-11-02 02:46:10 +01:00
board-n8x0.c Merge branch 'depends/rmk/memory_h' into next/cleanup2 2011-11-01 13:47:27 +01:00
board-omap3beagle.c Merge branch 'for-next' of git://git.infradead.org/users/sameo/mfd-2.6 2011-11-03 09:40:51 -07:00
board-omap3evm.c Merge branch 'depends/rmk/memory_h' into next/cleanup2 2011-11-01 13:47:27 +01:00
board-omap3logic.c Merge branch 'depends/rmk/memory_h' into next/cleanup2 2011-11-01 13:47:27 +01:00
board-omap3pandora.c Merge branch 'depends/rmk/memory_h' into next/cleanup2 2011-11-01 13:47:27 +01:00
board-omap3stalker.c Merge branch 'depends/rmk/memory_h' into next/cleanup2 2011-11-01 13:47:27 +01:00
board-omap3touchbook.c Merge branch 'depends/rmk/memory_h' into next/cleanup2 2011-11-01 13:47:27 +01:00
board-omap4panda.c Merge branch 'depends/rmk/memory_h' into next/cleanup2 2011-11-01 13:47:27 +01:00
board-overo.c Merge branch 'depends/rmk/memory_h' into next/cleanup2 2011-11-01 13:47:27 +01:00
board-rm680.c Merge branch 'depends/rmk/memory_h' into next/cleanup2 2011-11-01 13:47:27 +01:00
board-rx51-peripherals.c ASoC: tpa6130a2: Remove model_id from platform data 2011-09-21 16:07:45 +01:00
board-rx51-video.c Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 2011-05-26 12:11:54 -07:00
board-rx51.c Merge branch 'depends/rmk/memory_h' into next/cleanup2 2011-11-01 13:47:27 +01:00
board-ti8168evm.c Merge branch 'depends/rmk/memory_h' into next/cleanup2 2011-11-01 13:47:27 +01:00
board-zoom-debugboard.c omap: ZOOM: QUART: Request reset GPIO 2011-07-04 04:11:08 -07:00
board-zoom-display.c OMAP2+: Fix 9 section mismatch(es) warnings from mach-omap2/built-in.o 2011-05-31 06:17:02 -07:00
board-zoom-peripherals.c MFD: twl4030-audio: Rename platform data 2011-07-04 18:44:02 +03:00
board-zoom.c Merge branch 'depends/rmk/memory_h' into next/cleanup2 2011-11-01 13:47:27 +01:00
clkt2xxx_apll.c
clkt2xxx_dpll.c
clkt2xxx_dpllcore.c
clkt2xxx_osc.c
clkt2xxx_sys.c
clkt2xxx_virt_prcm_set.c
clkt34xx_dpll3m2.c
clkt_clksel.c
clkt_dpll.c
clkt_iclk.c
clock.c Merge branch 'next/devel2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 2011-07-26 17:42:18 -07:00
clock.h OMAP2+: clock: allow per-SoC clock init code to prevent clockdomain calls from clock code 2011-07-10 05:57:06 -06:00
clock2xxx.c
clock2xxx.h
clock3xxx.c
clock3xxx.h
clock3xxx_data.c ARM: OMAP2+: dmtimer: add device names to flck nodes 2011-09-21 15:50:31 -07:00
clock34xx.c
clock34xx.h
clock36xx.c
clock36xx.h
clock44xx.h OMAP4: clock data: Fix max mult and div for USB DPLL 2011-07-09 19:14:46 -06:00
clock44xx_data.c ARM: OMAP2+: dmtimer: add device names to flck nodes 2011-09-21 15:50:31 -07:00
clock2420_data.c ARM: OMAP2+: dmtimer: add device names to flck nodes 2011-09-21 15:50:31 -07:00
clock2430.c
clock2430_data.c ARM: OMAP2+: dmtimer: add device names to flck nodes 2011-09-21 15:50:31 -07:00
clock3517.c
clock3517.h
clock_common_data.c
clockdomain.c OMAP: clockdomain code/data: remove omap_chip bitmask from struct clockdomain 2011-09-14 16:01:21 -06:00
clockdomain.h OMAP: clockdomain code/data: remove omap_chip bitmask from struct clockdomain 2011-09-14 16:01:21 -06:00
clockdomain2xxx_3xxx.c OMAP: clockdomain code/data: remove omap_chip bitmask from struct clockdomain 2011-09-14 16:01:21 -06:00
clockdomain44xx.c OMAP: clockdomain code/data: remove omap_chip bitmask from struct clockdomain 2011-09-14 16:01:21 -06:00
clockdomains2xxx_3xxx_data.c OMAP: clockdomain code/data: remove omap_chip bitmask from struct clockdomain 2011-09-14 16:01:21 -06:00
clockdomains3xxx_data.c OMAP: clockdomain code/data: remove omap_chip bitmask from struct clockdomain 2011-09-14 16:01:21 -06:00
clockdomains44xx_data.c OMAP: clockdomain code/data: remove omap_chip bitmask from struct clockdomain 2011-09-14 16:01:21 -06:00
clockdomains2420_data.c OMAP: clockdomain code/data: remove omap_chip bitmask from struct clockdomain 2011-09-14 16:01:21 -06:00
clockdomains2430_data.c OMAP: clockdomain code/data: remove omap_chip bitmask from struct clockdomain 2011-09-14 16:01:21 -06:00
cm-regbits-24xx.h
cm-regbits-34xx.h
cm-regbits-44xx.h Merge branch 'next/soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 2011-07-26 17:09:31 -07:00
cm.h
cm1_44xx.h OMAP4: cm: Remove RESTORE macros to avoid access from SW 2011-07-09 19:15:05 -06:00
cm2_44xx.h OMAP4: cm: Remove RESTORE macros to avoid access from SW 2011-07-09 19:15:05 -06:00
cm2xxx_3xxx.c
cm2xxx_3xxx.h
cm44xx.c
cm44xx.h OMAP4: hwmod: Replace CLKCTRL absolute address with offset macros 2011-07-10 05:56:30 -06:00
cminst44xx.c OMAP4: cm: Add two new APIs for modulemode control 2011-07-10 05:56:32 -06:00
cminst44xx.h OMAP: hwmod: fix build break on non-OMAP4 multi-OMAP2 builds 2011-08-10 02:20:43 -07:00
common-board-devices.c OMAP: New twl-common for common TWL configuration 2011-07-04 18:43:27 +03:00
common-board-devices.h OMAP: New twl-common for common TWL configuration 2011-07-04 18:43:27 +03:00
common.c ARM: OMAP: Move set_globals initialization to happen in init_early 2011-10-19 16:34:11 -07:00
control.c ARM: OMAP: Move set_globals initialization to happen in init_early 2011-10-19 16:34:11 -07:00
control.h ARM: pm: omap34xx: remove get_*_restore_pointer functions, directly use entry points 2011-06-24 09:54:31 +01:00
cpuidle34xx.c
devices.c Merge branch 'next/cleanup2' of git://git.linaro.org/people/arnd/arm-soc 2011-11-01 20:58:25 -07:00
devices.h
display.c Merge branch 'next/cleanup2' of git://git.linaro.org/people/arnd/arm-soc 2011-11-01 20:58:25 -07:00
dma.c ARM: OMAP2+: devices: Remove all omap_device_pm_latency structures 2011-10-04 09:52:23 -07:00
dpll3xxx.c
dpll44xx.c
dsp.c
emu.c
gpio.c ARM: OMAP2+: devices: Remove all omap_device_pm_latency structures 2011-10-04 09:52:23 -07:00
gpmc-nand.c omap: cleanup NAND platform data 2011-06-29 01:11:37 -07:00
gpmc-onenand.c
gpmc-smc91x.c
gpmc-smsc911x.c
gpmc.c
hsmmc.c Merge branch 'next/fixes' into next/cleanup 2011-10-31 23:25:41 +01:00
hsmmc.h ARM: OMAP4: MMC: no regulator off during probe for eMMC 2011-06-01 02:25:04 -07:00
hwspinlock.c Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock 2011-11-03 08:05:35 -07:00
i2c.c OMAP: hwmod: fix the i2c-reset timeout during bootup 2011-07-10 05:27:16 -06:00
id.c OMAP: id: remove OMAP_CHIP declarations, code 2011-09-14 17:23:39 -06:00
io.c Merge branch 'next/pm' of git://git.linaro.org/people/arnd/arm-soc 2011-11-01 20:22:01 -07:00
io.h ARM: OMAP: Map SRAM later on with ioremap_exec() 2011-10-19 16:34:10 -07:00
iommu2.c omap: iommu: omapify 'struct iommu' and exposed API 2011-08-26 11:46:01 +02:00
irq.c ARM: OMAP: irq: loop counter fix in omap_init_irq() 2011-10-03 11:46:49 -07:00
Kconfig Merge branch 'for-next' of git://git.infradead.org/users/sameo/mfd-2.6 2011-11-03 09:40:51 -07:00
mailbox.c
Makefile Merge branch 'next/pm' of git://git.linaro.org/people/arnd/arm-soc 2011-11-01 20:22:01 -07:00
Makefile.boot ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
mcbsp.c ARM: OMAP2+: devices: Remove all omap_device_pm_latency structures 2011-10-04 09:52:23 -07:00
mux.c arm: mach-omap2: mux: use kstrdup() 2011-08-10 04:53:28 -07:00
mux.h ARM: omap4: Pass core and wakeup mux tables to omap4_mux_init 2011-06-01 02:25:04 -07:00
mux34xx.c
mux34xx.h
mux44xx.c ARM: omap4: Pass core and wakeup mux tables to omap4_mux_init 2011-06-01 02:25:04 -07:00
mux44xx.h
mux2420.c
mux2420.h
mux2430.c
mux2430.h
omap-headsmp.S
omap-hotplug.c
omap-iommu.c OMAP4: iommu: fix clock name 2011-07-04 15:08:06 +03:00
omap-smp.c Merge branch 'next/cleanup2' of git://git.linaro.org/people/arnd/arm-soc 2011-11-01 20:58:25 -07:00
omap4-common.c omap: Use separate init_irq functions to avoid cpu_is_omap tests early 2011-06-16 05:42:09 -07:00
omap44xx-smc.S
omap_hwmod.c OMAP2+: hwmod: remove OMAP_CHIP* 2011-09-14 17:23:19 -06:00
omap_hwmod_2xxx_3xxx_interconnect_data.c omap_hwmod: share identical omap_hwmod_addr_space arrays 2011-07-09 19:14:06 -06:00
omap_hwmod_2xxx_3xxx_ipblock_data.c omap_hwmod: share identical omap_hwmod_class, omap_hwmod_class_sysconfig arrays 2011-07-09 19:14:08 -06:00
omap_hwmod_2xxx_interconnect_data.c omap_hwmod: share identical omap_hwmod_addr_space arrays 2011-07-09 19:14:06 -06:00
omap_hwmod_2xxx_ipblock_data.c omap_hwmod: share identical omap_hwmod_class, omap_hwmod_class_sysconfig arrays 2011-07-09 19:14:08 -06:00
omap_hwmod_3xxx_data.c Merge branch 'next/pm' of git://git.linaro.org/people/arnd/arm-soc 2011-11-01 20:22:01 -07:00
omap_hwmod_44xx_data.c Merge branch 'next/timer' of git://git.linaro.org/people/arnd/arm-soc 2011-11-01 20:18:05 -07:00
omap_hwmod_2420_data.c ARM: OMAP2+: dmtimer: convert to platform devices 2011-09-21 15:50:31 -07:00
omap_hwmod_2430_data.c ARM: OMAP2+: dmtimer: convert to platform devices 2011-09-21 15:50:31 -07:00
omap_hwmod_common_data.c omap_hwmod: share identical omap_hwmod_dma_info arrays 2011-07-09 19:14:07 -06:00
omap_hwmod_common_data.h omap_hwmod: share identical omap_hwmod_class, omap_hwmod_class_sysconfig arrays 2011-07-09 19:14:08 -06:00
omap_l3_noc.c ARM: OMAP2+: l3-noc: Add support for device-tree 2011-10-04 22:29:38 +02:00
omap_l3_noc.h OMAP: Print Initiator name for l3 custom error. 2011-09-24 13:28:57 +05:30
omap_l3_smx.c OMAP: Fix indentation issues in l3 error handler. 2011-09-24 13:28:57 +05:30
omap_l3_smx.h OMAP: Fix sparse warnings in l3 error handler. 2011-09-24 13:28:57 +05:30
omap_opp_data.h
omap_phy_internal.c ARM: OMAP2: Add missing iounmap in omap4430_phy_init 2011-06-01 02:25:04 -07:00
omap_twl.c OMAP4: PM: TWL6030: add cmd register 2011-09-15 12:09:37 -07:00
opp.c OMAP: omap_device: decouple platform_device from omap_device 2011-09-15 16:35:47 -07:00
opp2xxx.h
opp3xxx_data.c
opp4xxx_data.c
opp2420_data.c
opp2430_data.c
pm-debug.c Merge branch 'for_3.1/pm-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into devel-cleanup 2011-06-29 04:45:16 -07:00
pm.c Merge branch 'next/pm' of git://git.linaro.org/people/arnd/arm-soc 2011-11-01 20:22:01 -07:00
pm.h Merge branch 'next/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 2011-07-25 12:38:42 -07:00
pm24xx.c OMAP2: PM debug: remove leftover debug code 2011-08-26 16:14:25 -07:00
pm34xx.c OMAP3: PM: fix UART handling when using no_console_suspend 2011-09-16 09:44:50 -07:00
pm44xx.c
powerdomain-common.c OMAP: powerdomain: remove omap_chip bitmasks 2011-09-14 17:20:44 -06:00
powerdomain.c OMAP2+: voltage: keep track of powerdomains in each voltagedomain 2011-09-15 11:39:10 -07:00
powerdomain.h OMAP2+: voltage: keep track of powerdomains in each voltagedomain 2011-09-15 11:39:10 -07:00
powerdomain2xxx_3xxx.c OMAP2: add voltage domains and connect to powerdomains 2011-09-15 11:39:10 -07:00
powerdomain44xx.c
powerdomains2xxx_3xxx_data.c OMAP3: powerdomain data: add voltage domains 2011-09-15 11:39:10 -07:00
powerdomains2xxx_3xxx_data.h
powerdomains2xxx_data.c OMAP2: add voltage domains and connect to powerdomains 2011-09-15 11:39:10 -07:00
powerdomains3xxx_data.c OMAP3: powerdomain data: add voltage domains 2011-09-15 11:39:10 -07:00
powerdomains44xx_data.c OMAP4: powerdomain data: add voltage domains 2011-09-15 11:39:10 -07:00
prcm-common.h
prcm.c ARM: OMAP: Move set_globals initialization to happen in init_early 2011-10-19 16:34:11 -07:00
prcm44xx.h
prcm_mpu44xx.c
prcm_mpu44xx.h OMAP4: prcm_mpu: Fix indent in few macros 2011-07-09 19:15:06 -06:00
prm-regbits-24xx.h
prm-regbits-34xx.h
prm-regbits-44xx.h OMAP4: PRCM: OMAP4460 specific PRM and CM register bitshifts 2011-07-08 02:18:24 -07:00
prm.h
prm2xxx_3xxx.c OMAP2+: PRM: add register access functions for VC/VP 2011-09-15 12:02:07 -07:00
prm2xxx_3xxx.h OMAP2+: PRM: add register access functions for VC/VP 2011-09-15 12:02:07 -07:00
prm44xx.c OMAP2+: PRM: add register access functions for VC/VP 2011-09-15 12:02:07 -07:00
prm44xx.h OMAP2+: PRM: add register access functions for VC/VP 2011-09-15 12:02:07 -07:00
prminst44xx.c OMAP4: prm: Replace warm reset API with the offset based version 2011-07-10 05:56:31 -06:00
prminst44xx.h OMAP4: prm: Replace warm reset API with the offset based version 2011-07-10 05:56:31 -06:00
scrm44xx.h
sdram-hynix-h8mbx00u0mer-0em.h
sdram-micron-mt46h32m32lf-6.h
sdram-nokia.c
sdram-nokia.h
sdram-numonyx-m65kxxxxam.h
sdram-qimonda-hyb18m512160af-6.h
sdrc.c ARM: OMAP: Move set_globals initialization to happen in init_early 2011-10-19 16:34:11 -07:00
sdrc.h
sdrc2xxx.c
serial.c ARM: OMAP2+: devices: Remove all omap_device_pm_latency structures 2011-10-04 09:52:23 -07:00
sleep24xx.S
sleep34xx.S ARM: pm: omap3: move saving of the auxiliary control registers to C 2011-06-30 08:47:35 +01:00
smartreflex-class3.c OMAP3+: voltage: rename omap_voltage_get_nom_volt -> voltdm_get_voltage 2011-09-15 12:09:21 -07:00
smartreflex.c Merge branch 'next/pm' of git://git.linaro.org/people/arnd/arm-soc 2011-11-01 20:22:01 -07:00
smartreflex.h
sr_device.c Merge branch 'next/pm' of git://git.linaro.org/people/arnd/arm-soc 2011-11-01 20:22:01 -07:00
sram34xx.S
sram242x.S
sram243x.S
timer-mpu.c
timer.c Merge branches 'cleanup-part3', 'voltage', 'dmtimer' and 'l3' into dt-base 2011-10-04 09:47:06 -07:00
twl-common.c OMAP4: TWL: Add common omapdss supplies 2011-09-30 16:16:12 +03:00
twl-common.h OMAP3: Move common regulator configuration to twl-common 2011-07-04 18:43:43 +03:00
usb-fs.c
usb-host.c
usb-musb.c ARM: OMAP2+: devices: Remove all omap_device_pm_latency structures 2011-10-04 09:52:23 -07:00
usb-tusb6010.c
vc.c OMAP2+: VC: more registers are per-channel starting with OMAP5 2011-09-15 12:09:22 -07:00
vc.h OMAP2+: VC: more registers are per-channel starting with OMAP5 2011-09-15 12:09:22 -07:00
vc3xxx_data.c OMAP2+: VC: more registers are per-channel starting with OMAP5 2011-09-15 12:09:22 -07:00
vc44xx_data.c OMAP2+: VC: more registers are per-channel starting with OMAP5 2011-09-15 12:09:22 -07:00
voltage.c OMAP3+: voltage: update nominal voltage in voltdm_scale() not VC post-scale 2011-09-15 12:09:22 -07:00
voltage.h ARM: OMAP: voltage: voltage layer present, even when CONFIG_PM=n 2011-09-21 09:36:21 -07:00
voltagedomains2xxx_data.c OMAP2: add voltage domains and connect to powerdomains 2011-09-15 11:39:10 -07:00
voltagedomains3xxx_data.c OMAP3+: voltdm: final removal of omap_vdd_info 2011-09-15 12:09:21 -07:00
voltagedomains44xx_data.c OMAP3+: voltdm: final removal of omap_vdd_info 2011-09-15 12:09:21 -07:00
vp.c OMAP3+: VP: combine setting init voltage into common function 2011-09-15 12:09:08 -07:00
vp.h OMAP3+: VP: remove unused omap_vp_get_curr_volt() 2011-09-15 12:09:08 -07:00
vp3xxx_data.c OMAP: VP: Explicitly mask VPVOLTAGE field 2011-09-15 12:09:08 -07:00
vp44xx_data.c OMAP: VP: Explicitly mask VPVOLTAGE field 2011-09-15 12:09:08 -07:00
wd_timer.c
wd_timer.h