All of lore.kernel.org
 help / color / mirror / Atom feed
* [U-Boot] [PATCH V4 0/9] peach_pit: Add support for FIMD, DP and parade chip
@ 2014-07-30  9:11 Ajay Kumar
  2014-07-30  9:11 ` [U-Boot] [PATCH V4 1/9] exynos_fb: Remove usage of static defines Ajay Kumar
                   ` (9 more replies)
  0 siblings, 10 replies; 16+ messages in thread
From: Ajay Kumar @ 2014-07-30  9:11 UTC (permalink / raw)
  To: u-boot

Patchset V1:
https://www.mail-archive.com/u-boot at lists.denx.de/msg140596.html

Patchset V2:
https://www.mail-archive.com/u-boot at lists.denx.de/msg141203.html

Patchset V3:
http://lists.denx.de/pipermail/u-boot/2014-July/183096.html

Changes from V1:
[PATCH V2 3/10] : Don't mix cpu_is and proid_is as per Minkyu's suggestion.
		  Also, incorporate Simon's suggestion of not using else.
[PATCH V2 4/10] : For FIMD SYSMMU DT, use same compatible string as kernel.
[TEST_ONLY V2 6/10]: Make this patch TEST_ONLY

Changes from V2:
[PATCH V3 5/9] : Use SPDX tags to define the license for the file: parade.c
Removed TEST_ONLY patches.

Changes from V3:
[PATCH V4 1/9] : Fix comment style.
[PATCH V4 3/9] : Use 'else if' clause instead of 'if'.

Ajay Kumar (8):
  [PATCH V4 1/9] exynos_fb: Remove usage of static defines
  [PATCH V4 2/9] arm: exynos: Add RPLL for Exynos5420
  [PATCH V4 3/9] arm: exynos: Add get_lcd_clk and set_lcd_clk callbacks for Exynos5420
  [PATCH V4 4/9] video: exynos_fimd: Add framework to disable FIMD sysmmu
  [PATCH V4 6/9] ARM: exynos: Add missing declaration for gpio_direction_input
  [PATCH V4 7/9] exynos5420: add callbacks needed for exynos_fb driver
  [PATCH V4 8/9] ARM: exynos: peach_pit: Add DT nodes for fimd and parade bridge chip
  [PATCH V4 9/9] CONFIGS: peach-pit: Enable display for peach_pit board

Vadim Bendebury (1):
  [PATCH V4 5/9] video: Add driver for Parade PS8625 dP to LVDS bridge

 arch/arm/cpu/armv7/exynos/clock.c              |   83 ++++++++-
 arch/arm/cpu/armv7/exynos/clock_init.h         |    3 +
 arch/arm/cpu/armv7/exynos/clock_init_exynos5.c |   13 ++
 arch/arm/cpu/armv7/exynos/exynos5_setup.h      |    2 +-
 arch/arm/dts/exynos5420-peach-pit.dts          |   30 ++++
 arch/arm/dts/exynos54xx.dtsi                   |   10 ++
 arch/arm/include/asm/arch-exynos/clk.h         |    1 +
 arch/arm/include/asm/arch-exynos/gpio.h        |    1 +
 arch/arm/include/asm/arch-exynos/system.h      |    4 +
 board/samsung/common/board.c                   |   15 ++
 board/samsung/smdk5420/smdk5420.c              |  129 +++++---------
 doc/device-tree-bindings/video/exynos-fb.txt   |    6 +
 drivers/video/Makefile                         |    1 +
 drivers/video/exynos_fb.c                      |   17 +-
 drivers/video/exynos_fimd.c                    |   43 +++++
 drivers/video/parade.c                         |  220 ++++++++++++++++++++++++
 include/configs/exynos5250-dt.h                |    2 -
 include/configs/peach-pit.h                    |   10 ++
 include/configs/s5pc210_universal.h            |    3 -
 include/configs/trats.h                        |    3 -
 include/configs/trats2.h                       |    3 -
 include/fdtdec.h                               |    2 +
 lib/fdtdec.c                                   |    2 +
 23 files changed, 492 insertions(+), 111 deletions(-)
 create mode 100644 drivers/video/parade.c

-- 
1.7.9.5

^ permalink raw reply	[flat|nested] 16+ messages in thread

* [U-Boot] [PATCH V4 1/9] exynos_fb: Remove usage of static defines
  2014-07-30  9:11 [U-Boot] [PATCH V4 0/9] peach_pit: Add support for FIMD, DP and parade chip Ajay Kumar
@ 2014-07-30  9:11 ` Ajay Kumar
  2014-07-30  9:11 ` [U-Boot] [PATCH V4 2/9] arm: exynos: Add RPLL for Exynos5420 Ajay Kumar
                   ` (8 subsequent siblings)
  9 siblings, 0 replies; 16+ messages in thread
From: Ajay Kumar @ 2014-07-30  9:11 UTC (permalink / raw)
  To: u-boot

Previously, we used to statically assign values for vl_col, vl_row and
vl_bpix using #defines like LCD_XRES, LCD_YRES and LCD_COLOR16.

Introducing the function exynos_lcd_early_init() would take care of this
assignment on the fly by parsing FIMD DT properties, thereby allowing us
to remove LCD_XRES and LCD_YRES from the main config file.

Signed-off-by: Ajay Kumar <ajaykumar.rs@samsung.com>
Acked-by: Simon Glass <sjg@chromium.org>
Tested-by: Simon Glass <sjg@chromium.org>
---
 arch/arm/include/asm/arch-exynos/system.h |    1 +
 board/samsung/common/board.c              |   15 +++++++++++++++
 drivers/video/exynos_fb.c                 |   17 +++++------------
 include/configs/exynos5250-dt.h           |    2 --
 include/configs/s5pc210_universal.h       |    3 ---
 include/configs/trats.h                   |    3 ---
 include/configs/trats2.h                  |    3 ---
 7 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/arch/arm/include/asm/arch-exynos/system.h b/arch/arm/include/asm/arch-exynos/system.h
index 7e2057c..4968d3d 100644
--- a/arch/arm/include/asm/arch-exynos/system.h
+++ b/arch/arm/include/asm/arch-exynos/system.h
@@ -39,5 +39,6 @@ struct exynos5_sysreg {
 
 void set_usbhost_mode(unsigned int mode);
 void set_system_display_ctrl(void);
+int exynos_lcd_early_init(const void *blob);
 
 #endif	/* _EXYNOS4_SYSTEM_H */
diff --git a/board/samsung/common/board.c b/board/samsung/common/board.c
index 9dc7c83..1f6f0a0 100644
--- a/board/samsung/common/board.c
+++ b/board/samsung/common/board.c
@@ -20,6 +20,7 @@
 #include <asm/arch/mmc.h>
 #include <asm/arch/pinmux.h>
 #include <asm/arch/power.h>
+#include <asm/arch/system.h>
 #include <power/pmic.h>
 #include <asm/arch/sromc.h>
 #include <lcd.h>
@@ -148,6 +149,20 @@ int board_early_init_f(void)
 	board_i2c_init(gd->fdt_blob);
 #endif
 
+#if defined(CONFIG_OF_CONTROL) && defined(CONFIG_EXYNOS_FB)
+/*
+ * board_init_f(arch/arm/lib/board.c) calls lcd_setmem() which needs
+ * panel_info.vl_col, panel_info.vl_row and panel_info.vl_bpix, to reserve
+ * FB memory at a very early stage. So, we need to fill panel_info.vl_col,
+ * panel_info.vl_row and panel_info.vl_bpix before lcd_setmem() is called.
+ */
+	err = exynos_lcd_early_init(gd->fdt_blob);
+	if (err) {
+		debug("LCD early init failed\n");
+		return err;
+	}
+#endif
+
 	return exynos_early_init_f();
 }
 #endif
diff --git a/drivers/video/exynos_fb.c b/drivers/video/exynos_fb.c
index e1e0d80..bc478a9 100644
--- a/drivers/video/exynos_fb.c
+++ b/drivers/video/exynos_fb.c
@@ -27,17 +27,13 @@ DECLARE_GLOBAL_DATA_PTR;
 
 static unsigned int panel_width, panel_height;
 
-/*
- * board_init_f(arch/arm/lib/board.c) calls lcd_setmem() which needs
- * panel_info.vl_col, panel_info.vl_row and panel_info.vl_bpix to reserve
- * FB memory at a very early stage, i.e even before exynos_fimd_parse_dt()
- * is called. So, we are forced to statically assign it.
- */
 #ifdef CONFIG_OF_CONTROL
 vidinfo_t panel_info  = {
-	.vl_col = LCD_XRES,
-	.vl_row = LCD_YRES,
-	.vl_bpix = LCD_COLOR16,
+	/*
+	 * Insert a value here so that we don't end up in the BSS
+	 * Reference: drivers/video/tegra.c
+	 */
+	.vl_col = -1,
 };
 #endif
 
@@ -141,7 +136,7 @@ static void lcd_panel_on(vidinfo_t *vid)
 }
 
 #ifdef CONFIG_OF_CONTROL
-int exynos_fimd_parse_dt(const void *blob)
+int exynos_lcd_early_init(const void *blob)
 {
 	unsigned int node;
 	node = fdtdec_next_compatible(blob, 0, COMPAT_SAMSUNG_EXYNOS_FIMD);
@@ -286,8 +281,6 @@ void lcd_ctrl_init(void *lcdbase)
 	set_lcd_clk();
 
 #ifdef CONFIG_OF_CONTROL
-	if (exynos_fimd_parse_dt(gd->fdt_blob))
-		debug("Can't get proper panel info\n");
 #ifdef CONFIG_EXYNOS_MIPI_DSIM
 	exynos_init_dsim_platform_data(&panel_info);
 #endif
diff --git a/include/configs/exynos5250-dt.h b/include/configs/exynos5250-dt.h
index 74e72a5..c24984b 100644
--- a/include/configs/exynos5250-dt.h
+++ b/include/configs/exynos5250-dt.h
@@ -61,8 +61,6 @@
 #ifdef CONFIG_LCD
 #define CONFIG_EXYNOS_FB
 #define CONFIG_EXYNOS_DP
-#define LCD_XRES			2560
-#define LCD_YRES			1600
 #define LCD_BPP			LCD_COLOR16
 #endif
 
diff --git a/include/configs/s5pc210_universal.h b/include/configs/s5pc210_universal.h
index eb046cd..20985da 100644
--- a/include/configs/s5pc210_universal.h
+++ b/include/configs/s5pc210_universal.h
@@ -247,7 +247,4 @@ int universal_spi_read(void);
 #define CONFIG_VIDEO_BMP_GZIP
 #define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE ((500 * 160 * 4) + 54)
 
-#define LCD_XRES	480
-#define LCD_YRES	800
-
 #endif	/* __CONFIG_H */
diff --git a/include/configs/trats.h b/include/configs/trats.h
index 90f1962..35c1feb 100644
--- a/include/configs/trats.h
+++ b/include/configs/trats.h
@@ -261,7 +261,4 @@
 #define CONFIG_VIDEO_BMP_GZIP
 #define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE  ((500 * 160 * 4) + 54)
 
-#define LCD_XRES	720
-#define LCD_YRES	1280
-
 #endif	/* __CONFIG_H */
diff --git a/include/configs/trats2.h b/include/configs/trats2.h
index 206975b..94c8a9f 100644
--- a/include/configs/trats2.h
+++ b/include/configs/trats2.h
@@ -241,7 +241,4 @@ int get_soft_i2c_sda_pin(void);
 #define CONFIG_VIDEO_BMP_GZIP
 #define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE ((500 * 160 * 4) + 54)
 
-#define LCD_XRES	720
-#define LCD_YRES	1280
-
 #endif	/* __CONFIG_H */
-- 
1.7.9.5

^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [U-Boot] [PATCH V4 2/9] arm: exynos: Add RPLL for Exynos5420
  2014-07-30  9:11 [U-Boot] [PATCH V4 0/9] peach_pit: Add support for FIMD, DP and parade chip Ajay Kumar
  2014-07-30  9:11 ` [U-Boot] [PATCH V4 1/9] exynos_fb: Remove usage of static defines Ajay Kumar
