Linus Torvalds
9e4db1c3ee
Merge branch 'platforms' of git://git.linaro.org/people/rmk/linux-arm
...
Pull ARM platform updates from Russell King:
"This covers platform stuff for platforms I have a direct interest in
(iow, I have the hardware). Essentially:
- as we no longer support any other Acorn platforms other than RiscPC
anymore, we can collect all that code into mach-rpc.
- convert Acorn expansion card stuff to use IRQ allocation functions,
and get rid of NO_IRQ from there.
- cleanups to the ebsa110 platform to move some private stuff out of
its header files.
- large amount of SA11x0 updates:
- conversion of private DMA implementation to DMA engine support
(this actually gives us greater flexibility in drivers over the old
API.)
- re-worked ucb1x00 updates - convert to genirq, remove sa11x0
dependencies, fix various minor issues
- move platform specific sa11x0 framebuffer data into platform files
in arch/arm instead of keeping this in the driver itself
- update sa11x0 IrDA driver for DMA engine, and allow it to use DMA
for SIR transmissions as well as FIR
- rework sa1111 support for genirq, and irq allocation
- fix sa1111 IRQ support so it works again
- use sparse IRQ support
After this, I have one more pull request remaining from my current
set, which I think is going to be the most problematical as it
generates 8 conflicts."
Fixed up the trivial conflict in arch/arm/mach-rpc/Makefile as per
Russell.
* 'platforms' of git://git.linaro.org/people/rmk/linux-arm: (125 commits)
ARM: 7343/1: sa11x0: convert to sparse IRQ
ARM: 7342/2: sa1100: prepare for sparse irq conversion
ARM: 7341/1: input: prepare jornada720 keyboard and ts for sa11x0 sparse irq
ARM: 7340/1: rtc: sa1100: include mach/irqs.h instead of asm/irq.h
ARM: sa11x0: remove unused DMA controller definitions
ARM: sa11x0: remove old SoC private DMA driver
USB: sa1111: add hcd .reset method
USB: sa1111: add OHCI shutdown methods
USB: sa1111: reorganize ohci-sa1111.c
USB: sa1111: get rid of nasty printk(KERN_DEBUG "%s: ...", __FILE__)
USB: sa1111: sparse and checkpatch cleanups
ARM: sa11x0: don't static map sa1111
ARM: sa1111: use dev_err() rather than printk()
ARM: sa1111: cleanup sub-device registration and unregistration
ARM: sa1111: only setup DMA for DMA capable devices
ARM: sa1111: register sa1111 devices with dmabounce in bus notifier
ARM: sa1111: move USB interface register definitions to ohci-sa1111.c
ARM: sa1111: move PCMCIA interface register definitions to sa1111_generic.c
ARM: sa1111: move PS/2 interface register definitions to sa1111p2.c
ARM: sa1111: delete unused physical GPIO register definitions
...
2012-03-27 18:17:02 -07:00
..
class.c
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2011-12-05 16:53:43 -08:00
hctosys.c
interface.c
rtc: Disable the alarm in the hardware (v2)
2012-01-26 19:41:42 -08:00
Kconfig
ARM: driver specific updates
2012-03-27 16:41:24 -07:00
Makefile
rtc: driver for DA9052/53 PMIC v1
2012-03-23 16:58:40 -07:00
rtc-88pm860x.c
rtc: convert drivers/rtc/* to use module_platform_driver()
2012-01-10 16:30:53 -08:00
rtc-ab3100.c
rtc-ab8500.c
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6
2012-01-13 20:43:32 -08:00
rtc-at32ap700x.c
rtc-at91rm9200.c
ARM: at91: make rm9200 rtc drivers soc independent
2011-11-28 22:50:39 +08:00
rtc-at91sam9.c
ARM: device tree work
2012-03-27 16:47:35 -07:00
rtc-au1xxx.c
rtc-bfin.c
rtc: convert drivers/rtc/* to use module_platform_driver()
2012-01-10 16:30:53 -08:00
rtc-bq32k.c
rtc: convert rtc i2c drivers to module_i2c_driver
2012-03-23 16:58:39 -07:00
rtc-bq4802.c
rtc: convert drivers/rtc/* to use module_platform_driver()
2012-01-10 16:30:53 -08:00
rtc-cmos.c
drivers/rtc: remove IRQF_DISABLED
2012-03-23 16:58:39 -07:00
rtc-coh901331.c
drivers/rtc: remove IRQF_DISABLED
2012-03-23 16:58:39 -07:00
rtc-core.h
rtc-da9052.c
rtc: driver for DA9052/53 PMIC v1
2012-03-23 16:58:40 -07:00
rtc-davinci.c
drivers/rtc: remove IRQF_DISABLED
2012-03-23 16:58:39 -07:00
rtc-dev.c
rtc-dm355evm.c
rtc: convert drivers/rtc/* to use module_platform_driver()
2012-01-10 16:30:53 -08:00
rtc-ds1216.c
rtc-ds1286.c
rtc: convert drivers/rtc/* to use module_platform_driver()
2012-01-10 16:30:53 -08:00
rtc-ds1302.c
rtc-ds1305.c
rtc: convert rtc spi drivers to module_spi_driver
2012-03-23 16:58:39 -07:00
rtc-ds1307.c
rtc: ds1307: generalise ram size and offset
2012-03-23 16:58:40 -07:00
rtc-ds1374.c
rtc: convert rtc i2c drivers to module_i2c_driver
2012-03-23 16:58:39 -07:00
rtc-ds1390.c
rtc: convert rtc spi drivers to module_spi_driver
2012-03-23 16:58:39 -07:00
rtc-ds1511.c
drivers/rtc: remove IRQF_DISABLED
2012-03-23 16:58:39 -07:00
rtc-ds1553.c
drivers/rtc: remove IRQF_DISABLED
2012-03-23 16:58:39 -07:00
rtc-ds1672.c
rtc: convert rtc i2c drivers to module_i2c_driver
2012-03-23 16:58:39 -07:00
rtc-ds1742.c
rtc: convert drivers/rtc/* to use module_platform_driver()
2012-01-10 16:30:53 -08:00
rtc-ds3232.c
rtc: convert rtc i2c drivers to module_i2c_driver
2012-03-23 16:58:39 -07:00
rtc-ds3234.c
rtc: convert rtc spi drivers to module_spi_driver
2012-03-23 16:58:39 -07:00
rtc-efi.c
rtc-em3027.c
rtc: convert rtc i2c drivers to module_i2c_driver
2012-03-23 16:58:39 -07:00
rtc-ep93xx.c
rtc-fm3130.c
rtc: convert rtc i2c drivers to module_i2c_driver
2012-03-23 16:58:39 -07:00
rtc-generic.c
rtc-imxdi.c
rtc-isl1208.c
rtc: convert rtc i2c drivers to module_i2c_driver
2012-03-23 16:58:39 -07:00
rtc-isl12022.c
rtc: convert rtc i2c drivers to module_i2c_driver
2012-03-23 16:58:39 -07:00
rtc-jz4740.c
drivers/rtc/rtc-jz4740.c: make jz4740_rtc_driver static
2012-01-10 16:30:53 -08:00
rtc-lib.c
rtc-lpc32xx.c
drivers/rtc: remove IRQF_DISABLED
2012-03-23 16:58:39 -07:00
rtc-ls1x.c
MIPS: add RTC support for loongson1B
2012-03-23 16:58:39 -07:00
rtc-m41t80.c
rtc: convert rtc i2c drivers to module_i2c_driver
2012-03-23 16:58:39 -07:00
rtc-m41t93.c
rtc: convert rtc spi drivers to module_spi_driver
2012-03-23 16:58:39 -07:00
rtc-m41t94.c
rtc: convert rtc spi drivers to module_spi_driver
2012-03-23 16:58:39 -07:00
rtc-m48t35.c
rtc: convert drivers/rtc/* to use module_platform_driver()
2012-01-10 16:30:53 -08:00
rtc-m48t59.c
rtc: convert drivers/rtc/* to use module_platform_driver()
2012-01-10 16:30:53 -08:00
rtc-m48t86.c
rtc: convert drivers/rtc/* to use module_platform_driver()
2012-01-10 16:30:53 -08:00
rtc-max6900.c
rtc: convert rtc i2c drivers to module_i2c_driver
2012-03-23 16:58:39 -07:00
rtc-max6902.c
rtc: convert rtc spi drivers to module_spi_driver
2012-03-23 16:58:39 -07:00
rtc-max8925.c
drivers/rtc/rtc-max8925.c: fix alarm->enabled mistake in max8925_rtc_read_alarm/max8925_rtc_set_alarm
2012-03-23 16:58:39 -07:00
rtc-max8998.c
rtc: convert drivers/rtc/* to use module_platform_driver()
2012-01-10 16:30:53 -08:00
rtc-mc13xxx.c
drivers/rtc/rtc-mc13xxx.c: make mc13xxx_rtc_idtable static
2012-01-10 16:30:53 -08:00
rtc-mpc5121.c
drivers/rtc: remove IRQF_DISABLED
2012-03-23 16:58:39 -07:00
rtc-mrst.c
drivers/rtc: remove IRQF_DISABLED
2012-03-23 16:58:39 -07:00
rtc-msm6242.c
rtc-mv.c
drivers/rtc: remove IRQF_DISABLED
2012-03-23 16:58:39 -07:00
rtc-mxc.c
drivers/rtc/rtc-mxc.c: make alarm work
2012-01-10 16:30:52 -08:00
rtc-nuc900.c
drivers/rtc: remove IRQF_DISABLED
2012-03-23 16:58:39 -07:00
rtc-omap.c
drivers/rtc: remove IRQF_DISABLED
2012-03-23 16:58:39 -07:00
rtc-pcap.c
rtc-pcf2123.c
rtc: convert rtc spi drivers to module_spi_driver
2012-03-23 16:58:39 -07:00
rtc-pcf8563.c
rtc: convert rtc i2c drivers to module_i2c_driver
2012-03-23 16:58:39 -07:00
rtc-pcf8583.c
rtc: convert rtc i2c drivers to module_i2c_driver
2012-03-23 16:58:39 -07:00
rtc-pcf50633.c
rtc: convert drivers/rtc/* to use module_platform_driver()
2012-01-10 16:30:53 -08:00
rtc-pl030.c
Merge branch 'amba' of git://git.linaro.org/people/rmk/linux-arm
2012-03-23 17:36:29 -07:00
rtc-pl031.c
Merge branch 'amba' of git://git.linaro.org/people/rmk/linux-arm
2012-03-23 17:36:29 -07:00
rtc-pm8xxx.c
drivers/rtc/rtc-pm8xxx.c: make pm8xxx_rtc_pm_ops static
2012-03-23 16:58:39 -07:00
rtc-proc.c
rtc-ps3.c
rtc-puv3.c
rtc-puv3: solve section mismatch in rtc-puv3.c
2012-01-10 10:29:42 +08:00
rtc-pxa.c
drivers/rtc: remove IRQF_DISABLED
2012-03-23 16:58:39 -07:00
rtc-r9701.c
rtc: convert rtc spi drivers to module_spi_driver
2012-03-23 16:58:39 -07:00
rtc-rp5c01.c
rtc-rs5c313.c
rtc-rs5c348.c
rtc: convert rtc spi drivers to module_spi_driver
2012-03-23 16:58:39 -07:00
rtc-rs5c372.c
rtc: convert rtc i2c drivers to module_i2c_driver
2012-03-23 16:58:39 -07:00
rtc-rv3029c2.c
rtc: convert rtc i2c drivers to module_i2c_driver
2012-03-23 16:58:39 -07:00
rtc-rx8025.c
rtc: convert rtc i2c drivers to module_i2c_driver
2012-03-23 16:58:39 -07:00
rtc-rx8581.c
rtc: convert rtc i2c drivers to module_i2c_driver
2012-03-23 16:58:39 -07:00
rtc-s3c.c
ARM: driver specific updates
2012-03-27 16:41:24 -07:00
rtc-s35390a.c
rtc: convert rtc i2c drivers to module_i2c_driver
2012-03-23 16:58:39 -07:00
rtc-sa1100.c
Merge branch 'platforms' of git://git.linaro.org/people/rmk/linux-arm
2012-03-27 18:17:02 -07:00
rtc-sh.c
drivers/rtc: remove IRQF_DISABLED
2012-03-23 16:58:39 -07:00
rtc-spear.c
rtc/rtc-spear: call platform_set_drvdata() before registering rtc device
2012-03-23 16:58:39 -07:00
rtc-starfire.c
rtc-stk17ta8.c
drivers/rtc: remove IRQF_DISABLED
2012-03-23 16:58:39 -07:00
rtc-stmp3xxx.c
rtc: convert drivers/rtc/* to use module_platform_driver()
2012-01-10 16:30:53 -08:00
rtc-sun4v.c
rtc-sysfs.c
rtc-tegra.c
rtc-test.c
rtc-tile.c
rtc-twl.c
drivers/rtc/rtc-twl.c: return correct RTC event from ISR
2012-03-23 16:58:39 -07:00
rtc-tx4939.c
drivers/rtc: remove IRQF_DISABLED
2012-03-23 16:58:39 -07:00
rtc-v3020.c
rtc: convert drivers/rtc/* to use module_platform_driver()
2012-01-10 16:30:53 -08:00
rtc-vr41xx.c
drivers/rtc: remove IRQF_DISABLED
2012-03-23 16:58:39 -07:00
rtc-vt8500.c
rtc: convert drivers/rtc/* to use module_platform_driver()
2012-01-10 16:30:53 -08:00
rtc-wm831x.c
rtc: convert drivers/rtc/* to use module_platform_driver()
2012-01-10 16:30:53 -08:00
rtc-wm8350.c
rtc: convert drivers/rtc/* to use module_platform_driver()
2012-01-10 16:30:53 -08:00
rtc-x1205.c
rtc: convert rtc i2c drivers to module_i2c_driver
2012-03-23 16:58:39 -07:00