Skip to contentSkip to conversation

rockchip: rk3288: Enable pre console buffer

PATCH In review Jagan Teki 3 participants 8 messages Jan 23, 2020 – Jan 30, 2020 1 message not in the archive

Subsystems (3)
lore
Share & tools
lore

Jagan Teki

author
#0 lore raw

PATCH 1/4 rockchip: rk3288: Enable pre console buffer

Enable pre console buffer for rk3288 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 RK3288 platform boards.

Buffer address used for pre console is 0x0f000000 which is ram base plus 240MiB. right now the Allwinner SoC is using similar computation.

---
 arch/arm/mach-rockchip/Kconfig | 1 +
 common/Kconfig                 | 1 +
 2 files changed, 2 insertions(+)
arch/arm/mach-rockchip/Kconfig +1 -0
index 2f260a5c5f..ed7514ab75 100644
@@ -102,6 +102,7 @@ config ROCKCHIP_RK3288
 	select SUPPORT_SPL
 	select SPL
 	select SUPPORT_TPL
+	imply PRE_CONSOLE_BUFFER
 	imply ROCKCHIP_COMMON_BOARD
 	imply SPL_ROCKCHIP_COMMON_BOARD
 	imply TPL_CLK
common/Kconfig +1 -0
index a7c5ba278a..21d0244050 100644
@@ -567,6 +567,7 @@ config PRE_CON_BUF_ADDR
 	depends on PRE_CONSOLE_BUFFER
 	default 0x2f000000 if ARCH_SUNXI && MACH_SUN9I
 	default 0x4f000000 if ARCH_SUNXI && !MACH_SUN9I
+	default 0x0f000000 if ROCKCHIP_RK3288
 	help
 	  This sets the start address of the pre-console buffer. This must
 	  be in available memory and is accessed before relocation and
Signature · 1 line
2.18.0.321.gffc6fa0e3

A message that is not in the archive (sent off-list or not yet received): 20200123141222.486-1-jagan-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org

#2 lore raw

PATCH 2/4 ARM: dts: rockchip: Sync rk3288-vyasa dts from linux

Sync rk3288-vyasa dts file from Linux.

This sync has changes required to work HDMI output on Vyasa RK3288 board.

This sync excludes the io_domains node since it is not available in rk3288.dtsi.

Changes like vcc50_hdmi, vdd10_lcd and ddc-i2c-bus are not merged to Linux yet but wil resync later if any further updates on this.

---
 arch/arm/dts/rk3288-vyasa.dts | 79 ++++++++++++++---------------------
 1 file changed, 32 insertions(+), 47 deletions(-)
arch/arm/dts/rk3288-vyasa.dts +32 -47
index 850aa25818..4193f7208c 100644
@@ -1,43 +1,6 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Copyright (C) 2017 Jagan Teki <jagan-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org>
- *
- * This file is dual-licensed: you can use it either under the terms
- * of the GPL or the X11 license, at your option. Note that this dual
- * licensing only applies to this file, and not this project as a
- * whole.
- *
- *  a) This file is free software; you can redistribute it and/or
- *     modify it under the terms of the GNU General Public License as
- *     published by the Free Software Foundation; either version 2 of the
- *     License, or (at your option) any later version.
- *
- *     This file is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- * Or, alternatively,
- *
- *  b) Permission is hereby granted, free of charge, to any person
- *     obtaining a copy of this software and associated documentation
- *     files (the "Software"), to deal in the Software without
- *     restriction, including without limitation the rights to use,
- *     copy, modify, merge, publish, distribute, sublicense, and/or
- *     sell copies of the Software, and to permit persons to whom the
- *     Software is furnished to do so, subject to the following
- *     conditions:
- *
- *     The above copyright notice and this permission notice shall be
- *     included in all copies or substantial portions of the Software.
- *
- *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- *     OTHER DEALINGS IN THE SOFTWARE.
  */
 
 /dts-v1/;