@ 2014-07-30  9:11 ` Ajay Kumar
  2014-07-30  9:11 ` [U-Boot] [PATCH V4 3/9] arm: exynos: Add get_lcd_clk and set_lcd_clk callbacks " Ajay Kumar
                   ` (7 subsequent siblings)
  9 siblings, 0 replies; 16+ messages in thread
From: Ajay Kumar @ 2014-07-30  9:11 UTC (permalink / raw)
  To: u-boot

RPLL is needed to drive the LCD panel on Exynos5420 based boards.

Signed-off-by: Ajay Kumar <ajaykumar.rs@samsung.com>
Acked-by: Simon Glass <sjg@chromium.org>
Tested-by: Simon Glass <sjg@chromium.org>
---
 arch/arm/cpu/armv7/exynos/clock_init.h         |    3 +++
 arch/arm/cpu/armv7/exynos/clock_init_exynos5.c |   13 +++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/arch/arm/cpu/armv7/exynos/clock_init.h b/arch/arm/cpu/armv7/exynos/clock_init.h
index a875d0b..fce502f 100644
--- a/arch/arm/cpu/armv7/exynos/clock_init.h
+++ b/arch/arm/cpu/armv7/exynos/clock_init.h
@@ -75,6 +75,9 @@ struct mem_timings {
 	unsigned spll_mdiv;
 	unsigned spll_pdiv;
 	unsigned spll_sdiv;
+	unsigned rpll_mdiv;
+	unsigned rpll_pdiv;
+	unsigned rpll_sdiv;
 	unsigned pclk_cdrex_ratio;
 	unsigned direct_cmd_msr[MEM_TIMINGS_MSR_COUNT];
 
diff --git a/arch/arm/cpu/armv7/exynos/clock_init_exynos5.c b/arch/arm/cpu/armv7/exynos/clock_init_exynos5.c
index 1d6977f..b6a9bc1 100644
--- a/arch/arm/cpu/armv7/exynos/clock_init_exynos5.c
+++ b/arch/arm/cpu/armv7/exynos/clock_init_exynos5.c
@@ -179,6 +179,10 @@ struct mem_timings mem_timings[] = {
 		.spll_mdiv = 0xc8,
 		.spll_pdiv = 0x3,
 		.spll_sdiv = 0x2,
+		/* RPLL @70.5Mhz */
+		.rpll_mdiv = 0x5E,
+		.rpll_pdiv = 0x2,
+		.rpll_sdiv = 0x4,
 
 		.direct_cmd_msr = {
 			0x00020018, 0x00030000, 0x00010046, 0x00000d70,
@@ -800,6 +804,7 @@ static void exynos5420_system_clock_init(void)
 	writel(mem->ipll_pdiv * PLL_LOCK_FACTOR, &clk->ipll_lock);
 	writel(mem->spll_pdiv * PLL_LOCK_FACTOR, &clk->spll_lock);
 	writel(mem->kpll_pdiv * PLL_LOCK_FACTOR, &clk->kpll_lock);
+	writel(mem->rpll_pdiv * PLL_X_LOCK_FACTOR, &clk->rpll_lock);
 
 	setbits_le32(&clk->src_cpu, MUX_HPM_SEL_MASK);
 
@@ -898,6 +903,14 @@ static void exynos5420_system_clock_init(void)
 	while ((readl(&clk->spll_con0) & PLL_LOCKED) == 0)
 		;
 
+	/* Set RPLL */
+	writel(RPLL_CON2_VAL, &clk->rpll_con2);
+	writel(RPLL_CON1_VAL, &clk->rpll_con1);
+	val = set_pll(mem->rpll_mdiv, mem->rpll_pdiv, mem->rpll_sdiv);
+	writel(val, &clk->rpll_con0);
+	while ((readl(&clk->rpll_con0) & PLL_LOCKED) == 0)
+		;
+
 	writel(CLK_DIV_CDREX0_VAL, &clk->div_cdrex0);
 	writel(CLK_DIV_CDREX1_VAL, &clk->div_cdrex1);
 
-- 
1.7.9.5

^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [U-Boot] [PATCH V4 3/9] arm: exynos: Add get_lcd_clk and set_lcd_clk callbacks for Exynos5420
  2014-07-30  9:11 [U-Boot] [PATCH V4 0/9] peach_pit: Add support for FIMD, DP and parade chip Ajay Kumar
  2014-07-30  9:11 ` [U-Boot] [PATCH V4 1/9] exynos_fb: Remove usage of static defines Ajay Kumar
  2014-07-30  9:11 ` [U-Boot] [PATCH V4 2/9] arm: exynos: Add RPLL for Exynos5420 Ajay Kumar
@ 2014-07-30  9:11 ` Ajay Kumar
  2014-07-30  9:11 ` [U-Boot] [PATCH V4 4/9] video: exynos_fimd: Add framework to disable FIMD sysmmu Ajay Kumar
                   ` (6 subsequent siblings)
  9 siblings, 0 replies; 16+ messages in thread
From: Ajay Kumar @ 2014-07-30  9:11 UTC (permalink / raw)
  To: u-boot

Add get_lcd_clk and set_lcd_clk callbacks for Exynos5420 needed by
exynos video driver.
Also, configure ACLK_400_DISP1 as the parent for MUX_ACLK_400_DISP1_SUB_SEL.

Signed-off-by: Ajay Kumar <ajaykumar.rs@samsung.com>
Acked-by: Simon Glass <sjg@chromium.org>
Tested-by: Simon Glass <sjg@chromium.org>
---
 arch/arm/cpu/armv7/exynos/clock.c         |   83 +++++++++++++++++++++++++++--
 arch/arm/cpu/armv7/exynos/exynos5_setup.h |    2 +-
 arch/arm/include/asm/arch-exynos/clk.h    |    1 +
 3 files changed, 80 insertions(+), 6 deletions(-)

diff --git a/arch/arm/cpu/armv7/exynos/clock.c b/arch/arm/cpu/armv7/exynos/clock.c
index 400d134..c8be39b 100644
--- a/arch/arm/cpu/armv7/exynos/clock.c
+++ b/arch/arm/cpu/armv7/exynos/clock.c
@@ -82,7 +82,8 @@ static int exynos_get_pll_clk(int pllreg, unsigned int r, unsigned int k)
 	 * VPLL_CON: MIDV [24:16]
 	 * BPLL_CON: MIDV [25:16]: Exynos5
 	 */
