Skip to contentSkip to conversation

rockchip: Enable Console MUX in ROCKPi N10

PATCH New Jagan Teki 2 participants 8 messages Oct 23, 2020 – Oct 30, 2020

Subsystems (3)
lore
Share & tools
lore

Jagan Teki

author
#0 lore raw

PATCH 1/4 rockchip: Enable Console MUX in ROCKPi N10

Enable Console multiplexing in ROCKPi N10 which would is required to video out the console buffer.

Enable it.

---
 configs/rock-pi-n10-rk3399pro_defconfig | 1 -
 1 file changed, 1 deletion(-)
configs/rock-pi-n10-rk3399pro_defconfig +0 -1
index 3255e01512..b1c7b9abe6 100644
@@ -12,7 +12,6 @@ CONFIG_DEFAULT_DEVICE_TREE="rk3399pro-rock-pi-n10"
 CONFIG_DEBUG_UART=y
 # CONFIG_ANDROID_BOOT_IMAGE is not set
 CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399pro-rock-pi-n10.dtb"
-# CONFIG_CONSOLE_MUX is not set
 CONFIG_DISPLAY_BOARDINFO_LATE=y
 CONFIG_MISC_INIT_R=y
 # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
Signature · 1 line
2.25.1
author
#1 lore raw

PATCH 2/4 arm64: dts: rockchip: Add chosen node for ROCK-Pi N8

Add chosen node in -u-boot.dtsi for ROCK-Pi N8 board.

This will help to get serial out messages.

---
 arch/arm/dts/rk3288-rock-pi-n8-u-boot.dtsi | 6 ++++++
 1 file changed, 6 insertions(+)
arch/arm/dts/rk3288-rock-pi-n8-u-boot.dtsi +6 -0
index e9d7404ed9..538607dd73 100644
@@ -5,6 +5,12 @@
 
 #include "rk3288-u-boot.dtsi"
 