@@ -115,6 +78,17 @@
 		vin-supply = <&vcc_io>;
 	};
 
+	vcc50_hdmi: vcc50-hdmi {
+		compatible = "regulator-fixed";
+		regulator-name = "vcc50_hdmi";
+		enable-active-high;
+		gpio = <&gpio7 RK_PB4 GPIO_ACTIVE_HIGH>; /* HDMI_EN */
+		pinctrl-names = "default";
+		pinctrl-0 = <&vcc50_hdmi_en>;
+		regulator-always-on;
+		regulator-boot-on;
+		vin-supply = <&vsus_5v>;
+	};
 	vusb1_5v: vusb1-5v {
 		compatible = "regulator-fixed";
 		regulator-name = "vusb1_5v";
@@ -158,7 +132,6 @@
 &emmc {
 	bus-width = <8>;
 	cap-mmc-highspeed;
-	disable-wp;
 	non-removable;
 	pinctrl-names = "default";
 	pinctrl-0 = <&emmc_clk &emmc_cmd &emmc_pwr &emmc_bus8>;
@@ -188,7 +161,7 @@
 };
 
 &hdmi {
-	ddc-i2c-bus = <&i2c2>;
+	ddc-i2c-bus = <&i2c5>;
 	status = "okay";
 };
 
@@ -324,15 +297,15 @@
 				};
 			};
 
-			vcc10_lcd: LDO_REG6 {
-				regulator-name = "vcc10_lcd";
+			vdd10_lcd: LDO_REG6 {
+				regulator-name = "vdd10_lcd";
 				regulator-min-microvolt = <1000000>;
 				regulator-max-microvolt = <1000000>;
 				regulator-always-on;
 				regulator-boot-on;
 				regulator-state-mem {
 					regulator-on-in-suspend;
-					regulator-suspend-microvolt = <1800000>;
+					regulator-suspend-microvolt = <1000000>;
 				};
 			};
 
@@ -385,7 +358,7 @@
 	};
 };
 
-&i2c2 {
+&i2c5 {
 	status = "okay";
 };
 
@@ -402,6 +375,12 @@
 	status = "okay";
 };
 
+&tsadc {
+	rockchip,hw-tshut-mode = <1>; /* tshut mode 0:CRU 1:GPIO */
+	rockchip,hw-tshut-polarity = <1>; /* tshut polarity 0:LOW 1:HIGH */
+	status = "okay";
+};
+
 &uart2 {
 	status = "okay";
 };
@@ -463,15 +442,21 @@
 		};
 	};
 
