Skip to contentSkip to conversation

fsl/diu: ch7301 encoder split off from t1040qds/diu.c

PATCH New Dongsheng Wang 2 participants 4 messages Mar 19, 2014 – Aug 20, 2014

lore
Share & tools
lore

Dongsheng Wang

author
#0 lore raw

PATCH v2 1/2 fsl/diu: ch7301 encoder split off from t1040qds/diu.c

From: Wang Dongsheng <[email protected]>

The ch7301 encoder not only used in t1040qds platform, so we split it for t1042rdb and LSx platform.

Signed-off-by Wang Dongsheng <[email protected]>

---
V2: No Change

board/freescale/common/Makefile +2 -0
index f6a0879..cd4b33b 100644
@@ -34,6 +34,8 @@ ifndef CONFIG_RAMBOOT_PBL
 obj-$(CONFIG_FSL_FIXED_MMC_LOCATION)	+= sdhc_boot.o
 endif
 
+obj-$(CONFIG_FSL_DIU_CH7301)	+= diu_ch7301.o
+
 obj-$(CONFIG_MPC8541CDS)	+= cds_pci_ft.o
 obj-$(CONFIG_MPC8548CDS)	+= cds_pci_ft.o
 obj-$(CONFIG_MPC8555CDS)	+= cds_pci_ft.o
board/freescale/common/diu_ch7301.c new file +136 -0

136 lines not on this page · raw message

board/freescale/common/diu_ch7301.h new file +13 -0
new file mode 100644
index 0000000..8b6ead0
@@ -0,0 +1,13 @@
+/*
+ * Copyright 2014 Freescale Semiconductor, Inc.
+ *
+ * SPDX-License-Identifier:     GPL-2.0+
+ */
+
+#ifndef __DIU_HDMI_CH7301__
+#define __DIU_HDMI_CH7301__
+
+/* Programming of HDMI Chrontel CH7301 connector */
+int diu_set_dvi_encoder(unsigned int pixclock);
+
+#endif
board/freescale/t1040qds/diu.c +8 -126

160 lines not on this page · raw message

include/configs/T1040QDS.h +1 -0
index 993f9ae..f4c8547 100644
@@ -404,6 +404,7 @@ unsigned long get_board_ddr_clk(void);
 /* Video */
 #define CONFIG_FSL_DIU_FB
 #ifdef CONFIG_FSL_DIU_FB
+#define CONFIG_FSL_DIU_CH7301
 #define CONFIG_SYS_DIU_ADDR	(CONFIG_SYS_CCSRBAR + 0x180000)
 #define CONFIG_VIDEO
 #define CONFIG_CMD_BMP
Signature · 1 line
1.8.5
author
#1 lore raw

PATCH v2 2/2 powerpc/t1042RDB: Add Video - HDMI support

From: Jason Jin <[email protected]>

T1042 has internal display interface unit (DIU) for driving video. T1042RDB supports video mode via
-LCD using TI enconder
-HDMI type interface via HDMI encoder

Chrontel, CH7301C encoder which is I2C programmable is used as HDMI connector on T1042RDB.
This patch add support to
-enable Video interface for T1042RDB
-route qixis multiplexing to enable DIU-HDMI interface on board -program DIU pixel clock gerenartor for T1042 -program HDMI encoder via I2C on board

This patch refer to the upstream diu patch (337b0c52b3296f371d04aef71a833e09110e0e6b) for T1040qds.

Signed-off-by Jason Jin <[email protected]>
Signed-off-by Wang Dongsheng <[email protected]>

---
V2:
- Restore CONFIG_SYS_CONSOLE_IS_IN_ENV macors.
- Restore CONFIG_SYS_MALLOC_LEN macors, this macors not effect FB.
- Add a blank line between declarations and code.

board/freescale/t104xrdb/Makefile +1 -0
index af38d9f..f15a633 100644
@@ -12,3 +12,4 @@ obj-$(CONFIG_PCI)	+= pci.o
 obj-y	+= law.o
 obj-y	+= tlb.o
 obj-y	+= cpld.o
+obj-$(CONFIG_FSL_DIU_FB)	+= diu.o
board/freescale/t104xrdb/diu.c new file +84 -0