-	if (pllreg == APLL || pllreg == MPLL || pllreg == BPLL)
+	if (pllreg == APLL || pllreg == MPLL || pllreg == BPLL ||
+	    pllreg == SPLL)
 		mask = 0x3ff;
 	else
 		mask = 0x1ff;
@@ -391,6 +392,9 @@ static unsigned long exynos5420_get_pll_clk(int pllreg)
 		r = readl(&clk->rpll_con0);
 		k = readl(&clk->rpll_con1);
 		break;
+	case SPLL:
+		r = readl(&clk->spll_con0);
+		break;
 	default:
 		printf("Unsupported PLL (%d)\n", pllreg);
 		return 0;
@@ -1027,6 +1031,40 @@ static unsigned long exynos5_get_lcd_clk(void)
 	return pclk;
 }
 
+static unsigned long exynos5420_get_lcd_clk(void)
+{
+	struct exynos5420_clock *clk =
+		(struct exynos5420_clock *)samsung_get_base_clock();
+	unsigned long pclk, sclk;
+	unsigned int sel;
+	unsigned int ratio;
+
+	/*
+	 * CLK_SRC_DISP10
+	 * FIMD1_SEL [4]
+	 * 0: SCLK_RPLL
+	 * 1: SCLK_SPLL
+	 */
+	sel = readl(&clk->src_disp10);
+	sel &= (1 << 4);
+
+	if (sel)
+		sclk = get_pll_clk(SPLL);
+	else
+		sclk = get_pll_clk(RPLL);
+
+	/*
+	 * CLK_DIV_DISP10
+	 * FIMD1_RATIO [3:0]
+	 */
+	ratio = readl(&clk->div_disp10);
+	ratio = ratio & 0xf;
+
+	pclk = sclk / (ratio + 1);
+
+	return pclk;
+}
+
 void exynos4_set_lcd_clk(void)
 {
 	struct exynos4_clock *clk =
@@ -1131,6 +1169,33 @@ void exynos5_set_lcd_clk(void)
 	clrsetbits_le32(&clk->div_disp1_0, 0xf, 0x0);
 }
 
