diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-07-10 11:41:13 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-07-10 11:41:13 -0400 |
| commit | 4450cb7d586c3d8f6615ee437eab1d1e064b20c0 (patch) | |
| tree | 542ad0a042e52a0fafc6a2fd70e04b7aa795526a /arch/arm/plat-omap | |
| parent | 99ac7b577fb5b2d46b35b6f52540a535466e030a (diff) | |
| parent | 79ab2664336d73245023a236345bb31f2b0a2dfe (diff) | |
Merge tag 'omap-devel-am33xx-data-for-v3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/clk
From Tony Lindgren <tony@atomide.com>:
This branch adds clock data for am33xx. Note that eventually these
will use the common clock framework, but those patches are not quite
ready yet for omaps. This branch depends on omap-cleanup-part2-for-v3.6
branch.
* tag 'omap-devel-am33xx-data-for-v3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: OMAP3+: clock33xx: Add AM33XX clock tree data
ARM: OMAP3+: clock: Move common clksel_rate & clock data to common file
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/plat-omap')
| -rw-r--r-- | arch/arm/plat-omap/include/plat/clkdev_omap.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/plat-omap/include/plat/clkdev_omap.h b/arch/arm/plat-omap/include/plat/clkdev_omap.h index d0ed8c443a63..025d85a3ee86 100644 --- a/arch/arm/plat-omap/include/plat/clkdev_omap.h +++ b/arch/arm/plat-omap/include/plat/clkdev_omap.h | |||
| @@ -39,6 +39,7 @@ struct omap_clk { | |||
| 39 | #define CK_443X (1 << 11) | 39 | #define CK_443X (1 << 11) |
| 40 | #define CK_TI816X (1 << 12) | 40 | #define CK_TI816X (1 << 12) |
| 41 | #define CK_446X (1 << 13) | 41 | #define CK_446X (1 << 13) |
| 42 | #define CK_AM33XX (1 << 14) /* AM33xx specific clocks */ | ||
| 42 | #define CK_1710 (1 << 15) /* 1710 extra for rate selection */ | 43 | #define CK_1710 (1 << 15) /* 1710 extra for rate selection */ |
| 43 | 44 | ||
| 44 | 45 | ||