mpc5200: digsy_mtc: add support for graphic extension board

Add detection and initialisation for graphic extension board
and support splash screen when booting. Enable "bmp" command
in the board configuration and provide "disp" command to
be able to switch the display on/off.

Signed-off-by: Anatolij Gustschin <agust@denx.de>
Acked-by: Detlev Zundel <dzu@denx.de>

diff --git a/board/digsy_mtc/Makefile b/board/digsy_mtc/Makefile
index a40076c..19f5b3a 100644 (file)
--- a/board/digsy_mtc/Makefile
+++ b/board/digsy_mtc/Makefile
@@ -7,10 +7,11 @@ include $(TOPDIR)/config.mk
 
 LIB    = $(obj)lib$(BOARD).o
 
-COBJS  := $(BOARD).o cmd_mtc.o
+COBJS-y        := $(BOARD).o cmd_mtc.o
+COBJS-$(CONFIG_VIDEO) += cmd_disp.o
 
-SRCS   := $(SOBJS:.o=.S) $(COBJS:.o=.c)
-OBJS   := $(addprefix $(obj),$(COBJS))
+SRCS   := $(SOBJS:.o=.S) $(COBJS-y:.o=.c)
+OBJS   := $(addprefix $(obj),$(COBJS-y))
 SOBJS  := $(addprefix $(obj),$(SOBJS))
 
 $(LIB):        $(obj).depend $(OBJS)

