* [PATCH v3 0/5] rockchip: rk3399: Fix HDMI out
@ 2020-04-02 11:41 ` Jagan Teki
0 siblings, 0 replies; 34+ messages in thread
From: Jagan Teki @ 2020-04-02 11:41 UTC (permalink / raw)
To: Kever Yang, Simon Glass, Philipp Tomsich, Anatolij Gustschin
Cc: linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
u-boot-0aAXYlwwYIKGBzrmiIFOJg, Jagan Teki,
sunil-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/,
linux-amarula-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/,
Mark Kettenis
Due to recent Linux dts(i) sync for rk3399. the existing
vop driver is not working with HDMI out on RK3399.
This is v3 patchset, for previous version fixes[1].
Changes for v3:
- handle vopl clks in clk driver
- drop dts changes
- fix 4K display out for rk3399
Changes for v2:
- use usbkbd as stdin
- enable USB Keyboard
[1] https://patchwork.ozlabs.org/cover/1264187/
Any inputs?
Jagan.
Jagan Teki (5):
clk: rk3399: Set empty for vopl assigned-clocks
video: rockchip: Fix vop modes for rk3399
rockchip: Enable pre console for rk3399
rockchip: Enable HDMI output on rk3399 board w/ HDMI
video: rockchip: Support 4K resolution for rk3399, HDMI
arch/arm/include/asm/arch-rockchip/vop_rk3288.h | 11 +++++++++++
arch/arm/mach-rockchip/Kconfig | 1 +
common/Kconfig | 1 +
configs/nanopc-t4-rk3399_defconfig | 7 +++++++
configs/nanopi-m4-rk3399_defconfig | 7 +++++++
configs/nanopi-neo4-rk3399_defconfig | 7 +++++++
configs/roc-pc-rk3399_defconfig | 6 ++++++
configs/rock960-rk3399_defconfig | 7 +++++++
drivers/clk/rockchip/clk_rk3399.c | 7 +++++++
drivers/video/rockchip/Kconfig | 2 ++
drivers/video/rockchip/rk3399_vop.c | 2 --
drivers/video/rockchip/rk_vop.c | 4 ++++
include/configs/evb_rk3399.h | 5 +++++
include/configs/rock960_rk3399.h | 5 +++++
14 files changed, 70 insertions(+), 2 deletions(-)
--
2.17.1
^ permalink raw reply [flat|nested] 34+ messages in thread
* [PATCH v3 0/5] rockchip: rk3399: Fix HDMI out
@ 2020-04-02 11:41 ` Jagan Teki
0 siblings, 0 replies; 34+ messages in thread
From: Jagan Teki @ 2020-04-02 11:41 UTC (permalink / raw)
To: u-boot
Due to recent Linux dts(i) sync for rk3399. the existing
vop driver is not working with HDMI out on RK3399.
This is v3 patchset, for previous version fixes[1].
Changes for v3:
- handle vopl clks in clk driver
- drop dts changes
- fix 4K display out for rk3399
Changes for v2:
- use usbkbd as stdin
- enable USB Keyboard
[1] https://patchwork.ozlabs.org/cover/1264187/
Any inputs?
Jagan.
Jagan Teki (5):
clk: rk3399: Set empty for vopl assigned-clocks
video: rockchip: Fix vop modes for rk3399
rockchip: Enable pre console for rk3399
rockchip: Enable HDMI output on rk3399 board w/ HDMI
video: rockchip: Support 4K resolution for rk3399, HDMI
arch/arm/include/asm/arch-rockchip/vop_rk3288.h | 11 +++++++++++
arch/arm/mach-rockchip/Kconfig | 1 +
common/Kconfig | 1 +
configs/nanopc-t4-rk3399_defconfig | 7 +++++++
configs/nanopi-m4-rk3399_defconfig | 7 +++++++
configs/nanopi-neo4-rk3399_defconfig | 7 +++++++
configs/roc-pc-rk3399_defconfig | 6 ++++++
configs/rock960-rk3399_defconfig | 7 +++++++
drivers/clk/rockchip/clk_rk3399.c | 7 +++++++
drivers/video/rockchip/Kconfig | 2 ++
drivers/video/rockchip/rk3399_vop.c | 2 --
drivers/video/rockchip/rk_vop.c | 4 ++++
include/configs/evb_rk3399.h | 5 +++++
include/configs/rock960_rk3399.h | 5 +++++
14 files changed, 70 insertions(+), 2 deletions(-)
--
2.17.1
^ permalink raw reply [flat|nested] 34+ messages in thread
* [PATCH v3 1/5] clk: rk3399: Set empty for vopl assigned-clocks
2020-04-02 11:41 ` Jagan Teki
@ 2020-04-02 11:41 ` Jagan Teki
-1 siblings, 0 replies; 34+ messages in thread
From: Jagan Teki @ 2020-04-02 11:41 UTC (permalink / raw)
To: Kever Yang, Simon Glass, Philipp Tomsich, Anatolij Gustschin
Cc: linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
u-boot-0aAXYlwwYIKGBzrmiIFOJg, Jagan Teki,
sunil-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/,
linux-amarula-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/,
Mark Kettenis
During vidconsole probe, the device probe will try to
check whether the assigned clocks on that video console
node is initialized or not? and return an error if not.
But, unlike Linux U-Boot won't require to handle these
vopl assigned-clocks since core clocks are enough to
handle the video out to process.
So, mark them as empty in set_rate to satisfy clk_set_defaults
so-that probe happened properly.
Signed-off-by: Jagan Teki <jagan-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org>
---
Changes for v3:
- new patch
drivers/clk/rockchip/clk_rk3399.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/drivers/clk/rockchip/clk_rk3399.c b/drivers/clk/rockchip/clk_rk3399.c
index 865b80cc0f..1f62376595 100644
--- a/drivers/clk/rockchip/clk_rk3399.c
+++ b/drivers/clk/rockchip/clk_rk3399.c
@@ -994,6 +994,13 @@ static ulong rk3399_clk_set_rate(struct clk *clk, ulong rate)
case DCLK_VOP1:
ret = rk3399_vop_set_clk(priv->cru, clk->id, rate);
break;
+ case ACLK_VOP1:
+ case HCLK_VOP1:
+ /**
+ * assigned-clocks handling won't require for vopl, so
+ * return 0 to satisfy clk_set_defaults during device probe.
+ */
+ return 0;
case SCLK_DDRCLK:
ret = rk3399_ddr_set_clk(priv->cru, rate);
break;
--
2.17.1
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH v3 1/5] clk: rk3399: Set empty for vopl assigned-clocks
@ 2020-04-02 11:41 ` Jagan Teki
0 siblings, 0 replies; 34+ messages in thread
From: Jagan Teki @ 2020-04-02 11:41 UTC (permalink / raw)
To: u-boot
During vidconsole probe, the device probe will try to
check whether the assigned clocks on that video console
node is initialized or not? and return an error if not.
But, unlike Linux U-Boot won't require to handle these
vopl assigned-clocks since core clocks are enough to
handle the video out to process.
So, mark them as empty in set_rate to satisfy clk_set_defaults
so-that probe happened properly.
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
---
Changes for v3:
- new patch
drivers/clk/rockchip/clk_rk3399.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/drivers/clk/rockchip/clk_rk3399.c b/drivers/clk/rockchip/clk_rk3399.c
index 865b80cc0f..1f62376595 100644
--- a/drivers/clk/rockchip/clk_rk3399.c
+++ b/drivers/clk/rockchip/clk_rk3399.c
@@ -994,6 +994,13 @@ static ulong rk3399_clk_set_rate(struct clk *clk, ulong rate)
case DCLK_VOP1:
ret = rk3399_vop_set_clk(priv->cru, clk->id, rate);
break;
+ case ACLK_VOP1:
+ case HCLK_VOP1:
+ /**
+ * assigned-clocks handling won't require for vopl, so
+ * return 0 to satisfy clk_set_defaults during device probe.
+ */
+ return 0;
case SCLK_DDRCLK:
ret = rk3399_ddr_set_clk(priv->cru, rate);
break;
--
2.17.1
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH v3 2/5] video: rockchip: Fix vop modes for rk3399
2020-04-02 11:41 ` Jagan Teki
@ 2020-04-02 11:41 ` Jagan Teki
-1 siblings, 0 replies; 34+ messages in thread
From: Jagan Teki @ 2020-04-02 11:41 UTC (permalink / raw)
To: Kever Yang, Simon Glass, Philipp Tomsich, Anatolij Gustschin
Cc: linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
u-boot-0aAXYlwwYIKGBzrmiIFOJg, Jagan Teki,
sunil-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/,
linux-amarula-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/,
Mark Kettenis
VOP display endpoint pipeline configuration is differs
between rk3288 vs rk3399.
These VOP pipeline configuration depends on how the
different display interfaces connected in sequence to
IN and OUT ports like for,
RK3288:
vopb_out: port {
#address-cells = <1>;
#size-cells = <0>;
vopb_out_edp: endpoint@0 {
reg = <0>;
remote-endpoint = <&edp_in_vopb>;
};
vopb_out_hdmi: endpoint@1 {
reg = <1>;
remote-endpoint = <&hdmi_in_vopb>;
};
vopb_out_lvds: endpoint@2 {
reg = <2>;
remote-endpoint = <&lvds_in_vopb>;
};
vopb_out_mipi: endpoint@3 {
reg = <3>;
remote-endpoint = <&mipi_in_vopb>;
};
};
RK3399:
vopb_out: port {
#address-cells = <1>;
#size-cells = <0>;
vopb_out_edp: endpoint@0 {
reg = <0>;
remote-endpoint = <&edp_in_vopb>;
};
vopb_out_mipi: endpoint@1 {
reg = <1>;
remote-endpoint = <&mipi_in_vopb>;
};
vopb_out_hdmi: endpoint@2 {
reg = <2>;
remote-endpoint = <&hdmi_in_vopb>;
};
vopb_out_mipi1: endpoint@3 {
reg = <3>;
remote-endpoint = <&mipi1_in_vopb>;
};
vopb_out_dp: endpoint@4 {
reg = <4>;
remote-endpoint = <&dp_in_vopb>;
};
};
here, HDMI interface has endpoint 1 in rk3288 and 2 in rk3399.
The rockchip vop driver often depends on this determined endpoint
number and stored in vop_mode. So based on this vop_mode the bpp
and pin polarity would configure on detected display interface.
Since, the existing driver using rk3288 vop mode settings enabling
the same will result wrong display interface configuration for rk3399.
Add the patch for fixing these vop modes for rk3399.
Signed-off-by: Jagan Teki <jagan-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org>
---
arch/arm/include/asm/arch-rockchip/vop_rk3288.h | 11 +++++++++++
drivers/video/rockchip/rk3399_vop.c | 2 --
drivers/video/rockchip/rk_vop.c | 4 ++++
3 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/arch/arm/include/asm/arch-rockchip/vop_rk3288.h b/arch/arm/include/asm/arch-rockchip/vop_rk3288.h
index 8398249509..872a158b71 100644
--- a/arch/arm/include/asm/arch-rockchip/vop_rk3288.h
+++ b/arch/arm/include/asm/arch-rockchip/vop_rk3288.h
@@ -85,6 +85,16 @@ enum {
LB_RGB_1280X8 = 0x5
};
+#if defined(CONFIG_ROCKCHIP_RK3399)
+enum vop_modes {
+ VOP_MODE_EDP = 0,
+ VOP_MODE_MIPI,
+ VOP_MODE_HDMI,
+ VOP_MODE_MIPI1,
+ VOP_MODE_DP,
+ VOP_MODE_NONE,
+};
+#else
enum vop_modes {
VOP_MODE_EDP = 0,
VOP_MODE_HDMI,
@@ -94,6 +104,7 @@ enum vop_modes {
VOP_MODE_AUTO_DETECT,
VOP_MODE_UNKNOWN,
};
+#endif
/* VOP_VERSION_INFO */
#define M_FPGA_VERSION (0xffff << 16)
diff --git a/drivers/video/rockchip/rk3399_vop.c b/drivers/video/rockchip/rk3399_vop.c
index 81c122d7a9..1d5b3931a6 100644
--- a/drivers/video/rockchip/rk3399_vop.c
+++ b/drivers/video/rockchip/rk3399_vop.c
@@ -45,8 +45,6 @@ static void rk3399_set_pin_polarity(struct udevice *dev,
V_RK3399_DSP_MIPI_POL(polarity));
break;
- case VOP_MODE_LVDS:
- /* The RK3399 has neither parallel RGB nor LVDS output. */
default:
debug("%s: unsupported output mode %x\n", __func__, mode);
}
diff --git a/drivers/video/rockchip/rk_vop.c b/drivers/video/rockchip/rk_vop.c
index e91d4dfa7f..e1bd656bee 100644
--- a/drivers/video/rockchip/rk_vop.c
+++ b/drivers/video/rockchip/rk_vop.c
@@ -118,10 +118,12 @@ static void rkvop_enable_output(struct udevice *dev, enum vop_modes mode)
V_EDP_OUT_EN(1));
break;
+#if defined(CONFIG_ROCKCHIP_RK3288)
case VOP_MODE_LVDS:
clrsetbits_le32(®s->sys_ctrl, M_ALL_OUT_EN,
V_RGB_OUT_EN(1));
break;
+#endif
case VOP_MODE_MIPI:
clrsetbits_le32(®s->sys_ctrl, M_ALL_OUT_EN,
@@ -313,7 +315,9 @@ static int rk_display_init(struct udevice *dev, ulong fbbase, ofnode ep_node)
/* Set bitwidth for vop display according to vop mode */
switch (vop_id) {
case VOP_MODE_EDP:
+#if defined(CONFIG_ROCKCHIP_RK3288)
case VOP_MODE_LVDS:
+#endif
l2bpp = VIDEO_BPP16;
break;
case VOP_MODE_HDMI:
--
2.17.1
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH v3 2/5] video: rockchip: Fix vop modes for rk3399
@ 2020-04-02 11:41 ` Jagan Teki
0 siblings, 0 replies; 34+ messages in thread
From: Jagan Teki @ 2020-04-02 11:41 UTC (permalink / raw)
To: u-boot
VOP display endpoint pipeline configuration is differs
between rk3288 vs rk3399.
These VOP pipeline configuration depends on how the
different display interfaces connected in sequence to
IN and OUT ports like for,
RK3288:
vopb_out: port {
#address-cells = <1>;
#size-cells = <0>;
vopb_out_edp: endpoint at 0 {
reg = <0>;
remote-endpoint = <&edp_in_vopb>;
};
vopb_out_hdmi: endpoint at 1 {
reg = <1>;
remote-endpoint = <&hdmi_in_vopb>;
};
vopb_out_lvds: endpoint at 2 {
reg = <2>;
remote-endpoint = <&lvds_in_vopb>;
};
vopb_out_mipi: endpoint at 3 {
reg = <3>;
remote-endpoint = <&mipi_in_vopb>;
};
};
RK3399:
vopb_out: port {
#address-cells = <1>;
#size-cells = <0>;
vopb_out_edp: endpoint at 0 {
reg = <0>;
remote-endpoint = <&edp_in_vopb>;
};
vopb_out_mipi: endpoint at 1 {
reg = <1>;
remote-endpoint = <&mipi_in_vopb>;
};
vopb_out_hdmi: endpoint at 2 {
reg = <2>;
remote-endpoint = <&hdmi_in_vopb>;
};
vopb_out_mipi1: endpoint at 3 {
reg = <3>;
remote-endpoint = <&mipi1_in_vopb>;
};
vopb_out_dp: endpoint at 4 {
reg = <4>;
remote-endpoint = <&dp_in_vopb>;
};
};
here, HDMI interface has endpoint 1 in rk3288 and 2 in rk3399.
The rockchip vop driver often depends on this determined endpoint
number and stored in vop_mode. So based on this vop_mode the bpp
and pin polarity would configure on detected display interface.
Since, the existing driver using rk3288 vop mode settings enabling
the same will result wrong display interface configuration for rk3399.
Add the patch for fixing these vop modes for rk3399.
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
---
arch/arm/include/asm/arch-rockchip/vop_rk3288.h | 11 +++++++++++
drivers/video/rockchip/rk3399_vop.c | 2 --
drivers/video/rockchip/rk_vop.c | 4 ++++
3 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/arch/arm/include/asm/arch-rockchip/vop_rk3288.h b/arch/arm/include/asm/arch-rockchip/vop_rk3288.h
index 8398249509..872a158b71 100644
--- a/arch/arm/include/asm/arch-rockchip/vop_rk3288.h
+++ b/arch/arm/include/asm/arch-rockchip/vop_rk3288.h
@@ -85,6 +85,16 @@ enum {
LB_RGB_1280X8 = 0x5
};
+#if defined(CONFIG_ROCKCHIP_RK3399)
+enum vop_modes {
+ VOP_MODE_EDP = 0,
+ VOP_MODE_MIPI,
+ VOP_MODE_HDMI,
+ VOP_MODE_MIPI1,
+ VOP_MODE_DP,
+ VOP_MODE_NONE,
+};
+#else
enum vop_modes {
VOP_MODE_EDP = 0,
VOP_MODE_HDMI,
@@ -94,6 +104,7 @@ enum vop_modes {
VOP_MODE_AUTO_DETECT,
VOP_MODE_UNKNOWN,
};
+#endif
/* VOP_VERSION_INFO */
#define M_FPGA_VERSION (0xffff << 16)
diff --git a/drivers/video/rockchip/rk3399_vop.c b/drivers/video/rockchip/rk3399_vop.c
index 81c122d7a9..1d5b3931a6 100644
--- a/drivers/video/rockchip/rk3399_vop.c
+++ b/drivers/video/rockchip/rk3399_vop.c
@@ -45,8 +45,6 @@ static void rk3399_set_pin_polarity(struct udevice *dev,
V_RK3399_DSP_MIPI_POL(polarity));
break;
- case VOP_MODE_LVDS:
- /* The RK3399 has neither parallel RGB nor LVDS output. */
default:
debug("%s: unsupported output mode %x\n", __func__, mode);
}
diff --git a/drivers/video/rockchip/rk_vop.c b/drivers/video/rockchip/rk_vop.c
index e91d4dfa7f..e1bd656bee 100644
--- a/drivers/video/rockchip/rk_vop.c
+++ b/drivers/video/rockchip/rk_vop.c
@@ -118,10 +118,12 @@ static void rkvop_enable_output(struct udevice *dev, enum vop_modes mode)
V_EDP_OUT_EN(1));
break;
+#if defined(CONFIG_ROCKCHIP_RK3288)
case VOP_MODE_LVDS:
clrsetbits_le32(®s->sys_ctrl, M_ALL_OUT_EN,
V_RGB_OUT_EN(1));
break;
+#endif
case VOP_MODE_MIPI:
clrsetbits_le32(®s->sys_ctrl, M_ALL_OUT_EN,
@@ -313,7 +315,9 @@ static int rk_display_init(struct udevice *dev, ulong fbbase, ofnode ep_node)
/* Set bitwidth for vop display according to vop mode */
switch (vop_id) {
case VOP_MODE_EDP:
+#if defined(CONFIG_ROCKCHIP_RK3288)
case VOP_MODE_LVDS:
+#endif
l2bpp = VIDEO_BPP16;
break;
case VOP_MODE_HDMI:
--
2.17.1
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH v3 3/5] rockchip: Enable pre console for rk3399
2020-04-02 11:41 ` Jagan Teki
@ 2020-04-02 11:41 ` Jagan Teki
-1 siblings, 0 replies; 34+ messages in thread
From: Jagan Teki @ 2020-04-02 11:41 UTC (permalink / raw)
To: Kever Yang, Simon Glass, Philipp Tomsich, Anatolij Gustschin
Cc: linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
u-boot-0aAXYlwwYIKGBzrmiIFOJg, Jagan Teki,
sunil-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/,
linux-amarula-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/,
Mark Kettenis
Enable pre console buffer for rk3399 platform.
This would help to capture the console messages prior to
the console being initialised. Enabling this would help
to capture all the console messages on video output source
like HDMI. So we can find the full console messages of
U-Boot proper on HDMI display when enabled it for RK3399
platform boards.
Buffer address used for pre console is 0x0f200000 which is
ram base plus 240MiB. right now the Allwinner SoC is using
similar computation.
Signed-off-by: Jagan Teki <jagan-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org>
---
arch/arm/mach-rockchip/Kconfig | 1 +
common/Kconfig | 1 +
2 files changed, 2 insertions(+)
diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig
index ed7514ab75..0cb1f23d0f 100644
--- a/arch/arm/mach-rockchip/Kconfig
+++ b/arch/arm/mach-rockchip/Kconfig
@@ -229,6 +229,7 @@ config ROCKCHIP_RK3399
select DM_PMIC
select DM_REGULATOR_FIXED
select BOARD_LATE_INIT
+ imply PRE_CONSOLE_BUFFER
imply ROCKCHIP_COMMON_BOARD
imply ROCKCHIP_SDRAM_COMMON
imply SPL_ROCKCHIP_COMMON_BOARD
diff --git a/common/Kconfig b/common/Kconfig
index 46e4193fc8..bd35de3056 100644
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -568,6 +568,7 @@ config PRE_CON_BUF_ADDR
default 0x2f000000 if ARCH_SUNXI && MACH_SUN9I
default 0x4f000000 if ARCH_SUNXI && !MACH_SUN9I
default 0x0f000000 if ROCKCHIP_RK3288
+ default 0x0f200000 if ROCKCHIP_RK3399
help
This sets the start address of the pre-console buffer. This must
be in available memory and is accessed before relocation and
--
2.17.1
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH v3 3/5] rockchip: Enable pre console for rk3399
@ 2020-04-02 11:41 ` Jagan Teki
0 siblings, 0 replies; 34+ messages in thread
From: Jagan Teki @ 2020-04-02 11:41 UTC (permalink / raw)
To: u-boot
Enable pre console buffer for rk3399 platform.
This would help to capture the console messages prior to
the console being initialised. Enabling this would help
to capture all the console messages on video output source
like HDMI. So we can find the full console messages of
U-Boot proper on HDMI display when enabled it for RK3399
platform boards.
Buffer address used for pre console is 0x0f200000 which is
ram base plus 240MiB. right now the Allwinner SoC is using
similar computation.
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
---
arch/arm/mach-rockchip/Kconfig | 1 +
common/Kconfig | 1 +
2 files changed, 2 insertions(+)
diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig
index ed7514ab75..0cb1f23d0f 100644
--- a/arch/arm/mach-rockchip/Kconfig
+++ b/arch/arm/mach-rockchip/Kconfig
@@ -229,6 +229,7 @@ config ROCKCHIP_RK3399
select DM_PMIC
select DM_REGULATOR_FIXED
select BOARD_LATE_INIT
+ imply PRE_CONSOLE_BUFFER
imply ROCKCHIP_COMMON_BOARD
imply ROCKCHIP_SDRAM_COMMON
imply SPL_ROCKCHIP_COMMON_BOARD
diff --git a/common/Kconfig b/common/Kconfig
index 46e4193fc8..bd35de3056 100644
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -568,6 +568,7 @@ config PRE_CON_BUF_ADDR
default 0x2f000000 if ARCH_SUNXI && MACH_SUN9I
default 0x4f000000 if ARCH_SUNXI && !MACH_SUN9I
default 0x0f000000 if ROCKCHIP_RK3288
+ default 0x0f200000 if ROCKCHIP_RK3399
help
This sets the start address of the pre-console buffer. This must
be in available memory and is accessed before relocation and
--
2.17.1
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH v3 4/5] rockchip: Enable HDMI output on rk3399 board w/ HDMI
2020-04-02 11:41 ` Jagan Teki
@ 2020-04-02 11:41 ` Jagan Teki
-1 siblings, 0 replies; 34+ messages in thread
From: Jagan Teki @ 2020-04-02 11:41 UTC (permalink / raw)
To: Kever Yang, Simon Glass, Philipp Tomsich, Anatolij Gustschin
Cc: linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
Manivannan Sadhasivam, u-boot-0aAXYlwwYIKGBzrmiIFOJg, Jagan Teki,
sunil-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/,
linux-amarula-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/,
Mark Kettenis
Enable config options and console setting to respective
rk3399 board for HDMI output.
Boards supported and tested on this patch are:
- NanoPc T4
- NanoPi M4
- NanoPi Neo4
- ROC-RK3399-PC
- Rock960
Cc: Manivannan Sadhasivam <manivannan.sadhasivam-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
Signed-off-by: Jagan Teki <jagan-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org>
---
Changes for v3:
- add rock960 hdmi out support
configs/nanopc-t4-rk3399_defconfig | 7 +++++++
configs/nanopi-m4-rk3399_defconfig | 7 +++++++
configs/nanopi-neo4-rk3399_defconfig | 7 +++++++
configs/roc-pc-rk3399_defconfig | 6 ++++++
configs/rock960-rk3399_defconfig | 7 +++++++
include/configs/evb_rk3399.h | 5 +++++
include/configs/rock960_rk3399.h | 5 +++++
7 files changed, 44 insertions(+)
diff --git a/configs/nanopc-t4-rk3399_defconfig b/configs/nanopc-t4-rk3399_defconfig
index 9ea9b11574..607a00dbf7 100644
--- a/configs/nanopc-t4-rk3399_defconfig
+++ b/configs/nanopc-t4-rk3399_defconfig
@@ -52,5 +52,12 @@ CONFIG_USB_ETHER_ASIX88179=y
CONFIG_USB_ETHER_MCS7830=y
CONFIG_USB_ETHER_RTL8152=y
CONFIG_USB_ETHER_SMSC95XX=y
+CONFIG_USB_KEYBOARD=y
CONFIG_SPL_TINY_MEMSET=y
CONFIG_ERRNO_STR=y
+CONFIG_DM_VIDEO=y
+CONFIG_VIDEO_BPP16=y
+CONFIG_VIDEO_BPP32=y
+CONFIG_DISPLAY=y
+CONFIG_VIDEO_ROCKCHIP=y
+CONFIG_DISPLAY_ROCKCHIP_HDMI=y
diff --git a/configs/nanopi-m4-rk3399_defconfig b/configs/nanopi-m4-rk3399_defconfig
index ad0e808bf6..3fcb7ac2d7 100644
--- a/configs/nanopi-m4-rk3399_defconfig
+++ b/configs/nanopi-m4-rk3399_defconfig
@@ -52,5 +52,12 @@ CONFIG_USB_ETHER_ASIX88179=y
CONFIG_USB_ETHER_MCS7830=y
CONFIG_USB_ETHER_RTL8152=y
CONFIG_USB_ETHER_SMSC95XX=y
+CONFIG_USB_KEYBOARD=y
CONFIG_SPL_TINY_MEMSET=y
CONFIG_ERRNO_STR=y
+CONFIG_DM_VIDEO=y
+CONFIG_VIDEO_BPP16=y
+CONFIG_VIDEO_BPP32=y
+CONFIG_DISPLAY=y
+CONFIG_VIDEO_ROCKCHIP=y
+CONFIG_DISPLAY_ROCKCHIP_HDMI=y
diff --git a/configs/nanopi-neo4-rk3399_defconfig b/configs/nanopi-neo4-rk3399_defconfig
index d038a8cab9..b9ea535e43 100644
--- a/configs/nanopi-neo4-rk3399_defconfig
+++ b/configs/nanopi-neo4-rk3399_defconfig
@@ -52,5 +52,12 @@ CONFIG_USB_ETHER_ASIX88179=y
CONFIG_USB_ETHER_MCS7830=y
CONFIG_USB_ETHER_RTL8152=y
CONFIG_USB_ETHER_SMSC95XX=y
+CONFIG_USB_KEYBOARD=y
CONFIG_SPL_TINY_MEMSET=y
CONFIG_ERRNO_STR=y
+CONFIG_DM_VIDEO=y
+CONFIG_VIDEO_BPP16=y
+CONFIG_VIDEO_BPP32=y
+CONFIG_DISPLAY=y
+CONFIG_VIDEO_ROCKCHIP=y
+CONFIG_DISPLAY_ROCKCHIP_HDMI=y
diff --git a/configs/roc-pc-rk3399_defconfig b/configs/roc-pc-rk3399_defconfig
index d540a17aeb..be76524cef 100644
--- a/configs/roc-pc-rk3399_defconfig
+++ b/configs/roc-pc-rk3399_defconfig
@@ -59,3 +59,9 @@ CONFIG_USB_ETHER_SMSC95XX=y
CONFIG_USB_KEYBOARD=y
CONFIG_SPL_TINY_MEMSET=y
CONFIG_ERRNO_STR=y
+CONFIG_DM_VIDEO=y
+CONFIG_VIDEO_BPP16=y
+CONFIG_VIDEO_BPP32=y
+CONFIG_DISPLAY=y
+CONFIG_VIDEO_ROCKCHIP=y
+CONFIG_DISPLAY_ROCKCHIP_HDMI=y
diff --git a/configs/rock960-rk3399_defconfig b/configs/rock960-rk3399_defconfig
index ba4226e173..c4e954731a 100644
--- a/configs/rock960-rk3399_defconfig
+++ b/configs/rock960-rk3399_defconfig
@@ -58,5 +58,12 @@ CONFIG_USB_ETHER_ASIX88179=y
CONFIG_USB_ETHER_MCS7830=y
CONFIG_USB_ETHER_RTL8152=y
CONFIG_USB_ETHER_SMSC95XX=y
+CONFIG_USB_KEYBOARD=y
CONFIG_SPL_TINY_MEMSET=y
CONFIG_ERRNO_STR=y
+CONFIG_DM_VIDEO=y
+CONFIG_VIDEO_BPP16=y
+CONFIG_VIDEO_BPP32=y
+CONFIG_DISPLAY=y
+CONFIG_VIDEO_ROCKCHIP=y
+CONFIG_DISPLAY_ROCKCHIP_HDMI=y
diff --git a/include/configs/evb_rk3399.h b/include/configs/evb_rk3399.h
index c0b0358893..2d3db22877 100644
--- a/include/configs/evb_rk3399.h
+++ b/include/configs/evb_rk3399.h
@@ -6,6 +6,11 @@
#ifndef __EVB_RK3399_H
#define __EVB_RK3399_H
+#define ROCKCHIP_DEVICE_SETTINGS \
+ "stdin=serial,usbkbd\0" \
+ "stdout=serial,vidconsole\0" \
+ "stderr=serial,vidconsole\0"
+
#include <configs/rk3399_common.h>
#if defined(CONFIG_ENV_IS_IN_MMC)
diff --git a/include/configs/rock960_rk3399.h b/include/configs/rock960_rk3399.h
index 746d24cbff..304ad2b7aa 100644
--- a/include/configs/rock960_rk3399.h
+++ b/include/configs/rock960_rk3399.h
@@ -6,6 +6,11 @@
#ifndef __ROCK960_RK3399_H
#define __ROCK960_RK3399_H
+#define ROCKCHIP_DEVICE_SETTINGS \
+ "stdin=serial,usbkbd\0" \
+ "stdout=serial,vidconsole\0" \
+ "stderr=serial,vidconsole\0"
+
#include <configs/rk3399_common.h>
#define CONFIG_SYS_MMC_ENV_DEV 1
--
2.17.1
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH v3 4/5] rockchip: Enable HDMI output on rk3399 board w/ HDMI
@ 2020-04-02 11:41 ` Jagan Teki
0 siblings, 0 replies; 34+ messages in thread
From: Jagan Teki @ 2020-04-02 11:41 UTC (permalink / raw)
To: u-boot
Enable config options and console setting to respective
rk3399 board for HDMI output.
Boards supported and tested on this patch are:
- NanoPc T4
- NanoPi M4
- NanoPi Neo4
- ROC-RK3399-PC
- Rock960
Cc: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
---
Changes for v3:
- add rock960 hdmi out support
configs/nanopc-t4-rk3399_defconfig | 7 +++++++
configs/nanopi-m4-rk3399_defconfig | 7 +++++++
configs/nanopi-neo4-rk3399_defconfig | 7 +++++++
configs/roc-pc-rk3399_defconfig | 6 ++++++
configs/rock960-rk3399_defconfig | 7 +++++++
include/configs/evb_rk3399.h | 5 +++++
include/configs/rock960_rk3399.h | 5 +++++
7 files changed, 44 insertions(+)
diff --git a/configs/nanopc-t4-rk3399_defconfig b/configs/nanopc-t4-rk3399_defconfig
index 9ea9b11574..607a00dbf7 100644
--- a/configs/nanopc-t4-rk3399_defconfig
+++ b/configs/nanopc-t4-rk3399_defconfig
@@ -52,5 +52,12 @@ CONFIG_USB_ETHER_ASIX88179=y
CONFIG_USB_ETHER_MCS7830=y
CONFIG_USB_ETHER_RTL8152=y
CONFIG_USB_ETHER_SMSC95XX=y
+CONFIG_USB_KEYBOARD=y
CONFIG_SPL_TINY_MEMSET=y
CONFIG_ERRNO_STR=y
+CONFIG_DM_VIDEO=y
+CONFIG_VIDEO_BPP16=y
+CONFIG_VIDEO_BPP32=y
+CONFIG_DISPLAY=y
+CONFIG_VIDEO_ROCKCHIP=y
+CONFIG_DISPLAY_ROCKCHIP_HDMI=y
diff --git a/configs/nanopi-m4-rk3399_defconfig b/configs/nanopi-m4-rk3399_defconfig
index ad0e808bf6..3fcb7ac2d7 100644
--- a/configs/nanopi-m4-rk3399_defconfig
+++ b/configs/nanopi-m4-rk3399_defconfig
@@ -52,5 +52,12 @@ CONFIG_USB_ETHER_ASIX88179=y
CONFIG_USB_ETHER_MCS7830=y
CONFIG_USB_ETHER_RTL8152=y
CONFIG_USB_ETHER_SMSC95XX=y
+CONFIG_USB_KEYBOARD=y
CONFIG_SPL_TINY_MEMSET=y
CONFIG_ERRNO_STR=y
+CONFIG_DM_VIDEO=y
+CONFIG_VIDEO_BPP16=y
+CONFIG_VIDEO_BPP32=y
+CONFIG_DISPLAY=y
+CONFIG_VIDEO_ROCKCHIP=y
+CONFIG_DISPLAY_ROCKCHIP_HDMI=y
diff --git a/configs/nanopi-neo4-rk3399_defconfig b/configs/nanopi-neo4-rk3399_defconfig
index d038a8cab9..b9ea535e43 100644
--- a/configs/nanopi-neo4-rk3399_defconfig
+++ b/configs/nanopi-neo4-rk3399_defconfig
@@ -52,5 +52,12 @@ CONFIG_USB_ETHER_ASIX88179=y
CONFIG_USB_ETHER_MCS7830=y
CONFIG_USB_ETHER_RTL8152=y
CONFIG_USB_ETHER_SMSC95XX=y
+CONFIG_USB_KEYBOARD=y
CONFIG_SPL_TINY_MEMSET=y
CONFIG_ERRNO_STR=y
+CONFIG_DM_VIDEO=y
+CONFIG_VIDEO_BPP16=y
+CONFIG_VIDEO_BPP32=y
+CONFIG_DISPLAY=y
+CONFIG_VIDEO_ROCKCHIP=y
+CONFIG_DISPLAY_ROCKCHIP_HDMI=y
diff --git a/configs/roc-pc-rk3399_defconfig b/configs/roc-pc-rk3399_defconfig
index d540a17aeb..be76524cef 100644
--- a/configs/roc-pc-rk3399_defconfig
+++ b/configs/roc-pc-rk3399_defconfig
@@ -59,3 +59,9 @@ CONFIG_USB_ETHER_SMSC95XX=y
CONFIG_USB_KEYBOARD=y
CONFIG_SPL_TINY_MEMSET=y
CONFIG_ERRNO_STR=y
+CONFIG_DM_VIDEO=y
+CONFIG_VIDEO_BPP16=y
+CONFIG_VIDEO_BPP32=y
+CONFIG_DISPLAY=y
+CONFIG_VIDEO_ROCKCHIP=y
+CONFIG_DISPLAY_ROCKCHIP_HDMI=y
diff --git a/configs/rock960-rk3399_defconfig b/configs/rock960-rk3399_defconfig
index ba4226e173..c4e954731a 100644
--- a/configs/rock960-rk3399_defconfig
+++ b/configs/rock960-rk3399_defconfig
@@ -58,5 +58,12 @@ CONFIG_USB_ETHER_ASIX88179=y
CONFIG_USB_ETHER_MCS7830=y
CONFIG_USB_ETHER_RTL8152=y
CONFIG_USB_ETHER_SMSC95XX=y
+CONFIG_USB_KEYBOARD=y
CONFIG_SPL_TINY_MEMSET=y
CONFIG_ERRNO_STR=y
+CONFIG_DM_VIDEO=y
+CONFIG_VIDEO_BPP16=y
+CONFIG_VIDEO_BPP32=y
+CONFIG_DISPLAY=y
+CONFIG_VIDEO_ROCKCHIP=y
+CONFIG_DISPLAY_ROCKCHIP_HDMI=y
diff --git a/include/configs/evb_rk3399.h b/include/configs/evb_rk3399.h
index c0b0358893..2d3db22877 100644
--- a/include/configs/evb_rk3399.h
+++ b/include/configs/evb_rk3399.h
@@ -6,6 +6,11 @@
#ifndef __EVB_RK3399_H
#define __EVB_RK3399_H
+#define ROCKCHIP_DEVICE_SETTINGS \
+ "stdin=serial,usbkbd\0" \
+ "stdout=serial,vidconsole\0" \
+ "stderr=serial,vidconsole\0"
+
#include <configs/rk3399_common.h>
#if defined(CONFIG_ENV_IS_IN_MMC)
diff --git a/include/configs/rock960_rk3399.h b/include/configs/rock960_rk3399.h
index 746d24cbff..304ad2b7aa 100644
--- a/include/configs/rock960_rk3399.h
+++ b/include/configs/rock960_rk3399.h
@@ -6,6 +6,11 @@
#ifndef __ROCK960_RK3399_H
#define __ROCK960_RK3399_H
+#define ROCKCHIP_DEVICE_SETTINGS \
+ "stdin=serial,usbkbd\0" \
+ "stdout=serial,vidconsole\0" \
+ "stderr=serial,vidconsole\0"
+
#include <configs/rk3399_common.h>
#define CONFIG_SYS_MMC_ENV_DEV 1
--
2.17.1
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH v3 5/5] video: rockchip: Support 4K resolution for rk3399, HDMI
2020-04-02 11:41 ` Jagan Teki
@ 2020-04-02 11:41 ` Jagan Teki
-1 siblings, 0 replies; 34+ messages in thread
From: Jagan Teki @ 2020-04-02 11:41 UTC (permalink / raw)
To: Kever Yang, Simon Glass, Philipp Tomsich, Anatolij Gustschin
Cc: linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
u-boot-0aAXYlwwYIKGBzrmiIFOJg, Jagan Teki,
sunil-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/,
linux-amarula-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/,
Mark Kettenis
The default resolution for rockchip display is 1920x1080
which failed to work on 4K HDMI out displays on rk3399.
So, mark the default resolution as 3480x2160 for rk3399
HDMI out.
This would work all the hdmi display resolutions till
4K.
Signed-off-by: Jagan Teki <jagan-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org>
---
Changes for v3:
- new patch
drivers/video/rockchip/Kconfig | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/video/rockchip/Kconfig b/drivers/video/rockchip/Kconfig
index 10182d0b66..cfd774ead6 100644
--- a/drivers/video/rockchip/Kconfig
+++ b/drivers/video/rockchip/Kconfig
@@ -22,6 +22,7 @@ menuconfig VIDEO_ROCKCHIP
config VIDEO_ROCKCHIP_MAX_XRES
int "Maximum horizontal resolution (for memory allocation purposes)"
depends on VIDEO_ROCKCHIP
+ default 3480 if ROCKCHIP_RK3399 && DISPLAY_ROCKCHIP_HDMI
default 1920
help
The maximum horizontal resolution to support for the framebuffer.
@@ -31,6 +32,7 @@ config VIDEO_ROCKCHIP_MAX_XRES
config VIDEO_ROCKCHIP_MAX_YRES
int "Maximum vertical resolution (for memory allocation purposes)"
depends on VIDEO_ROCKCHIP
+ default 2160 if ROCKCHIP_RK3399 && DISPLAY_ROCKCHIP_HDMI
default 1080
help
The maximum vertical resolution to support for the framebuffer.
--
2.17.1
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH v3 5/5] video: rockchip: Support 4K resolution for rk3399, HDMI
@ 2020-04-02 11:41 ` Jagan Teki
0 siblings, 0 replies; 34+ messages in thread
From: Jagan Teki @ 2020-04-02 11:41 UTC (permalink / raw)
To: u-boot
The default resolution for rockchip display is 1920x1080
which failed to work on 4K HDMI out displays on rk3399.
So, mark the default resolution as 3480x2160 for rk3399
HDMI out.
This would work all the hdmi display resolutions till
4K.
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
---
Changes for v3:
- new patch
drivers/video/rockchip/Kconfig | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/video/rockchip/Kconfig b/drivers/video/rockchip/Kconfig
index 10182d0b66..cfd774ead6 100644
--- a/drivers/video/rockchip/Kconfig
+++ b/drivers/video/rockchip/Kconfig
@@ -22,6 +22,7 @@ menuconfig VIDEO_ROCKCHIP
config VIDEO_ROCKCHIP_MAX_XRES
int "Maximum horizontal resolution (for memory allocation purposes)"
depends on VIDEO_ROCKCHIP
+ default 3480 if ROCKCHIP_RK3399 && DISPLAY_ROCKCHIP_HDMI
default 1920
help
The maximum horizontal resolution to support for the framebuffer.
@@ -31,6 +32,7 @@ config VIDEO_ROCKCHIP_MAX_XRES
config VIDEO_ROCKCHIP_MAX_YRES
int "Maximum vertical resolution (for memory allocation purposes)"
depends on VIDEO_ROCKCHIP
+ default 2160 if ROCKCHIP_RK3399 && DISPLAY_ROCKCHIP_HDMI
default 1080
help
The maximum vertical resolution to support for the framebuffer.
--
2.17.1
^ permalink raw reply related [flat|nested] 34+ messages in thread
* Re: [PATCH v3 4/5] rockchip: Enable HDMI output on rk3399 board w/ HDMI
2020-04-02 11:41 ` Jagan Teki
@ 2020-04-02 12:38 ` Peter Robinson
-1 siblings, 0 replies; 34+ messages in thread
From: Peter Robinson @ 2020-04-02 12:38 UTC (permalink / raw)
To: Jagan Teki
Cc: Philipp Tomsich, linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
Simon Glass, Manivannan Sadhasivam, Kever Yang,
u-boot-0aAXYlwwYIKGBzrmiIFOJg,
sunil-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/,
Anatolij Gustschin,
linux-amarula-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/,
Mark Kettenis
> Enable config options and console setting to respective
> rk3399 board for HDMI output.
>
> Boards supported and tested on this patch are:
> - NanoPc T4
> - NanoPi M4
> - NanoPi Neo4
> - ROC-RK3399-PC
> - Rock960
>
> Cc: Manivannan Sadhasivam <manivannan.sadhasivam-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
> Signed-off-by: Jagan Teki <jagan-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org>
Tested-by: Peter Robinson <pbrobinson-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Tested on the Rock960 rev 1.2, I'm guessing the firefly-rk3399 should
be able to be enabled in a similar manner, will try and test that as
well when I get a moment.
> ---
> Changes for v3:
> - add rock960 hdmi out support
>
> configs/nanopc-t4-rk3399_defconfig | 7 +++++++
> configs/nanopi-m4-rk3399_defconfig | 7 +++++++
> configs/nanopi-neo4-rk3399_defconfig | 7 +++++++
> configs/roc-pc-rk3399_defconfig | 6 ++++++
> configs/rock960-rk3399_defconfig | 7 +++++++
> include/configs/evb_rk3399.h | 5 +++++
> include/configs/rock960_rk3399.h | 5 +++++
> 7 files changed, 44 insertions(+)
>
> diff --git a/configs/nanopc-t4-rk3399_defconfig b/configs/nanopc-t4-rk3399_defconfig
> index 9ea9b11574..607a00dbf7 100644
> --- a/configs/nanopc-t4-rk3399_defconfig
> +++ b/configs/nanopc-t4-rk3399_defconfig
> @@ -52,5 +52,12 @@ CONFIG_USB_ETHER_ASIX88179=y
> CONFIG_USB_ETHER_MCS7830=y
> CONFIG_USB_ETHER_RTL8152=y
> CONFIG_USB_ETHER_SMSC95XX=y
> +CONFIG_USB_KEYBOARD=y
> CONFIG_SPL_TINY_MEMSET=y
> CONFIG_ERRNO_STR=y
> +CONFIG_DM_VIDEO=y
> +CONFIG_VIDEO_BPP16=y
> +CONFIG_VIDEO_BPP32=y
> +CONFIG_DISPLAY=y
> +CONFIG_VIDEO_ROCKCHIP=y
> +CONFIG_DISPLAY_ROCKCHIP_HDMI=y
> diff --git a/configs/nanopi-m4-rk3399_defconfig b/configs/nanopi-m4-rk3399_defconfig
> index ad0e808bf6..3fcb7ac2d7 100644
> --- a/configs/nanopi-m4-rk3399_defconfig
> +++ b/configs/nanopi-m4-rk3399_defconfig
> @@ -52,5 +52,12 @@ CONFIG_USB_ETHER_ASIX88179=y
> CONFIG_USB_ETHER_MCS7830=y
> CONFIG_USB_ETHER_RTL8152=y
> CONFIG_USB_ETHER_SMSC95XX=y
> +CONFIG_USB_KEYBOARD=y
> CONFIG_SPL_TINY_MEMSET=y
> CONFIG_ERRNO_STR=y
> +CONFIG_DM_VIDEO=y
> +CONFIG_VIDEO_BPP16=y
> +CONFIG_VIDEO_BPP32=y
> +CONFIG_DISPLAY=y
> +CONFIG_VIDEO_ROCKCHIP=y
> +CONFIG_DISPLAY_ROCKCHIP_HDMI=y
> diff --git a/configs/nanopi-neo4-rk3399_defconfig b/configs/nanopi-neo4-rk3399_defconfig
> index d038a8cab9..b9ea535e43 100644
> --- a/configs/nanopi-neo4-rk3399_defconfig
> +++ b/configs/nanopi-neo4-rk3399_defconfig
> @@ -52,5 +52,12 @@ CONFIG_USB_ETHER_ASIX88179=y
> CONFIG_USB_ETHER_MCS7830=y
> CONFIG_USB_ETHER_RTL8152=y
> CONFIG_USB_ETHER_SMSC95XX=y
> +CONFIG_USB_KEYBOARD=y
> CONFIG_SPL_TINY_MEMSET=y
> CONFIG_ERRNO_STR=y
> +CONFIG_DM_VIDEO=y
> +CONFIG_VIDEO_BPP16=y
> +CONFIG_VIDEO_BPP32=y
> +CONFIG_DISPLAY=y
> +CONFIG_VIDEO_ROCKCHIP=y
> +CONFIG_DISPLAY_ROCKCHIP_HDMI=y
> diff --git a/configs/roc-pc-rk3399_defconfig b/configs/roc-pc-rk3399_defconfig
> index d540a17aeb..be76524cef 100644
> --- a/configs/roc-pc-rk3399_defconfig
> +++ b/configs/roc-pc-rk3399_defconfig
> @@ -59,3 +59,9 @@ CONFIG_USB_ETHER_SMSC95XX=y
> CONFIG_USB_KEYBOARD=y
> CONFIG_SPL_TINY_MEMSET=y
> CONFIG_ERRNO_STR=y
> +CONFIG_DM_VIDEO=y
> +CONFIG_VIDEO_BPP16=y
> +CONFIG_VIDEO_BPP32=y
> +CONFIG_DISPLAY=y
> +CONFIG_VIDEO_ROCKCHIP=y
> +CONFIG_DISPLAY_ROCKCHIP_HDMI=y
> diff --git a/configs/rock960-rk3399_defconfig b/configs/rock960-rk3399_defconfig
> index ba4226e173..c4e954731a 100644
> --- a/configs/rock960-rk3399_defconfig
> +++ b/configs/rock960-rk3399_defconfig
> @@ -58,5 +58,12 @@ CONFIG_USB_ETHER_ASIX88179=y
> CONFIG_USB_ETHER_MCS7830=y
> CONFIG_USB_ETHER_RTL8152=y
> CONFIG_USB_ETHER_SMSC95XX=y
> +CONFIG_USB_KEYBOARD=y
> CONFIG_SPL_TINY_MEMSET=y
> CONFIG_ERRNO_STR=y
> +CONFIG_DM_VIDEO=y
> +CONFIG_VIDEO_BPP16=y
> +CONFIG_VIDEO_BPP32=y
> +CONFIG_DISPLAY=y
> +CONFIG_VIDEO_ROCKCHIP=y
> +CONFIG_DISPLAY_ROCKCHIP_HDMI=y
> diff --git a/include/configs/evb_rk3399.h b/include/configs/evb_rk3399.h
> index c0b0358893..2d3db22877 100644
> --- a/include/configs/evb_rk3399.h
> +++ b/include/configs/evb_rk3399.h
> @@ -6,6 +6,11 @@
> #ifndef __EVB_RK3399_H
> #define __EVB_RK3399_H
>
> +#define ROCKCHIP_DEVICE_SETTINGS \
> + "stdin=serial,usbkbd\0" \
> + "stdout=serial,vidconsole\0" \
> + "stderr=serial,vidconsole\0"
> +
> #include <configs/rk3399_common.h>
>
> #if defined(CONFIG_ENV_IS_IN_MMC)
> diff --git a/include/configs/rock960_rk3399.h b/include/configs/rock960_rk3399.h
> index 746d24cbff..304ad2b7aa 100644
> --- a/include/configs/rock960_rk3399.h
> +++ b/include/configs/rock960_rk3399.h
> @@ -6,6 +6,11 @@
> #ifndef __ROCK960_RK3399_H
> #define __ROCK960_RK3399_H
>
> +#define ROCKCHIP_DEVICE_SETTINGS \
> + "stdin=serial,usbkbd\0" \
> + "stdout=serial,vidconsole\0" \
> + "stderr=serial,vidconsole\0"
> +
> #include <configs/rk3399_common.h>
>
> #define CONFIG_SYS_MMC_ENV_DEV 1
> --
> 2.17.1
>
^ permalink raw reply [flat|nested] 34+ messages in thread
* [PATCH v3 4/5] rockchip: Enable HDMI output on rk3399 board w/ HDMI
@ 2020-04-02 12:38 ` Peter Robinson
0 siblings, 0 replies; 34+ messages in thread
From: Peter Robinson @ 2020-04-02 12:38 UTC (permalink / raw)
To: u-boot
> Enable config options and console setting to respective
> rk3399 board for HDMI output.
>
> Boards supported and tested on this patch are:
> - NanoPc T4
> - NanoPi M4
> - NanoPi Neo4
> - ROC-RK3399-PC
> - Rock960
>
> Cc: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
Tested-by: Peter Robinson <pbrobinson@gmail.com>
Tested on the Rock960 rev 1.2, I'm guessing the firefly-rk3399 should
be able to be enabled in a similar manner, will try and test that as
well when I get a moment.
> ---
> Changes for v3:
> - add rock960 hdmi out support
>
> configs/nanopc-t4-rk3399_defconfig | 7 +++++++
> configs/nanopi-m4-rk3399_defconfig | 7 +++++++
> configs/nanopi-neo4-rk3399_defconfig | 7 +++++++
> configs/roc-pc-rk3399_defconfig | 6 ++++++
> configs/rock960-rk3399_defconfig | 7 +++++++
> include/configs/evb_rk3399.h | 5 +++++
> include/configs/rock960_rk3399.h | 5 +++++
> 7 files changed, 44 insertions(+)
>
> diff --git a/configs/nanopc-t4-rk3399_defconfig b/configs/nanopc-t4-rk3399_defconfig
> index 9ea9b11574..607a00dbf7 100644
> --- a/configs/nanopc-t4-rk3399_defconfig
> +++ b/configs/nanopc-t4-rk3399_defconfig
> @@ -52,5 +52,12 @@ CONFIG_USB_ETHER_ASIX88179=y
> CONFIG_USB_ETHER_MCS7830=y
> CONFIG_USB_ETHER_RTL8152=y
> CONFIG_USB_ETHER_SMSC95XX=y
> +CONFIG_USB_KEYBOARD=y
> CONFIG_SPL_TINY_MEMSET=y
> CONFIG_ERRNO_STR=y
> +CONFIG_DM_VIDEO=y
> +CONFIG_VIDEO_BPP16=y
> +CONFIG_VIDEO_BPP32=y
> +CONFIG_DISPLAY=y
> +CONFIG_VIDEO_ROCKCHIP=y
> +CONFIG_DISPLAY_ROCKCHIP_HDMI=y
> diff --git a/configs/nanopi-m4-rk3399_defconfig b/configs/nanopi-m4-rk3399_defconfig
> index ad0e808bf6..3fcb7ac2d7 100644
> --- a/configs/nanopi-m4-rk3399_defconfig
> +++ b/configs/nanopi-m4-rk3399_defconfig
> @@ -52,5 +52,12 @@ CONFIG_USB_ETHER_ASIX88179=y
> CONFIG_USB_ETHER_MCS7830=y
> CONFIG_USB_ETHER_RTL8152=y
> CONFIG_USB_ETHER_SMSC95XX=y
> +CONFIG_USB_KEYBOARD=y
> CONFIG_SPL_TINY_MEMSET=y
> CONFIG_ERRNO_STR=y
> +CONFIG_DM_VIDEO=y
> +CONFIG_VIDEO_BPP16=y
> +CONFIG_VIDEO_BPP32=y
> +CONFIG_DISPLAY=y
> +CONFIG_VIDEO_ROCKCHIP=y
> +CONFIG_DISPLAY_ROCKCHIP_HDMI=y
> diff --git a/configs/nanopi-neo4-rk3399_defconfig b/configs/nanopi-neo4-rk3399_defconfig
> index d038a8cab9..b9ea535e43 100644
> --- a/configs/nanopi-neo4-rk3399_defconfig
> +++ b/configs/nanopi-neo4-rk3399_defconfig
> @@ -52,5 +52,12 @@ CONFIG_USB_ETHER_ASIX88179=y
> CONFIG_USB_ETHER_MCS7830=y
> CONFIG_USB_ETHER_RTL8152=y
> CONFIG_USB_ETHER_SMSC95XX=y
> +CONFIG_USB_KEYBOARD=y
> CONFIG_SPL_TINY_MEMSET=y
> CONFIG_ERRNO_STR=y
> +CONFIG_DM_VIDEO=y
> +CONFIG_VIDEO_BPP16=y
> +CONFIG_VIDEO_BPP32=y
> +CONFIG_DISPLAY=y
> +CONFIG_VIDEO_ROCKCHIP=y
> +CONFIG_DISPLAY_ROCKCHIP_HDMI=y
> diff --git a/configs/roc-pc-rk3399_defconfig b/configs/roc-pc-rk3399_defconfig
> index d540a17aeb..be76524cef 100644
> --- a/configs/roc-pc-rk3399_defconfig
> +++ b/configs/roc-pc-rk3399_defconfig
> @@ -59,3 +59,9 @@ CONFIG_USB_ETHER_SMSC95XX=y
> CONFIG_USB_KEYBOARD=y
> CONFIG_SPL_TINY_MEMSET=y
> CONFIG_ERRNO_STR=y
> +CONFIG_DM_VIDEO=y
> +CONFIG_VIDEO_BPP16=y
> +CONFIG_VIDEO_BPP32=y
> +CONFIG_DISPLAY=y
> +CONFIG_VIDEO_ROCKCHIP=y
> +CONFIG_DISPLAY_ROCKCHIP_HDMI=y
> diff --git a/configs/rock960-rk3399_defconfig b/configs/rock960-rk3399_defconfig
> index ba4226e173..c4e954731a 100644
> --- a/configs/rock960-rk3399_defconfig
> +++ b/configs/rock960-rk3399_defconfig
> @@ -58,5 +58,12 @@ CONFIG_USB_ETHER_ASIX88179=y
> CONFIG_USB_ETHER_MCS7830=y
> CONFIG_USB_ETHER_RTL8152=y
> CONFIG_USB_ETHER_SMSC95XX=y
> +CONFIG_USB_KEYBOARD=y
> CONFIG_SPL_TINY_MEMSET=y
> CONFIG_ERRNO_STR=y
> +CONFIG_DM_VIDEO=y
> +CONFIG_VIDEO_BPP16=y
> +CONFIG_VIDEO_BPP32=y
> +CONFIG_DISPLAY=y
> +CONFIG_VIDEO_ROCKCHIP=y
> +CONFIG_DISPLAY_ROCKCHIP_HDMI=y
> diff --git a/include/configs/evb_rk3399.h b/include/configs/evb_rk3399.h
> index c0b0358893..2d3db22877 100644
> --- a/include/configs/evb_rk3399.h
> +++ b/include/configs/evb_rk3399.h
> @@ -6,6 +6,11 @@
> #ifndef __EVB_RK3399_H
> #define __EVB_RK3399_H
>
> +#define ROCKCHIP_DEVICE_SETTINGS \
> + "stdin=serial,usbkbd\0" \
> + "stdout=serial,vidconsole\0" \
> + "stderr=serial,vidconsole\0"
> +
> #include <configs/rk3399_common.h>
>
> #if defined(CONFIG_ENV_IS_IN_MMC)
> diff --git a/include/configs/rock960_rk3399.h b/include/configs/rock960_rk3399.h
> index 746d24cbff..304ad2b7aa 100644
> --- a/include/configs/rock960_rk3399.h
> +++ b/include/configs/rock960_rk3399.h
> @@ -6,6 +6,11 @@
> #ifndef __ROCK960_RK3399_H
> #define __ROCK960_RK3399_H
>
> +#define ROCKCHIP_DEVICE_SETTINGS \
> + "stdin=serial,usbkbd\0" \
> + "stdout=serial,vidconsole\0" \
> + "stderr=serial,vidconsole\0"
> +
> #include <configs/rk3399_common.h>
>
> #define CONFIG_SYS_MMC_ENV_DEV 1
> --
> 2.17.1
>
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [PATCH v3 0/5] rockchip: rk3399: Fix HDMI out
2020-04-02 11:41 ` Jagan Teki
@ 2020-04-02 12:39 ` Peter Robinson
-1 siblings, 0 replies; 34+ messages in thread
From: Peter Robinson @ 2020-04-02 12:39 UTC (permalink / raw)
To: Jagan Teki
Cc: Philipp Tomsich, linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
Simon Glass, Kever Yang, u-boot-0aAXYlwwYIKGBzrmiIFOJg,
sunil-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/,
Anatolij Gustschin,
linux-amarula-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/,
Mark Kettenis
On Thu, Apr 2, 2020 at 12:41 PM Jagan Teki <jagan-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org> wrote:
>
> Due to recent Linux dts(i) sync for rk3399. the existing
> vop driver is not working with HDMI out on RK3399.
>
> This is v3 patchset, for previous version fixes[1].
>
> Changes for v3:
> - handle vopl clks in clk driver
> - drop dts changes
> - fix 4K display out for rk3399
> Changes for v2:
> - use usbkbd as stdin
> - enable USB Keyboard
>
> [1] https://patchwork.ozlabs.org/cover/1264187/
>
> Any inputs?
This series works for me for display output on the Rock960, I had
tried one of the prior versions with it (I think v1) and it had caused
issues but the display comes up and outputs on HDMI for me so:
Tested-by: Peter Robinson <pbrobinson-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> Jagan.
>
> Jagan Teki (5):
> clk: rk3399: Set empty for vopl assigned-clocks
> video: rockchip: Fix vop modes for rk3399
> rockchip: Enable pre console for rk3399
> rockchip: Enable HDMI output on rk3399 board w/ HDMI
> video: rockchip: Support 4K resolution for rk3399, HDMI
>
> arch/arm/include/asm/arch-rockchip/vop_rk3288.h | 11 +++++++++++
> arch/arm/mach-rockchip/Kconfig | 1 +
> common/Kconfig | 1 +
> configs/nanopc-t4-rk3399_defconfig | 7 +++++++
> configs/nanopi-m4-rk3399_defconfig | 7 +++++++
> configs/nanopi-neo4-rk3399_defconfig | 7 +++++++
> configs/roc-pc-rk3399_defconfig | 6 ++++++
> configs/rock960-rk3399_defconfig | 7 +++++++
> drivers/clk/rockchip/clk_rk3399.c | 7 +++++++
> drivers/video/rockchip/Kconfig | 2 ++
> drivers/video/rockchip/rk3399_vop.c | 2 --
> drivers/video/rockchip/rk_vop.c | 4 ++++
> include/configs/evb_rk3399.h | 5 +++++
> include/configs/rock960_rk3399.h | 5 +++++
> 14 files changed, 70 insertions(+), 2 deletions(-)
>
> --
> 2.17.1
>
^ permalink raw reply [flat|nested] 34+ messages in thread
* [PATCH v3 0/5] rockchip: rk3399: Fix HDMI out
@ 2020-04-02 12:39 ` Peter Robinson
0 siblings, 0 replies; 34+ messages in thread
From: Peter Robinson @ 2020-04-02 12:39 UTC (permalink / raw)
To: u-boot
On Thu, Apr 2, 2020 at 12:41 PM Jagan Teki <jagan@amarulasolutions.com> wrote:
>
> Due to recent Linux dts(i) sync for rk3399. the existing
> vop driver is not working with HDMI out on RK3399.
>
> This is v3 patchset, for previous version fixes[1].
>
> Changes for v3:
> - handle vopl clks in clk driver
> - drop dts changes
> - fix 4K display out for rk3399
> Changes for v2:
> - use usbkbd as stdin
> - enable USB Keyboard
>
> [1] https://patchwork.ozlabs.org/cover/1264187/
>
> Any inputs?
This series works for me for display output on the Rock960, I had
tried one of the prior versions with it (I think v1) and it had caused
issues but the display comes up and outputs on HDMI for me so:
Tested-by: Peter Robinson <pbrobinson@gmail.com>
> Jagan.
>
> Jagan Teki (5):
> clk: rk3399: Set empty for vopl assigned-clocks
> video: rockchip: Fix vop modes for rk3399
> rockchip: Enable pre console for rk3399
> rockchip: Enable HDMI output on rk3399 board w/ HDMI
> video: rockchip: Support 4K resolution for rk3399, HDMI
>
> arch/arm/include/asm/arch-rockchip/vop_rk3288.h | 11 +++++++++++
> arch/arm/mach-rockchip/Kconfig | 1 +
> common/Kconfig | 1 +
> configs/nanopc-t4-rk3399_defconfig | 7 +++++++
> configs/nanopi-m4-rk3399_defconfig | 7 +++++++
> configs/nanopi-neo4-rk3399_defconfig | 7 +++++++
> configs/roc-pc-rk3399_defconfig | 6 ++++++
> configs/rock960-rk3399_defconfig | 7 +++++++
> drivers/clk/rockchip/clk_rk3399.c | 7 +++++++
> drivers/video/rockchip/Kconfig | 2 ++
> drivers/video/rockchip/rk3399_vop.c | 2 --
> drivers/video/rockchip/rk_vop.c | 4 ++++
> include/configs/evb_rk3399.h | 5 +++++
> include/configs/rock960_rk3399.h | 5 +++++
> 14 files changed, 70 insertions(+), 2 deletions(-)
>
> --
> 2.17.1
>
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [PATCH v3 1/5] clk: rk3399: Set empty for vopl assigned-clocks
2020-04-02 11:41 ` Jagan Teki
@ 2020-04-02 12:47 ` Kever Yang
-1 siblings, 0 replies; 34+ messages in thread
From: Kever Yang @ 2020-04-02 12:47 UTC (permalink / raw)
To: Jagan Teki, Simon Glass, Philipp Tomsich, Anatolij Gustschin
Cc: u-boot-0aAXYlwwYIKGBzrmiIFOJg,
linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
sunil-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/,
linux-amarula-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/,
Mark Kettenis
On 2020/4/2 下午7:41, Jagan Teki wrote:
> During vidconsole probe, the device probe will try to
> check whether the assigned clocks on that video console
> node is initialized or not? and return an error if not.
>
> But, unlike Linux U-Boot won't require to handle these
> vopl assigned-clocks since core clocks are enough to
> handle the video out to process.
>
> So, mark them as empty in set_rate to satisfy clk_set_defaults
> so-that probe happened properly.
>
> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
Thanks,
- Kever
> ---
> Changes for v3:
> - new patch
>
> drivers/clk/rockchip/clk_rk3399.c | 7 +++++++
> 1 file changed, 7 insertions(+)
>
> diff --git a/drivers/clk/rockchip/clk_rk3399.c b/drivers/clk/rockchip/clk_rk3399.c
> index 865b80cc0f..1f62376595 100644
> --- a/drivers/clk/rockchip/clk_rk3399.c
> +++ b/drivers/clk/rockchip/clk_rk3399.c
> @@ -994,6 +994,13 @@ static ulong rk3399_clk_set_rate(struct clk *clk, ulong rate)
> case DCLK_VOP1:
> ret = rk3399_vop_set_clk(priv->cru, clk->id, rate);
> break;
> + case ACLK_VOP1:
> + case HCLK_VOP1:
> + /**
> + * assigned-clocks handling won't require for vopl, so
> + * return 0 to satisfy clk_set_defaults during device probe.
> + */
> + return 0;
> case SCLK_DDRCLK:
> ret = rk3399_ddr_set_clk(priv->cru, rate);
> break;
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
^ permalink raw reply [flat|nested] 34+ messages in thread
* [PATCH v3 1/5] clk: rk3399: Set empty for vopl assigned-clocks
@ 2020-04-02 12:47 ` Kever Yang
0 siblings, 0 replies; 34+ messages in thread
From: Kever Yang @ 2020-04-02 12:47 UTC (permalink / raw)
To: u-boot
On 2020/4/2 ??7:41, Jagan Teki wrote:
> During vidconsole probe, the device probe will try to
> check whether the assigned clocks on that video console
> node is initialized or not? and return an error if not.
>
> But, unlike Linux U-Boot won't require to handle these
> vopl assigned-clocks since core clocks are enough to
> handle the video out to process.
>
> So, mark them as empty in set_rate to satisfy clk_set_defaults
> so-that probe happened properly.
>
> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
Thanks,
- Kever
> ---
> Changes for v3:
> - new patch
>
> drivers/clk/rockchip/clk_rk3399.c | 7 +++++++
> 1 file changed, 7 insertions(+)
>
> diff --git a/drivers/clk/rockchip/clk_rk3399.c b/drivers/clk/rockchip/clk_rk3399.c
> index 865b80cc0f..1f62376595 100644
> --- a/drivers/clk/rockchip/clk_rk3399.c
> +++ b/drivers/clk/rockchip/clk_rk3399.c
> @@ -994,6 +994,13 @@ static ulong rk3399_clk_set_rate(struct clk *clk, ulong rate)
> case DCLK_VOP1:
> ret = rk3399_vop_set_clk(priv->cru, clk->id, rate);
> break;
> + case ACLK_VOP1:
> + case HCLK_VOP1:
> + /**
> + * assigned-clocks handling won't require for vopl, so
> + * return 0 to satisfy clk_set_defaults during device probe.
> + */
> + return 0;
> case SCLK_DDRCLK:
> ret = rk3399_ddr_set_clk(priv->cru, rate);
> break;
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [PATCH v3 2/5] video: rockchip: Fix vop modes for rk3399
2020-04-02 11:41 ` Jagan Teki
@ 2020-04-02 12:47 ` Kever Yang
-1 siblings, 0 replies; 34+ messages in thread
From: Kever Yang @ 2020-04-02 12:47 UTC (permalink / raw)
To: Jagan Teki, Simon Glass, Philipp Tomsich, Anatolij Gustschin
Cc: u-boot-0aAXYlwwYIKGBzrmiIFOJg,
linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
sunil-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/,
linux-amarula-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/,
Mark Kettenis
On 2020/4/2 下午7:41, Jagan Teki wrote:
> VOP display endpoint pipeline configuration is differs
> between rk3288 vs rk3399.
>
> These VOP pipeline configuration depends on how the
> different display interfaces connected in sequence to
> IN and OUT ports like for,
>
> RK3288:
>
> vopb_out: port {
> #address-cells = <1>;
> #size-cells = <0>;
> vopb_out_edp: endpoint@0 {
> reg = <0>;
> remote-endpoint = <&edp_in_vopb>;
> };
> vopb_out_hdmi: endpoint@1 {
> reg = <1>;
> remote-endpoint = <&hdmi_in_vopb>;
> };
> vopb_out_lvds: endpoint@2 {
> reg = <2>;
> remote-endpoint = <&lvds_in_vopb>;
> };
> vopb_out_mipi: endpoint@3 {
> reg = <3>;
> remote-endpoint = <&mipi_in_vopb>;
> };
> };
>
> RK3399:
>
> vopb_out: port {
> #address-cells = <1>;
> #size-cells = <0>;
> vopb_out_edp: endpoint@0 {
> reg = <0>;
> remote-endpoint = <&edp_in_vopb>;
> };
> vopb_out_mipi: endpoint@1 {
> reg = <1>;
> remote-endpoint = <&mipi_in_vopb>;
> };
> vopb_out_hdmi: endpoint@2 {
> reg = <2>;
> remote-endpoint = <&hdmi_in_vopb>;
> };
> vopb_out_mipi1: endpoint@3 {
> reg = <3>;
> remote-endpoint = <&mipi1_in_vopb>;
> };
> vopb_out_dp: endpoint@4 {
> reg = <4>;
> remote-endpoint = <&dp_in_vopb>;
> };
> };
>
> here, HDMI interface has endpoint 1 in rk3288 and 2 in rk3399.
>
> The rockchip vop driver often depends on this determined endpoint
> number and stored in vop_mode. So based on this vop_mode the bpp
> and pin polarity would configure on detected display interface.
>
> Since, the existing driver using rk3288 vop mode settings enabling
> the same will result wrong display interface configuration for rk3399.
>
> Add the patch for fixing these vop modes for rk3399.
>
> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
Thanks,
- Kever
> ---
> arch/arm/include/asm/arch-rockchip/vop_rk3288.h | 11 +++++++++++
> drivers/video/rockchip/rk3399_vop.c | 2 --
> drivers/video/rockchip/rk_vop.c | 4 ++++
> 3 files changed, 15 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/include/asm/arch-rockchip/vop_rk3288.h b/arch/arm/include/asm/arch-rockchip/vop_rk3288.h
> index 8398249509..872a158b71 100644
> --- a/arch/arm/include/asm/arch-rockchip/vop_rk3288.h
> +++ b/arch/arm/include/asm/arch-rockchip/vop_rk3288.h
> @@ -85,6 +85,16 @@ enum {
> LB_RGB_1280X8 = 0x5
> };
>
> +#if defined(CONFIG_ROCKCHIP_RK3399)
> +enum vop_modes {
> + VOP_MODE_EDP = 0,
> + VOP_MODE_MIPI,
> + VOP_MODE_HDMI,
> + VOP_MODE_MIPI1,
> + VOP_MODE_DP,
> + VOP_MODE_NONE,
> +};
> +#else
> enum vop_modes {
> VOP_MODE_EDP = 0,
> VOP_MODE_HDMI,
> @@ -94,6 +104,7 @@ enum vop_modes {
> VOP_MODE_AUTO_DETECT,
> VOP_MODE_UNKNOWN,
> };
> +#endif
>
> /* VOP_VERSION_INFO */
> #define M_FPGA_VERSION (0xffff << 16)
> diff --git a/drivers/video/rockchip/rk3399_vop.c b/drivers/video/rockchip/rk3399_vop.c
> index 81c122d7a9..1d5b3931a6 100644
> --- a/drivers/video/rockchip/rk3399_vop.c
> +++ b/drivers/video/rockchip/rk3399_vop.c
> @@ -45,8 +45,6 @@ static void rk3399_set_pin_polarity(struct udevice *dev,
> V_RK3399_DSP_MIPI_POL(polarity));
> break;
>
> - case VOP_MODE_LVDS:
> - /* The RK3399 has neither parallel RGB nor LVDS output. */
> default:
> debug("%s: unsupported output mode %x\n", __func__, mode);
> }
> diff --git a/drivers/video/rockchip/rk_vop.c b/drivers/video/rockchip/rk_vop.c
> index e91d4dfa7f..e1bd656bee 100644
> --- a/drivers/video/rockchip/rk_vop.c
> +++ b/drivers/video/rockchip/rk_vop.c
> @@ -118,10 +118,12 @@ static void rkvop_enable_output(struct udevice *dev, enum vop_modes mode)
> V_EDP_OUT_EN(1));
> break;
>
> +#if defined(CONFIG_ROCKCHIP_RK3288)
> case VOP_MODE_LVDS:
> clrsetbits_le32(®s->sys_ctrl, M_ALL_OUT_EN,
> V_RGB_OUT_EN(1));
> break;
> +#endif
>
> case VOP_MODE_MIPI:
> clrsetbits_le32(®s->sys_ctrl, M_ALL_OUT_EN,
> @@ -313,7 +315,9 @@ static int rk_display_init(struct udevice *dev, ulong fbbase, ofnode ep_node)
> /* Set bitwidth for vop display according to vop mode */
> switch (vop_id) {
> case VOP_MODE_EDP:
> +#if defined(CONFIG_ROCKCHIP_RK3288)
> case VOP_MODE_LVDS:
> +#endif
> l2bpp = VIDEO_BPP16;
> break;
> case VOP_MODE_HDMI:
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
^ permalink raw reply [flat|nested] 34+ messages in thread
* [PATCH v3 2/5] video: rockchip: Fix vop modes for rk3399
@ 2020-04-02 12:47 ` Kever Yang
0 siblings, 0 replies; 34+ messages in thread
From: Kever Yang @ 2020-04-02 12:47 UTC (permalink / raw)
To: u-boot
On 2020/4/2 ??7:41, Jagan Teki wrote:
> VOP display endpoint pipeline configuration is differs
> between rk3288 vs rk3399.
>
> These VOP pipeline configuration depends on how the
> different display interfaces connected in sequence to
> IN and OUT ports like for,
>
> RK3288:
>
> vopb_out: port {
> #address-cells = <1>;
> #size-cells = <0>;
> vopb_out_edp: endpoint at 0 {
> reg = <0>;
> remote-endpoint = <&edp_in_vopb>;
> };
> vopb_out_hdmi: endpoint at 1 {
> reg = <1>;
> remote-endpoint = <&hdmi_in_vopb>;
> };
> vopb_out_lvds: endpoint at 2 {
> reg = <2>;
> remote-endpoint = <&lvds_in_vopb>;
> };
> vopb_out_mipi: endpoint at 3 {
> reg = <3>;
> remote-endpoint = <&mipi_in_vopb>;
> };
> };
>
> RK3399:
>
> vopb_out: port {
> #address-cells = <1>;
> #size-cells = <0>;
> vopb_out_edp: endpoint at 0 {
> reg = <0>;
> remote-endpoint = <&edp_in_vopb>;
> };
> vopb_out_mipi: endpoint at 1 {
> reg = <1>;
> remote-endpoint = <&mipi_in_vopb>;
> };
> vopb_out_hdmi: endpoint at 2 {
> reg = <2>;
> remote-endpoint = <&hdmi_in_vopb>;
> };
> vopb_out_mipi1: endpoint at 3 {
> reg = <3>;
> remote-endpoint = <&mipi1_in_vopb>;
> };
> vopb_out_dp: endpoint at 4 {
> reg = <4>;
> remote-endpoint = <&dp_in_vopb>;
> };
> };
>
> here, HDMI interface has endpoint 1 in rk3288 and 2 in rk3399.
>
> The rockchip vop driver often depends on this determined endpoint
> number and stored in vop_mode. So based on this vop_mode the bpp
> and pin polarity would configure on detected display interface.
>
> Since, the existing driver using rk3288 vop mode settings enabling
> the same will result wrong display interface configuration for rk3399.
>
> Add the patch for fixing these vop modes for rk3399.
>
> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
Thanks,
- Kever
> ---
> arch/arm/include/asm/arch-rockchip/vop_rk3288.h | 11 +++++++++++
> drivers/video/rockchip/rk3399_vop.c | 2 --
> drivers/video/rockchip/rk_vop.c | 4 ++++
> 3 files changed, 15 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/include/asm/arch-rockchip/vop_rk3288.h b/arch/arm/include/asm/arch-rockchip/vop_rk3288.h
> index 8398249509..872a158b71 100644
> --- a/arch/arm/include/asm/arch-rockchip/vop_rk3288.h
> +++ b/arch/arm/include/asm/arch-rockchip/vop_rk3288.h
> @@ -85,6 +85,16 @@ enum {
> LB_RGB_1280X8 = 0x5
> };
>
> +#if defined(CONFIG_ROCKCHIP_RK3399)
> +enum vop_modes {
> + VOP_MODE_EDP = 0,
> + VOP_MODE_MIPI,
> + VOP_MODE_HDMI,
> + VOP_MODE_MIPI1,
> + VOP_MODE_DP,
> + VOP_MODE_NONE,
> +};
> +#else
> enum vop_modes {
> VOP_MODE_EDP = 0,
> VOP_MODE_HDMI,
> @@ -94,6 +104,7 @@ enum vop_modes {
> VOP_MODE_AUTO_DETECT,
> VOP_MODE_UNKNOWN,
> };
> +#endif
>
> /* VOP_VERSION_INFO */
> #define M_FPGA_VERSION (0xffff << 16)
> diff --git a/drivers/video/rockchip/rk3399_vop.c b/drivers/video/rockchip/rk3399_vop.c
> index 81c122d7a9..1d5b3931a6 100644
> --- a/drivers/video/rockchip/rk3399_vop.c
> +++ b/drivers/video/rockchip/rk3399_vop.c
> @@ -45,8 +45,6 @@ static void rk3399_set_pin_polarity(struct udevice *dev,
> V_RK3399_DSP_MIPI_POL(polarity));
> break;
>
> - case VOP_MODE_LVDS:
> - /* The RK3399 has neither parallel RGB nor LVDS output. */
> default:
> debug("%s: unsupported output mode %x\n", __func__, mode);
> }
> diff --git a/drivers/video/rockchip/rk_vop.c b/drivers/video/rockchip/rk_vop.c
> index e91d4dfa7f..e1bd656bee 100644
> --- a/drivers/video/rockchip/rk_vop.c
> +++ b/drivers/video/rockchip/rk_vop.c
> @@ -118,10 +118,12 @@ static void rkvop_enable_output(struct udevice *dev, enum vop_modes mode)
> V_EDP_OUT_EN(1));
> break;
>
> +#if defined(CONFIG_ROCKCHIP_RK3288)
> case VOP_MODE_LVDS:
> clrsetbits_le32(®s->sys_ctrl, M_ALL_OUT_EN,
> V_RGB_OUT_EN(1));
> break;
> +#endif
>
> case VOP_MODE_MIPI:
> clrsetbits_le32(®s->sys_ctrl, M_ALL_OUT_EN,
> @@ -313,7 +315,9 @@ static int rk_display_init(struct udevice *dev, ulong fbbase, ofnode ep_node)
> /* Set bitwidth for vop display according to vop mode */
> switch (vop_id) {
> case VOP_MODE_EDP:
> +#if defined(CONFIG_ROCKCHIP_RK3288)
> case VOP_MODE_LVDS:
> +#endif
> l2bpp = VIDEO_BPP16;
> break;
> case VOP_MODE_HDMI:
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [PATCH v3 3/5] rockchip: Enable pre console for rk3399
2020-04-02 11:41 ` Jagan Teki
@ 2020-04-02 12:47 ` Kever Yang
-1 siblings, 0 replies; 34+ messages in thread
From: Kever Yang @ 2020-04-02 12:47 UTC (permalink / raw)
To: Jagan Teki, Simon Glass, Philipp Tomsich, Anatolij Gustschin
Cc: u-boot-0aAXYlwwYIKGBzrmiIFOJg,
linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
sunil-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/,
linux-amarula-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/,
Mark Kettenis
On 2020/4/2 下午7:41, Jagan Teki wrote:
> Enable pre console buffer for rk3399 platform.
>
> This would help to capture the console messages prior to
> the console being initialised. Enabling this would help
> to capture all the console messages on video output source
> like HDMI. So we can find the full console messages of
> U-Boot proper on HDMI display when enabled it for RK3399
> platform boards.
>
> Buffer address used for pre console is 0x0f200000 which is
> ram base plus 240MiB. right now the Allwinner SoC is using
> similar computation.
>
> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
Thanks,
- Kever
> ---
> arch/arm/mach-rockchip/Kconfig | 1 +
> common/Kconfig | 1 +
> 2 files changed, 2 insertions(+)
>
> diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig
> index ed7514ab75..0cb1f23d0f 100644
> --- a/arch/arm/mach-rockchip/Kconfig
> +++ b/arch/arm/mach-rockchip/Kconfig
> @@ -229,6 +229,7 @@ config ROCKCHIP_RK3399
> select DM_PMIC
> select DM_REGULATOR_FIXED
> select BOARD_LATE_INIT
> + imply PRE_CONSOLE_BUFFER
> imply ROCKCHIP_COMMON_BOARD
> imply ROCKCHIP_SDRAM_COMMON
> imply SPL_ROCKCHIP_COMMON_BOARD
> diff --git a/common/Kconfig b/common/Kconfig
> index 46e4193fc8..bd35de3056 100644
> --- a/common/Kconfig
> +++ b/common/Kconfig
> @@ -568,6 +568,7 @@ config PRE_CON_BUF_ADDR
> default 0x2f000000 if ARCH_SUNXI && MACH_SUN9I
> default 0x4f000000 if ARCH_SUNXI && !MACH_SUN9I
> default 0x0f000000 if ROCKCHIP_RK3288
> + default 0x0f200000 if ROCKCHIP_RK3399
> help
> This sets the start address of the pre-console buffer. This must
> be in available memory and is accessed before relocation and
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
^ permalink raw reply [flat|nested] 34+ messages in thread
* [PATCH v3 3/5] rockchip: Enable pre console for rk3399
@ 2020-04-02 12:47 ` Kever Yang
0 siblings, 0 replies; 34+ messages in thread
From: Kever Yang @ 2020-04-02 12:47 UTC (permalink / raw)
To: u-boot
On 2020/4/2 ??7:41, Jagan Teki wrote:
> Enable pre console buffer for rk3399 platform.
>
> This would help to capture the console messages prior to
> the console being initialised. Enabling this would help
> to capture all the console messages on video output source
> like HDMI. So we can find the full console messages of
> U-Boot proper on HDMI display when enabled it for RK3399
> platform boards.
>
> Buffer address used for pre console is 0x0f200000 which is
> ram base plus 240MiB. right now the Allwinner SoC is using
> similar computation.
>
> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
Thanks,
- Kever
> ---
> arch/arm/mach-rockchip/Kconfig | 1 +
> common/Kconfig | 1 +
> 2 files changed, 2 insertions(+)
>
> diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig
> index ed7514ab75..0cb1f23d0f 100644
> --- a/arch/arm/mach-rockchip/Kconfig
> +++ b/arch/arm/mach-rockchip/Kconfig
> @@ -229,6 +229,7 @@ config ROCKCHIP_RK3399
> select DM_PMIC
> select DM_REGULATOR_FIXED
> select BOARD_LATE_INIT
> + imply PRE_CONSOLE_BUFFER
> imply ROCKCHIP_COMMON_BOARD
> imply ROCKCHIP_SDRAM_COMMON
> imply SPL_ROCKCHIP_COMMON_BOARD
> diff --git a/common/Kconfig b/common/Kconfig
> index 46e4193fc8..bd35de3056 100644
> --- a/common/Kconfig
> +++ b/common/Kconfig
> @@ -568,6 +568,7 @@ config PRE_CON_BUF_ADDR
> default 0x2f000000 if ARCH_SUNXI && MACH_SUN9I
> default 0x4f000000 if ARCH_SUNXI && !MACH_SUN9I
> default 0x0f000000 if ROCKCHIP_RK3288
> + default 0x0f200000 if ROCKCHIP_RK3399
> help
> This sets the start address of the pre-console buffer. This must
> be in available memory and is accessed before relocation and
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [PATCH v3 4/5] rockchip: Enable HDMI output on rk3399 board w/ HDMI
2020-04-02 11:41 ` Jagan Teki
@ 2020-04-02 12:48 ` Kever Yang
-1 siblings, 0 replies; 34+ messages in thread
From: Kever Yang @ 2020-04-02 12:48 UTC (permalink / raw)
To: Jagan Teki, Simon Glass, Philipp Tomsich, Anatolij Gustschin
Cc: linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
Manivannan Sadhasivam, u-boot-0aAXYlwwYIKGBzrmiIFOJg,
sunil-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/,
linux-amarula-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/,
Mark Kettenis
On 2020/4/2 下午7:41, Jagan Teki wrote:
> Enable config options and console setting to respective
> rk3399 board for HDMI output.
>
> Boards supported and tested on this patch are:
> - NanoPc T4
> - NanoPi M4
> - NanoPi Neo4
> - ROC-RK3399-PC
> - Rock960
>
> Cc: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
Thanks,
- Kever
> ---
> Changes for v3:
> - add rock960 hdmi out support
>
> configs/nanopc-t4-rk3399_defconfig | 7 +++++++
> configs/nanopi-m4-rk3399_defconfig | 7 +++++++
> configs/nanopi-neo4-rk3399_defconfig | 7 +++++++
> configs/roc-pc-rk3399_defconfig | 6 ++++++
> configs/rock960-rk3399_defconfig | 7 +++++++
> include/configs/evb_rk3399.h | 5 +++++
> include/configs/rock960_rk3399.h | 5 +++++
> 7 files changed, 44 insertions(+)
>
> diff --git a/configs/nanopc-t4-rk3399_defconfig b/configs/nanopc-t4-rk3399_defconfig
> index 9ea9b11574..607a00dbf7 100644
> --- a/configs/nanopc-t4-rk3399_defconfig
> +++ b/configs/nanopc-t4-rk3399_defconfig
> @@ -52,5 +52,12 @@ CONFIG_USB_ETHER_ASIX88179=y
> CONFIG_USB_ETHER_MCS7830=y
> CONFIG_USB_ETHER_RTL8152=y
> CONFIG_USB_ETHER_SMSC95XX=y
> +CONFIG_USB_KEYBOARD=y
> CONFIG_SPL_TINY_MEMSET=y
> CONFIG_ERRNO_STR=y
> +CONFIG_DM_VIDEO=y
> +CONFIG_VIDEO_BPP16=y
> +CONFIG_VIDEO_BPP32=y
> +CONFIG_DISPLAY=y
> +CONFIG_VIDEO_ROCKCHIP=y
> +CONFIG_DISPLAY_ROCKCHIP_HDMI=y
> diff --git a/configs/nanopi-m4-rk3399_defconfig b/configs/nanopi-m4-rk3399_defconfig
> index ad0e808bf6..3fcb7ac2d7 100644
> --- a/configs/nanopi-m4-rk3399_defconfig
> +++ b/configs/nanopi-m4-rk3399_defconfig
> @@ -52,5 +52,12 @@ CONFIG_USB_ETHER_ASIX88179=y
> CONFIG_USB_ETHER_MCS7830=y
> CONFIG_USB_ETHER_RTL8152=y
> CONFIG_USB_ETHER_SMSC95XX=y
> +CONFIG_USB_KEYBOARD=y
> CONFIG_SPL_TINY_MEMSET=y
> CONFIG_ERRNO_STR=y
> +CONFIG_DM_VIDEO=y
> +CONFIG_VIDEO_BPP16=y
> +CONFIG_VIDEO_BPP32=y
> +CONFIG_DISPLAY=y
> +CONFIG_VIDEO_ROCKCHIP=y
> +CONFIG_DISPLAY_ROCKCHIP_HDMI=y
> diff --git a/configs/nanopi-neo4-rk3399_defconfig b/configs/nanopi-neo4-rk3399_defconfig
> index d038a8cab9..b9ea535e43 100644
> --- a/configs/nanopi-neo4-rk3399_defconfig
> +++ b/configs/nanopi-neo4-rk3399_defconfig
> @@ -52,5 +52,12 @@ CONFIG_USB_ETHER_ASIX88179=y
> CONFIG_USB_ETHER_MCS7830=y
> CONFIG_USB_ETHER_RTL8152=y
> CONFIG_USB_ETHER_SMSC95XX=y
> +CONFIG_USB_KEYBOARD=y
> CONFIG_SPL_TINY_MEMSET=y
> CONFIG_ERRNO_STR=y
> +CONFIG_DM_VIDEO=y
> +CONFIG_VIDEO_BPP16=y
> +CONFIG_VIDEO_BPP32=y
> +CONFIG_DISPLAY=y
> +CONFIG_VIDEO_ROCKCHIP=y
> +CONFIG_DISPLAY_ROCKCHIP_HDMI=y
> diff --git a/configs/roc-pc-rk3399_defconfig b/configs/roc-pc-rk3399_defconfig
> index d540a17aeb..be76524cef 100644
> --- a/configs/roc-pc-rk3399_defconfig
> +++ b/configs/roc-pc-rk3399_defconfig
> @@ -59,3 +59,9 @@ CONFIG_USB_ETHER_SMSC95XX=y
> CONFIG_USB_KEYBOARD=y
> CONFIG_SPL_TINY_MEMSET=y
> CONFIG_ERRNO_STR=y
> +CONFIG_DM_VIDEO=y
> +CONFIG_VIDEO_BPP16=y
> +CONFIG_VIDEO_BPP32=y
> +CONFIG_DISPLAY=y
> +CONFIG_VIDEO_ROCKCHIP=y
> +CONFIG_DISPLAY_ROCKCHIP_HDMI=y
> diff --git a/configs/rock960-rk3399_defconfig b/configs/rock960-rk3399_defconfig
> index ba4226e173..c4e954731a 100644
> --- a/configs/rock960-rk3399_defconfig
> +++ b/configs/rock960-rk3399_defconfig
> @@ -58,5 +58,12 @@ CONFIG_USB_ETHER_ASIX88179=y
> CONFIG_USB_ETHER_MCS7830=y
> CONFIG_USB_ETHER_RTL8152=y
> CONFIG_USB_ETHER_SMSC95XX=y
> +CONFIG_USB_KEYBOARD=y
> CONFIG_SPL_TINY_MEMSET=y
> CONFIG_ERRNO_STR=y
> +CONFIG_DM_VIDEO=y
> +CONFIG_VIDEO_BPP16=y
> +CONFIG_VIDEO_BPP32=y
> +CONFIG_DISPLAY=y
> +CONFIG_VIDEO_ROCKCHIP=y
> +CONFIG_DISPLAY_ROCKCHIP_HDMI=y
> diff --git a/include/configs/evb_rk3399.h b/include/configs/evb_rk3399.h
> index c0b0358893..2d3db22877 100644
> --- a/include/configs/evb_rk3399.h
> +++ b/include/configs/evb_rk3399.h
> @@ -6,6 +6,11 @@
> #ifndef __EVB_RK3399_H
> #define __EVB_RK3399_H
>
> +#define ROCKCHIP_DEVICE_SETTINGS \
> + "stdin=serial,usbkbd\0" \
> + "stdout=serial,vidconsole\0" \
> + "stderr=serial,vidconsole\0"
> +
> #include <configs/rk3399_common.h>
>
> #if defined(CONFIG_ENV_IS_IN_MMC)
> diff --git a/include/configs/rock960_rk3399.h b/include/configs/rock960_rk3399.h
> index 746d24cbff..304ad2b7aa 100644
> --- a/include/configs/rock960_rk3399.h
> +++ b/include/configs/rock960_rk3399.h
> @@ -6,6 +6,11 @@
> #ifndef __ROCK960_RK3399_H
> #define __ROCK960_RK3399_H
>
> +#define ROCKCHIP_DEVICE_SETTINGS \
> + "stdin=serial,usbkbd\0" \
> + "stdout=serial,vidconsole\0" \
> + "stderr=serial,vidconsole\0"
> +
> #include <configs/rk3399_common.h>
>
> #define CONFIG_SYS_MMC_ENV_DEV 1
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
^ permalink raw reply [flat|nested] 34+ messages in thread
* [PATCH v3 4/5] rockchip: Enable HDMI output on rk3399 board w/ HDMI
@ 2020-04-02 12:48 ` Kever Yang
0 siblings, 0 replies; 34+ messages in thread
From: Kever Yang @ 2020-04-02 12:48 UTC (permalink / raw)
To: u-boot
On 2020/4/2 ??7:41, Jagan Teki wrote:
> Enable config options and console setting to respective
> rk3399 board for HDMI output.
>
> Boards supported and tested on this patch are:
> - NanoPc T4
> - NanoPi M4
> - NanoPi Neo4
> - ROC-RK3399-PC
> - Rock960
>
> Cc: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
Thanks,
- Kever
> ---
> Changes for v3:
> - add rock960 hdmi out support
>
> configs/nanopc-t4-rk3399_defconfig | 7 +++++++
> configs/nanopi-m4-rk3399_defconfig | 7 +++++++
> configs/nanopi-neo4-rk3399_defconfig | 7 +++++++
> configs/roc-pc-rk3399_defconfig | 6 ++++++
> configs/rock960-rk3399_defconfig | 7 +++++++
> include/configs/evb_rk3399.h | 5 +++++
> include/configs/rock960_rk3399.h | 5 +++++
> 7 files changed, 44 insertions(+)
>
> diff --git a/configs/nanopc-t4-rk3399_defconfig b/configs/nanopc-t4-rk3399_defconfig
> index 9ea9b11574..607a00dbf7 100644
> --- a/configs/nanopc-t4-rk3399_defconfig
> +++ b/configs/nanopc-t4-rk3399_defconfig
> @@ -52,5 +52,12 @@ CONFIG_USB_ETHER_ASIX88179=y
> CONFIG_USB_ETHER_MCS7830=y
> CONFIG_USB_ETHER_RTL8152=y
> CONFIG_USB_ETHER_SMSC95XX=y
> +CONFIG_USB_KEYBOARD=y
> CONFIG_SPL_TINY_MEMSET=y
> CONFIG_ERRNO_STR=y
> +CONFIG_DM_VIDEO=y
> +CONFIG_VIDEO_BPP16=y
> +CONFIG_VIDEO_BPP32=y
> +CONFIG_DISPLAY=y
> +CONFIG_VIDEO_ROCKCHIP=y
> +CONFIG_DISPLAY_ROCKCHIP_HDMI=y
> diff --git a/configs/nanopi-m4-rk3399_defconfig b/configs/nanopi-m4-rk3399_defconfig
> index ad0e808bf6..3fcb7ac2d7 100644
> --- a/configs/nanopi-m4-rk3399_defconfig
> +++ b/configs/nanopi-m4-rk3399_defconfig
> @@ -52,5 +52,12 @@ CONFIG_USB_ETHER_ASIX88179=y
> CONFIG_USB_ETHER_MCS7830=y
> CONFIG_USB_ETHER_RTL8152=y
> CONFIG_USB_ETHER_SMSC95XX=y
> +CONFIG_USB_KEYBOARD=y
> CONFIG_SPL_TINY_MEMSET=y
> CONFIG_ERRNO_STR=y
> +CONFIG_DM_VIDEO=y
> +CONFIG_VIDEO_BPP16=y
> +CONFIG_VIDEO_BPP32=y
> +CONFIG_DISPLAY=y
> +CONFIG_VIDEO_ROCKCHIP=y
> +CONFIG_DISPLAY_ROCKCHIP_HDMI=y
> diff --git a/configs/nanopi-neo4-rk3399_defconfig b/configs/nanopi-neo4-rk3399_defconfig
> index d038a8cab9..b9ea535e43 100644
> --- a/configs/nanopi-neo4-rk3399_defconfig
> +++ b/configs/nanopi-neo4-rk3399_defconfig
> @@ -52,5 +52,12 @@ CONFIG_USB_ETHER_ASIX88179=y
> CONFIG_USB_ETHER_MCS7830=y
> CONFIG_USB_ETHER_RTL8152=y
> CONFIG_USB_ETHER_SMSC95XX=y
> +CONFIG_USB_KEYBOARD=y
> CONFIG_SPL_TINY_MEMSET=y
> CONFIG_ERRNO_STR=y
> +CONFIG_DM_VIDEO=y
> +CONFIG_VIDEO_BPP16=y
> +CONFIG_VIDEO_BPP32=y
> +CONFIG_DISPLAY=y
> +CONFIG_VIDEO_ROCKCHIP=y
> +CONFIG_DISPLAY_ROCKCHIP_HDMI=y
> diff --git a/configs/roc-pc-rk3399_defconfig b/configs/roc-pc-rk3399_defconfig
> index d540a17aeb..be76524cef 100644
> --- a/configs/roc-pc-rk3399_defconfig
> +++ b/configs/roc-pc-rk3399_defconfig
> @@ -59,3 +59,9 @@ CONFIG_USB_ETHER_SMSC95XX=y
> CONFIG_USB_KEYBOARD=y
> CONFIG_SPL_TINY_MEMSET=y
> CONFIG_ERRNO_STR=y
> +CONFIG_DM_VIDEO=y
> +CONFIG_VIDEO_BPP16=y
> +CONFIG_VIDEO_BPP32=y
> +CONFIG_DISPLAY=y
> +CONFIG_VIDEO_ROCKCHIP=y
> +CONFIG_DISPLAY_ROCKCHIP_HDMI=y
> diff --git a/configs/rock960-rk3399_defconfig b/configs/rock960-rk3399_defconfig
> index ba4226e173..c4e954731a 100644
> --- a/configs/rock960-rk3399_defconfig
> +++ b/configs/rock960-rk3399_defconfig
> @@ -58,5 +58,12 @@ CONFIG_USB_ETHER_ASIX88179=y
> CONFIG_USB_ETHER_MCS7830=y
> CONFIG_USB_ETHER_RTL8152=y
> CONFIG_USB_ETHER_SMSC95XX=y
> +CONFIG_USB_KEYBOARD=y
> CONFIG_SPL_TINY_MEMSET=y
> CONFIG_ERRNO_STR=y
> +CONFIG_DM_VIDEO=y
> +CONFIG_VIDEO_BPP16=y
> +CONFIG_VIDEO_BPP32=y
> +CONFIG_DISPLAY=y
> +CONFIG_VIDEO_ROCKCHIP=y
> +CONFIG_DISPLAY_ROCKCHIP_HDMI=y
> diff --git a/include/configs/evb_rk3399.h b/include/configs/evb_rk3399.h
> index c0b0358893..2d3db22877 100644
> --- a/include/configs/evb_rk3399.h
> +++ b/include/configs/evb_rk3399.h
> @@ -6,6 +6,11 @@
> #ifndef __EVB_RK3399_H
> #define __EVB_RK3399_H
>
> +#define ROCKCHIP_DEVICE_SETTINGS \
> + "stdin=serial,usbkbd\0" \
> + "stdout=serial,vidconsole\0" \
> + "stderr=serial,vidconsole\0"
> +
> #include <configs/rk3399_common.h>
>
> #if defined(CONFIG_ENV_IS_IN_MMC)
> diff --git a/include/configs/rock960_rk3399.h b/include/configs/rock960_rk3399.h
> index 746d24cbff..304ad2b7aa 100644
> --- a/include/configs/rock960_rk3399.h
> +++ b/include/configs/rock960_rk3399.h
> @@ -6,6 +6,11 @@
> #ifndef __ROCK960_RK3399_H
> #define __ROCK960_RK3399_H
>
> +#define ROCKCHIP_DEVICE_SETTINGS \
> + "stdin=serial,usbkbd\0" \
> + "stdout=serial,vidconsole\0" \
> + "stderr=serial,vidconsole\0"
> +
> #include <configs/rk3399_common.h>
>
> #define CONFIG_SYS_MMC_ENV_DEV 1
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [PATCH v3 5/5] video: rockchip: Support 4K resolution for rk3399, HDMI
2020-04-02 11:41 ` Jagan Teki
@ 2020-04-02 12:48 ` Kever Yang
-1 siblings, 0 replies; 34+ messages in thread
From: Kever Yang @ 2020-04-02 12:48 UTC (permalink / raw)
To: Jagan Teki, Simon Glass, Philipp Tomsich, Anatolij Gustschin
Cc: Mark Kettenis, sunil, u-boot, linux-rockchip, linux-amarula
On 2020/4/2 下午7:41, Jagan Teki wrote:
> The default resolution for rockchip display is 1920x1080
> which failed to work on 4K HDMI out displays on rk3399.
>
> So, mark the default resolution as 3480x2160 for rk3399
> HDMI out.
>
> This would work all the hdmi display resolutions till
> 4K.
>
> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
Thanks,
- Kever
> ---
> Changes for v3:
> - new patch
>
> drivers/video/rockchip/Kconfig | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/drivers/video/rockchip/Kconfig b/drivers/video/rockchip/Kconfig
> index 10182d0b66..cfd774ead6 100644
> --- a/drivers/video/rockchip/Kconfig
> +++ b/drivers/video/rockchip/Kconfig
> @@ -22,6 +22,7 @@ menuconfig VIDEO_ROCKCHIP
> config VIDEO_ROCKCHIP_MAX_XRES
> int "Maximum horizontal resolution (for memory allocation purposes)"
> depends on VIDEO_ROCKCHIP
> + default 3480 if ROCKCHIP_RK3399 && DISPLAY_ROCKCHIP_HDMI
> default 1920
> help
> The maximum horizontal resolution to support for the framebuffer.
> @@ -31,6 +32,7 @@ config VIDEO_ROCKCHIP_MAX_XRES
> config VIDEO_ROCKCHIP_MAX_YRES
> int "Maximum vertical resolution (for memory allocation purposes)"
> depends on VIDEO_ROCKCHIP
> + default 2160 if ROCKCHIP_RK3399 && DISPLAY_ROCKCHIP_HDMI
> default 1080
> help
> The maximum vertical resolution to support for the framebuffer.
^ permalink raw reply [flat|nested] 34+ messages in thread
* [PATCH v3 5/5] video: rockchip: Support 4K resolution for rk3399, HDMI
@ 2020-04-02 12:48 ` Kever Yang
0 siblings, 0 replies; 34+ messages in thread
From: Kever Yang @ 2020-04-02 12:48 UTC (permalink / raw)
To: u-boot
On 2020/4/2 ??7:41, Jagan Teki wrote:
> The default resolution for rockchip display is 1920x1080
> which failed to work on 4K HDMI out displays on rk3399.
>
> So, mark the default resolution as 3480x2160 for rk3399
> HDMI out.
>
> This would work all the hdmi display resolutions till
> 4K.
>
> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
Thanks,
- Kever
> ---
> Changes for v3:
> - new patch
>
> drivers/video/rockchip/Kconfig | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/drivers/video/rockchip/Kconfig b/drivers/video/rockchip/Kconfig
> index 10182d0b66..cfd774ead6 100644
> --- a/drivers/video/rockchip/Kconfig
> +++ b/drivers/video/rockchip/Kconfig
> @@ -22,6 +22,7 @@ menuconfig VIDEO_ROCKCHIP
> config VIDEO_ROCKCHIP_MAX_XRES
> int "Maximum horizontal resolution (for memory allocation purposes)"
> depends on VIDEO_ROCKCHIP
> + default 3480 if ROCKCHIP_RK3399 && DISPLAY_ROCKCHIP_HDMI
> default 1920
> help
> The maximum horizontal resolution to support for the framebuffer.
> @@ -31,6 +32,7 @@ config VIDEO_ROCKCHIP_MAX_XRES
> config VIDEO_ROCKCHIP_MAX_YRES
> int "Maximum vertical resolution (for memory allocation purposes)"
> depends on VIDEO_ROCKCHIP
> + default 2160 if ROCKCHIP_RK3399 && DISPLAY_ROCKCHIP_HDMI
> default 1080
> help
> The maximum vertical resolution to support for the framebuffer.
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [PATCH v3 0/5] rockchip: rk3399: Fix HDMI out
2020-04-02 11:41 ` Jagan Teki
@ 2020-04-02 13:56 ` Anatolij Gustschin
-1 siblings, 0 replies; 34+ messages in thread
From: Anatolij Gustschin @ 2020-04-02 13:56 UTC (permalink / raw)
To: Jagan Teki
Cc: Kever Yang, Simon Glass, Philipp Tomsich, Mark Kettenis, sunil,
u-boot, linux-rockchip, linux-amarula
On Thu, 2 Apr 2020 17:11:20 +0530
Jagan Teki jagan@amarulasolutions.com wrote:
...
> Jagan Teki (5):
> clk: rk3399: Set empty for vopl assigned-clocks
> video: rockchip: Fix vop modes for rk3399
> rockchip: Enable pre console for rk3399
> rockchip: Enable HDMI output on rk3399 board w/ HDMI
> video: rockchip: Support 4K resolution for rk3399, HDMI
>
> arch/arm/include/asm/arch-rockchip/vop_rk3288.h | 11 +++++++++++
> arch/arm/mach-rockchip/Kconfig | 1 +
> common/Kconfig | 1 +
> configs/nanopc-t4-rk3399_defconfig | 7 +++++++
> configs/nanopi-m4-rk3399_defconfig | 7 +++++++
> configs/nanopi-neo4-rk3399_defconfig | 7 +++++++
> configs/roc-pc-rk3399_defconfig | 6 ++++++
> configs/rock960-rk3399_defconfig | 7 +++++++
> drivers/clk/rockchip/clk_rk3399.c | 7 +++++++
> drivers/video/rockchip/Kconfig | 2 ++
> drivers/video/rockchip/rk3399_vop.c | 2 --
> drivers/video/rockchip/rk_vop.c | 4 ++++
> include/configs/evb_rk3399.h | 5 +++++
> include/configs/rock960_rk3399.h | 5 +++++
> 14 files changed, 70 insertions(+), 2 deletions(-)
Series applied to u-boot-video/video-fixes-v2020.04, thanks!
--
Anatolij
^ permalink raw reply [flat|nested] 34+ messages in thread
* [PATCH v3 0/5] rockchip: rk3399: Fix HDMI out
@ 2020-04-02 13:56 ` Anatolij Gustschin
0 siblings, 0 replies; 34+ messages in thread
From: Anatolij Gustschin @ 2020-04-02 13:56 UTC (permalink / raw)
To: u-boot
On Thu, 2 Apr 2020 17:11:20 +0530
Jagan Teki jagan at amarulasolutions.com wrote:
...
> Jagan Teki (5):
> clk: rk3399: Set empty for vopl assigned-clocks
> video: rockchip: Fix vop modes for rk3399
> rockchip: Enable pre console for rk3399
> rockchip: Enable HDMI output on rk3399 board w/ HDMI
> video: rockchip: Support 4K resolution for rk3399, HDMI
>
> arch/arm/include/asm/arch-rockchip/vop_rk3288.h | 11 +++++++++++
> arch/arm/mach-rockchip/Kconfig | 1 +
> common/Kconfig | 1 +
> configs/nanopc-t4-rk3399_defconfig | 7 +++++++
> configs/nanopi-m4-rk3399_defconfig | 7 +++++++
> configs/nanopi-neo4-rk3399_defconfig | 7 +++++++
> configs/roc-pc-rk3399_defconfig | 6 ++++++
> configs/rock960-rk3399_defconfig | 7 +++++++
> drivers/clk/rockchip/clk_rk3399.c | 7 +++++++
> drivers/video/rockchip/Kconfig | 2 ++
> drivers/video/rockchip/rk3399_vop.c | 2 --
> drivers/video/rockchip/rk_vop.c | 4 ++++
> include/configs/evb_rk3399.h | 5 +++++
> include/configs/rock960_rk3399.h | 5 +++++
> 14 files changed, 70 insertions(+), 2 deletions(-)
Series applied to u-boot-video/video-fixes-v2020.04, thanks!
--
Anatolij
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [PATCH v3 0/5] rockchip: rk3399: Fix HDMI out
2020-04-02 13:56 ` Anatolij Gustschin
@ 2020-04-02 14:28 ` Kever Yang
-1 siblings, 0 replies; 34+ messages in thread
From: Kever Yang @ 2020-04-02 14:28 UTC (permalink / raw)
To: Anatolij Gustschin, Jagan Teki
Cc: u-boot-0aAXYlwwYIKGBzrmiIFOJg, Simon Glass,
linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
sunil-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/,
Philipp Tomsich, linux-amarula-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/,
Mark Kettenis
Hi Anatolij,
On 2020/4/2 下午9:56, Anatolij Gustschin wrote:
> On Thu, 2 Apr 2020 17:11:20 +0530
> Jagan Teki jagan@amarulasolutions.com wrote:
> ...
>> Jagan Teki (5):
>> clk: rk3399: Set empty for vopl assigned-clocks
>> video: rockchip: Fix vop modes for rk3399
>> rockchip: Enable pre console for rk3399
>> rockchip: Enable HDMI output on rk3399 board w/ HDMI
>> video: rockchip: Support 4K resolution for rk3399, HDMI
>>
>> arch/arm/include/asm/arch-rockchip/vop_rk3288.h | 11 +++++++++++
>> arch/arm/mach-rockchip/Kconfig | 1 +
>> common/Kconfig | 1 +
>> configs/nanopc-t4-rk3399_defconfig | 7 +++++++
>> configs/nanopi-m4-rk3399_defconfig | 7 +++++++
>> configs/nanopi-neo4-rk3399_defconfig | 7 +++++++
>> configs/roc-pc-rk3399_defconfig | 6 ++++++
>> configs/rock960-rk3399_defconfig | 7 +++++++
>> drivers/clk/rockchip/clk_rk3399.c | 7 +++++++
>> drivers/video/rockchip/Kconfig | 2 ++
>> drivers/video/rockchip/rk3399_vop.c | 2 --
>> drivers/video/rockchip/rk_vop.c | 4 ++++
>> include/configs/evb_rk3399.h | 5 +++++
>> include/configs/rock960_rk3399.h | 5 +++++
>> 14 files changed, 70 insertions(+), 2 deletions(-)
> Series applied to u-boot-video/video-fixes-v2020.04, thanks!
I was about to apply these patches, and under travis build now.
It's also OK for these patches to merge into u-boot-video.
Thanks,
- Kever
>
> --
> Anatolij
>
>
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
^ permalink raw reply [flat|nested] 34+ messages in thread
* [PATCH v3 0/5] rockchip: rk3399: Fix HDMI out
@ 2020-04-02 14:28 ` Kever Yang
0 siblings, 0 replies; 34+ messages in thread
From: Kever Yang @ 2020-04-02 14:28 UTC (permalink / raw)
To: u-boot
Hi Anatolij,
On 2020/4/2 ??9:56, Anatolij Gustschin wrote:
> On Thu, 2 Apr 2020 17:11:20 +0530
> Jagan Teki jagan at amarulasolutions.com wrote:
> ...
>> Jagan Teki (5):
>> clk: rk3399: Set empty for vopl assigned-clocks
>> video: rockchip: Fix vop modes for rk3399
>> rockchip: Enable pre console for rk3399
>> rockchip: Enable HDMI output on rk3399 board w/ HDMI
>> video: rockchip: Support 4K resolution for rk3399, HDMI
>>
>> arch/arm/include/asm/arch-rockchip/vop_rk3288.h | 11 +++++++++++
>> arch/arm/mach-rockchip/Kconfig | 1 +
>> common/Kconfig | 1 +
>> configs/nanopc-t4-rk3399_defconfig | 7 +++++++
>> configs/nanopi-m4-rk3399_defconfig | 7 +++++++
>> configs/nanopi-neo4-rk3399_defconfig | 7 +++++++
>> configs/roc-pc-rk3399_defconfig | 6 ++++++
>> configs/rock960-rk3399_defconfig | 7 +++++++
>> drivers/clk/rockchip/clk_rk3399.c | 7 +++++++
>> drivers/video/rockchip/Kconfig | 2 ++
>> drivers/video/rockchip/rk3399_vop.c | 2 --
>> drivers/video/rockchip/rk_vop.c | 4 ++++
>> include/configs/evb_rk3399.h | 5 +++++
>> include/configs/rock960_rk3399.h | 5 +++++
>> 14 files changed, 70 insertions(+), 2 deletions(-)
> Series applied to u-boot-video/video-fixes-v2020.04, thanks!
I was about to apply these patches, and under travis build now.
It's also OK for these patches to merge into u-boot-video.
Thanks,
- Kever
>
> --
> Anatolij
>
>
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [PATCH v3 0/5] rockchip: rk3399: Fix HDMI out
2020-04-02 14:28 ` Kever Yang
@ 2020-04-02 14:42 ` Anatolij Gustschin
-1 siblings, 0 replies; 34+ messages in thread
From: Anatolij Gustschin @ 2020-04-02 14:42 UTC (permalink / raw)
To: Kever Yang
Cc: linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, Simon Glass,
u-boot-0aAXYlwwYIKGBzrmiIFOJg, Jagan Teki,
sunil-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/,
Philipp Tomsich, linux-amarula-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/,
Mark Kettenis
Hi Kever,
On Thu, 2 Apr 2020 22:28:53 +0800
Kever Yang kever.yang-TNX95d0MmH7DzftRWevZcw@public.gmane.org wrote:
...
> > Series applied to u-boot-video/video-fixes-v2020.04, thanks!
>
> I was about to apply these patches, and under travis build now.
>
> It's also OK for these patches to merge into u-boot-video.
I'm build testing the series [1] and will submit a pull request to
Tom.
[1] https://gitlab.denx.de/u-boot/custodians/u-boot-video/pipelines/2606
--
Anatolij
^ permalink raw reply [flat|nested] 34+ messages in thread
* [PATCH v3 0/5] rockchip: rk3399: Fix HDMI out
@ 2020-04-02 14:42 ` Anatolij Gustschin
0 siblings, 0 replies; 34+ messages in thread
From: Anatolij Gustschin @ 2020-04-02 14:42 UTC (permalink / raw)
To: u-boot
Hi Kever,
On Thu, 2 Apr 2020 22:28:53 +0800
Kever Yang kever.yang at rock-chips.com wrote:
...
> > Series applied to u-boot-video/video-fixes-v2020.04, thanks!
>
> I was about to apply these patches, and under travis build now.
>
> It's also OK for these patches to merge into u-boot-video.
I'm build testing the series [1] and will submit a pull request to
Tom.
[1] https://gitlab.denx.de/u-boot/custodians/u-boot-video/pipelines/2606
--
Anatolij
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [PATCH v3 4/5] rockchip: Enable HDMI output on rk3399 board w/ HDMI
2020-04-02 11:41 ` Jagan Teki
@ 2020-04-05 14:07 ` Manivannan Sadhasivam
-1 siblings, 0 replies; 34+ messages in thread
From: Manivannan Sadhasivam @ 2020-04-05 14:07 UTC (permalink / raw)
To: Jagan Teki
Cc: Kever Yang, Simon Glass, Philipp Tomsich, Anatolij Gustschin,
Mark Kettenis, sunil, u-boot, linux-rockchip, linux-amarula
On Thu, Apr 02, 2020 at 05:11:24PM +0530, Jagan Teki wrote:
> Enable config options and console setting to respective
> rk3399 board for HDMI output.
>
> Boards supported and tested on this patch are:
> - NanoPc T4
> - NanoPi M4
> - NanoPi Neo4
> - ROC-RK3399-PC
> - Rock960
>
> Cc: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
For Rock960,
Acked-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Thanks,
Mani
> ---
> Changes for v3:
> - add rock960 hdmi out support
>
> configs/nanopc-t4-rk3399_defconfig | 7 +++++++
> configs/nanopi-m4-rk3399_defconfig | 7 +++++++
> configs/nanopi-neo4-rk3399_defconfig | 7 +++++++
> configs/roc-pc-rk3399_defconfig | 6 ++++++
> configs/rock960-rk3399_defconfig | 7 +++++++
> include/configs/evb_rk3399.h | 5 +++++
> include/configs/rock960_rk3399.h | 5 +++++
> 7 files changed, 44 insertions(+)
>
> diff --git a/configs/nanopc-t4-rk3399_defconfig b/configs/nanopc-t4-rk3399_defconfig
> index 9ea9b11574..607a00dbf7 100644
> --- a/configs/nanopc-t4-rk3399_defconfig
> +++ b/configs/nanopc-t4-rk3399_defconfig
> @@ -52,5 +52,12 @@ CONFIG_USB_ETHER_ASIX88179=y
> CONFIG_USB_ETHER_MCS7830=y
> CONFIG_USB_ETHER_RTL8152=y
> CONFIG_USB_ETHER_SMSC95XX=y
> +CONFIG_USB_KEYBOARD=y
> CONFIG_SPL_TINY_MEMSET=y
> CONFIG_ERRNO_STR=y
> +CONFIG_DM_VIDEO=y
> +CONFIG_VIDEO_BPP16=y
> +CONFIG_VIDEO_BPP32=y
> +CONFIG_DISPLAY=y
> +CONFIG_VIDEO_ROCKCHIP=y
> +CONFIG_DISPLAY_ROCKCHIP_HDMI=y
> diff --git a/configs/nanopi-m4-rk3399_defconfig b/configs/nanopi-m4-rk3399_defconfig
> index ad0e808bf6..3fcb7ac2d7 100644
> --- a/configs/nanopi-m4-rk3399_defconfig
> +++ b/configs/nanopi-m4-rk3399_defconfig
> @@ -52,5 +52,12 @@ CONFIG_USB_ETHER_ASIX88179=y
> CONFIG_USB_ETHER_MCS7830=y
> CONFIG_USB_ETHER_RTL8152=y
> CONFIG_USB_ETHER_SMSC95XX=y
> +CONFIG_USB_KEYBOARD=y
> CONFIG_SPL_TINY_MEMSET=y
> CONFIG_ERRNO_STR=y
> +CONFIG_DM_VIDEO=y
> +CONFIG_VIDEO_BPP16=y
> +CONFIG_VIDEO_BPP32=y
> +CONFIG_DISPLAY=y
> +CONFIG_VIDEO_ROCKCHIP=y
> +CONFIG_DISPLAY_ROCKCHIP_HDMI=y
> diff --git a/configs/nanopi-neo4-rk3399_defconfig b/configs/nanopi-neo4-rk3399_defconfig
> index d038a8cab9..b9ea535e43 100644
> --- a/configs/nanopi-neo4-rk3399_defconfig
> +++ b/configs/nanopi-neo4-rk3399_defconfig
> @@ -52,5 +52,12 @@ CONFIG_USB_ETHER_ASIX88179=y
> CONFIG_USB_ETHER_MCS7830=y
> CONFIG_USB_ETHER_RTL8152=y
> CONFIG_USB_ETHER_SMSC95XX=y
> +CONFIG_USB_KEYBOARD=y
> CONFIG_SPL_TINY_MEMSET=y
> CONFIG_ERRNO_STR=y
> +CONFIG_DM_VIDEO=y
> +CONFIG_VIDEO_BPP16=y
> +CONFIG_VIDEO_BPP32=y
> +CONFIG_DISPLAY=y
> +CONFIG_VIDEO_ROCKCHIP=y
> +CONFIG_DISPLAY_ROCKCHIP_HDMI=y
> diff --git a/configs/roc-pc-rk3399_defconfig b/configs/roc-pc-rk3399_defconfig
> index d540a17aeb..be76524cef 100644
> --- a/configs/roc-pc-rk3399_defconfig
> +++ b/configs/roc-pc-rk3399_defconfig
> @@ -59,3 +59,9 @@ CONFIG_USB_ETHER_SMSC95XX=y
> CONFIG_USB_KEYBOARD=y
> CONFIG_SPL_TINY_MEMSET=y
> CONFIG_ERRNO_STR=y
> +CONFIG_DM_VIDEO=y
> +CONFIG_VIDEO_BPP16=y
> +CONFIG_VIDEO_BPP32=y
> +CONFIG_DISPLAY=y
> +CONFIG_VIDEO_ROCKCHIP=y
> +CONFIG_DISPLAY_ROCKCHIP_HDMI=y
> diff --git a/configs/rock960-rk3399_defconfig b/configs/rock960-rk3399_defconfig
> index ba4226e173..c4e954731a 100644
> --- a/configs/rock960-rk3399_defconfig
> +++ b/configs/rock960-rk3399_defconfig
> @@ -58,5 +58,12 @@ CONFIG_USB_ETHER_ASIX88179=y
> CONFIG_USB_ETHER_MCS7830=y
> CONFIG_USB_ETHER_RTL8152=y
> CONFIG_USB_ETHER_SMSC95XX=y
> +CONFIG_USB_KEYBOARD=y
> CONFIG_SPL_TINY_MEMSET=y
> CONFIG_ERRNO_STR=y
> +CONFIG_DM_VIDEO=y
> +CONFIG_VIDEO_BPP16=y
> +CONFIG_VIDEO_BPP32=y
> +CONFIG_DISPLAY=y
> +CONFIG_VIDEO_ROCKCHIP=y
> +CONFIG_DISPLAY_ROCKCHIP_HDMI=y
> diff --git a/include/configs/evb_rk3399.h b/include/configs/evb_rk3399.h
> index c0b0358893..2d3db22877 100644
> --- a/include/configs/evb_rk3399.h
> +++ b/include/configs/evb_rk3399.h
> @@ -6,6 +6,11 @@
> #ifndef __EVB_RK3399_H
> #define __EVB_RK3399_H
>
> +#define ROCKCHIP_DEVICE_SETTINGS \
> + "stdin=serial,usbkbd\0" \
> + "stdout=serial,vidconsole\0" \
> + "stderr=serial,vidconsole\0"
> +
> #include <configs/rk3399_common.h>
>
> #if defined(CONFIG_ENV_IS_IN_MMC)
> diff --git a/include/configs/rock960_rk3399.h b/include/configs/rock960_rk3399.h
> index 746d24cbff..304ad2b7aa 100644
> --- a/include/configs/rock960_rk3399.h
> +++ b/include/configs/rock960_rk3399.h
> @@ -6,6 +6,11 @@
> #ifndef __ROCK960_RK3399_H
> #define __ROCK960_RK3399_H
>
> +#define ROCKCHIP_DEVICE_SETTINGS \
> + "stdin=serial,usbkbd\0" \
> + "stdout=serial,vidconsole\0" \
> + "stderr=serial,vidconsole\0"
> +
> #include <configs/rk3399_common.h>
>
> #define CONFIG_SYS_MMC_ENV_DEV 1
> --
> 2.17.1
>
^ permalink raw reply [flat|nested] 34+ messages in thread
* [PATCH v3 4/5] rockchip: Enable HDMI output on rk3399 board w/ HDMI
@ 2020-04-05 14:07 ` Manivannan Sadhasivam
0 siblings, 0 replies; 34+ messages in thread
From: Manivannan Sadhasivam @ 2020-04-05 14:07 UTC (permalink / raw)
To: u-boot
On Thu, Apr 02, 2020 at 05:11:24PM +0530, Jagan Teki wrote:
> Enable config options and console setting to respective
> rk3399 board for HDMI output.
>
> Boards supported and tested on this patch are:
> - NanoPc T4
> - NanoPi M4
> - NanoPi Neo4
> - ROC-RK3399-PC
> - Rock960
>
> Cc: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
For Rock960,
Acked-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Thanks,
Mani
> ---
> Changes for v3:
> - add rock960 hdmi out support
>
> configs/nanopc-t4-rk3399_defconfig | 7 +++++++
> configs/nanopi-m4-rk3399_defconfig | 7 +++++++
> configs/nanopi-neo4-rk3399_defconfig | 7 +++++++
> configs/roc-pc-rk3399_defconfig | 6 ++++++
> configs/rock960-rk3399_defconfig | 7 +++++++
> include/configs/evb_rk3399.h | 5 +++++
> include/configs/rock960_rk3399.h | 5 +++++
> 7 files changed, 44 insertions(+)
>
> diff --git a/configs/nanopc-t4-rk3399_defconfig b/configs/nanopc-t4-rk3399_defconfig
> index 9ea9b11574..607a00dbf7 100644
> --- a/configs/nanopc-t4-rk3399_defconfig
> +++ b/configs/nanopc-t4-rk3399_defconfig
> @@ -52,5 +52,12 @@ CONFIG_USB_ETHER_ASIX88179=y
> CONFIG_USB_ETHER_MCS7830=y
> CONFIG_USB_ETHER_RTL8152=y
> CONFIG_USB_ETHER_SMSC95XX=y
> +CONFIG_USB_KEYBOARD=y
> CONFIG_SPL_TINY_MEMSET=y
> CONFIG_ERRNO_STR=y
> +CONFIG_DM_VIDEO=y
> +CONFIG_VIDEO_BPP16=y
> +CONFIG_VIDEO_BPP32=y
> +CONFIG_DISPLAY=y
> +CONFIG_VIDEO_ROCKCHIP=y
> +CONFIG_DISPLAY_ROCKCHIP_HDMI=y
> diff --git a/configs/nanopi-m4-rk3399_defconfig b/configs/nanopi-m4-rk3399_defconfig
> index ad0e808bf6..3fcb7ac2d7 100644
> --- a/configs/nanopi-m4-rk3399_defconfig
> +++ b/configs/nanopi-m4-rk3399_defconfig
> @@ -52,5 +52,12 @@ CONFIG_USB_ETHER_ASIX88179=y
> CONFIG_USB_ETHER_MCS7830=y
> CONFIG_USB_ETHER_RTL8152=y
> CONFIG_USB_ETHER_SMSC95XX=y
> +CONFIG_USB_KEYBOARD=y
> CONFIG_SPL_TINY_MEMSET=y
> CONFIG_ERRNO_STR=y
> +CONFIG_DM_VIDEO=y
> +CONFIG_VIDEO_BPP16=y
> +CONFIG_VIDEO_BPP32=y
> +CONFIG_DISPLAY=y
> +CONFIG_VIDEO_ROCKCHIP=y
> +CONFIG_DISPLAY_ROCKCHIP_HDMI=y
> diff --git a/configs/nanopi-neo4-rk3399_defconfig b/configs/nanopi-neo4-rk3399_defconfig
> index d038a8cab9..b9ea535e43 100644
> --- a/configs/nanopi-neo4-rk3399_defconfig
> +++ b/configs/nanopi-neo4-rk3399_defconfig
> @@ -52,5 +52,12 @@ CONFIG_USB_ETHER_ASIX88179=y
> CONFIG_USB_ETHER_MCS7830=y
> CONFIG_USB_ETHER_RTL8152=y
> CONFIG_USB_ETHER_SMSC95XX=y
> +CONFIG_USB_KEYBOARD=y
> CONFIG_SPL_TINY_MEMSET=y
> CONFIG_ERRNO_STR=y
> +CONFIG_DM_VIDEO=y
> +CONFIG_VIDEO_BPP16=y
> +CONFIG_VIDEO_BPP32=y
> +CONFIG_DISPLAY=y
> +CONFIG_VIDEO_ROCKCHIP=y
> +CONFIG_DISPLAY_ROCKCHIP_HDMI=y
> diff --git a/configs/roc-pc-rk3399_defconfig b/configs/roc-pc-rk3399_defconfig
> index d540a17aeb..be76524cef 100644
> --- a/configs/roc-pc-rk3399_defconfig
> +++ b/configs/roc-pc-rk3399_defconfig
> @@ -59,3 +59,9 @@ CONFIG_USB_ETHER_SMSC95XX=y
> CONFIG_USB_KEYBOARD=y
> CONFIG_SPL_TINY_MEMSET=y
> CONFIG_ERRNO_STR=y
> +CONFIG_DM_VIDEO=y
> +CONFIG_VIDEO_BPP16=y
> +CONFIG_VIDEO_BPP32=y
> +CONFIG_DISPLAY=y
> +CONFIG_VIDEO_ROCKCHIP=y
> +CONFIG_DISPLAY_ROCKCHIP_HDMI=y
> diff --git a/configs/rock960-rk3399_defconfig b/configs/rock960-rk3399_defconfig
> index ba4226e173..c4e954731a 100644
> --- a/configs/rock960-rk3399_defconfig
> +++ b/configs/rock960-rk3399_defconfig
> @@ -58,5 +58,12 @@ CONFIG_USB_ETHER_ASIX88179=y
> CONFIG_USB_ETHER_MCS7830=y
> CONFIG_USB_ETHER_RTL8152=y
> CONFIG_USB_ETHER_SMSC95XX=y
> +CONFIG_USB_KEYBOARD=y
> CONFIG_SPL_TINY_MEMSET=y
> CONFIG_ERRNO_STR=y
> +CONFIG_DM_VIDEO=y
> +CONFIG_VIDEO_BPP16=y
> +CONFIG_VIDEO_BPP32=y
> +CONFIG_DISPLAY=y
> +CONFIG_VIDEO_ROCKCHIP=y
> +CONFIG_DISPLAY_ROCKCHIP_HDMI=y
> diff --git a/include/configs/evb_rk3399.h b/include/configs/evb_rk3399.h
> index c0b0358893..2d3db22877 100644
> --- a/include/configs/evb_rk3399.h
> +++ b/include/configs/evb_rk3399.h
> @@ -6,6 +6,11 @@
> #ifndef __EVB_RK3399_H
> #define __EVB_RK3399_H
>
> +#define ROCKCHIP_DEVICE_SETTINGS \
> + "stdin=serial,usbkbd\0" \
> + "stdout=serial,vidconsole\0" \
> + "stderr=serial,vidconsole\0"
> +
> #include <configs/rk3399_common.h>
>
> #if defined(CONFIG_ENV_IS_IN_MMC)
> diff --git a/include/configs/rock960_rk3399.h b/include/configs/rock960_rk3399.h
> index 746d24cbff..304ad2b7aa 100644
> --- a/include/configs/rock960_rk3399.h
> +++ b/include/configs/rock960_rk3399.h
> @@ -6,6 +6,11 @@
> #ifndef __ROCK960_RK3399_H
> #define __ROCK960_RK3399_H
>
> +#define ROCKCHIP_DEVICE_SETTINGS \
> + "stdin=serial,usbkbd\0" \
> + "stdout=serial,vidconsole\0" \
> + "stderr=serial,vidconsole\0"
> +
> #include <configs/rk3399_common.h>
>
> #define CONFIG_SYS_MMC_ENV_DEV 1
> --
> 2.17.1
>
^ permalink raw reply [flat|nested] 34+ messages in thread
end of thread, other threads:[~2020-04-05 14:07 UTC | newest]
Thread overview: 34+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-04-02 11:41 [PATCH v3 0/5] rockchip: rk3399: Fix HDMI out Jagan Teki
2020-04-02 11:41 ` Jagan Teki
[not found] ` <20200402114125.2501-1-jagan-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org>
2020-04-02 11:41 ` [PATCH v3 1/5] clk: rk3399: Set empty for vopl assigned-clocks Jagan Teki
2020-04-02 11:41 ` Jagan Teki
[not found] ` <20200402114125.2501-2-jagan-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org>
2020-04-02 12:47 ` Kever Yang
2020-04-02 12:47 ` Kever Yang
2020-04-02 11:41 ` [PATCH v3 2/5] video: rockchip: Fix vop modes for rk3399 Jagan Teki
2020-04-02 11:41 ` Jagan Teki
[not found] ` <20200402114125.2501-3-jagan-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org>
2020-04-02 12:47 ` Kever Yang
2020-04-02 12:47 ` Kever Yang
2020-04-02 11:41 ` [PATCH v3 3/5] rockchip: Enable pre console " Jagan Teki
2020-04-02 11:41 ` Jagan Teki
[not found] ` <20200402114125.2501-4-jagan-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org>
2020-04-02 12:47 ` Kever Yang
2020-04-02 12:47 ` Kever Yang
2020-04-02 11:41 ` [PATCH v3 4/5] rockchip: Enable HDMI output on rk3399 board w/ HDMI Jagan Teki
2020-04-02 11:41 ` Jagan Teki
[not found] ` <20200402114125.2501-5-jagan-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org>
2020-04-02 12:38 ` Peter Robinson
2020-04-02 12:38 ` Peter Robinson
2020-04-02 12:48 ` Kever Yang
2020-04-02 12:48 ` Kever Yang
2020-04-05 14:07 ` Manivannan Sadhasivam
2020-04-05 14:07 ` Manivannan Sadhasivam
2020-04-02 11:41 ` [PATCH v3 5/5] video: rockchip: Support 4K resolution for rk3399, HDMI Jagan Teki
2020-04-02 11:41 ` Jagan Teki
2020-04-02 12:48 ` Kever Yang
2020-04-02 12:48 ` Kever Yang
2020-04-02 12:39 ` [PATCH v3 0/5] rockchip: rk3399: Fix HDMI out Peter Robinson
2020-04-02 12:39 ` Peter Robinson
2020-04-02 13:56 ` Anatolij Gustschin
2020-04-02 13:56 ` Anatolij Gustschin
2020-04-02 14:28 ` Kever Yang
2020-04-02 14:28 ` Kever Yang
[not found] ` <4e11274d-b166-1e41-83a6-8bf647f96c84-TNX95d0MmH7DzftRWevZcw@public.gmane.org>
2020-04-02 14:42 ` Anatolij Gustschin
2020-04-02 14:42 ` Anatolij Gustschin
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.