+void exynos5420_set_lcd_clk(void)
+{
+	struct exynos5420_clock *clk =
+		(struct exynos5420_clock *)samsung_get_base_clock();
+	unsigned int cfg;
+
+	/*
+	 * CLK_SRC_DISP10
+	 * FIMD1_SEL [4]
+	 * 0: SCLK_RPLL
+	 * 1: SCLK_SPLL
+	 */
+	cfg = readl(&clk->src_disp10);
+	cfg &= ~(0x1 << 4);
+	cfg |= (0 << 4);
+	writel(cfg, &clk->src_disp10);
+
+	/*
+	 * CLK_DIV_DISP10
+	 * FIMD1_RATIO		[3:0]
+	 */
+	cfg = readl(&clk->div_disp10);
+	cfg &= ~(0xf << 0);
+	cfg |= (0 << 0);
+	writel(cfg, &clk->div_disp10);
+}
+
 void exynos4_set_mipi_clk(void)
 {
 	struct exynos4_clock *clk =
@@ -1602,16 +1667,24 @@ unsigned long get_lcd_clk(void)
 {
 	if (cpu_is_exynos4())
 		return exynos4_get_lcd_clk();
-	else
-		return exynos5_get_lcd_clk();
+	else {
+		if (proid_is_exynos5420())
+			return exynos5420_get_lcd_clk();
+		else
+			return exynos5_get_lcd_clk();
+	}
 }
 
 void set_lcd_clk(void)
 {
 	if (cpu_is_exynos4())
 		exynos4_set_lcd_clk();
-	else
-		exynos5_set_lcd_clk();
+	else {
+		if (proid_is_exynos5250())
+			exynos5_set_lcd_clk();
+		else if (proid_is_exynos5420())
+			exynos5420_set_lcd_clk();
+	}
 }
 
 void set_mipi_clk(void)
diff --git a/arch/arm/cpu/armv7/exynos/exynos5_setup.h b/arch/arm/cpu/armv7/exynos/exynos5_setup.h
index 3242093..2eea48a 100644
--- a/arch/arm/cpu/armv7/exynos/exynos5_setup.h
+++ b/arch/arm/cpu/armv7/exynos/exynos5_setup.h
@@ -783,7 +783,7 @@
 #define CLK_SRC_TOP2_VAL	0x11101000
 #define CLK_SRC_TOP3_VAL	0x11111111
 #define CLK_SRC_TOP4_VAL	0x11110111
-#define CLK_SRC_TOP5_VAL	0x11111100
+#define CLK_SRC_TOP5_VAL	0x11111101
 #define CLK_SRC_TOP6_VAL	0x11110111
 #define CLK_SRC_TOP7_VAL	0x00022200
 
diff --git a/arch/arm/include/asm/arch-exynos/clk.h b/arch/arm/include/asm/arch-exynos/clk.h
index ffbc07e..db24dc0 100644
--- a/arch/arm/include/asm/arch-exynos/clk.h
+++ b/arch/arm/include/asm/arch-exynos/clk.h
@@ -15,6 +15,7 @@
 #define VPLL	4
 #define BPLL	5
 #define RPLL	6
+#define SPLL	7
 
 #define MASK_PRE_RATIO(x)	(0xff << ((x << 4) + 8))
 #define MASK_RATIO(x)		(0xf << (x << 4))
-- 
1.7.9.5

^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [U-Boot] [PATCH V4 4/9] video: exynos_fimd: Add framework to disable FIMD sysmmu
  2014-07-30  9:11 [U-Boot] [PATCH V4 0/9] peach_pit: Add support for FIMD, DP and parade chip Ajay Kumar
                   ` (2 preceding siblings ...)
  2014-07-30  9:11 ` [U-Boot] [PATCH V4 3/9] arm: exynos: Add get_lcd_clk and set_lcd_clk callbacks " Ajay Kumar
@ 2014-07-30  9:11 ` Ajay Kumar
  2014-07-30  9:11 ` [U-Boot] [PATCH V4 5/9] video: Add driver for Parade PS8625 dP to LVDS bridge Ajay Kumar
                   ` (5 subsequent siblings)
  9 siblings, 0 replies; 16+ messages in thread
From: Ajay Kumar @ 2014-07-30  9:11 UTC (permalink / raw)
  To: u-boot

On Exynos5420 and newer versions, the FIMD sysmmus are in
"on state" by default.
We have to disable them in order to make FIMD DMA work.
This patch adds the required framework to exynos_fimd driver,
and disables FIMD sysmmu on Exynos5420.

Signed-off-by: Ajay Kumar <ajaykumar.rs@samsung.com>
Acked-by: Simon Glass <sjg@chromium.org>
---
 arch/arm/dts/exynos54xx.dtsi                 |   10 ++++++
 doc/device-tree-bindings/video/exynos-fb.txt |    6 ++++
 drivers/video/exynos_fimd.c                  |   43 ++++++++++++++++++++++++++
 include/fdtdec.h                             |    1 +
 lib/fdtdec.c                                 |    1 +
 5 files changed, 61 insertions(+)

diff --git a/arch/arm/dts/exynos54xx.dtsi b/arch/arm/dts/exynos54xx.dtsi
index b9f8e0b..c21d798 100644
--- a/arch/arm/dts/exynos54xx.dtsi
+++ b/arch/arm/dts/exynos54xx.dtsi
@@ -113,6 +113,16 @@
 		status = "disabled";
 	};
 
+	fimdm0_sysmmu at 0x14640000 {
+		compatible = "samsung,sysmmu-v3.3";
+		reg = <0x14640000 0x100>;
+	};
+
+	fimdm1_sysmmu at 0x14680000 {
+		compatible = "samsung,sysmmu-v3.3";
+		reg = <0x14680000 0x100>;
+	};
+
 	fimd at 14400000 {
 		/* sysmmu is not used in U-Boot */
 		samsung,disable-sysmmu;
diff --git a/doc/device-tree-bindings/video/exynos-fb.txt b/doc/device-tree-bindings/video/exynos-fb.txt
index bb7441c..dc4e44f 100644
--- a/doc/device-tree-bindings/video/exynos-fb.txt
+++ b/doc/device-tree-bindings/video/exynos-fb.txt
@@ -55,6 +55,12 @@ Board(panel specific):
 	samsung,pclk-name: parent clock identifier: 1(MPLL), 2(EPLL), 3(VPLL)
 	samsung,sclk-div: parent_clock/source_clock ratio
 	samsung,dual-lcd-enabled: 1 if you support two LCD, else 0
+	samsung,disable-sysmmu: Define this if you want to disable FIMD sysmmu.
+				(needed for Exynos5420 and newer versions)
+				Add the required FIMD sysmmu nodes to be
+				disabled with compatible string
+				"samsung,sysmmu-v3.3", with a "reg" property
+				holding the register address of FIMD sysmmu.
 
 Example:
 SOC specific part:
diff --git a/drivers/video/exynos_fimd.c b/drivers/video/exynos_fimd.c
index cebbba7..f67fa81 100644
--- a/drivers/video/exynos_fimd.c
+++ b/drivers/video/exynos_fimd.c
@@ -251,6 +251,45 @@ void exynos_fimd_window_off(unsigned int win_id)
 	writel(cfg, &fimd_ctrl->winshmap);
 }
 
+#ifdef CONFIG_OF_CONTROL
+/*
+* The reset value for FIMD SYSMMU register MMU_CTRL is 3
+* on Exynos5420 and newer versions.
+* This means FIMD SYSMMU is on by default on Exynos5420
+* and newer versions.
+* Since in u-boot we don't use SYSMMU, we should disable
+* those FIMD SYSMMU.
+* Note that there are 2 SYSMMU for FIMD: m0 and m1.
+* m0 handles windows 0 and 4, and m1 handles windows 1, 2 and 3.
+* We disable both of them here.
+*/
+void exynos_fimd_disable_sysmmu(void)
+{
+	u32 *sysmmufimd;
+	unsigned int node;
+	int node_list[2];
+	int count;
+	int i;
+
+	count = fdtdec_find_aliases_for_id(gd->fdt_blob, "fimd",
+				COMPAT_SAMSUNG_EXYNOS_SYSMMU, node_list, 2);
+	for (i = 0; i < count; i++) {
+		node = node_list[i];
+		if (node <= 0) {
+			debug("Can't get device node for fimd sysmmu\n");
+			return;
+		}
+
+		sysmmufimd = (u32 *)fdtdec_get_addr(gd->fdt_blob, node, "reg");
+		if (!sysmmufimd) {
+			debug("Can't get base address for sysmmu fimdm0");
+			return;
+		}
+
+		writel(0x0, sysmmufimd);
+	}
+}
+#endif
 
 void exynos_fimd_lcd_init(vidinfo_t *vid)
 {
@@ -268,6 +307,10 @@ void exynos_fimd_lcd_init(vidinfo_t *vid)
 								node, "reg");
 	if (fimd_ctrl == NULL)
 		debug("Can't get the FIMD base address\n");
+
+	if (fdtdec_get_bool(gd->fdt_blob, node, "samsung,disable-sysmmu"))
+		exynos_fimd_disable_sysmmu();
+
 #else
 	fimd_ctrl = (struct exynos_fb *)samsung_get_base_fimd();
 #endif
diff --git a/include/fdtdec.h b/include/fdtdec.h
index a7e6ee7..a583d68 100644
--- a/include/fdtdec.h
+++ b/include/fdtdec.h
@@ -94,6 +94,7 @@ enum fdt_compat_id {
 	COMPAT_SANDBOX_LCD_SDL,		/* Sandbox LCD emulation with SDL */
 	COMPAT_TI_TPS65090,		/* Texas Instrument TPS65090 */
 	COMPAT_NXP_PTN3460,		/* NXP PTN3460 DP/LVDS bridge */
+	COMPAT_SAMSUNG_EXYNOS_SYSMMU,	/* Exynos sysmmu */
 
 	COMPAT_COUNT,
 };
diff --git a/lib/fdtdec.c b/lib/fdtdec.c
index aaa6620..64d2398 100644
--- a/lib/fdtdec.c
+++ b/lib/fdtdec.c
@@ -68,6 +68,7 @@ static const char * const compat_names[COMPAT_COUNT] = {
 	COMPAT(SANDBOX_LCD_SDL, "sandbox,lcd-sdl"),
 	COMPAT(TI_TPS65090, "ti,tps65090"),
 	COMPAT(COMPAT_NXP_PTN3460, "nxp,ptn3460"),
+	COMPAT(SAMSUNG_EXYNOS_SYSMMU, "samsung,sysmmu-v3.3"),
 };
 
 const char *fdtdec_get_compatible(enum fdt_compat_id id)
-- 
1.7.9.5

^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [U-Boot] [PATCH V4 5/9] video: Add driver for Parade PS8625 dP to LVDS bridge
  2014-07-30  9:11 [U-Boot] [PATCH V4 0/9] peach_pit: Add support for FIMD, DP and parade chip Ajay Kumar
                   ` (3 preceding siblings ...)
  2014-07-30  9:11 ` [U-Boot] [PATCH V4 4/9] video: exynos_fimd: Add framework to disable FIMD sysmmu Ajay Kumar
@ 2014-07-30  9:11 ` Ajay Kumar
  2014-07-30  9:11 ` [U-Boot] [PATCH V4 6/9] ARM: exynos: Add missing declaration for gpio_direction_input Ajay Kumar
                   ` (4 subsequent siblings)
  9 siblings, 0 replies; 16+ messages in thread
From: Ajay Kumar @ 2014-07-30  9:11 UTC (permalink / raw)
  To: u-boot

From: Vadim Bendebury <vbendeb@chromium.org>

The initialization table comes from the "Illustration of I2C command
for initialing PS8625" document supplied by Parade.

Signed-off-by: Vadim Bendebury <vbendeb@chromium.org>
Signed-off-by: Ajay Kumar <ajaykumar.rs@samsung.com>
Acked-by: Simon Glass <sjg@chromium.org>
Tested-by: Simon Glass <sjg@chromium.org>
---
 drivers/video/Makefile |    1 +
 drivers/video/parade.c |  220 ++++++++++++++++++++++++++++++++++++++++++++++++
 include/fdtdec.h       |    1 +
 lib/fdtdec.c           |    1 +
 4 files changed, 223 insertions(+)
 create mode 100644 drivers/video/parade.c

diff --git a/drivers/video/Makefile b/drivers/video/Makefile
index 945f35d..8618590 100644
--- a/drivers/video/Makefile
+++ b/drivers/video/Makefile
@@ -41,3 +41,4 @@ obj-$(CONFIG_VIDEO_SMI_LYNXEM) += smiLynxEM.o videomodes.o
 obj-$(CONFIG_VIDEO_TEGRA) += tegra.o
 obj-$(CONFIG_VIDEO_VCXK) += bus_vcxk.o
 obj-$(CONFIG_FORMIKE) += formike.o
+obj-$(CONFIG_VIDEO_PARADE) += parade.o
diff --git a/drivers/video/parade.c b/drivers/video/parade.c
new file mode 100644
index 0000000..0f543f6
--- /dev/null
+++ b/drivers/video/parade.c
@@ -0,0 +1,220 @@
+/*
+ * Copyright (c) 2014 The Chromium OS Authors. All rights reserved.
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+/*
+ * This file is a driver for Parade dP<->LVDS bridges. The original submission
+ * is for the ps8625 chip.
+ */
+#include <config.h>
+#include <common.h>
+#include <i2c.h>
+#include <fdtdec.h>
+
+/*
+ * Initialization of the chip is a process of writing certaing values into
+ * certain registers over i2c bus. The chip in fact responds to a range of
+ * addresses on the i2c bus, so for each written value three parameters are
+ * required: i2c address, register address and the actual value.
+ *
+ * The base address is derived from the device tree, only address offset is
+ * stored in the table below.
+ */
+/**
+ * struct reg_data() - data for a parade register write
+ *
+ * @addr_off        offset from the i2c base address for parade
+ * @reg_addr        register address to write
+ * @value           value to be written
+ */
+struct reg_data {
+	uint8_t addr_off;
+	uint8_t reg;
+	uint8_t value;
+} _packed;
+
+#define END_OF_TABLE 0xff /* Ficticious offset */
+
+static const struct reg_data parade_values[] = {
+	{0x02, 0xa1, 0x01},  /* HPD low */
+	 /*
+	  * SW setting
+	  * [1:0] SW output 1.2V voltage is lower to 96%
+	  */
+	{0x04, 0x14, 0x01},
+	 /*
+	  * RCO SS setting
+	  * [5:4] = b01 0.5%, b10 1%, b11 1.5%
+	  */
+	{0x04, 0xe3, 0x20},
+	{0x04, 0xe2, 0x80}, /* [7] RCO SS enable */
+	 /*
+	  *  RPHY Setting
+	  * [3:2] CDR tune wait cycle before
+	  * measure for fine tune b00: 1us,
+	  * 01: 0.5us, 10:2us, 11:4us.
+	  */
+	{0x04, 0x8a, 0x0c},
+	{0x04, 0x89, 0x08}, /* [3] RFD always on */
+	 /*
+	  * CTN lock in/out:
+	  * 20000ppm/80000ppm. Lock out 2
+	  * times.
+	  */
+	{0x04, 0x71, 0x2d},
+	 /*
+	  * 2.7G CDR settings
+	  * NOF=40LSB for HBR CDR setting
+	  */
+	{0x04, 0x7d, 0x07},
+	{0x04, 0x7b, 0x00},  /* [1:0] Fmin=+4bands */
+	{0x04, 0x7a, 0xfd},  /* [7:5] DCO_FTRNG=+-40% */
+	 /*
+	  * 1.62G CDR settings
+	  * [5:2]NOF=64LSB [1:0]DCO scale is 2/5
+	  */
+	{0x04, 0xc0, 0x12},
+	{0x04, 0xc1, 0x92},  /* Gitune=-37% */
+	{0x04, 0xc2, 0x1c},  /* Fbstep=100% */
+	{0x04, 0x32, 0x80},  /* [7] LOS signal disable */
+	 /*
+	  * RPIO Setting
+	  * [7:4] LVDS driver bias current :
+	  * 75% (250mV swing)
+	  */
+	{0x04, 0x00, 0xb0},
+	 /*
+	  * [7:6] Right-bar GPIO output strength is 8mA
+	  */
+	{0x04, 0x15, 0x40},
+	 /* EQ Training State Machine Setting */
+	{0x04, 0x54, 0x10},  /* RCO calibration start */
+	 /* [4:0] MAX_LANE_COUNT set to one lane */
+	{0x01, 0x02, 0x81},
+	 /* [4:0] LANE_COUNT_SET set to one lane */
+	{0x01, 0x21, 0x81},
+	{0x00, 0x52, 0x20},
+	{0x00, 0xf1, 0x03},  /* HPD CP toggle enable */
+	{0x00, 0x62, 0x41},
+	 /* Counter number, add 1ms counter delay */
+	{0x00, 0xf6, 0x01},
+	 /*
+	  * [6]PWM function control by
+	  * DPCD0040f[7], default is PWM
+	  * block always works.
+	  */
+	{0x00, 0x77, 0x06},
+	 /*
+	  * 04h Adjust VTotal tolerance to
+	  * fix the 30Hz no display issue
+	  */
+	{0x00, 0x4c, 0x04},
+	 /* DPCD00400='h00, Parade OUI = 'h001cf8 */
+	{0x01, 0xc0, 0x00},
+	{0x01, 0xc1, 0x1c},  /* DPCD00401='h1c */
+	{0x01, 0xc2, 0xf8},  /* DPCD00402='hf8 */
+	 /*
+	  * DPCD403~408 = ASCII code
+	  * D2SLV5='h4432534c5635
+	  */
+	{0x01, 0xc3, 0x44},
+	{0x01, 0xc4, 0x32},  /* DPCD404 */
+	{0x01, 0xc5, 0x53},  /* DPCD405 */
+	{0x01, 0xc6, 0x4c},  /* DPCD406 */
+	{0x01, 0xc7, 0x56},  /* DPCD407 */
+	{0x01, 0xc8, 0x35},  /* DPCD408 */
+	 /*
+	  * DPCD40A, Initial Code major  revision
+	  * '01'
+	  */
+	{0x01, 0xca, 0x01},
+	 /* DPCD40B, Initial Code minor revision '05' */
+	{0x01, 0xcb, 0x05},
+	 /* DPCD720, Select internal PWM */
+	{0x01, 0xa5, 0xa0},
+	 /*
+	  * FFh for 100% PWM of brightness, 0h for 0%
+	  * brightness
+	  */
+	{0x01, 0xa7, 0xff},
+	 /*
+	  * Set LVDS output as 6bit-VESA mapping,
+	  * single LVDS channel
+	  */
+	{0x01, 0xcc, 0x13},
+	 /* Enable SSC set by register */
+	{0x02, 0xb1, 0x20},
+	 /*
+	  * Set SSC enabled and +/-1% central
+	  * spreading
+	  */
+	{0x04, 0x10, 0x16},
+	 /* MPU Clock source: LC => RCO */
+	{0x04, 0x59, 0x60},
+	{0x04, 0x54, 0x14},  /* LC -> RCO */
+	{0x02, 0xa1, 0x91},  /* HPD high */
+	{END_OF_TABLE}
+};
+
+/**
+ * Write values table into the Parade eDP bridge
+ *
+ * @return      0 on success, non-0 on failure
+ */
+
+static int parade_write_regs(int base_addr, const struct reg_data *table)
+{
+	int ret = 0;
+
+	while (!ret && (table->addr_off != END_OF_TABLE)) {
+		ret = i2c_write(base_addr + table->addr_off,
+				table->reg, 1,
+				(uint8_t *)&table->value,
+				sizeof(table->value));
+		table++;
+	}
+	return ret;
+}
+
+int parade_init(const void *blob)
+{
+	int bus, old_bus;
+	int parent;
+	int node;
+	int addr;
+	int ret;
+
+	node = fdtdec_next_compatible(blob, 0, COMPAT_PARADE_PS8625);
+	if (node < 0)
+		return 0;
+
+	parent = fdt_parent_offset(blob, node);
+	if (parent < 0) {
+		debug("%s: Could not find parent i2c node\n", __func__);
+		return -1;
+	}
+	addr = fdtdec_get_int(blob, node, "reg", -1);
+	if (addr < 0) {
+		debug("%s: Could not find i2c address\n", __func__);
+		return -1;
+	}
+
+	bus = i2c_get_bus_num_fdt(parent);
+	old_bus = i2c_get_bus_num();
+
+	debug("%s: Using i2c bus %d\n", __func__, bus);
+
+	/*
+	 * TODO(sjg@chromium.org): Hmmm we seem to need some sort of delay
+	 * here.
+	 */
+	mdelay(40);
+	i2c_set_bus_num(bus);
+	ret = parade_write_regs(addr, parade_values);
+
+	i2c_set_bus_num(old_bus);
+
+	return ret;
+}
diff --git a/include/fdtdec.h b/include/fdtdec.h
index a583d68..d4284bb 100644
--- a/include/fdtdec.h
+++ b/include/fdtdec.h
@@ -95,6 +95,7 @@ enum fdt_compat_id {
 	COMPAT_TI_TPS65090,		/* Texas Instrument TPS65090 */
 	COMPAT_NXP_PTN3460,		/* NXP PTN3460 DP/LVDS bridge */
 	COMPAT_SAMSUNG_EXYNOS_SYSMMU,	/* Exynos sysmmu */
+	COMPAT_PARADE_PS8625,		/* Parade PS8622 EDP->LVDS bridge */
 
 	COMPAT_COUNT,
 };
diff --git a/lib/fdtdec.c b/lib/fdtdec.c
index 64d2398..17d7969 100644
--- a/lib/fdtdec.c
+++ b/lib/fdtdec.c
@@ -69,6 +69,7 @@ static const char * const compat_names[COMPAT_COUNT] = {
 	COMPAT(TI_TPS65090, "ti,tps65090"),
 	COMPAT(COMPAT_NXP_PTN3460, "nxp,ptn3460"),
 	COMPAT(SAMSUNG_EXYNOS_SYSMMU, "samsung,sysmmu-v3.3"),
+	COMPAT(PARADE_PS8625, "parade,ps8625"),
 };
 
 const char *fdtdec_get_compatible(enum fdt_compat_id id)
-- 
1.7.9.5

^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [U-Boot] [PATCH V4 6/9] ARM: exynos: Add missing declaration for gpio_direction_input
  2014-07-30  9:11 [U-Boot] [PATCH V4 0/9] peach_pit: Add support for FIMD, DP and parade chip Ajay Kumar
                   ` (4 preceding siblings ...)
  2014-07-30  9:11 ` [U-Boot] [PATCH V4 5/9] video: Add driver for Parade PS8625 dP to LVDS bridge Ajay Kumar
@ 2014-07-30  9:11 ` Ajay Kumar
  2014-07-30  9:11 ` [U-Boot] [PATCH V4 7/9] exynos5420: add callbacks needed for exynos_fb driver Ajay Kumar
                   ` (3 subsequent siblings)
  9 siblings, 0 replies; 16+ messages in thread
From: Ajay Kumar @ 2014-07-30  9:11 UTC (permalink / raw)
  To: u-boot

This patch adds missing declaration for gpio_direction_input
function, thereby helps in resolving compilation warnings.

Signed-off-by: Ajay Kumar <ajaykumar.rs@samsung.com>
Acked-by: Simon Glass <sjg@chromium.org>
Tested-by: Simon Glass <sjg@chromium.org>
---
 arch/arm/include/asm/arch-exynos/gpio.h |    1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm/include/asm/arch-exynos/gpio.h b/arch/arm/include/asm/arch-exynos/gpio.h
index be5113f..8fb5c23 100644
--- a/arch/arm/include/asm/arch-exynos/gpio.h
+++ b/arch/arm/include/asm/arch-exynos/gpio.h
@@ -1504,6 +1504,7 @@ static const struct gpio_name_num_table exynos5420_gpio_table[] = {
 void gpio_cfg_pin(int gpio, int cfg);
 void gpio_set_pull(int gpio, int mode);
 void gpio_set_drv(int gpio, int mode);
+int gpio_direction_input(unsigned gpio);
 int gpio_direction_output(unsigned gpio, int value);
 int gpio_set_value(unsigned gpio, int value);
 int gpio_get_value(unsigned gpio);
-- 
1.7.9.5

^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [U-Boot] [PATCH V4 7/9] exynos5420: add callbacks needed for exynos_fb driver
  2014-07-30  9:11 [U-Boot] [PATCH V4 0/9] peach_pit: Add support for FIMD, DP and parade chip Ajay Kumar
                   ` (5 preceding siblings ...)
  2014-07-30  9:11 ` [U-Boot] [PATCH V4 6/9] ARM: exynos: Add missing declaration for gpio_direction_input Ajay Kumar
@ 2014-07-30  9:11 ` Ajay Kumar
  2014-07-30  9:11 ` [U-Boot] [PATCH V4 8/9] ARM: exynos: peach_pit: Add DT nodes for fimd and parade bridge chip Ajay Kumar
                   ` (2 subsequent siblings)
  9 siblings, 0 replies; 16+ messages in thread
From: Ajay Kumar @ 2014-07-30  9:11 UTC (permalink / raw)
  To: u-boot

Add initialization code for peach_pit panel, parade bridge chip,
and backlight.

Signed-off-by: Ajay Kumar <ajaykumar.rs@samsung.com>
Acked-by: Simon Glass <sjg@chromium.org>
Tested-by: Simon Glass <sjg@chromium.org>
---
 arch/arm/include/asm/arch-exynos/system.h |    3 +
 board/samsung/smdk5420/smdk5420.c         |  129 +++++++++++------------------
 2 files changed, 50 insertions(+), 82 deletions(-)

diff --git a/arch/arm/include/asm/arch-exynos/system.h b/arch/arm/include/asm/arch-exynos/system.h
index 4968d3d..320763f 100644
--- a/arch/arm/include/asm/arch-exynos/system.h
+++ b/arch/arm/include/asm/arch-exynos/system.h
@@ -41,4 +41,7 @@ void set_usbhost_mode(unsigned int mode);
 void set_system_display_ctrl(void);
 int exynos_lcd_early_init(const void *blob);
 
+/* Initialize the Parade dP<->LVDS bridge if present */
+int parade_init(const void *blob);
+
 #endif	/* _EXYNOS4_SYSTEM_H */
diff --git a/board/samsung/smdk5420/smdk5420.c b/board/samsung/smdk5420/smdk5420.c
index 183c522..270ee83 100644
--- a/board/samsung/smdk5420/smdk5420.c
+++ b/board/samsung/smdk5420/smdk5420.c
@@ -10,11 +10,14 @@
 #include <i2c.h>
 #include <lcd.h>
 #include <spi.h>
+#include <errno.h>
 #include <asm/arch/board.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/gpio.h>
 #include <asm/arch/pinmux.h>
+#include <asm/arch/system.h>
 #include <asm/arch/dp_info.h>
+#include <power/tps65090_pmic.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -40,95 +43,57 @@ int exynos_init(void)
 }
 
 #ifdef CONFIG_LCD
