diff options
author | Linus Walleij <linus.walleij@linaro.org> | 2012-11-21 16:06:33 +0100 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2012-11-21 16:06:33 +0100 |
commit | 5f007db68cc01e068f3e12b30151f3b68418cd79 (patch) | |
tree | 8234ce857846ed904a8a997fecee584369516e4a /arch/arm/mach-at91/at91sam9g45.c | |
parent | b4d4b1f087b9d4d730eb70f24032395d7cd7e591 (diff) | |
parent | c12a819e3ad9147acec3f20201fd51144f2244e9 (diff) |
Merge branch 'at91' into devel
Diffstat (limited to 'arch/arm/mach-at91/at91sam9g45.c')
-rw-r--r-- | arch/arm/mach-at91/at91sam9g45.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-at91/at91sam9g45.c b/arch/arm/mach-at91/at91sam9g45.c index e6dd371d9f5..c5c2acc4bf2 100644 --- a/arch/arm/mach-at91/at91sam9g45.c +++ b/arch/arm/mach-at91/at91sam9g45.c @@ -256,6 +256,8 @@ static struct clk_lookup periph_clocks_lookups[] = { CLKDEV_CON_DEV_ID("t0_clk", "fffd4000.timer", &tcb0_clk), CLKDEV_CON_DEV_ID("hclk", "700000.ohci", &uhphs_clk), CLKDEV_CON_DEV_ID("ehci_clk", "800000.ehci", &uhphs_clk), + CLKDEV_CON_DEV_ID("mci_clk", "fff80000.mmc", &mmc0_clk), + CLKDEV_CON_DEV_ID("mci_clk", "fffd0000.mmc", &mmc1_clk), CLKDEV_CON_DEV_ID(NULL, "fff84000.i2c", &twi0_clk), CLKDEV_CON_DEV_ID(NULL, "fff88000.i2c", &twi1_clk), /* fake hclk clock */ |