am335x, guardian: Enable panel driver Himax HX8238D

- Enable lcd controller
- Display splash screen

Signed-off-by: Gireesh Hiremath <Gireesh.Hiremath@in.bosch.com>
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Link: https://lore.kernel.org/r/20210611161350.2141-16-Gireesh.Hiremath@in.bosch.com

diff --git a/arch/arm/dts/am335x-guardian-u-boot.dtsi b/arch/arm/dts/am335x-guardian-u-boot.dtsi
index 986f58e6648938a5afe9d84ac65f78bcd558bf0d..a1a7913de89ae67d5059c49e6f2a01e83b530553 100644 (file)
--- a/arch/arm/dts/am335x-guardian-u-boot.dtsi
+++ b/arch/arm/dts/am335x-guardian-u-boot.dtsi
@@ -42,6 +42,17 @@
        u-boot,dm-pre-reloc;
 };
 
+&spi0 {
+       lcd0: display@0 {
+               compatible = "himax,hx8238d";
+               pinctrl-names = "default";
+               pinctrl-0 = <&lcd0_pins>;
+               reg = <0>;
+               label = "lcd";
+               spi-max-frequency = <100000>;
+       };
+};
+
 &uart0 {
        u-boot,dm-pre-reloc;
 };

diff --git a/arch/arm/dts/am335x-guardian.dts b/arch/arm/dts/am335x-guardian.dts
index 207246b4e07ab31eec25ddf8c01f764e9b4b2c1d..69bee45848d51fd09e15adf14ef44e3ab8547542 100644 (file)
--- a/arch/arm/dts/am335x-guardian.dts
+++ b/arch/arm/dts/am335x-guardian.dts
@@ -87,7 +87,7 @@
                        ac-bias           = <255>;
                        ac-bias-intrpt    = <0>;
                        dma-burst-sz      = <16>;
-                       bpp               = <24>;
+                       bpp               = <16>;
                        bus-width         = <16>;
                        fdd               = <0x80>;
                        sync-edge         = <0>;
@@ -247,6 +247,12 @@
 &lcdc {
        blue-and-red-wiring = "crossed";
        status = "okay";
+
+       port {
+               lcdc_0: endpoint@0 {
+                       remote-endpoint = <0>;
+               };
+       };
 };
 
 &mmc1 {

diff --git a/arch/arm/mach-omap2/am33xx/Kconfig b/arch/arm/mach-omap2/am33xx/Kconfig
index 11e54cd2935ade64616b9257356fdaa2276fd825..65f43944fe2eaf8382b7a72d0b9ff40076b47423 100644 (file)
--- a/arch/arm/mach-omap2/am33xx/Kconfig
+++ b/arch/arm/mach-omap2/am33xx/Kconfig
@@ -95,6 +95,8 @@ config TARGET_AM335X_GUARDIAN
        select DM_SERIAL
        select DM_GPIO
        select DM_USB
+       select DM_VIDEO
+       select DM_PANEL_HX8238D
 
 config TARGET_AM335X_SL50
        bool "Support am335x_sl50"

diff --git a/board/bosch/guardian/board.c b/board/bosch/guardian/board.c
index 4388ef70d2571333d833fc4258fb49221c27b3c5..179511a670788cb7c276bff9205cdba15f9fe485 100644 (file)
--- a/board/bosch/guardian/board.c
+++ b/board/bosch/guardian/board.c
@@ -26,12 +26,16 @@
 #include <asm/arch/gpio.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/mem-guardian.h>
-#include <asm/arch/mmc_host_def.h>
 #include <asm/arch/omap.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/emif.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
+#include <jffs2/load_kernel.h>
+#include <mtd.h>
+#include <nand.h>
+#include <video.h>
+#include <video_console.h>
 #include "board.h"
 
 DECLARE_GLOBAL_DATA_PTR;
@@ -250,13 +254,94 @@ void lcdbacklight_en(void)
                           brightness != 0 ? 0x0A : 0x02, 0xFF);
 }
 