-void cfg_lcd_gpio(void)
+static int has_edp_bridge(void)
 {
-	/* For Backlight */
-	gpio_cfg_pin(EXYNOS5420_GPIO_B20, S5P_GPIO_OUTPUT);
-	gpio_set_value(EXYNOS5420_GPIO_B20, 1);
+	int node;
+
+	node = fdtdec_next_compatible(gd->fdt_blob, 0, COMPAT_PARADE_PS8625);
 
-	/* LCD power on */
-	gpio_cfg_pin(EXYNOS5420_GPIO_X15, S5P_GPIO_OUTPUT);
-	gpio_set_value(EXYNOS5420_GPIO_X15, 1);
+	/* No node for bridge in device tree. */
+	if (node <= 0)
+		return 0;
 
-	/* Set Hotplug detect for DP */
-	gpio_cfg_pin(EXYNOS5420_GPIO_X07, S5P_GPIO_FUNC(0x3));
+	/* Default is with bridge ic */
+	return 1;
 }
 
-vidinfo_t panel_info = {
-	.vl_freq	= 60,
-	.vl_col		= 2560,
-	.vl_row		= 1600,
-	.vl_width	= 2560,
-	.vl_height	= 1600,
-	.vl_clkp	= CONFIG_SYS_LOW,
-	.vl_hsp		= CONFIG_SYS_LOW,
-	.vl_vsp		= CONFIG_SYS_LOW,
-	.vl_dp		= CONFIG_SYS_LOW,
-	.vl_bpix	= 4,	/* LCD_BPP = 2^4, for output conosle on LCD */
-
-	/* wDP panel timing infomation */
-	.vl_hspw	= 32,
-	.vl_hbpd	= 80,
-	.vl_hfpd	= 48,
-
-	.vl_vspw	= 6,
-	.vl_vbpd	= 37,
-	.vl_vfpd	= 3,
-	.vl_cmd_allow_len = 0xf,
-
-	.win_id		= 3,
-	.cfg_gpio	= cfg_lcd_gpio,
-	.backlight_on	= NULL,
-	.lcd_power_on	= NULL,
-	.reset_lcd	= NULL,
-	.dual_lcd_enabled = 0,
-
-	.init_delay	= 0,
-	.power_on_delay = 0,
-	.reset_delay	= 0,
-	.interface_mode = FIMD_RGB_INTERFACE,
-	.dp_enabled	= 1,
-};
-
-static struct edp_device_info edp_info = {
-	.disp_info = {
-		.h_res = 2560,
-		.h_sync_width = 32,
-		.h_back_porch = 80,
-		.h_front_porch = 48,
-		.v_res = 1600,
-		.v_sync_width  = 6,
-		.v_back_porch = 37,
-		.v_front_porch = 3,
-		.v_sync_rate = 60,
-	},
-	.lt_info = {
-		.lt_status = DP_LT_NONE,
-	},
-	.video_info = {
-		.master_mode = 0,
-		.bist_mode = DP_DISABLE,
-		.bist_pattern = NO_PATTERN,
-		.h_sync_polarity = 0,
-		.v_sync_polarity = 0,
-		.interlaced = 0,
-		.color_space = COLOR_RGB,
-		.dynamic_range = VESA,
-		.ycbcr_coeff = COLOR_YCBCR601,
-		.color_depth = COLOR_8,
-	},
-};
-
-static struct exynos_dp_platform_data dp_platform_data = {
-	.phy_enable	= set_dp_phy_ctrl,
-	.edp_dev_info	= &edp_info,
-};
-
-void init_panel_info(vidinfo_t *vid)
+void exynos_lcd_power_on(void)
 {
-	vid->rgb_mode   = MODE_RGB_P;
+	int ret;
+
+#ifdef CONFIG_POWER_TPS65090
+	ret = tps65090_init();
+	if (ret < 0) {
+		printf("%s: tps65090_init() failed\n", __func__);
+		return;
+	}
+
+	tps65090_fet_enable(6);
+#endif
+
+	mdelay(5);
+
+	/* TODO(ajaykumar.rs@samsung.com): Use device tree */
+	gpio_direction_output(EXYNOS5420_GPIO_X35, 1);	/* EDP_SLP# */
+	mdelay(10);
+	gpio_direction_output(EXYNOS5420_GPIO_Y77, 1);	/* EDP_RST# */
+	gpio_direction_input(EXYNOS5420_GPIO_X26);	/* EDP_HPD */
+	gpio_set_pull(EXYNOS5420_GPIO_X26, S5P_GPIO_PULL_NONE);
 
-	exynos_set_dp_platform_data(&dp_platform_data);
+	if (has_edp_bridge())
+		if (parade_init(gd->fdt_blob))
+			printf("%s: ps8625_init() failed\n", __func__);
+}
+
+void exynos_backlight_on(unsigned int onoff)
+{
+	/* For PWM */
+	gpio_cfg_pin(EXYNOS5420_GPIO_B20, S5P_GPIO_FUNC(0x1));
+	gpio_set_value(EXYNOS5420_GPIO_B20, 1);
+
+#ifdef CONFIG_POWER_TPS65090
+	tps65090_fet_enable(1);
+#endif
 }
 #endif
 