+	hdmi {
+		vcc50_hdmi_en: vcc50-hdmi-en {
+			rockchip,pins = <7 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>;
+		};
+	};
+
 	pmic {
 		pmic_int: pmic-int {
-			rockchip,pins = <RK_GPIO0 4 RK_FUNC_GPIO &pcfg_pull_up>;
+			rockchip,pins = <0 RK_PA4 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 	};
 
 	usb_host {
 		phy_pwr_en: phy-pwr-en {
-			rockchip,pins = <RK_GPIO2 RK_PB1 RK_FUNC_GPIO &pcfg_output_high>;
+			rockchip,pins = <2 RK_PB1 RK_FUNC_GPIO &pcfg_output_high>;
 		};
 
 		usb2_pwr_en: usb2-pwr-en {
@@ -481,7 +466,7 @@
 
 	usb_otg {
 		otg_vbus_drv: otg-vbus-drv {
-			rockchip,pins = <RK_GPIO0 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>;
+			rockchip,pins = <0 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>;
 
 		};
 	};
Signature · 1 line
2.18.0.321.gffc6fa0e3
Reviewed-by on v1 2/4
#3 lore raw

Re: [PATCH 2/4] ARM: dts: rockchip: Sync rk3288-vyasa dts from linux

Quoted 5 lines · Jagan Teki

Sync rk3288-vyasa dts file from Linux.

This sync has changes required to work HDMI output on Vyasa RK3288 board.

Quoted 8 lines

This sync excludes the io_domains node since it is not available in rk3288.dtsi.

Changes like vcc50_hdmi, vdd10_lcd and ddc-i2c-bus are not merged to Linux yet but wil resync later if any further updates on this.

Thanks,
- Kever

Quoted 162 lines
---
  arch/arm/dts/rk3288-vyasa.dts | 79 ++++++++++++++---------------------
  1 file changed, 32 insertions(+), 47 deletions(-)
arch/arm/dts/rk3288-vyasa.dts +32 -47
index 850aa25818..4193f7208c 100644
@@ -1,43 +1,6 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
  /*
   * Copyright (C) 2017 Jagan Teki <[email protected]>
- *
- * This file is dual-licensed: you can use it either under the terms
- * of the GPL or the X11 license, at your option. Note that this dual
- * licensing only applies to this file, and not this project as a
- * whole.
- *
- *  a) This file is free software; you can redistribute it and/or
- *     modify it under the terms of the GNU General Public License as
- *     published by the Free Software Foundation; either version 2 of the
- *     License, or (at your option) any later version.
- *
- *     This file is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- * Or, alternatively,
- *
- *  b) Permission is hereby granted, free of charge, to any person
- *     obtaining a copy of this software and associated documentation
- *     files (the "Software"), to deal in the Software without
- *     restriction, including without limitation the rights to use,
- *     copy, modify, merge, publish, distribute, sublicense, and/or
- *     sell copies of the Software, and to permit persons to whom the
- *     Software is furnished to do so, subject to the following
- *     conditions:
- *
- *     The above copyright notice and this permission notice shall be
- *     included in all copies or substantial portions of the Software.
- *
- *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- *     OTHER DEALINGS IN THE SOFTWARE.
   */
 
  /dts-v1/;
@@ -115,6 +78,17 @@
  		vin-supply = <&vcc_io>;
  	};
 
+	vcc50_hdmi: vcc50-hdmi {
+		compatible = "regulator-fixed";
+		regulator-name = "vcc50_hdmi";
+		enable-active-high;
+		gpio = <&gpio7 RK_PB4 GPIO_ACTIVE_HIGH>; /* HDMI_EN */
+		pinctrl-names = "default";
+		pinctrl-0 = <&vcc50_hdmi_en>;
+		regulator-always-on;
+		regulator-boot-on;
+		vin-supply = <&vsus_5v>;
+	};
  	vusb1_5v: vusb1-5v {
  		compatible = "regulator-fixed";
  		regulator-name = "vusb1_5v";
@@ -158,7 +132,6 @@
  &emmc {
  	bus-width = <8>;
  	cap-mmc-highspeed;
-	disable-wp;
  	non-removable;
  	pinctrl-names = "default";
  	pinctrl-0 = <&emmc_clk &emmc_cmd &emmc_pwr &emmc_bus8>;
@@ -188,7 +161,7 @@
  };
 
  &hdmi {
-	ddc-i2c-bus = <&i2c2>;
+	ddc-i2c-bus = <&i2c5>;
  	status = "okay";
  };
 
@@ -324,15 +297,15 @@
  				};
  			};
 
-			vcc10_lcd: LDO_REG6 {
-				regulator-name = "vcc10_lcd";
+			vdd10_lcd: LDO_REG6 {
+				regulator-name = "vdd10_lcd";
  				regulator-min-microvolt = <1000000>;
  				regulator-max-microvolt = <1000000>;
  				regulator-always-on;
  				regulator-boot-on;
  				regulator-state-mem {
  					regulator-on-in-suspend;
-					regulator-suspend-microvolt = <1800000>;
+					regulator-suspend-microvolt = <1000000>;
  				};
  			};
 
@@ -385,7 +358,7 @@
  	};
  };
 
-&i2c2 {
+&i2c5 {
  	status = "okay";
  };
 
@@ -402,6 +375,12 @@
  	status = "okay";
  };
 