diff --git a/board/digsy_mtc/cmd_disp.c b/board/digsy_mtc/cmd_disp.c
new file mode 100644 (file)
index 0000000..d5f5efb
--- /dev/null
+++ b/board/digsy_mtc/cmd_disp.c
@@ -0,0 +1,57 @@
+/*
+ * (C) Copyright 2011 DENX Software Engineering,
+ * Anatolij Gustschin <agust@denx.de>
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program 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 program 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#include <common.h>
+#include <command.h>
+#include <mpc5xxx.h>
+#include <asm/io.h>
+
+#define GPIO_USB1_0    0x00010000
+
+static int cmd_disp(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+{
+       struct mpc5xxx_gpio *gpio = (struct mpc5xxx_gpio *)MPC5XXX_GPIO;
+
+       if (argc < 2) {
+               printf("%s\n",
+                      in_be32(&gpio->simple_dvo) & GPIO_USB1_0 ? "on" : "off");
+               return 0;
+       }
+
+       if (!strncmp(argv[1], "on", 2)) {
+               setbits_be32(&gpio->simple_dvo, GPIO_USB1_0);
+       } else if (!strncmp(argv[1], "off", 3)) {
+               clrbits_be32(&gpio->simple_dvo, GPIO_USB1_0);
+       } else {
+               cmd_usage(cmdtp);
+               return 1;
+       }
+       return 0;
+}
+
+U_BOOT_CMD(disp, 2, 1, cmd_disp,
+               "disp [on/off] - switch display on/off",
+               "\n    - print display on/off status\n"
+               "on\n    - turn on\n"
+               "off\n    - turn off\n"
+);

diff --git a/board/digsy_mtc/digsy_mtc.c b/board/digsy_mtc/digsy_mtc.c
index 588face..784ba2a 100644 (file)
--- a/board/digsy_mtc/digsy_mtc.c
+++ b/board/digsy_mtc/digsy_mtc.c
@@ -48,6 +48,7 @@
 #endif
 #include <libfdt.h>
 #include <fdt_support.h>
+#include <i2c.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -207,6 +208,69 @@ int checkboard(void)
        return 0;
 }
 
+#if defined(CONFIG_VIDEO)
+
+#define GPIO_USB1_0            0x00010000      /* Power-On pin */
+#define GPIO_USB1_9            0x08            /* PX_~EN pin */
+
+#define GPIO_EE_DO             0x10            /* PSC6_0 (DO) pin */
+#define GPIO_EE_CTS            0x20            /* PSC6_1 (CTS) pin */
+#define GPIO_EE_DI             0x10000000      /* PSC6_2 (DI) pin */
+#define GPIO_EE_CLK            0x20000000      /* PSC6_3 (CLK) pin */
+
+#define GPT_GPIO_ON            0x00000034      /* GPT as simple GPIO, high */
+
+/* ExBo I2C Addresses */
+#define EXBO_EE_I2C_ADDRESS    0x56
+
+static void exbo_hw_init(void)
+{
+       struct mpc5xxx_gpt *gpt = (struct mpc5xxx_gpt *)MPC5XXX_GPT;
+       struct mpc5xxx_gpio *gpio = (struct mpc5xxx_gpio *)MPC5XXX_GPIO;
+       struct mpc5xxx_wu_gpio *wu_gpio =
+                               (struct mpc5xxx_wu_gpio *)MPC5XXX_WU_GPIO;
+       unsigned char val;
+
+       /* 1st, check if extension board is present */
+       if (i2c_read(EXBO_EE_I2C_ADDRESS, 0, 1, &val, 1))
+               return;
+
+       /* configure IrDA pins (PSC6 port) as gpios */
+       gpio->port_config &= 0xFF8FFFFF;
+
+       /* Init for USB1_0, EE_CLK and EE_DI - Low */
+       setbits_be32(&gpio->simple_ddr,
+                       GPIO_USB1_0 | GPIO_EE_CLK | GPIO_EE_DI);
+       clrbits_be32(&gpio->simple_ode,
+                       GPIO_USB1_0 | GPIO_EE_CLK | GPIO_EE_DI);
+       clrbits_be32(&gpio->simple_dvo,
+                       GPIO_USB1_0 | GPIO_EE_CLK | GPIO_EE_DI);
+       setbits_be32(&gpio->simple_gpioe,
+                       GPIO_USB1_0 | GPIO_EE_CLK | GPIO_EE_DI);
+
+       /* Init for EE_DO, EE_CTS - Input */
+       clrbits_8(&wu_gpio->ddr, GPIO_EE_DO | GPIO_EE_CTS);
+       setbits_8(&wu_gpio->enable, GPIO_EE_DO | GPIO_EE_CTS);
+
+       /* Init for PX_~EN (USB1_9) - High */
+       clrbits_8(&gpio->sint_ode, GPIO_USB1_9);
+       setbits_8(&gpio->sint_ddr, GPIO_USB1_9);
+       clrbits_8(&gpio->sint_inten, GPIO_USB1_9);
+       setbits_8(&gpio->sint_dvo, GPIO_USB1_9);
+       setbits_8(&gpio->sint_gpioe, GPIO_USB1_9);
+
+       /* Init for ~OE Switch (GPIO3) - Timer_0 GPIO High */
+       out_be32(&gpt[0].emsr, GPT_GPIO_ON);
+       /* Init for S Switch (GPIO4) - Timer_1 GPIO High */
+       out_be32(&gpt[1].emsr, GPT_GPIO_ON);
+
+       /* Power-On camera supply */
+       setbits_be32(&gpio->simple_dvo, GPIO_USB1_0);
+}
+#else
+static inline void exbo_hw_init(void) {}
+#endif /* CONFIG_VIDEO */
+
 int board_early_init_r(void)
 {
 #ifdef CONFIG_MPC52XX_SPI
@@ -224,6 +288,8 @@ int board_early_init_r(void)
        /* enable CS0 */
        setbits_be32((void *)MPC5XXX_ADDECR, (1 << 16));
 
+       exbo_hw_init();
+
 #if defined(CONFIG_USB_OHCI_NEW) && defined(CONFIG_SYS_USB_OHCI_CPU_INIT)
        /* Low level USB init, required for proper kernel operation */
        usb_cpu_init();

diff --git a/include/configs/digsy_mtc.h b/include/configs/digsy_mtc.h
index c738b3a..4a4eaba 100644 (file)
--- a/include/configs/digsy_mtc.h
+++ b/include/configs/digsy_mtc.h
@@ -86,10 +86,37 @@
 #define CONFIG_BZIP2
 
 /*
+ * Video
+ */
+#define CONFIG_VIDEO
+
+#ifdef CONFIG_VIDEO
+#define CONFIG_VIDEO_MB862xx
+#define CONFIG_VIDEO_MB862xx_ACCEL
+#define CONFIG_VIDEO_CORALP
+#define CONFIG_CFB_CONSOLE
+#define CONFIG_VIDEO_LOGO
+#define CONFIG_VIDEO_SW_CURSOR
+#define CONFIG_VGA_AS_SINGLE_DEVICE
+#define CONFIG_SYS_CONSOLE_IS_IN_ENV
+#define CONFIG_SPLASH_SCREEN
+#define CONFIG_VIDEO_BMP_GZIP
+#define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE (2 << 20)       /* decompressed img */
+
+/* Coral-PA clock frequency, geo and other both 133MHz */
+#define CONFIG_SYS_MB862xx_CCF 0x00050000
+/* Video SDRAM parameters */
+#define CONFIG_SYS_MB862xx_MMR 0x11d7fa72
+#endif
+
+/*
  * Command line configuration.
  */
 #include <config_cmd_default.h>
 
+#ifdef CONFIG_VIDEO
+#define CONFIG_CMD_BMP
+#endif
 #define CONFIG_CMD_DFL
 #define CONFIG_CMD_CACHE
 #define CONFIG_CMD_DATE