-- 
1.7.9.5

^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [U-Boot] [PATCH V4 8/9] ARM: exynos: peach_pit: Add DT nodes for fimd and parade bridge chip
  2014-07-30  9:11 [U-Boot] [PATCH V4 0/9] peach_pit: Add support for FIMD, DP and parade chip Ajay Kumar
                   ` (6 preceding siblings ...)
  2014-07-30  9:11 ` [U-Boot] [PATCH V4 7/9] exynos5420: add callbacks needed for exynos_fb driver Ajay Kumar
@ 2014-07-30  9:11 ` Ajay Kumar
  2014-07-30  9:11 ` [U-Boot] [PATCH V4 9/9] CONFIGS: peach-pit: Enable display for peach_pit board Ajay Kumar
  2014-08-04 11:19 ` [U-Boot] [PATCH V4 0/9] peach_pit: Add support for FIMD, DP and parade chip Simon Glass
  9 siblings, 0 replies; 16+ messages in thread
From: Ajay Kumar @ 2014-07-30  9:11 UTC (permalink / raw)
  To: u-boot

This patch adds DT properties for fimd and the parade bridge chip
present on peach_pit. The panel supports 1366x768 resolution.

Signed-off-by: Ajay Kumar <ajaykumar.rs@samsung.com>
Acked-by: Simon Glass <sjg@chromium.org>
Tested-by: Simon Glass <sjg@chromium.org>
---
 arch/arm/dts/exynos5420-peach-pit.dts |   30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/arch/arm/dts/exynos5420-peach-pit.dts b/arch/arm/dts/exynos5420-peach-pit.dts
index 8d148af..3ed70a8 100644
--- a/arch/arm/dts/exynos5420-peach-pit.dts
+++ b/arch/arm/dts/exynos5420-peach-pit.dts
@@ -63,6 +63,11 @@
 	              reg = <0x20>;
 	              compatible = "maxim,max98090-codec";
 	       };
+
+	        edp-lvds-bridge at 48 {
+	                compatible = "parade,ps8625";
+	                reg = <0x48>;
+	        };
 	};
 
         sound at 3830000 {
@@ -124,4 +129,29 @@
 	xhci at 12400000 {
 		samsung,vbus-gpio = <&gpio 0x41 0>; /* H01 */
 	};
+
+	fimd at 14400000 {
+		samsung,vl-freq = <60>;
+		samsung,vl-col = <1366>;
+		samsung,vl-row = <768>;
+		samsung,vl-width = <1366>;
+		samsung,vl-height = <768>;
+
+		samsung,vl-clkp;
+		samsung,vl-dp;
+		samsung,vl-bpix = <4>;
+
+		samsung,vl-hspw = <32>;
+		samsung,vl-hbpd = <40>;
+		samsung,vl-hfpd = <40>;
+		samsung,vl-vspw = <6>;
+		samsung,vl-vbpd = <10>;
+		samsung,vl-vfpd = <12>;
+		samsung,vl-cmd-allow-len = <0xf>;
+
+		samsung,winid = <3>;
+		samsung,interface-mode = <1>;
+		samsung,dp-enabled = <1>;
+		samsung,dual-lcd-enabled = <0>;
+	};
 };
-- 
1.7.9.5

^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [U-Boot] [PATCH V4 9/9] CONFIGS: peach-pit: Enable display for peach_pit board
  2014-07-30  9:11 [U-Boot] [PATCH V4 0/9] peach_pit: Add support for FIMD, DP and parade chip Ajay Kumar
                   ` (7 preceding siblings ...)
  2014-07-30  9:11 ` [U-Boot] [PATCH V4 8/9] ARM: exynos: peach_pit: Add DT nodes for fimd and parade bridge chip Ajay Kumar
@ 2014-07-30  9:11 ` Ajay Kumar
  2014-08-04 11:19 ` [U-Boot] [PATCH V4 0/9] peach_pit: Add support for FIMD, DP and parade chip Simon Glass
  9 siblings, 0 replies; 16+ messages in thread
From: Ajay Kumar @ 2014-07-30  9:11 UTC (permalink / raw)
  To: u-boot

Enable drivers for FIMD, DP and parade bridge chip.

Signed-off-by: Ajay Kumar <ajaykumar.rs@samsung.com>
Acked-by: Simon Glass <sjg@chromium.org>
Tested-by: Simon Glass <sjg@chromium.org>
---
 include/configs/peach-pit.h |   10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/include/configs/peach-pit.h b/include/configs/peach-pit.h
index 76b8d7a..88c093f 100644
--- a/include/configs/peach-pit.h
+++ b/include/configs/peach-pit.h
@@ -22,4 +22,14 @@
 #define CONFIG_SYS_PROMPT	"Peach # "
 #define CONFIG_IDENT_STRING	" for Peach"
 
+#define CONFIG_VIDEO_PARADE
+
+/* Display */
+#define CONFIG_LCD
+#ifdef CONFIG_LCD
+#define CONFIG_EXYNOS_FB
+#define CONFIG_EXYNOS_DP
+#define LCD_BPP			LCD_COLOR16
+#endif
+
 #endif	/* __CONFIG_PEACH_PIT_H */
-- 
1.7.9.5

^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [U-Boot] [PATCH V4 0/9] peach_pit: Add support for FIMD, DP and parade chip
  2014-07-30  9:11 [U-Boot] [PATCH V4 0/9] peach_pit: Add support for FIMD, DP and parade chip Ajay Kumar
                   ` (8 preceding siblings ...)
  2014-07-30  9:11 ` [U-Boot] [PATCH V4 9/9] CONFIGS: peach-pit: Enable display for peach_pit board Ajay Kumar
@ 2014-08-04 11:19 ` Simon Glass
  2014-08-04 11:39   ` Ajay kumar
  9 siblings, 1 reply; 16+ messages in thread
From: Simon Glass @ 2014-08-04 11:19 UTC (permalink / raw)
  To: u-boot

Hi,

On 30 July 2014 03:11, Ajay Kumar <ajaykumar.rs@samsung.com> wrote:
> Patchset V1:
> https://www.mail-archive.com/u-boot at lists.denx.de/msg140596.html
>
> Patchset V2:
> https://www.mail-archive.com/u-boot at lists.denx.de/msg141203.html
>
> Patchset V3:
> http://lists.denx.de/pipermail/u-boot/2014-July/183096.html
>
> Changes from V1:
> [PATCH V2 3/10] : Don't mix cpu_is and proid_is as per Minkyu's suggestion.
>                   Also, incorporate Simon's suggestion of not using else.
> [PATCH V2 4/10] : For FIMD SYSMMU DT, use same compatible string as kernel.
> [TEST_ONLY V2 6/10]: Make this patch TEST_ONLY
>
> Changes from V2:
> [PATCH V3 5/9] : Use SPDX tags to define the license for the file: parade.c
> Removed TEST_ONLY patches.
>
> Changes from V3:
> [PATCH V4 1/9] : Fix comment style.
> [PATCH V4 3/9] : Use 'else if' clause instead of 'if'.

Is this series ready to be merged? I have several series dependent on it.

Regards,
Simon

^ permalink raw reply	[flat|nested] 16+ messages in thread

* [U-Boot] [PATCH V4 0/9] peach_pit: Add support for FIMD, DP and parade chip
  2014-08-04 11:19 ` [U-Boot] [PATCH V4 0/9] peach_pit: Add support for FIMD, DP and parade chip Simon Glass
