Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-12 07:57:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of git://git.denx.de/u-boot-video

Browse source
This commit is contained in:
Tom Rini 2017-09-11 15:54:39 -04:00
commit bce2629887
22 changed files with 13 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
drivers/video/ipu_common.c
View file

@ -19,6 +19,7 @@
#include <linux/errno.h> #include <linux/errno.h>
#include <asm/arch/imx-regs.h> #include <asm/arch/imx-regs.h>
#include <asm/arch/crm_regs.h> #include <asm/arch/crm_regs.h>
#include <asm/arch/sys_proto.h>
#include <div64.h> #include <div64.h>
#include "ipu.h" #include "ipu.h"
#include "ipu_regs.h" #include "ipu_regs.h"
@ -81,6 +82,11 @@ struct ipu_ch_param {
#define IPU_SW_RST_TOUT_USEC (10000) #define IPU_SW_RST_TOUT_USEC (10000)
#define IPUV3_CLK_MX51 133000000
#define IPUV3_CLK_MX53 200000000
#define IPUV3_CLK_MX6Q 264000000
#define IPUV3_CLK_MX6DL 198000000
void clk_enable(struct clk *clk) void clk_enable(struct clk *clk)
{ {
if (clk) { if (clk) {
@ -196,7 +202,6 @@ static void clk_ipu_disable(struct clk *clk)
static struct clk ipu_clk = { static struct clk ipu_clk = {
.name = "ipu_clk", .name = "ipu_clk",
.rate = CONFIG_IPUV3_CLK,
#if defined(CONFIG_MX51) || defined(CONFIG_MX53) #if defined(CONFIG_MX51) || defined(CONFIG_MX53)
.enable_reg = (u32 *)(CCM_BASE_ADDR + .enable_reg = (u32 *)(CCM_BASE_ADDR +
offsetof(struct mxc_ccm_reg, CCGR5)), offsetof(struct mxc_ccm_reg, CCGR5)),
@ -476,6 +481,13 @@ int ipu_probe(void)
g_pixel_clk[1] = &pixel_clk[1]; g_pixel_clk[1] = &pixel_clk[1];
g_ipu_clk = &ipu_clk; g_ipu_clk = &ipu_clk;
#if defined(CONFIG_MX51)
g_ipu_clk->rate = IPUV3_CLK_MX51;
#elif defined(CONFIG_MX53)
g_ipu_clk->rate = IPUV3_CLK_MX53;
#else
g_ipu_clk->rate = is_mx6sdl() ? IPUV3_CLK_MX6DL : IPUV3_CLK_MX6Q;
#endif
debug("ipu_clk = %u\n", clk_get_rate(g_ipu_clk)); debug("ipu_clk = %u\n", clk_get_rate(g_ipu_clk));
g_ldb_clk = &ldb_clk; g_ldb_clk = &ldb_clk;
debug("ldb_clk = %u\n", clk_get_rate(g_ldb_clk)); debug("ldb_clk = %u\n", clk_get_rate(g_ldb_clk));

1
include/configs/advantech_dms-ba16.h
View file

@ -253,7 +253,6 @@
#define CONFIG_BMP_16BPP #define CONFIG_BMP_16BPP
#define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_LOGO
#define CONFIG_VIDEO_BMP_LOGO #define CONFIG_VIDEO_BMP_LOGO
#define CONFIG_IPUV3_CLK 260000000
#define CONFIG_IMX_HDMI #define CONFIG_IMX_HDMI
#define CONFIG_IMX_VIDEO_SKIP #define CONFIG_IMX_VIDEO_SKIP
#endif #endif

1
include/configs/apalis_imx6.h
View file

@ -117,7 +117,6 @@
#define CONFIG_BMP_16BPP #define CONFIG_BMP_16BPP
#define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_LOGO
#define CONFIG_VIDEO_BMP_LOGO #define CONFIG_VIDEO_BMP_LOGO
#define CONFIG_IPUV3_CLK 260000000
#define CONFIG_CONSOLE_MUX #define CONFIG_CONSOLE_MUX
#define CONFIG_IMX_HDMI #define CONFIG_IMX_HDMI
#define CONFIG_IMX_VIDEO_SKIP #define CONFIG_IMX_VIDEO_SKIP

1
include/configs/aristainetos-common.h
View file

@ -214,7 +214,6 @@
#define CONFIG_BMP_16BPP #define CONFIG_BMP_16BPP
#define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_LOGO
#define CONFIG_VIDEO_BMP_LOGO #define CONFIG_VIDEO_BMP_LOGO
#define CONFIG_IPUV3_CLK 198000000
#define CONFIG_IMX_VIDEO_SKIP #define CONFIG_IMX_VIDEO_SKIP
#define CONFIG_PWM_IMX #define CONFIG_PWM_IMX

5
include/configs/cgtqmx6eval.h
View file

@ -78,11 +78,6 @@
#define CONFIG_BMP_16BPP #define CONFIG_BMP_16BPP
#define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_LOGO
#define CONFIG_VIDEO_BMP_LOGO #define CONFIG_VIDEO_BMP_LOGO
#ifdef CONFIG_MX6DL
#define CONFIG_IPUV3_CLK 198000000
#else
#define CONFIG_IPUV3_CLK 264000000
#endif
#define CONFIG_IMX_HDMI #define CONFIG_IMX_HDMI
/* SATA */ /* SATA */

1
include/configs/cm_fx6.h
View file

@ -236,7 +236,6 @@
/* Display */ /* Display */
#define CONFIG_VIDEO_IPUV3 #define CONFIG_VIDEO_IPUV3
#define CONFIG_IPUV3_CLK 260000000
#define CONFIG_IMX_HDMI #define CONFIG_IMX_HDMI
#define CONFIG_SPLASH_SCREEN #define CONFIG_SPLASH_SCREEN

1
include/configs/colibri_imx6.h
View file

@ -103,7 +103,6 @@
#define CONFIG_BMP_16BPP #define CONFIG_BMP_16BPP
#define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_LOGO
#define CONFIG_VIDEO_BMP_LOGO #define CONFIG_VIDEO_BMP_LOGO
#define CONFIG_IPUV3_CLK 260000000
#define CONFIG_CONSOLE_MUX #define CONFIG_CONSOLE_MUX
#define CONFIG_IMX_HDMI #define CONFIG_IMX_HDMI
#define CONFIG_IMX_VIDEO_SKIP #define CONFIG_IMX_VIDEO_SKIP

1
include/configs/embestmx6boards.h
View file

@ -108,7 +108,6 @@
#define CONFIG_BMP_16BPP #define CONFIG_BMP_16BPP
#define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_LOGO
#define CONFIG_VIDEO_BMP_LOGO #define CONFIG_VIDEO_BMP_LOGO
#define CONFIG_IPUV3_CLK 260000000
#define CONFIG_IMX_HDMI #define CONFIG_IMX_HDMI
#define CONFIG_IMX_VIDEO_SKIP #define CONFIG_IMX_VIDEO_SKIP

1
include/configs/ge_bx50v3.h
View file

@ -277,7 +277,6 @@
#define CONFIG_BMP_16BPP #define CONFIG_BMP_16BPP
#define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_LOGO
#define CONFIG_VIDEO_BMP_LOGO #define CONFIG_VIDEO_BMP_LOGO
#define CONFIG_IPUV3_CLK 260000000
#define CONFIG_IMX_HDMI #define CONFIG_IMX_HDMI
#define CONFIG_IMX_VIDEO_SKIP #define CONFIG_IMX_VIDEO_SKIP
#endif #endif

1
include/configs/gw_ventana.h
View file

@ -156,7 +156,6 @@
/* Framebuffer and LCD */ /* Framebuffer and LCD */
#define CONFIG_VIDEO_IPUV3 #define CONFIG_VIDEO_IPUV3
#define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_LOGO
#define CONFIG_IPUV3_CLK 260000000
#define CONFIG_IMX_HDMI #define CONFIG_IMX_HDMI
#define CONFIG_IMX_VIDEO_SKIP #define CONFIG_IMX_VIDEO_SKIP
#define CONFIG_VIDEO_BMP_LOGO #define CONFIG_VIDEO_BMP_LOGO

1
include/configs/imx6-engicam.h
View file

@ -199,7 +199,6 @@
/* Framebuffer */ /* Framebuffer */
#ifdef CONFIG_VIDEO_IPUV3 #ifdef CONFIG_VIDEO_IPUV3
# define CONFIG_IPUV3_CLK 260000000
# define CONFIG_IMX_VIDEO_SKIP # define CONFIG_IMX_VIDEO_SKIP
# define CONFIG_SPLASH_SCREEN # define CONFIG_SPLASH_SCREEN

1
include/configs/m53evk.h
View file

@ -172,7 +172,6 @@
#define CONFIG_BMP_16BPP #define CONFIG_BMP_16BPP
#define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_LOGO
#define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE (2 << 20) #define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE (2 << 20)
#define CONFIG_IPUV3_CLK 200000000
#endif #endif
/* /*

1
include/configs/mx51evk.h
View file

@ -84,7 +84,6 @@
#define CONFIG_SPLASH_SCREEN #define CONFIG_SPLASH_SCREEN
#define CONFIG_BMP_16BPP #define CONFIG_BMP_16BPP
#define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_LOGO
#define CONFIG_IPUV3_CLK 133000000
/* allow to overwrite serial and ethaddr */ /* allow to overwrite serial and ethaddr */
#define CONFIG_ENV_OVERWRITE #define CONFIG_ENV_OVERWRITE

1
include/configs/mx53cx9020.h
View file

@ -179,6 +179,5 @@
#define CONFIG_SPLASH_SCREEN #define CONFIG_SPLASH_SCREEN
#define CONFIG_BMP_16BPP #define CONFIG_BMP_16BPP
#define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_LOGO
#define CONFIG_IPUV3_CLK 200000000
#endif /* __CONFIG_H */ #endif /* __CONFIG_H */

1
include/configs/mx53loco.h
View file

@ -197,6 +197,5 @@
#define CONFIG_SPLASH_SCREEN #define CONFIG_SPLASH_SCREEN
#define CONFIG_BMP_16BPP #define CONFIG_BMP_16BPP
#define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_LOGO
#define CONFIG_IPUV3_CLK 200000000
#endif /* __CONFIG_H */ #endif /* __CONFIG_H */

1
include/configs/mx6cuboxi.h
View file

@ -41,7 +41,6 @@
/* Framebuffer */ /* Framebuffer */
#define CONFIG_VIDEO_IPUV3 #define CONFIG_VIDEO_IPUV3
#define CONFIG_IPUV3_CLK 260000000
#define CONFIG_VIDEO_BMP_RLE8 #define CONFIG_VIDEO_BMP_RLE8
#define CONFIG_SPLASH_SCREEN #define CONFIG_SPLASH_SCREEN
#define CONFIG_SPLASH_SCREEN_ALIGN #define CONFIG_SPLASH_SCREEN_ALIGN

5
include/configs/mx6sabre_common.h
View file

@ -205,11 +205,6 @@
#define CONFIG_BMP_16BPP #define CONFIG_BMP_16BPP
#define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_LOGO
#define CONFIG_VIDEO_BMP_LOGO #define CONFIG_VIDEO_BMP_LOGO
#ifdef CONFIG_MX6DL
#define CONFIG_IPUV3_CLK 198000000
#else
#define CONFIG_IPUV3_CLK 264000000
#endif
#define CONFIG_IMX_HDMI #define CONFIG_IMX_HDMI
#define CONFIG_IMX_VIDEO_SKIP #define CONFIG_IMX_VIDEO_SKIP

1
include/configs/nitrogen6x.h
View file

@ -80,7 +80,6 @@
#define CONFIG_VIDEO_BMP_GZIP #define CONFIG_VIDEO_BMP_GZIP
#define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE (6 * 1024 * 1024) #define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE (6 * 1024 * 1024)
#define CONFIG_BMP_16BPP #define CONFIG_BMP_16BPP
#define CONFIG_IPUV3_CLK 260000000
#define CONFIG_IMX_HDMI #define CONFIG_IMX_HDMI
#define CONFIG_IMX_VIDEO_SKIP #define CONFIG_IMX_VIDEO_SKIP

1
include/configs/novena.h
View file

@ -141,7 +141,6 @@
#define CONFIG_SPLASH_SCREEN #define CONFIG_SPLASH_SCREEN
#define CONFIG_BMP_16BPP #define CONFIG_BMP_16BPP
#define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_LOGO
#define CONFIG_IPUV3_CLK 260000000
#define CONFIG_IMX_HDMI #define CONFIG_IMX_HDMI
#define CONFIG_IMX_VIDEO_SKIP #define CONFIG_IMX_VIDEO_SKIP
#endif #endif

1
include/configs/tbs2910.h
View file

@ -64,7 +64,6 @@
/* Framebuffer */ /* Framebuffer */
#ifdef CONFIG_VIDEO #ifdef CONFIG_VIDEO
#define CONFIG_VIDEO_IPUV3 #define CONFIG_VIDEO_IPUV3
#define CONFIG_IPUV3_CLK 260000000
#define CONFIG_VIDEO_BMP_RLE8 #define CONFIG_VIDEO_BMP_RLE8
#define CONFIG_IMX_HDMI #define CONFIG_IMX_HDMI
#define CONFIG_IMX_VIDEO_SKIP #define CONFIG_IMX_VIDEO_SKIP

1
include/configs/wandboard.h
View file

@ -71,7 +71,6 @@
#define CONFIG_BMP_16BPP #define CONFIG_BMP_16BPP
#define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_LOGO
#define CONFIG_VIDEO_BMP_LOGO #define CONFIG_VIDEO_BMP_LOGO
#define CONFIG_IPUV3_CLK 260000000
#define CONFIG_IMX_HDMI #define CONFIG_IMX_HDMI
#define CONFIG_IMX_VIDEO_SKIP #define CONFIG_IMX_VIDEO_SKIP
#endif #endif

1
scripts/config_whitelist.txt
View file

@ -1119,7 +1119,6 @@ CONFIG_IPAM390_GPIO_BOOTMODE
CONFIG_IPAM390_GPIO_LED_GREEN CONFIG_IPAM390_GPIO_LED_GREEN
CONFIG_IPAM390_GPIO_LED_RED CONFIG_IPAM390_GPIO_LED_RED
CONFIG_IPROC CONFIG_IPROC
CONFIG_IPUV3_CLK
CONFIG_IP_DEFRAG CONFIG_IP_DEFRAG
CONFIG_IRAM_BASE CONFIG_IRAM_BASE
CONFIG_IRAM_END CONFIG_IRAM_END