diff options
| author | Paul Walmsley <paul@pwsan.com> | 2012-09-22 18:00:35 +0200 |
|---|---|---|
| committer | Paul Walmsley <paul@pwsan.com> | 2012-09-22 18:00:35 +0200 |
| commit | 9fe0624e1b9faa43d1f6136c70409c4716fb73c9 (patch) | |
| tree | ec734f2da98e41c780a251e1e21adaa726e5bc3a /arch/arm/mach-omap2/clock33xx_data.c | |
| parent | Merge tag 'cleanup-fixes-for-v3.7' into test_v3.6-rc6_cff3.7_odaf3.7 (diff) | |
| parent | Merge tag 'omap-devel-a2-for-3.7' of git://git.kernel.org/pub/scm/linux/kerne... (diff) | |
| download | linux-9fe0624e1b9faa43d1f6136c70409c4716fb73c9.tar.xz linux-9fe0624e1b9faa43d1f6136c70409c4716fb73c9.zip | |
Merge tag 'omap-devel-am33xx-for-v3.7' into test_v3.6-rc6_cff3.7_odaf3.7
From Paul Walmsley <paul@pwsan.com>:
AM33xx hwmod data and miscellaneous clock and hwmod fixes. AM33xx
should now boot on mainline after this is applied, according to
Vaibhav.
Diffstat (limited to 'arch/arm/mach-omap2/clock33xx_data.c')
| -rw-r--r-- | arch/arm/mach-omap2/clock33xx_data.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/clock33xx_data.c b/arch/arm/mach-omap2/clock33xx_data.c index 8e06de665b14..2026311a4ff6 100644 --- a/arch/arm/mach-omap2/clock33xx_data.c +++ b/arch/arm/mach-omap2/clock33xx_data.c @@ -1027,7 +1027,9 @@ static struct omap_clk am33xx_clks[] = { CLK(NULL, "cefuse_fck", &cefuse_fck, CK_AM33XX), CLK(NULL, "clkdiv32k_ick", &clkdiv32k_ick, CK_AM33XX), CLK(NULL, "dcan0_fck", &dcan0_fck, CK_AM33XX), + CLK("481cc000.d_can", NULL, &dcan0_fck, CK_AM33XX), CLK(NULL, "dcan1_fck", &dcan1_fck, CK_AM33XX), + CLK("481d0000.d_can", NULL, &dcan1_fck, CK_AM33XX), CLK(NULL, "debugss_ick", &debugss_ick, CK_AM33XX), CLK(NULL, "pruss_ocp_gclk", &pruss_ocp_gclk, CK_AM33XX), CLK("davinci-mcasp.0", NULL, &mcasp0_fck, CK_AM33XX), |