+#if IS_ENABLED(CONFIG_AM335X_LCD)
+static void splash_screen(void)
+{
+       struct udevice *video_dev;
+       struct udevice *console_dev;
+       struct video_priv *vid_priv;
+       struct mtd_info *mtd;
+       size_t len;
+       int ret;
+
+       struct mtd_device *mtd_dev;
+       struct part_info  *part;
+       u8 pnum;
+
+       ret = uclass_get_device(UCLASS_VIDEO, 0, &video_dev);
+       if (ret != 0) {
+               debug("video device not found\n");
+               goto exit;
+       }
+
+       vid_priv = dev_get_uclass_priv(video_dev);
+       mtdparts_init();
+
+       if (find_dev_and_part(SPLASH_SCREEN_NAND_PART, &mtd_dev, &pnum, &part)) {
+               debug("Could not find nand partition\n");
+               goto splash_screen_text;
+       }
+
+       mtd = get_nand_dev_by_index(mtd_dev->id->num);
+       if (!mtd) {
+               debug("MTD partition is not valid\n");
+               goto splash_screen_text;
+       }
+
+       len = SPLASH_SCREEN_BMP_FILE_SIZE;
+       ret = nand_read_skip_bad(mtd, part->offset, &len, NULL,
+                                SPLASH_SCREEN_BMP_FILE_SIZE,
+                                (u_char *)SPLASH_SCREEN_BMP_LOAD_ADDR);
+       if (ret != 0) {
+               debug("Reading NAND partition failed\n");
+               goto splash_screen_text;
+       }
+
+       ret = video_bmp_display(video_dev, SPLASH_SCREEN_BMP_LOAD_ADDR, 0, 0, false);
+       if (ret != 0) {
+               debug("No valid bmp image found!!\n");
+               goto splash_screen_text;
+       } else {
+               goto exit;
+       }
+
+splash_screen_text:
+       vid_priv->colour_fg = CONSOLE_COLOR_RED;
+       vid_priv->colour_bg = CONSOLE_COLOR_BLACK;
+
+       if (!uclass_first_device_err(UCLASS_VIDEO_CONSOLE, &console_dev)) {
+               debug("Found console\n");
+               vidconsole_position_cursor(console_dev, 17, 7);
+               vidconsole_put_string(console_dev, SPLASH_SCREEN_TEXT);
+       } else {
+               debug("No console device found\n");
+       }
+
+exit:
+       return;
+}
+#endif /* CONFIG_AM335X_LCD */
+
 int board_late_init(void)
 {
+       int ret;
+       struct udevice *cdev;
+
 #ifdef CONFIG_LED_GPIO
        led_default_state();
 #endif
        set_bootmode_env();
+
+       ret = uclass_get_device(UCLASS_PANEL, 0, &cdev);
+       if (ret) {
+               debug("video panel not found: %d\n", ret);
+               return ret;
+       }
+
        lcdbacklight_en();
+       if (IS_ENABLED(CONFIG_AM335X_LCD))
+               splash_screen();
+
        return 0;
 }
 #endif /* CONFIG_BOARD_LATE_INIT */

diff --git a/board/bosch/guardian/mux.c b/board/bosch/guardian/mux.c
index 9c81f29f9f230d46bc29130e86db005cb1362736..12c3eb666fb1c4c4101d2f46c8cc15139649301e 100644 (file)
--- a/board/bosch/guardian/mux.c
+++ b/board/bosch/guardian/mux.c
@@ -28,8 +28,9 @@ static struct module_pin_mux i2c0_pin_mux[] = {
 
 static struct module_pin_mux guardian_interfaces_pin_mux[] = {
        {OFFSET(mcasp0_ahclkx), (MODE(7) | PULLDOWN_EN)},
+       {OFFSET(mii1_txen),     (MODE(7) | PULLDOWN_EN)},
        {OFFSET(mcasp0_aclkx),  (MODE(7) | PULLUP_EN)},
-       {OFFSET(mii1_txd0),     (MODE(7) | PULLUP_EN)},
+       {OFFSET(mdio_clk),      (MODE(7) | PULLUP_EN)},
        {OFFSET(uart1_rxd),     (MODE(7) | RXACTIVE | PULLUDDIS)},
        {OFFSET(uart1_txd),     (MODE(7) | PULLUDDIS)},
        {OFFSET(mii1_crs),      (MODE(7) | PULLDOWN_EN)},

diff --git a/include/configs/am335x_guardian.h b/include/configs/am335x_guardian.h
index 73248292f2640779f86a7c8d8e341c35258271bc..c161b9335235cae8cbe7ca22854279b58ef74c94 100644 (file)
--- a/include/configs/am335x_guardian.h
+++ b/include/configs/am335x_guardian.h
@@ -82,6 +82,17 @@
 
 #endif /* ! CONFIG_SPL_BUILD */
 
+#define CONFIG_BMP_16BPP
+#define SPLASH_SCREEN_NAND_PART "nand0,10"
+#define SPLASH_SCREEN_BMP_FILE_SIZE 0x26000
+#define SPLASH_SCREEN_BMP_LOAD_ADDR 0x82000000
+#define SPLASH_SCREEN_TEXT "U-Boot"
+
+/* BGR 16Bit Color Definitions */
+#define CONSOLE_COLOR_BLACK 0x0000
+#define CONSOLE_COLOR_WHITE 0xFFFF
+#define CONSOLE_COLOR_RED 0x001F
+
 /* NS16550 Configuration */
 #define CONFIG_SYS_NS16550_COM1                0x44e09000      /* UART0 */
 #define CONFIG_SYS_NS16550_COM2                0x48022000      /* UART1 */