diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-02 13:34:58 +0900 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-02 13:34:58 +0900 |
commit | 3bc324922663bda59af5cdc409e8df3ed217d296 (patch) | |
tree | 1c9c7d527c4fd3383350d54acd7d15b9c5c4f639 /arch/arm/mach-at91/at91sam9x5.c | |
parent | Merge remote-tracking branch 'asoc/topic/arizona' into asoc-next (diff) | |
parent | ASoC: atmel-pcm: dma support based on pcm dmaengine (diff) | |
download | linux-dev-3bc324922663bda59af5cdc409e8df3ed217d296.tar.xz linux-dev-3bc324922663bda59af5cdc409e8df3ed217d296.zip |
Merge remote-tracking branch 'asoc/topic/atmel' into asoc-next
Diffstat (limited to 'arch/arm/mach-at91/at91sam9x5.c')
-rw-r--r-- | arch/arm/mach-at91/at91sam9x5.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-at91/at91sam9x5.c b/arch/arm/mach-at91/at91sam9x5.c index e5035380dcbc..18fbbb27f97f 100644 --- a/arch/arm/mach-at91/at91sam9x5.c +++ b/arch/arm/mach-at91/at91sam9x5.c @@ -231,6 +231,7 @@ static struct clk_lookup periph_clocks_lookups[] = { CLKDEV_CON_DEV_ID("t0_clk", "f800c000.timer", &tcb0_clk), CLKDEV_CON_DEV_ID("dma_clk", "ffffec00.dma-controller", &dma0_clk), CLKDEV_CON_DEV_ID("dma_clk", "ffffee00.dma-controller", &dma1_clk), + CLKDEV_CON_DEV_ID("pclk", "f0010000.ssc", &ssc_clk), CLKDEV_CON_DEV_ID(NULL, "f8010000.i2c", &twi0_clk), CLKDEV_CON_DEV_ID(NULL, "f8014000.i2c", &twi1_clk), CLKDEV_CON_DEV_ID(NULL, "f8018000.i2c", &twi2_clk), |