@ 2014-08-04 11:39   ` Ajay kumar
  2014-08-26 23:19     ` Simon Glass
  2014-09-05 10:03     ` Minkyu Kang
  0 siblings, 2 replies; 16+ messages in thread
From: Ajay kumar @ 2014-08-04 11:39 UTC (permalink / raw)
  To: u-boot

+Minkyu

On Mon, Aug 4, 2014 at 4:49 PM, Simon Glass <sjg@chromium.org> wrote:
> Hi,
>
> On 30 July 2014 03:11, Ajay Kumar <ajaykumar.rs@samsung.com> wrote:
>> Patchset V1:
>> https://www.mail-archive.com/u-boot at lists.denx.de/msg140596.html
>>
>> Patchset V2:
>> https://www.mail-archive.com/u-boot at lists.denx.de/msg141203.html
>>
>> Patchset V3:
>> http://lists.denx.de/pipermail/u-boot/2014-July/183096.html
>>
>> Changes from V1:
>> [PATCH V2 3/10] : Don't mix cpu_is and proid_is as per Minkyu's suggestion.
>>                   Also, incorporate Simon's suggestion of not using else.
>> [PATCH V2 4/10] : For FIMD SYSMMU DT, use same compatible string as kernel.
>> [TEST_ONLY V2 6/10]: Make this patch TEST_ONLY
>>
>> Changes from V2:
>> [PATCH V3 5/9] : Use SPDX tags to define the license for the file: parade.c
>> Removed TEST_ONLY patches.
>>
>> Changes from V3:
>> [PATCH V4 1/9] : Fix comment style.
>> [PATCH V4 3/9] : Use 'else if' clause instead of 'if'.
>
> Is this series ready to be merged? I have several series dependent on it.
I have addressed all the comments from Minkyu.
Hopefully, it should get in this time!

Ajay

^ permalink raw reply	[flat|nested] 16+ messages in thread

* [U-Boot] [PATCH V4 0/9] peach_pit: Add support for FIMD, DP and parade chip
  2014-08-04 11:39   ` Ajay kumar
@ 2014-08-26 23:19     ` Simon Glass
  2014-08-29  2:51       ` Minkyu Kang
  2014-09-05 10:03     ` Minkyu Kang
  1 sibling, 1 reply; 16+ messages in thread
From: Simon Glass @ 2014-08-26 23:19 UTC (permalink / raw)
  To: u-boot

Hi Minkyu,

On 4 August 2014 05:39, Ajay kumar <ajaynumb@gmail.com> wrote:
> +Minkyu
>
> On Mon, Aug 4, 2014 at 4:49 PM, Simon Glass <sjg@chromium.org> wrote:
>> Hi,
>>
>> On 30 July 2014 03:11, Ajay Kumar <ajaykumar.rs@samsung.com> wrote:
>>> Patchset V1:
>>> https://www.mail-archive.com/u-boot at lists.denx.de/msg140596.html
>>>
>>> Patchset V2:
>>> https://www.mail-archive.com/u-boot at lists.denx.de/msg141203.html
>>>
>>> Patchset V3:
>>> http://lists.denx.de/pipermail/u-boot/2014-July/183096.html
>>>
>>> Changes from V1:
>>> [PATCH V2 3/10] : Don't mix cpu_is and proid_is as per Minkyu's suggestion.
>>>                   Also, incorporate Simon's suggestion of not using else.
>>> [PATCH V2 4/10] : For FIMD SYSMMU DT, use same compatible string as kernel.
>>> [TEST_ONLY V2 6/10]: Make this patch TEST_ONLY
>>>
>>> Changes from V2:
>>> [PATCH V3 5/9] : Use SPDX tags to define the license for the file: parade.c
>>> Removed TEST_ONLY patches.
>>>
>>> Changes from V3:
>>> [PATCH V4 1/9] : Fix comment style.
>>> [PATCH V4 3/9] : Use 'else if' clause instead of 'if'.
>>
>> Is this series ready to be merged? I have several series dependent on it.
> I have addressed all the comments from Minkyu.
> Hopefully, it should get in this time!

Can this series be applied please?

Regards,
Simon

^ permalink raw reply	[flat|nested] 16+ messages in thread

* [U-Boot] [PATCH V4 0/9] peach_pit: Add support for FIMD, DP and parade chip
  2014-08-26 23:19     ` Simon Glass