+/{
+	chosen {
+		stdout-path = &uart2;
+	};
+};
+
 &dmc {
 	rockchip,pctl-timing = <0x215 0xc8 0x0 0x35 0x26 0x2 0x70 0x2000d
 		0x6 0x0 0x8 0x4 0x17 0x24 0xd 0x6
Signature · 1 line
2.25.1
#2 lore raw

PATCH 2/4 arm64: dts: rockchip: Add chosen node for ROCK-Pi N8

Quoted 5 lines · Jagan Teki

Add chosen node in -u-boot.dtsi for ROCK-Pi N8 board.

This will help to get serial out messages.

Thanks,
- Kever

Quoted 21 lines
---
  arch/arm/dts/rk3288-rock-pi-n8-u-boot.dtsi | 6 ++++++
  1 file changed, 6 insertions(+)
arch/arm/dts/rk3288-rock-pi-n8-u-boot.dtsi +6 -0
index e9d7404ed9..538607dd73 100644
@@ -5,6 +5,12 @@
 
  #include "rk3288-u-boot.dtsi"
 
+/{
+	chosen {
+		stdout-path = &uart2;
+	};
+};
+
  &dmc {
  	rockchip,pctl-timing = <0x215 0xc8 0x0 0x35 0x26 0x2 0x70 0x2000d
  		0x6 0x0 0x8 0x4 0x17 0x24 0xd 0x6
author
#3 lore raw

PATCH 3/4 video: rockchip: Support 4K resolution for rk3288, HDMI

In reply to Jagan Teki

Like, rk3399 the rk3288 also supports 4K resolution.

So, enable it for rk3288 with HDMI platforms.

Right now, rockchip video drivers are supporting for rk3288, rk3399 SoC families, so mark the 4K resolution by default if it's an HDMI video out.

Cc Anatolij Gustschin <[email protected]>
---
 drivers/video/rockchip/Kconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/video/rockchip/Kconfig +2 -2
index 5215a71f99..0ade631bd5 100644
@@ -22,7 +22,7 @@ menuconfig VIDEO_ROCKCHIP
 config VIDEO_ROCKCHIP_MAX_XRES
         int "Maximum horizontal resolution (for memory allocation purposes)"
 	depends on VIDEO_ROCKCHIP
-	default 3840 if ROCKCHIP_RK3399 && DISPLAY_ROCKCHIP_HDMI
+	default 3840 if DISPLAY_ROCKCHIP_HDMI
 	default 1920
 	help
 	  The maximum horizontal resolution to support for the framebuffer.
@@ -32,7 +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 2160 if DISPLAY_ROCKCHIP_HDMI
 	default 1080
 	help
 	  The maximum vertical resolution to support for the framebuffer.
Signature · 1 line
2.25.1
#4 lore raw

PATCH 3/4 video: rockchip: Support 4K resolution for rk3288, HDMI

Quoted 10 lines · Jagan Teki

Like, rk3399 the rk3288 also supports 4K resolution.

So, enable it for rk3288 with HDMI platforms.

Right now, rockchip video drivers are supporting for rk3288, rk3399 SoC families, so mark the 4K resolution by default if it's an HDMI video out.

Cc Anatolij Gustschin <[email protected]>

Thanks,
- Kever

Quoted 26 lines
---
  drivers/video/rockchip/Kconfig | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
drivers/video/rockchip/Kconfig +2 -2
index 5215a71f99..0ade631bd5 100644
@@ -22,7 +22,7 @@ menuconfig VIDEO_ROCKCHIP
  config VIDEO_ROCKCHIP_MAX_XRES
          int "Maximum horizontal resolution (for memory allocation purposes)"
  	depends on VIDEO_ROCKCHIP
-	default 3840 if ROCKCHIP_RK3399 && DISPLAY_ROCKCHIP_HDMI
+	default 3840 if DISPLAY_ROCKCHIP_HDMI
  	default 1920
  	help
  	  The maximum horizontal resolution to support for the framebuffer.
@@ -32,7 +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 2160 if DISPLAY_ROCKCHIP_HDMI
  	default 1080
  	help
  	  The maximum vertical resolution to support for the framebuffer.
author
#5 lore raw

PATCH 4/4 rockchip: Enable Console MUX in ROCKPi N8

In reply to Jagan Teki

Enable Console multiplexing in ROCKPi N8 which would is required to video out the console buffer.

Enable it.

---
 configs/rock-pi-n8-rk3288_defconfig | 1 -
 1 file changed, 1 deletion(-)
configs/rock-pi-n8-rk3288_defconfig +0 -1
index e5bc035926..380a58c5c4 100644
@@ -16,7 +16,6 @@ CONFIG_DEBUG_UART=y
 CONFIG_USE_PREBOOT=y
 CONFIG_DEFAULT_FDT_FILE="rk3288-rock-pi-n8.dtb"
 CONFIG_SILENT_CONSOLE=y
-# CONFIG_CONSOLE_MUX is not set
 CONFIG_DISPLAY_BOARDINFO_LATE=y
 CONFIG_SPL_STACK_R=y
 CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x2000
Signature · 1 line
2.25.1
#6 lore raw

PATCH 4/4 rockchip: Enable Console MUX in ROCKPi N8

Quoted 6 lines · Jagan Teki

Enable Console multiplexing in ROCKPi N8 which would is required to video out the console buffer.

Enable it.

Thanks,
- Kever

Quoted 16 lines
---
  configs/rock-pi-n8-rk3288_defconfig | 1 -
  1 file changed, 1 deletion(-)
configs/rock-pi-n8-rk3288_defconfig +0 -1
index e5bc035926..380a58c5c4 100644
@@ -16,7 +16,6 @@ CONFIG_DEBUG_UART=y
  CONFIG_USE_PREBOOT=y
  CONFIG_DEFAULT_FDT_FILE="rk3288-rock-pi-n8.dtb"
  CONFIG_SILENT_CONSOLE=y
-# CONFIG_CONSOLE_MUX is not set
  CONFIG_DISPLAY_BOARDINFO_LATE=y
  CONFIG_SPL_STACK_R=y
  CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x2000
#7 lore raw

PATCH 1/4 rockchip: Enable Console MUX in ROCKPi N10

In reply to Jagan Teki
Quoted 6 lines · Jagan Teki

Enable Console multiplexing in ROCKPi N10 which would is required to video out the console buffer.

Enable it.

Thanks,
- Kever

Quoted 16 lines
---
  configs/rock-pi-n10-rk3399pro_defconfig | 1 -
  1 file changed, 1 deletion(-)
configs/rock-pi-n10-rk3399pro_defconfig +0 -1
index 3255e01512..b1c7b9abe6 100644
@@ -12,7 +12,6 @@ CONFIG_DEFAULT_DEVICE_TREE="rk3399pro-rock-pi-n10"
  CONFIG_DEBUG_UART=y
  # CONFIG_ANDROID_BOOT_IMAGE is not set
  CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399pro-rock-pi-n10.dtb"
-# CONFIG_CONSOLE_MUX is not set
  CONFIG_DISPLAY_BOARDINFO_LATE=y
  CONFIG_MISC_INIT_R=y
  # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set