rockchip: jerry: Enable EDP and HDMI video output

Enable these devices using the VOPL video output device. We explicitly
disable VOPB in the device tree to avoid it taking over. Since this device
has an LCD display this comes up by default. If the display fails for some
reason then it will attempt to use HDMI. It is possible to force it to fail
(and thus fall back to HDMI) by puting 'return -EPERM' at the top of
rk_edp_probe(). For now there is no easy way to select between the two.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/arch/arm/dts/rk3288-jerry.dts b/arch/arm/dts/rk3288-jerry.dts
index da37ea8e7add5c9c1de1ffa9da2ba150bdab6ef3..2aa3b9f97149a5ae36a4f4381ef027d70d6e8361 100644 (file)
--- a/arch/arm/dts/rk3288-jerry.dts
+++ b/arch/arm/dts/rk3288-jerry.dts
@@ -108,6 +108,11 @@
        pinctrl-0 = <&vcc50_hdmi_en>;
 };
 
+&vopb {
+       /* Disable this so that we use vopl */
+       status = "disabled";
+};
+
 &edp {
        pinctrl-names = "default";
        pinctrl-0 = <&edp_hpd>;

diff --git a/arch/arm/dts/rk3288.dtsi b/arch/arm/dts/rk3288.dtsi
index ac367f85b98807a7d5432ddadd81f1d9618ad73d..fb1d1f7e1b01ff6e5208ed77cf5168cd58ef75e4 100644 (file)
--- a/arch/arm/dts/rk3288.dtsi
+++ b/arch/arm/dts/rk3288.dtsi
@@ -692,6 +692,7 @@
                iommus = <&vopl_mmu>;
                power-domains = <&power RK3288_PD_VIO>;
                status = "disabled";
+               u-boot,dm-pre-reloc;
                vopl_out: port {
                        #address-cells = <1>;
                        #size-cells = <0>;

diff --git a/configs/chromebook_jerry_defconfig b/configs/chromebook_jerry_defconfig
index 526306f32d25ee9de5468f0f069a705db76745e9..27e53c14c6c21cb6ac9eaebb08b04f6f2dbd156d 100644 (file)
--- a/configs/chromebook_jerry_defconfig
+++ b/configs/chromebook_jerry_defconfig
@@ -42,7 +42,10 @@ CONFIG_DM_PMIC=y
 # CONFIG_SPL_PMIC_CHILDREN is not set
 CONFIG_PMIC_RK808=y
 CONFIG_DM_REGULATOR=y
+CONFIG_DM_REGULATOR_FIXED=y
 CONFIG_REGULATOR_RK808=y
+CONFIG_DM_PWM=y
+CONFIG_PWM_ROCKCHIP=y
 CONFIG_RAM=y
 CONFIG_SPL_RAM=y
 CONFIG_DEBUG_UART=y
@@ -51,6 +54,9 @@ CONFIG_DEBUG_UART_CLOCK=24000000
 CONFIG_DEBUG_UART_SHIFT=2
 CONFIG_SYS_NS16550=y
 CONFIG_ROCKCHIP_SPI=y
+CONFIG_DM_VIDEO=y
+CONFIG_VIDEO_ROTATION=y
+CONFIG_VIDEO_ROCKCHIP=y
 CONFIG_USE_PRIVATE_LIBGCC=y
 CONFIG_USE_TINY_PRINTF=y
 CONFIG_CMD_DHRYSTONE=y

diff --git a/include/configs/chromebook_jerry.h b/include/configs/chromebook_jerry.h
index 2a0dad4d465c9f6f63cb2fe08d98e6d58f2d0fc0..150e8765d642cb6664ea558c148f4a139aae8eca 100644 (file)
--- a/include/configs/chromebook_jerry.h
+++ b/include/configs/chromebook_jerry.h
@@ -9,8 +9,8 @@
 
 #define ROCKCHIP_DEVICE_SETTINGS \
                "stdin=serial,cros-ec-keyb\0" \
-               "stdout=serial\0" \
-               "stderr=serial\0"
+               "stdout=serial,vidconsole\0" \
+               "stderr=serial,vidconsole\0"
 
 #include <configs/rk3288_common.h>
 
@@ -30,4 +30,8 @@
 #define CONFIG_SPL_POWER_SUPPORT
 #define CONFIG_SPL_I2C_SUPPORT
 
+#define CONFIG_I2C_EDID
+#define CONFIG_SYS_WHITE_ON_BLACK
+#define CONFIG_CONSOLE_SCROLL_LINES            10
+
 #endif