@ 2014-08-29  2:51       ` Minkyu Kang
  0 siblings, 0 replies; 16+ messages in thread
From: Minkyu Kang @ 2014-08-29  2:51 UTC (permalink / raw)
  To: u-boot

Hi,

On 27/08/14 08:19, Simon Glass wrote:
> Hi Minkyu,
> 
> On 4 August 2014 05:39, Ajay kumar <ajaynumb@gmail.com> wrote:
>> +Minkyu
>>
>> On Mon, Aug 4, 2014 at 4:49 PM, Simon Glass <sjg@chromium.org> wrote:
>>> Hi,
>>>
>>> On 30 July 2014 03:11, Ajay Kumar <ajaykumar.rs@samsung.com> wrote:
>>>> Patchset V1:
>>>> https://www.mail-archive.com/u-boot at lists.denx.de/msg140596.html
>>>>
>>>> Patchset V2:
>>>> https://www.mail-archive.com/u-boot at lists.denx.de/msg141203.html
>>>>
>>>> Patchset V3:
>>>> http://lists.denx.de/pipermail/u-boot/2014-July/183096.html
>>>>
>>>> Changes from V1:
>>>> [PATCH V2 3/10] : Don't mix cpu_is and proid_is as per Minkyu's suggestion.
>>>>                   Also, incorporate Simon's suggestion of not using else.
>>>> [PATCH V2 4/10] : For FIMD SYSMMU DT, use same compatible string as kernel.
>>>> [TEST_ONLY V2 6/10]: Make this patch TEST_ONLY
>>>>
>>>> Changes from V2:
>>>> [PATCH V3 5/9] : Use SPDX tags to define the license for the file: parade.c
>>>> Removed TEST_ONLY patches.
>>>>
>>>> Changes from V3:
>>>> [PATCH V4 1/9] : Fix comment style.
>>>> [PATCH V4 3/9] : Use 'else if' clause instead of 'if'.
>>>
>>> Is this series ready to be merged? I have several series dependent on it.
>> I have addressed all the comments from Minkyu.
>> Hopefully, it should get in this time!
> 
> Can this series be applied please?
> 

Will check soon.

Thanks,
Minkyu Kang.

^ permalink raw reply	[flat|nested] 16+ messages in thread

* [U-Boot] [PATCH V4 0/9] peach_pit: Add support for FIMD, DP and parade chip
  2014-08-04 11:39   ` Ajay kumar
  2014-08-26 23:19     ` Simon Glass
@ 2014-09-05 10:03     ` Minkyu Kang
  2014-09-05 11:33       ` Ajay kumar
  1 sibling, 1 reply; 16+ messages in thread
From: Minkyu Kang @ 2014-09-05 10:03 UTC (permalink / raw)
  To: u-boot

On 04/08/14 20:39, Ajay kumar wrote:
> +Minkyu
> 
> On Mon, Aug 4, 2014 at 4:49 PM, Simon Glass <sjg@chromium.org> wrote:
>> Hi,
>>
>> On 30 July 2014 03:11, Ajay Kumar <ajaykumar.rs@samsung.com> wrote:
>>> Patchset V1:
>>> https://www.mail-archive.com/u-boot at lists.denx.de/msg140596.html
>>>
>>> Patchset V2:
>>> https://www.mail-archive.com/u-boot at lists.denx.de/msg141203.html
>>>
>>> Patchset V3:
>>> http://lists.denx.de/pipermail/u-boot/2014-July/183096.html
>>>
>>> Changes from V1:
>>> [PATCH V2 3/10] : Don't mix cpu_is and proid_is as per Minkyu's suggestion.
>>>                   Also, incorporate Simon's suggestion of not using else.
>>> [PATCH V2 4/10] : For FIMD SYSMMU DT, use same compatible string as kernel.
>>> [TEST_ONLY V2 6/10]: Make this patch TEST_ONLY
>>>
>>> Changes from V2:
>>> [PATCH V3 5/9] : Use SPDX tags to define the license for the file: parade.c
>>> Removed TEST_ONLY patches.
>>>
>>> Changes from V3:
>>> [PATCH V4 1/9] : Fix comment style.
>>> [PATCH V4 3/9] : Use 'else if' clause instead of 'if'.
>>
>> Is this series ready to be merged? I have several series dependent on it.
> I have addressed all the comments from Minkyu.
> Hopefully, it should get in this time!
> 
> Ajay
> 

Could you please rebase & resend this patch?

Thanks,
Minkyu Kang.

^ permalink raw reply	[flat|nested] 16+ messages in thread

* [U-Boot] [PATCH V4 0/9] peach_pit: Add support for FIMD, DP and parade chip
  2014-09-05 10:03     ` Minkyu Kang
@ 2014-09-05 11:33       ` Ajay kumar
  0 siblings, 0 replies; 16+ messages in thread
From: Ajay kumar @ 2014-09-05 11:33 UTC (permalink / raw)
  To: u-boot

Hi Minkyu,

On Fri, Sep 5, 2014 at 3:33 PM, Minkyu Kang <mk7.kang@samsung.com> wrote:
> On 04/08/14 20:39, Ajay kumar wrote:
>> +Minkyu
>>
>> On Mon, Aug 4, 2014 at 4:49 PM, Simon Glass <sjg@chromium.org> wrote:
>>> Hi,
>>>
>>> On 30 July 2014 03:11, Ajay Kumar <ajaykumar.rs@samsung.com> wrote:
>>>> Patchset V1:
>>>> https://www.mail-archive.com/u-boot at lists.denx.de/msg140596.html
>>>>
>>>> Patchset V2:
>>>> https://www.mail-archive.com/u-boot at lists.denx.de/msg141203.html
>>>>
>>>> Patchset V3:
>>>> http://lists.denx.de/pipermail/u-boot/2014-July/183096.html
>>>>
>>>> Changes from V1:
>>>> [PATCH V2 3/10] : Don't mix cpu_is and proid_is as per Minkyu's suggestion.
>>>>                   Also, incorporate Simon's suggestion of not using else.
>>>> [PATCH V2 4/10] : For FIMD SYSMMU DT, use same compatible string as kernel.
>>>> [TEST_ONLY V2 6/10]: Make this patch TEST_ONLY
>>>>
>>>> Changes from V2:
>>>> [PATCH V3 5/9] : Use SPDX tags to define the license for the file: parade.c
>>>> Removed TEST_ONLY patches.
>>>>
>>>> Changes from V3:
>>>> [PATCH V4 1/9] : Fix comment style.
>>>> [PATCH V4 3/9] : Use 'else if' clause instead of 'if'.
>>>
>>> Is this series ready to be merged? I have several series dependent on it.
>> I have addressed all the comments from Minkyu.
>> Hopefully, it should get in this time!
>>
>> Ajay
>>
>
> Could you please rebase & resend this patch?
I have sent
"[PATCH V5 0/9] peach_pit: Add support for FIMD, DP and parade chip"
after rebasing and testing.

Thanks,
Ajay

^ permalink raw reply	[flat|nested] 16+ messages in thread

end of thread, other threads:[~2014-09-05 11:33 UTC | newest]

Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-07-30  9:11 [U-Boot] [PATCH V4 0/9] peach_pit: Add support for FIMD, DP and parade chip Ajay Kumar
2014-07-30  9:11 ` [U-Boot] [PATCH V4 1/9] exynos_fb: Remove usage of static defines Ajay Kumar
2014-07-30  9:11 ` [U-Boot] [PATCH V4 2/9] arm: exynos: Add RPLL for Exynos5420 Ajay Kumar
2014-07-30  9:11 ` [U-Boot] [PATCH V4 3/9] arm: exynos: Add get_lcd_clk and set_lcd_clk callbacks " Ajay Kumar
2014-07-30  9:11 ` [U-Boot] [PATCH V4 4/9] video: exynos_fimd: Add framework to disable FIMD sysmmu Ajay Kumar
2014-07-30  9:11 ` [U-Boot] [PATCH V4 5/9] video: Add driver for Parade PS8625 dP to LVDS bridge Ajay Kumar
2014-07-30  9:11 ` [U-Boot] [PATCH V4 6/9] ARM: exynos: Add missing declaration for gpio_direction_input Ajay Kumar
2014-07-30  9:11 ` [U-Boot] [PATCH V4 7/9] exynos5420: add callbacks needed for exynos_fb driver Ajay Kumar
2014-07-30  9:11 ` [U-Boot] [PATCH V4 8/9] ARM: exynos: peach_pit: Add DT nodes for fimd and parade bridge chip Ajay Kumar
2014-07-30  9:11 ` [U-Boot] [PATCH V4 9/9] CONFIGS: peach-pit: Enable display for peach_pit board Ajay Kumar
2014-08-04 11:19 ` [U-Boot] [PATCH V4 0/9] peach_pit: Add support for FIMD, DP and parade chip Simon Glass
2014-08-04 11:39   ` Ajay kumar
2014-08-26 23:19     ` Simon Glass
2014-08-29  2:51       ` Minkyu Kang
2014-09-05 10:03     ` Minkyu Kang
2014-09-05 11:33       ` Ajay kumar

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.