Linus Torvalds 97e7292ab5 arm-soc: clk changes ... Clock support is moving to the clk subsystem. These tegra, omap and imx changes are for code that is still platform specific and not (yet) part of that subsystem. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIVAwUAUA2dh2CrR//JCVInAQLm6g//UD7Q6xc/1I9/k0c/V35o4FRgmOt9xIp2 ofsB801AnYOOusFWkcBa8xb6zFQuNQwR6OflkYBBV+31Zp2cNHgF9SVxaYlh43MD iptUnCh8VzSEFFZGy1Vi3sdrKY5fw5dyffPjgv8HtWQzs4r8H+98UnNQFbkTwPft 9TxAeH73LRm4uNI/E8OerYN78TOefBK8p6HXyNW//MCzb59aG73/iD3EACrAmvyY gtyhLMtPeZTUWh3Fy5vXd9cfCmzQOAH/ADeMxVyx2QFyb3vCcPoS8Z5plh3zIjMt Ze0KlhHkB5lfBGBOB3gA/7ItlclhL2qLNkuhM2CBgYg+WTZ4OqaJCv80+OK8X4i5 XCVjuDG++CFH09jDnMPXeUBM6UHwRV3f/HIRhaL8nH+nq1mU5HzEGrvBZTnOIklI XNoOpAMVPih64vH8PIQL/8oXT+cNHyVkmKA2uqRKq+mgqC+FIjG7EKBmIVORr7eI HmDHtHpRZY9EpK/cfgykDl4ELDITEaaitxvk0uqchSj3SXjfmbBXNKKcInQhDKaZ TKRMCgzeTu4NXSrRyHAP2toKUQNSziB7mwL7aHD6LMloqP1jBVOyZpxAIVwt19lZ qBAAatYGYocbssypI/E4CptTn3uC3dQiXDHRNJkZC/4o5suZoW9wpT77yvQNR/YQ GBO0bhQCI0Y= =Cvpa -----END PGP SIGNATURE----- Merge tag 'clk' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc Pull arm-soc clk changes from Arnd Bergmann: "Clock support is moving to the clk subsystem. These tegra, omap and imx changes are for code that is still platform specific and not (yet) part of that subsystem." Fix up conflicts in arch/arm/mach-{imx/clk-imx51-imx53.c,omap2/Makefile} * tag 'clk' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (23 commits) ARM: imx: clk-imx31: Fix clock id for rnga driver ARM: imx: add missing item to the list of clock event modes ARM: i.MX5x CSPI: Fixed clock name for CSPI ARM: i.MX5x clocks: Fix GPT clocks ARM: i.MX5x clocks: Fix parent for PWM clocks ARM: i.MX5x clocks: Add EPIT support ARM: mx27: Reenable silicon version print ARM: clk-imx27: Fix rtc clock id ARM: tegra: Provide clock for only one PWM controller ARM: tegra: Fix PWM clock programming ARM: OMAP3+: clock33xx: Add AM33XX clock tree data ARM: OMAP3+: clock: Move common clksel_rate & clock data to common file ARM: tegra: dma: rename driver name for clock to "tegra-apbdma" ARM: tegra: Remove second instance of uart clk crypto: add clk_prepare/clk_unprepare ASoC: tegra: add clk_prepare/clk_unprepare staging: nvec: add clk_prepare/clk_unprepare spi/tegra: add clk_prepare/clk_unprepare Input: tegra-kbc - add clk_prepare/clk_unprepare USB: ehci-tegra: add clk_prepare/clk_unprepare ...		2012-07-23 17:51:03 -07:00
..
atmel	ASoC: Convert afeb9260 to table based DAPM init	2012-02-01 21:52:54 +00:00
au1x	Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus	2012-01-14 13:05:21 -08:00
blackfin	Linux 3.4-rc7	2012-05-13 13:32:54 +01:00
codecs	ASoC: tlv320aic3x: Fix codec pll configure bug	2012-06-29 08:18:03 +01:00
davinci	ASoC: replace 0xffffffff with DMA_BIT_MASK macro	2012-01-20 13:58:26 +00:00
ep93xx	ASoC: ep93xx-i2s: use devm_* helpers to cleanup probe	2012-04-01 11:28:29 +01:00
fsl	Merge branch 'imx/sparse-irq' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/irq	2012-07-02 23:18:19 +02:00
generic	ASoC: add generic simple-card support	2012-04-13 11:29:25 +01:00
jz4740	ASoC: JZ4740: Replaced comma operators with semicolons.	2012-04-06 18:22:05 +01:00
kirkwood	ARM: Orion: Audio: Add clk/clkdev support	2012-05-08 16:34:03 -07:00
mid-x86	ASoC: core: Add support for DAI and machine kcontrols.	2012-02-04 12:40:11 +00:00
mxs	Sound updates for 3.5-rc1	2012-05-23 13:05:43 -07:00
nuc900	Merge branch 'master' into fixes	2012-01-13 15:00:22 +00:00
omap	ASoC: OMAP: HDMI: Rename sound card source file	2012-05-22 17:33:24 +01:00
pxa	ASoC: fix pxa-ssp compiling issue under mach-mmp	2012-06-11 12:26:15 +08:00
s6000	ASoC: use proper defines for stream directions in pcm engines	2012-01-20 13:58:25 +00:00
samsung	ASoC: follow the updated samsung DMA common operations	2012-06-20 08:09:14 +09:00
sh	ASoC: fsi: bugfix: ensure dma is terminated	2012-05-30 11:04:12 +01:00
tegra	Merge branch 'for-3.6/common-clk' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into next/clk	2012-07-06 22:21:23 +02:00
txx9	dmaengine/dma_slave: introduce inline wrappers	2012-03-21 19:20:22 +05:30
ux500	ASoC: ux500: Don't make the CPU I2S driver user selectable	2012-05-10 10:05:18 +01:00
Kconfig	ASoC: Ux500: Add MSP I2S-driver	2012-05-09 12:52:59 +01:00
Makefile	ASoC: Ux500: Add MSP I2S-driver	2012-05-09 12:52:59 +01:00
soc-cache.c	ASoC: Remove rbtree register cache	2011-12-13 00:20:28 +08:00
soc-core.c	ASoC: don't flip master of DT-instantiated DAI links	2012-05-16 09:44:18 +01:00
soc-dapm.c	ASoC: dapm: Fix input list to use source widgets	2012-06-08 06:56:41 +08:00
soc-dmaengine-pcm.c	ASoC: dmaengine_pcm: use dmaengine cyclic wrapper	2012-03-26 18:28:11 +01:00
soc-io.c	ASoC: io: Retrieve val_bytes from the regmap API	2012-02-21 19:34:47 +00:00
soc-jack.c	ASoC: jack: Push locking for jacks down to the jack	2012-04-01 11:28:23 +01:00
soc-pcm.c	ASoC: dpcm: Fix dpcm_get_be() to check that DAI is BE	2012-06-08 06:56:38 +08:00
soc-utils.c	ASoC: utils - Add support for a dummy codec driver.	2012-01-20 13:58:27 +00:00