diff options
author | Arnd Bergmann | 2013-04-19 23:12:42 +0200 |
---|---|---|
committer | Arnd Bergmann | 2013-04-19 23:12:42 +0200 |
commit | 22cf644e03419b4c3d002109b021c7482306f0bf (patch) | |
tree | db426bcf5d4f7acfdbcaa5276b87d12cbb061fa1 /arch/arm/mach-at91/at91sam9261.c | |
parent | Linux 3.9-rc6 (diff) | |
parent | ARM: exynos: restore mach/regs-clock.h for exynos5 (diff) | |
download | kernel-qcow2-linux-22cf644e03419b4c3d002109b021c7482306f0bf.tar.gz kernel-qcow2-linux-22cf644e03419b4c3d002109b021c7482306f0bf.tar.xz kernel-qcow2-linux-22cf644e03419b4c3d002109b021c7482306f0bf.zip |
Merge branch 'next/drivers' into late/multiplatform
Multiple parts of next/drivers are prerequisites for the final
exynos multiplatform changes, so let's pull in the entire branch.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-at91/at91sam9261.c')
-rw-r--r-- | arch/arm/mach-at91/at91sam9261.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-at91/at91sam9261.c b/arch/arm/mach-at91/at91sam9261.c index 2998a08afc2d..0204f4cc9ebf 100644 --- a/arch/arm/mach-at91/at91sam9261.c +++ b/arch/arm/mach-at91/at91sam9261.c @@ -169,6 +169,8 @@ static struct clk *periph_clocks[] __initdata = { }; static struct clk_lookup periph_clocks_lookups[] = { + CLKDEV_CON_DEV_ID("hclk", "at91sam9261-lcdfb.0", &hck1), + CLKDEV_CON_DEV_ID("hclk", "at91sam9g10-lcdfb.0", &hck1), CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi.0", &spi0_clk), CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi.1", &spi1_clk), CLKDEV_CON_DEV_ID("t0_clk", "atmel_tcb.0", &tc0_clk), |