84 lines not on this page · raw message

include/configs/T1042RDB_PI.h +22 -0
index 8a8a2ff..6d3822d 100644
@@ -203,6 +203,7 @@
 #define CPLD_LBMAP_DFLTBANK		0x40 /* BANK OR | BANK0 */
 #define CPLD_LBMAP_RESET		0xFF
 #define CPLD_LBMAP_SHIFT		0x03
+#define CPLD_DIU_SEL_DFP		0x80
 
 #define CONFIG_SYS_CPLD_BASE	0xffdf0000
 #define CONFIG_SYS_CPLD_BASE_PHYS	(0xf00000000ull | CONFIG_SYS_CPLD_BASE)

@@ -358,6 +359,22 @@
 #define CONFIG_SYS_HUSH_PARSER
 #define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
 
+/* Video */
+#define CONFIG_FSL_DIU_FB
+
+#ifdef CONFIG_FSL_DIU_FB
+#define CONFIG_FSL_DIU_CH7301
+#define CONFIG_SYS_DIU_ADDR	(CONFIG_SYS_CCSRBAR + 0x180000)
+#define CONFIG_VIDEO
+#define CONFIG_CMD_BMP
+#define CONFIG_CFB_CONSOLE
+#define CONFIG_CFB_CONSOLE_ANSI
+#define CONFIG_VIDEO_SW_CURSOR
+#define CONFIG_VGA_AS_SINGLE_DEVICE
+#define CONFIG_VIDEO_LOGO
+#define CONFIG_VIDEO_BMP_LOGO
+#endif
+
 /* pass open firmware flat tree */
 #define CONFIG_OF_LIBFDT
 #define CONFIG_OF_BOARD_SETUP

@@ -380,6 +397,10 @@
 /* I2C bus multiplexer */
 #define I2C_MUX_PCA_ADDR                0x70
 
+/* LDI/DVI Encoder for display */
+#define CONFIG_SYS_I2C_LDI_ADDR         0x38
+#define CONFIG_SYS_I2C_DVI_ADDR         0x75
+
 /*
  * RTC configuration
  */

@@ -646,6 +667,7 @@
 	"usb1:dr_mode=host,phy_type=" __stringify(__USB_PHY_TYPE) ";"\
 	"usb2:dr_mode=host,phy_type=" __stringify(__USB_PHY_TYPE) "\0"\
 	"netdev=eth0\0"						\
+	"video-mode=fslfb:1024x768-32 at 60,monitor=dvi\0"		\
 	"uboot=" __stringify(CONFIG_UBOOTPATH) "\0"		\
 	"ubootaddr=" __stringify(CONFIG_SYS_TEXT_BASE) "\0"	\
 	"tftpflash=tftpboot $loadaddr $uboot && "		\
Signature · 1 line
1.8.5
#2 lore raw

PATCH v2 2/2 powerpc/t1042RDB: Add Video - HDMI support

Quoted 18 lines · Dongsheng Wang

From: Jason Jin <[email protected]>

T1042 has internal display interface unit (DIU) for driving video. T1042RDB supports video mode via

(quoted diff) +0 -2
-LCD using TI enconder
-HDMI type interface via HDMI encoder

Chrontel, CH7301C encoder which is I2C programmable is used as HDMI connector on T1042RDB.
This patch add support to

(quoted diff) +0 -4
-enable Video interface for T1042RDB
-route qixis multiplexing to enable DIU-HDMI interface on board
-program DIU pixel clock gerenartor for T1042
-program HDMI encoder via I2C on board

This patch refer to the upstream diu patch (337b0c52b3296f371d04aef71a833e09110e0e6b) for T1040qds.

Quoted 7 lines
Signed-off-by Jason Jin <[email protected]>
Signed-off-by Wang Dongsheng <[email protected]>

---
V2:
- Restore CONFIG_SYS_CONSOLE_IS_IN_ENV macors.
- Restore CONFIG_SYS_MALLOC_LEN macors, this macors not effect FB.
- Add a blank line between declarations and code.

Applied to u-boot-mpc85xx master branch, awaiting for upstream.

York