Arnd Bergmann
93c6d8927f
Merge branch 'clk/mxs' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/clock
...
Shawn Guo <shawn.guo@linaro.org> writes:
mxs common clk porting for v3.5. It depends on the following two branches.
[1] git://git.linaro.org/people/mturquette/linux.git clk-next
[2] http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-arm.git clkdev
As the mxs device tree conversion will constantly touch clock files,
to save the conflicts, the updated mxs/dt branch coming later will
based on this pull-request.
* 'clk/mxs' of git://git.linaro.org/people/shawnguo/linux-2.6:
ARM: mxs: remove now unused timer_clk argument from mxs_timer_init
ARM: mxs: remove old clock support
ARM: mxs: switch to common clk framework
ARM: mxs: change the lookup name for fec phy clock
ARM: mxs: request clock for timer
clk: mxs: add clock support for imx28
clk: mxs: add clock support for imx23
clk: mxs: add mxs specific clocks
Includes an update to Linux 3.4-rc6
Conflicts:
drivers/clk/Makefile
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2012-05-11 17:15:31 +02:00
..
class.c
hctosys.c
interface.c
rtc: Provide flag for rtc devices that don't support UIE
2012-03-15 18:23:10 -07: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
Merge branch 'akpm' (Andrew's patch-bomb)
2012-04-05 15:30:34 -07: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
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
drivers/rtc/rtc-ds1307.c: fix BUG shown with lock debugging enabled
2012-04-25 21:26:34 -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
drivers/rtc/rtc-efi.c: fix section mismatch warning
2012-04-12 13:12:12 -07:00
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: imx dryice: Add missing clk_prepare
2012-04-25 17:03:44 +02:00
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
rtc: Fix possible null pointer dereference in rtc-mpc5121.c
2012-04-26 11:17:01 +02:00
rtc-mrst.c
drivers/rtc: remove IRQF_DISABLED
2012-03-23 16:58:39 -07:00
rtc-msm6242.c
rtc-mv.c
ARM: More device tree support updates
2012-03-28 12:34:33 -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
drivers/rtc/rtc-pl031.c: enable clock on all ST variants
2012-04-12 13:12:12 -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
drivers/rtc/rtc-r9701.c: reset registers if invalid values are detected
2012-04-12 13:12:12 -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
drivers/rtc/rtc-s3c.c: add placeholder for driver private data
2012-04-12 13:12:12 -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
ARM: cleanups of io includes
2012-03-29 18:02:10 -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: use static register while reading time
2012-04-12 13:12:12 -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