Linus Torvalds
2795343705
arm-soc: clock driver changes ...
The new clock subsystem was merged in linux-3.4 without any users, this
now moves the first three platforms over to it: imx, mxs and spear.
The series also contains the changes for the clock subsystem itself,
since Mike preferred to have it together with the platforms that require
these changes, in order to avoid interdependencies and conflicts.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iQIcBAABAgAGBQJPuexPAAoJEIwa5zzehBx3YBsP/0nFhXjb5t1PdLfFzGKtcZVB
j4zXWXMHQ1fA7wIfEpZF3Nnco6MQkufF5wJPoPdn1+wmkzCn3D6IwNVWVtW4U5i9
VGyShSbgusAAYXUe/9yYj8eN+bbRQSvdN4eWYWU6+rRXShGZ5dZZmp+IPNl54dnW
6F8uCnHX0cnIMCpGqV+41zZgZ/4wL2k9gdqu0LO6pi07o4tGd0Z4gcySgUFAnn1R
kofNHueYIP4UgOg8DREoBzVKlpRqMou3S2kSZUfMeb3Q9ryF7UIvaGqIILyi7PKL
kWd3nptg0EPavfL21SwXHiGpnDpB/Gj/F70kcPLus5RYujB24C9bvBmc26z68NZx
Sz9mbElkkIU5duZsl1nxBWJ8IZ/tSWdtmC2xQMznmV7gHyGgVwr4j47f4Uv5sBvM
14JHDO7mqN6E6FnTFZu/oPAN5pDjgL+TVNK5BU6Wkq0zitrA6eyKDqCvBCqkO6Nn
tNzOuyRDzMOwM7HzqXhxqtzJWXylO1Mldc4bM8X4Cocf4pnLna/X6uP6dgE6A+JY
azVYx4I/0NdEPerDTzIcEhBDgZeBVROhUQr+kHxc4rf6WzUUbu/wEo1UKXWV66oW
1jb1yAFFWqYjkQuQc2PD4JSx35sFJaoSaoneRtmzBzRDfzSr5KjKj1E0e1skyMFq
7ZVLCqZD0cB9DhmMDkWP
=rwFF
-----END PGP SIGNATURE-----
Merge tag 'clock' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull arm-soc clock driver changes from Olof Johansson:
"The new clock subsystem was merged in linux-3.4 without any users,
this now moves the first three platforms over to it: imx, mxs and
spear.
The series also contains the changes for the clock subsystem itself,
since Mike preferred to have it together with the platforms that
require these changes, in order to avoid interdependencies and
conflicts."
Fix up trivial conflicts in arch/arm/mach-kirkwood/common.c (code
removed in one branch, added OF support in another) and
drivers/dma/imx-sdma.c (independent changes next to each other).
* tag 'clock' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (97 commits)
clk: Fix CLK_SET_RATE_GATE flag validation in clk_set_rate().
clk: Provide dummy clk_unregister()
SPEAr: Update defconfigs
SPEAr: Add SMI NOR partition info in dts files
SPEAr: Switch to common clock framework
SPEAr: Call clk_prepare() before calling clk_enable
SPEAr: clk: Add General Purpose Timer Synthesizer clock
SPEAr: clk: Add Fractional Synthesizer clock
SPEAr: clk: Add Auxiliary Synthesizer clock
SPEAr: clk: Add VCO-PLL Synthesizer clock
SPEAr: Add DT bindings for SPEAr's timer
ARM i.MX: remove now unused clock files
ARM: i.MX6: implement clocks using common clock framework
ARM i.MX35: implement clocks using common clock framework
ARM i.MX5: implement clocks using common clock framework
ARM: Kirkwood: Replace clock gating
ARM: Orion: Audio: Add clk/clkdev support
ARM: Orion: PCIE: Add support for clk
ARM: Orion: XOR: Add support for clk
ARM: Orion: CESA: Add support for clk
...
2012-05-26 12:42:29 -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: Provide flag for rtc devices that don't support UIE
2012-03-15 18:23:10 -07:00
rtc: Kconfig: remove dependency for AT91 rtc driver
2012-04-16 12:47:17 +02:00
rtc: driver for DA9052/53 PMIC v1
2012-03-23 16:58:40 -07:00
Merge branch 'akpm' (Andrew's patch-bomb)
2012-04-05 15:30:34 -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: 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
rtc: convert drivers/rtc/* to use module_platform_driver()
2012-01-10 16:30:53 -08:00
rtc: convert rtc spi drivers to module_spi_driver
2012-03-23 16:58:39 -07:00
drivers/rtc/rtc-ds1307.c: fix BUG shown with lock debugging enabled
2012-04-25 21:26:34 -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
drivers/rtc/rtc-efi.c: fix section mismatch warning
2012-04-12 13:12:12 -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
rtc: imx dryice: Add missing clk_prepare
2012-04-25 17:03:44 +02: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
rtc: Fix possible null pointer dereference in rtc-mpc5121.c
2012-04-26 11:17:01 +02: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
ARM: More device tree support updates
2012-03-28 12:34:33 -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
drivers/rtc/rtc-pl031.c: configure correct wday for 2000-01-01
2012-05-17 18:00:51 -07:00
drivers/rtc/rtc-pm8xxx.c: make pm8xxx_rtc_pm_ops static
2012-03-23 16:58:39 -07: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
drivers/rtc/rtc-r9701.c: reset registers if invalid values are detected
2012-04-12 13:12:12 -07:00
rtc: rp5c01: Initialize drvdata before registering device
2011-05-06 18:02:05 -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 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-s3c.c: add placeholder for driver private data
2012-04-12 13:12:12 -07:00
rtc: convert rtc i2c drivers to module_i2c_driver
2012-03-23 16:58:39 -07:00
ARM: cleanups of io includes
2012-03-29 18:02:10 -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
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/rtc-tegra.c: properly initialize spinlock
2011-07-25 20:57:17 -07:00
tile: add an RTC driver for the Tilera hypervisor
2011-05-17 14:44:36 -04:00
drivers/rtc/rtc-twl.c: use static register while reading time
2012-04-12 13:12:12 -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
2795343705