diff options
author | Wolfgang Denk <wd@denx.de> | 2011-10-17 21:48:20 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2011-10-17 21:48:20 +0200 |
commit | 10d1a160f5e28b05f891c050ca2f23855b226f5f (patch) | |
tree | 3858d272e390350bf0f9dd07847f8ce7c38d7d52 /arch/arm/include/asm/arch-mx31/clock.h | |
parent | 92faa8b109180fa28ec899479f676e62a3a391b7 (diff) | |
parent | 62a22dca32b988cce5d1908e8ac9fadb139bb3e8 (diff) |
Merge branch 'master' of git://git.denx.de/u-boot-video
* 'master' of git://git.denx.de/u-boot-video:
video: Moving mx3fb.c to CONFIG_VIDEO
mx31: make HSP clock for mx3fb driver available
MX5: Make IPU display output and pixel format configurable
VIDEO: MX5: export pix format
VIDEO: MX5: Switch MX5 to CONFIG_VIDEO
video: update the Freescale DIU driver to use linux/fb.h
Diffstat (limited to 'arch/arm/include/asm/arch-mx31/clock.h')
-rw-r--r-- | arch/arm/include/asm/arch-mx31/clock.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/include/asm/arch-mx31/clock.h b/arch/arm/include/asm/arch-mx31/clock.h index cc99a75e92..2e3bce2c31 100644 --- a/arch/arm/include/asm/arch-mx31/clock.h +++ b/arch/arm/include/asm/arch-mx31/clock.h @@ -30,6 +30,7 @@ enum mxc_clock { MXC_IPG_PERCLK, MXC_CSPI_CLK, MXC_UART_CLK, + MXC_IPU_CLK }; unsigned int mxc_get_clock(enum mxc_clock clk); |