summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLiu Ying <Ying.Liu@freescale.com>2011-01-13 11:10:02 +0800
committerLiu Ying <Ying.Liu@freescale.com>2011-01-14 15:39:42 +0800
commitd6bdab7e5220d908e54a7b4b8c09c37f66340dc5 (patch)
tree06492c9b53f9c6012f99201ee97518edb0db19e3 /include
parentb695e1012bf4c50564cc95391c9d7eaacaa1c6f7 (diff)
downloadu-boot-imx-d6bdab7e5220d908e54a7b4b8c09c37f66340dc5.zip
u-boot-imx-d6bdab7e5220d908e54a7b4b8c09c37f66340dc5.tar.gz
u-boot-imx-d6bdab7e5220d908e54a7b4b8c09c37f66340dc5.tar.bz2
ENGR00137894-3 IPU driver enhancement
1) Remove MX51 related comments in ipu drivers. 2) Add di clocks. 3) Support pixel clock being deprived from external clock. Signed-off-by: Liu Ying <Ying.Liu@freescale.com>
Diffstat (limited to 'include')
-rw-r--r--include/configs/mx51_bbg.h4
-rw-r--r--include/ipu.h12
2 files changed, 12 insertions, 4 deletions
diff --git a/include/configs/mx51_bbg.h b/include/configs/mx51_bbg.h
index ff4406a..46ff011 100644
--- a/include/configs/mx51_bbg.h
+++ b/include/configs/mx51_bbg.h
@@ -1,7 +1,7 @@
/*
* Copyright (C) 2007, Guennadi Liakhovetski <lg@denx.de>
*
- * (C) Copyright 2009-2010 Freescale Semiconductor, Inc.
+ * (C) Copyright 2009-2011 Freescale Semiconductor, Inc.
*
* Configuration settings for the MX51-3Stack Freescale board.
*
@@ -281,6 +281,8 @@
*/
#define CONFIG_LCD
#define CONFIG_VIDEO_MX5
+ #define CONFIG_MXC_HSC
+ #define CONFIG_IPU_CLKRATE 133000000
#define CONFIG_SYS_CONSOLE_ENV_OVERWRITE
#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
#define CONFIG_SYS_CONSOLE_IS_IN_ENV
diff --git a/include/ipu.h b/include/ipu.h
index 204897c..94e551f 100644
--- a/include/ipu.h
+++ b/include/ipu.h
@@ -4,9 +4,9 @@
* (C) Copyright 2010
* Stefano Babic, DENX Software Engineering, sbabic@denx.de
*
- * Linux IPU driver for MX51:
+ * Linux IPU driver:
*
- * (C) Copyright 2005-2010 Freescale Semiconductor, Inc.
+ * (C) Copyright 2005-2011 Freescale Semiconductor, Inc.
*
* See file CREDITS for list of people who contributed to this
* project.
@@ -258,6 +258,12 @@ typedef enum {
YUV
} ipu_color_space_t;
+typedef enum {
+ DI_PCLK_PLL3,
+ DI_PCLK_LDB,
+ DI_PCLK_TVE
+} ipu_di_clk_parent_t;
+
/* Common IPU API */
int32_t ipu_init_channel(ipu_channel_t channel, ipu_channel_params_t *params);
void ipu_uninit_channel(ipu_channel_t channel);
@@ -304,7 +310,7 @@ int clk_get_usecount(struct clk *clk);
struct clk *clk_get_parent(struct clk *clk);
void ipu_dump_registers(void);
-int ipu_probe(void);
+int ipu_probe(int di, ipu_di_clk_parent_t di_clk_parent, int di_clk_val);
void ipu_dmfc_init(int dmfc_type, int first);
void ipu_init_dc_mappings(void);