Linus Torvalds
66f03c614c
ARM: device tree work ...
Most of these patches convert code from using static platform data to
describing the hardware in the device tree. This is only the first
half of the changes for v3.4 because a lot of patches for this topic
came in the last week before the merge window.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iQIVAwUAT24/a2CrR//JCVInAQKYdxAAn+fs7yv+P4OWG/nIhGdnPw8MQ2u9fvqA
pmNL3Jy0eVowbENDcRRZgfhZ3ZlWBGUYym7J1uiFSrmHyJPoMtMvVg0miPYxLlpE
vr8bzuSfGOUOa7+Fk6kFVGxS3ZHZTsDvuhMQUIt/2jHgOaesqPvZ1FYFAj1bZ1fm
2CnQoF3OfnWAngHtoBXtgJxp/1r7+pHlGVbPYpmtHtikl45NmhqWza58aSQBilr+
S90cVeZs91gyveoxz5N+YrO8+Dx05te3mF+dwWuKC6aDC6d76fjLak54AvYv2Pzr
I6iaQPV8GIsXi5R4wptmVQAc5mbk5oktxJ7hCIHrmaBiAXygoVAYoqcuumoO3QDb
QKz10ga1yBYcKYrKvBzKxQrChw53IPU6po+Dd66ALJvLlc3KONksiJs5T/5Wma7P
v3VPcmZwPrJQbz+fQu6FysHeYQY+wfiR5E9Yz2OXs+PtkSy9OYsFFirdhJeWUPgA
ASjNLs1y5rxqrJBt7cjyQiBbIf1awGWyzF0yUNrlYHxmhJ6vcxHfrGoW38VRRCTM
8+JcxOHPRYrPfY7we6zsOn7ZeTWJduoUEeTxDnVS3w3zUIKCvkvkpHaJDvHvYcui
T/yJnXdUD2O3E5+5k/5cCyde8RbSB9gKsNpIMNkK5BLSmbux3C72dE0sMQFysahI
hS8aDCDUQUU=
=fMC+
-----END PGP SIGNATURE-----
Merge tag 'dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull "ARM: device tree work" from Arnd Bergmann:
"Most of these patches convert code from using static platform data to
describing the hardware in the device tree. This is only the first
half of the changes for v3.4 because a lot of patches for this topic
came in the last week before the merge window.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>"
Fix up trivial conflicts in arch/arm/mach-vexpress/{Kconfig,core.h}
* tag 'dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (86 commits)
Document: devicetree: add OF documents for arch-mmp
ARM: dts: append DTS file of pxa168
ARM: mmp: append OF support on pxa168
ARM: mmp: enable rtc clk in pxa168
i2c: pxa: add OF support
serial: pxa: add OF support
arm/dts: mt_ventoux: very basic support for TeeJet Mt.Ventoux board
ARM: OMAP2+: Remove extra ifdefs for board-generic
ARM: OMAP2+: Fix build error when only ARCH_OMAP2/3 or 4 is selected
ASoC: DT: Add digital microphone binding to PAZ00 board.
ARM: dt: Add ARM PMU to tegra*.dtsi
ARM: at91: at91sam9x5cm/dt: add leds support
ARM: at91: usb_a9g20/dt: add gpio-keys support
ARM: at91: at91sam9m10g45ek/dt: add gpio-keys support
ARM: at91: at91sam9m10g45ek/dt: add leds support
ARM: at91: usb_a9g20/dt: add leds support
ARM: at91/pio: add new PIO3 features
ARM: at91: add sam9_smc.o to at91sam9x5 build
ARM: at91/tc/clocksource: Add 32 bit variant to Timer Counter
ARM: at91/tc: add device tree support to atmel_tclib
...
2012-03-27 16:47:35 -07:00
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
rtc/hctosys: only claim the RTC provided the system time if it did
2010-03-12 15:52:28 -08:00
rtc: Disable the alarm in the hardware (v2)
2012-01-26 19:41:42 -08:00
ARM: driver specific updates
2012-03-27 16:41:24 -07:00
rtc: driver for DA9052/53 PMIC v1
2012-03-23 16:58:40 -07:00
rtc: convert drivers/rtc/* to use module_platform_driver()
2012-01-10 16:30:53 -08:00
drivers/rtc/rtc-ab3100.c: add missing platform_set_drvdata() in ab3100_rtc_probe()
2010-09-22 17:22:39 -07:00
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
treewide: Convert uses of struct resource to resource_size(ptr)
2011-06-10 14:55:36 +02:00
ARM: at91: make rm9200 rtc drivers soc independent
2011-11-28 22:50:39 +08:00
ARM: device tree work
2012-03-27 16:47:35 -07:00
rtc: t reaches -1, tested 0
2009-02-11 14:25:36 -08:00
rtc: convert drivers/rtc/* to use module_platform_driver()
2012-01-10 16:30:53 -08:00
rtc: convert rtc i2c drivers to module_i2c_driver
2012-03-23 16:58:39 -07:00
rtc: convert drivers/rtc/* to use module_platform_driver()
2012-01-10 16:30:53 -08:00
drivers/rtc: remove IRQF_DISABLED
2012-03-23 16:58:39 -07:00
drivers/rtc: remove IRQF_DISABLED
2012-03-23 16:58:39 -07:00
rtc: driver for DA9052/53 PMIC v1
2012-03-23 16:58:40 -07:00
drivers/rtc: remove IRQF_DISABLED
2012-03-23 16:58:39 -07:00
rtc: Fix ioctl error path return
2011-06-01 19:29:39 -07:00
rtc: convert drivers/rtc/* to use module_platform_driver()
2012-01-10 16:30:53 -08:00
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
rtc: convert drivers/rtc/* to use module_platform_driver()
2012-01-10 16:30:53 -08:00
sh: mach-snapgear: Kill off machtype, consolidate board def.
2010-10-29 19:06:53 +09:00
rtc: convert rtc spi drivers to module_spi_driver
2012-03-23 16:58:39 -07:00
rtc: ds1307: generalise ram size and offset
2012-03-23 16:58:40 -07:00
rtc: convert rtc i2c drivers to module_i2c_driver
2012-03-23 16:58:39 -07:00
rtc: convert rtc spi drivers to module_spi_driver
2012-03-23 16:58:39 -07:00
drivers/rtc: remove IRQF_DISABLED
2012-03-23 16:58:39 -07:00
drivers/rtc: remove IRQF_DISABLED
2012-03-23 16:58:39 -07:00
rtc: convert rtc i2c drivers to module_i2c_driver
2012-03-23 16:58:39 -07:00
rtc: convert drivers/rtc/* to use module_platform_driver()
2012-01-10 16:30:53 -08:00
rtc: convert rtc i2c drivers to module_i2c_driver
2012-03-23 16:58:39 -07:00
rtc: convert rtc spi drivers to module_spi_driver
2012-03-23 16:58:39 -07:00
rtc: add platform driver for EFI
2009-04-01 08:59:24 -07:00
rtc: convert rtc i2c drivers to module_i2c_driver
2012-03-23 16:58:39 -07:00
rtc: ep93xx: Fix 'rtc' may be used uninitialized warning
2011-08-10 15:54:24 -07:00
rtc: convert rtc i2c drivers to module_i2c_driver
2012-03-23 16:58:39 -07:00
parisc: rtc: Rename rtc-parisc to rtc-generic
2009-04-02 01:05:31 +00:00
drivers/rtc/rtc-imxdi.c needs linux/sched.h
2011-09-14 18:09:37 -07:00
rtc: convert rtc i2c drivers to module_i2c_driver
2012-03-23 16:58:39 -07:00
rtc: convert rtc i2c drivers to module_i2c_driver
2012-03-23 16:58:39 -07:00
drivers/rtc/rtc-jz4740.c: make jz4740_rtc_driver static
2012-01-10 16:30:53 -08:00
rtc: Initialized rtc_time->tm_isdst
2011-08-26 17:26:35 -07:00
drivers/rtc: remove IRQF_DISABLED
2012-03-23 16:58:39 -07:00
MIPS: add RTC support for loongson1B
2012-03-23 16:58:39 -07:00
rtc: convert rtc i2c drivers to module_i2c_driver
2012-03-23 16:58:39 -07:00
rtc: convert rtc spi drivers to module_spi_driver
2012-03-23 16:58:39 -07:00
rtc: convert rtc spi drivers to module_spi_driver
2012-03-23 16:58:39 -07:00
rtc: convert drivers/rtc/* to use module_platform_driver()
2012-01-10 16:30:53 -08:00
rtc: convert drivers/rtc/* to use module_platform_driver()
2012-01-10 16:30:53 -08:00
rtc: convert drivers/rtc/* to use module_platform_driver()
2012-01-10 16:30:53 -08:00
rtc: convert rtc i2c drivers to module_i2c_driver
2012-03-23 16:58:39 -07:00
rtc: convert rtc spi drivers to module_spi_driver
2012-03-23 16:58:39 -07:00
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: convert drivers/rtc/* to use module_platform_driver()
2012-01-10 16:30:53 -08:00
drivers/rtc/rtc-mc13xxx.c: make mc13xxx_rtc_idtable static
2012-01-10 16:30:53 -08:00
drivers/rtc: remove IRQF_DISABLED
2012-03-23 16:58:39 -07:00
drivers/rtc: remove IRQF_DISABLED
2012-03-23 16:58:39 -07:00
rtc: msm6242: Initialize drvdata before registering device
2011-05-06 18:02:03 -07:00
drivers/rtc: remove IRQF_DISABLED
2012-03-23 16:58:39 -07:00
drivers/rtc/rtc-mxc.c: make alarm work
2012-01-10 16:30:52 -08:00
drivers/rtc: remove IRQF_DISABLED
2012-03-23 16:58:39 -07:00
drivers/rtc: remove IRQF_DISABLED
2012-03-23 16:58:39 -07:00
rtc: pcap: Initialize drvdata before registering device
2011-05-06 18:02:04 -07:00
rtc: convert rtc spi drivers to module_spi_driver
2012-03-23 16:58:39 -07:00
rtc: convert rtc i2c drivers to module_i2c_driver
2012-03-23 16:58:39 -07:00
rtc: convert rtc i2c drivers to module_i2c_driver
2012-03-23 16:58:39 -07:00
rtc: convert drivers/rtc/* to use module_platform_driver()
2012-01-10 16:30:53 -08:00
Merge branch 'amba' of git://git.linaro.org/people/rmk/linux-arm
2012-03-23 17:36:29 -07:00
Merge branch 'amba' of git://git.linaro.org/people/rmk/linux-arm
2012-03-23 17:36:29 -07:00
drivers/rtc/rtc-pm8xxx.c: make pm8xxx_rtc_pm_ops static
2012-03-23 16:58:39 -07:00
RTC: Include information about UIE and PIE in RTC driver proc.
2011-03-09 11:25:04 -08:00
powerpc/ps3: Add rtc-ps3
2009-04-02 01:05:32 +00:00
rtc-puv3: solve section mismatch in rtc-puv3.c
2012-01-10 10:29:42 +08:00
drivers/rtc: remove IRQF_DISABLED
2012-03-23 16:58:39 -07:00
rtc: convert rtc spi drivers to module_spi_driver
2012-03-23 16:58:39 -07:00
rtc: rp5c01: Initialize drvdata before registering device
2011-05-06 18:02:05 -07:00
rtc: rtc-rs5c313: ctrl_in/outX to __raw_read/writeX conversion.
2010-10-27 15:30:32 +09:00
rtc: convert rtc spi drivers to module_spi_driver
2012-03-23 16:58:39 -07:00
rtc: convert rtc i2c drivers to module_i2c_driver
2012-03-23 16:58:39 -07:00
rtc: convert rtc i2c drivers to module_i2c_driver
2012-03-23 16:58:39 -07:00
rtc: convert rtc i2c drivers to module_i2c_driver
2012-03-23 16:58:39 -07:00
rtc: convert rtc i2c drivers to module_i2c_driver
2012-03-23 16:58:39 -07:00
ARM: driver specific updates
2012-03-27 16:41:24 -07:00
rtc: convert rtc i2c drivers to module_i2c_driver
2012-03-23 16:58:39 -07:00
ARM: driver specific updates
2012-03-27 16:41:24 -07:00
drivers/rtc: remove IRQF_DISABLED
2012-03-23 16:58:39 -07:00
rtc/rtc-spear: call platform_set_drvdata() before registering rtc device
2012-03-23 16:58:39 -07:00
rtc: rtc-starfire fixes
2008-11-21 01:24:38 -08:00
drivers/rtc: remove IRQF_DISABLED
2012-03-23 16:58:39 -07:00
rtc: convert drivers/rtc/* to use module_platform_driver()
2012-01-10 16:30:53 -08:00
rtc: rtc-sun4v fixes, revised
2008-11-14 16:37:54 -08:00
rtc/hctosys: only claim the RTC provided the system time if it did
2010-03-12 15:52:28 -08:00
drivers/rtc/rtc-tegra.c: properly initialize spinlock
2011-07-25 20:57:17 -07:00
RTC: Fix the cross interrupt issue on rtc-test.
2011-03-09 11:25:07 -08:00
tile: add an RTC driver for the Tilera hypervisor
2011-05-17 14:44:36 -04:00
drivers/rtc/rtc-twl.c: return correct RTC event from ISR
2012-03-23 16:58:39 -07:00
drivers/rtc: remove IRQF_DISABLED
2012-03-23 16:58:39 -07:00
rtc: convert drivers/rtc/* to use module_platform_driver()
2012-01-10 16:30:53 -08:00
drivers/rtc: remove IRQF_DISABLED
2012-03-23 16:58:39 -07:00
rtc: convert drivers/rtc/* to use module_platform_driver()
2012-01-10 16:30:53 -08:00
rtc: convert drivers/rtc/* to use module_platform_driver()
2012-01-10 16:30:53 -08:00
rtc: convert drivers/rtc/* to use module_platform_driver()
2012-01-10 16:30:53 -08:00
rtc: convert rtc i2c drivers to module_i2c_driver
2012-03-23 16:58:39 -07:00
66f03c614c