diff options
| author | Tony Lindgren | 2012-07-05 17:18:04 +0200 |
|---|---|---|
| committer | Tony Lindgren | 2012-07-05 17:18:04 +0200 |
| commit | 79ab2664336d73245023a236345bb31f2b0a2dfe (patch) | |
| tree | 16fb7f77074a39b74aecbf324b0b7de2eaf6d094 /arch/arm/plat-omap | |
| parent | ARM: OMAP2+: Remove unnecessary ifdef around __omap2_set_globals (diff) | |
| parent | ARM: OMAP3+: clock33xx: Add AM33XX clock tree data (diff) | |
| download | kernel-qcow2-linux-79ab2664336d73245023a236345bb31f2b0a2dfe.tar.gz kernel-qcow2-linux-79ab2664336d73245023a236345bb31f2b0a2dfe.tar.xz kernel-qcow2-linux-79ab2664336d73245023a236345bb31f2b0a2dfe.zip | |
Merge tag 'omap-devel-e-for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into devel-am33xx-data
OMAP AM33xx clock data
Conflicts:
arch/arm/mach-omap2/Makefile
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 { #define CK_443X (1 << 11) #define CK_TI816X (1 << 12) #define CK_446X (1 << 13) +#define CK_AM33XX (1 << 14) /* AM33xx specific clocks */ #define CK_1710 (1 << 15) /* 1710 extra for rate selection */ |