+&tsadc {
+	rockchip,hw-tshut-mode = <1>; /* tshut mode 0:CRU 1:GPIO */
+	rockchip,hw-tshut-polarity = <1>; /* tshut polarity 0:LOW 1:HIGH */
+	status = "okay";
+};
+
  &uart2 {
  	status = "okay";
  };
@@ -463,15 +442,21 @@
  		};
  	};
 
+	hdmi {
+		vcc50_hdmi_en: vcc50-hdmi-en {
+			rockchip,pins = <7 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>;
+		};
+	};
+
  	pmic {
  		pmic_int: pmic-int {
-			rockchip,pins = <RK_GPIO0 4 RK_FUNC_GPIO &pcfg_pull_up>;
+			rockchip,pins = <0 RK_PA4 RK_FUNC_GPIO &pcfg_pull_up>;
  		};
  	};
 
  	usb_host {
  		phy_pwr_en: phy-pwr-en {
-			rockchip,pins = <RK_GPIO2 RK_PB1 RK_FUNC_GPIO &pcfg_output_high>;
+			rockchip,pins = <2 RK_PB1 RK_FUNC_GPIO &pcfg_output_high>;
  		};
 
  		usb2_pwr_en: usb2-pwr-en {
@@ -481,7 +466,7 @@
 
  	usb_otg {
  		otg_vbus_drv: otg-vbus-drv {
-			rockchip,pins = <RK_GPIO0 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>;
+			rockchip,pins = <0 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>;
 
  		};
  	};
#4 lore raw

PATCH 3/4 rk3288: tinker: Enable HDMI output

In reply to a message not in the archive

Enable HDMI output for Tinker RK3288 board.

---
 configs/tinker-rk3288_defconfig | 6 ++++++
 include/configs/tinker_rk3288.h | 6 +++++-
 2 files changed, 11 insertions(+), 1 deletion(-)
configs/tinker-rk3288_defconfig +6 -0
index 894e7d1e12..ecade47e7a 100644
@@ -83,3 +83,9 @@ CONFIG_USB_ETHER_ASIX=y
 CONFIG_USB_ETHER_SMSC95XX=y
 CONFIG_CMD_DHRYSTONE=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
include/configs/tinker_rk3288.h +5 -1
index f8a55a2cec..f1095ccd0e 100644
@@ -6,7 +6,11 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#define ROCKCHIP_DEVICE_SETTINGS
+#define ROCKCHIP_DEVICE_SETTINGS \
+		"stdin=serial,cros-ec-keyb\0" \
+		"stdout=serial,vidconsole\0" \
+		"stderr=serial,vidconsole\0"
+
 #include <configs/rk3288_common.h>
 
 #undef BOOT_TARGET_DEVICES
Signature · 1 line
2.18.0.321.gffc6fa0e3
Reviewed-by on v1 3/4
#5 lore raw

Re: [PATCH 3/4] rk3288: tinker: Enable HDMI output

Quoted 3 lines · Jagan Teki

Enable HDMI output for Tinker RK3288 board.

Thanks,
- Kever

Quoted 36 lines
---
  configs/tinker-rk3288_defconfig | 6 ++++++
  include/configs/tinker_rk3288.h | 6 +++++-
  2 files changed, 11 insertions(+), 1 deletion(-)
configs/tinker-rk3288_defconfig +6 -0
index 894e7d1e12..ecade47e7a 100644
@@ -83,3 +83,9 @@ CONFIG_USB_ETHER_ASIX=y
  CONFIG_USB_ETHER_SMSC95XX=y
  CONFIG_CMD_DHRYSTONE=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
include/configs/tinker_rk3288.h +5 -1
index f8a55a2cec..f1095ccd0e 100644
@@ -6,7 +6,11 @@
  #ifndef __CONFIG_H
  #define __CONFIG_H
 
-#define ROCKCHIP_DEVICE_SETTINGS
+#define ROCKCHIP_DEVICE_SETTINGS \
+		"stdin=serial,cros-ec-keyb\0" \
+		"stdout=serial,vidconsole\0" \
+		"stderr=serial,vidconsole\0"
+
  #include <configs/rk3288_common.h>
 
  #undef BOOT_TARGET_DEVICES
#6 lore raw

PATCH 4/4 rk3288: vyasa: Add console settings

In reply to a message not in the archive

Add console settings like stdin, stdout and stderr as cros-ec-keyb and vidconsole respectively for Vyasa Rk3288 board.

This would certainly help to detect the attached video devices (like HDMI) and print the console message on display.

---
 include/configs/vyasa-rk3288.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
include/configs/vyasa-rk3288.h +5 -1
index 3574a3b5a5..e31dc77720 100644
@@ -8,7 +8,11 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#define ROCKCHIP_DEVICE_SETTINGS
+#define ROCKCHIP_DEVICE_SETTINGS \
+		"stdin=serial,cros-ec-keyb\0" \
+		"stdout=serial,vidconsole\0" \
+		"stderr=serial,vidconsole\0"
+
 #include <configs/rk3288_common.h>
 
 #undef BOOT_TARGET_DEVICES
Signature · 1 line
2.18.0.321.gffc6fa0e3
Reviewed-by on v1 4/4
#7 lore raw

Re: [PATCH 4/4] rk3288: vyasa: Add console settings

Quoted 8 lines · Jagan Teki

Add console settings like stdin, stdout and stderr as cros-ec-keyb and vidconsole respectively for Vyasa Rk3288 board.

This would certainly help to detect the attached video devices (like HDMI) and print the console message on display.

Thanks,
- Kever

Quoted 21 lines
---
  include/configs/vyasa-rk3288.h | 6 +++++-
  1 file changed, 5 insertions(+), 1 deletion(-)
include/configs/vyasa-rk3288.h +5 -1
index 3574a3b5a5..e31dc77720 100644
@@ -8,7 +8,11 @@
  #ifndef __CONFIG_H
  #define __CONFIG_H
 
-#define ROCKCHIP_DEVICE_SETTINGS
+#define ROCKCHIP_DEVICE_SETTINGS \
+		"stdin=serial,cros-ec-keyb\0" \
+		"stdout=serial,vidconsole\0" \
+		"stderr=serial,vidconsole\0"
+
  #include <configs/rk3288_common.h>
 
  #undef BOOT_TARGET_DEVICES
Reviewed-by on v1 1/4
#8 lore raw
In reply to Jagan Teki
Quoted 9 lines · Jagan Teki

Enable pre console buffer for rk3288 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 RK3288 platform boards.

Quoted 5 lines

Buffer address used for pre console is 0x0f000000 which is ram base plus 240MiB. right now the Allwinner SoC is using similar computation.

Thanks,
- Kever

Quoted 29 lines
---
  arch/arm/mach-rockchip/Kconfig | 1 +
  common/Kconfig                 | 1 +
  2 files changed, 2 insertions(+)
arch/arm/mach-rockchip/Kconfig +1 -0
index 2f260a5c5f..ed7514ab75 100644
@@ -102,6 +102,7 @@ config ROCKCHIP_RK3288
  	select SUPPORT_SPL
  	select SPL
  	select SUPPORT_TPL
+	imply PRE_CONSOLE_BUFFER
  	imply ROCKCHIP_COMMON_BOARD
  	imply SPL_ROCKCHIP_COMMON_BOARD
  	imply TPL_CLK
common/Kconfig +1 -0
index a7c5ba278a..21d0244050 100644
@@ -567,6 +567,7 @@ config PRE_CON_BUF_ADDR
  	depends on PRE_CONSOLE_BUFFER
  	default 0x2f000000 if ARCH_SUNXI && MACH_SUN9I
  	default 0x4f000000 if ARCH_SUNXI && !MACH_SUN9I
+	default 0x0f000000 if ROCKCHIP_RK3288
  	help
  	  This sets the start address of the pre-console buffer. This must
  	  be in available memory and is accessed before relocation and