{"id":795569,"url":"http://patchwork.ozlabs.org/api/patches/795569/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/patch/20170731060230.981-7-wenyou.yang@microchip.com/","project":{"id":18,"url":"http://patchwork.ozlabs.org/api/projects/18/?format=json","name":"U-Boot","link_name":"uboot","list_id":"u-boot.lists.denx.de","list_email":"u-boot@lists.denx.de","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170731060230.981-7-wenyou.yang@microchip.com>","list_archive_url":null,"date":"2017-07-31T06:02:29","name":"[U-Boot,6/7] board: sama5d4_xplained: Convert to support DM_VIDEO","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"4a8e9c6ab1195afd5b1de5e8ecb24a6d8e43b3a0","submitter":{"id":69532,"url":"http://patchwork.ozlabs.org/api/people/69532/?format=json","name":"Wenyou Yang","email":"Wenyou.Yang@microchip.com"},"delegate":{"id":1700,"url":"http://patchwork.ozlabs.org/api/users/1700/?format=json","username":"ag","first_name":"Anatolij","last_name":"Gustschin","email":"agust@denx.de"},"mbox":"http://patchwork.ozlabs.org/project/uboot/patch/20170731060230.981-7-wenyou.yang@microchip.com/mbox/","series":[],"comments":"http://patchwork.ozlabs.org/api/patches/795569/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/795569/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":"ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=lists.denx.de\n\t(client-ip=81.169.180.215; helo=lists.denx.de;\n\tenvelope-from=u-boot-bounces@lists.denx.de;\n\treceiver=)","Received":["from lists.denx.de (dione.denx.de [81.169.180.215])\n\tby ozlabs.org (Postfix) with ESMTP id 3xLTcV3BHxz9sRW\n\tfor ;\n\tMon, 31 Jul 2017 16:11:54 +1000 (AEST)","by lists.denx.de (Postfix, from userid 105)\n\tid 33B6BC220A5; Mon, 31 Jul 2017 06:10:12 +0000 (UTC)","from lists.denx.de (localhost [IPv6:::1])\n\tby lists.denx.de (Postfix) with ESMTP id 7A9A6C220A2;\n\tMon, 31 Jul 2017 06:08:53 +0000 (UTC)","by lists.denx.de (Postfix, from userid 105)\n\tid 74BC7C22086; Mon, 31 Jul 2017 06:08:30 +0000 (UTC)","from DVREDG02.corp.atmel.com (nasmtp01.atmel.com [192.199.1.246])\n\tby lists.denx.de (Postfix) with ESMTPS id 7F50EC21FFE\n\tfor ; Mon, 31 Jul 2017 06:08:25 +0000 (UTC)","from apsmtp01.atmel.com (10.168.254.31) by DVREDG02.corp.atmel.com\n\t(10.42.103.31) with Microsoft SMTP Server (TLS) id 14.3.235.1;\n\tMon, 31 Jul 2017 00:08:20 -0600","from shaarm01.corp.atmel.com (10.168.254.13) by apsmtp01.atmel.com\n\t(10.168.254.31) with Microsoft SMTP Server id 14.3.235.1;\n\tMon, 31 Jul 2017 14:11:11 +0800"],"X-Spam-Checker-Version":"SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de","X-Spam-Level":"","X-Spam-Status":"No, score=-2.3 required=5.0 tests=RCVD_IN_DNSWL_MED\n\tautolearn=unavailable autolearn_force=no version=3.4.0","From":"Wenyou Yang ","To":"U-Boot Mailing List ","Date":"Mon, 31 Jul 2017 14:02:29 +0800","Message-ID":"<20170731060230.981-7-wenyou.yang@microchip.com>","X-Mailer":"git-send-email 2.13.0","In-Reply-To":"<20170731060230.981-1-wenyou.yang@microchip.com>","References":"<20170731060230.981-1-wenyou.yang@microchip.com>","MIME-Version":"1.0","Cc":"Albert Aribaud , Tom Rini ","Subject":"[U-Boot] [PATCH 6/7] board: sama5d4_xplained: Convert to support\n\tDM_VIDEO","X-BeenThere":"u-boot@lists.denx.de","X-Mailman-Version":"2.1.18","Precedence":"list","List-Id":"U-Boot discussion ","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"base64","Errors-To":"u-boot-bounces@lists.denx.de","Sender":"\"U-Boot\" "},"content":"From: Wenyou Yang \n\nConvert the board to enable the driver model support for LCD/video.\n\nSigned-off-by: Wenyou Yang \n---\n\n arch/arm/dts/at91-sama5d4_xplained.dts | 25 ++++++\n arch/arm/dts/sama5d4.dtsi | 21 +----\n arch/arm/mach-at91/Kconfig | 1 +\n board/atmel/common/video_display.c | 2 +-\n board/atmel/sama5d4_xplained/sama5d4_xplained.c | 102 ++----------------------\n configs/sama5d4_xplained_mmc_defconfig | 2 +\n configs/sama5d4_xplained_nandflash_defconfig | 2 +\n configs/sama5d4_xplained_spiflash_defconfig | 2 +\n include/configs/sama5d4_xplained.h | 11 ---\n 9 files changed, 40 insertions(+), 128 deletions(-)","diff":"diff --git a/arch/arm/dts/at91-sama5d4_xplained.dts b/arch/arm/dts/at91-sama5d4_xplained.dts\nindex 0592b31b91..ea35dc21b6 100644\n--- a/arch/arm/dts/at91-sama5d4_xplained.dts\n+++ b/arch/arm/dts/at91-sama5d4_xplained.dts\n@@ -74,6 +74,31 @@\n \n \tahb {\n \t\tapb {\n+\t\t\thlcdc: hlcdc@f0000000 {\n+\t\t\t\tatmel,vl-bpix = <4>;\n+\t\t\t\tatmel,guard-time = <1>;\n+\t\t\t\tpinctrl-names = \"default\";\n+\t\t\t\tpinctrl-0 = <&pinctrl_lcd_base &pinctrl_lcd_pwm &pinctrl_lcd_rgb888>;\n+\t\t\t\tstatus = \"okay\";\n+\t\t\t\tu-boot,dm-pre-reloc;\n+\n+\t\t\t\tdisplay-timings {\n+\t\t\t\t\tu-boot,dm-pre-reloc;\n+\t\t\t\t\t480x272 {\n+\t\t\t\t\t\tclock-frequency = <9000000>;\n+\t\t\t\t\t\thactive = <480>;\n+\t\t\t\t\t\tvactive = <272>;\n+\t\t\t\t\t\thsync-len = <41>;\n+\t\t\t\t\t\thfront-porch = <2>;\n+\t\t\t\t\t\thback-porch = <2>;\n+\t\t\t\t\t\tvfront-porch = <2>;\n+\t\t\t\t\t\tvback-porch = <2>;\n+\t\t\t\t\t\tvsync-len = <11>;\n+\t\t\t\t\t\tu-boot,dm-pre-reloc;\n+\t\t\t\t\t};\n+\t\t\t\t};\n+\t\t\t};\n+\n \t\t\tspi0: spi@f8010000 {\n \t\t\t\tu-boot,dm-pre-reloc;\n \t\t\t\tcs-gpios = <&pioC 3 0>, <0>, <0>, <0>;\ndiff --git a/arch/arm/dts/sama5d4.dtsi b/arch/arm/dts/sama5d4.dtsi\nindex c6512ae437..8072b8a4f2 100644\n--- a/arch/arm/dts/sama5d4.dtsi\n+++ b/arch/arm/dts/sama5d4.dtsi\n@@ -320,31 +320,12 @@\n \t\t\tu-boot,dm-pre-reloc;\n \n \t\t\thlcdc: hlcdc@f0000000 {\n-\t\t\t\tcompatible = \"atmel,sama5d4-hlcdc\";\n+\t\t\t\tcompatible = \"atmel,at91sam9x5-hlcdc\";\n \t\t\t\treg = <0xf0000000 0x4000>;\n \t\t\t\tinterrupts = <51 IRQ_TYPE_LEVEL_HIGH 0>;\n \t\t\t\tclocks = <&lcdc_clk>, <&lcdck>, <&clk32k>;\n \t\t\t\tclock-names = \"periph_clk\",\"sys_clk\", \"slow_clk\";\n \t\t\t\tstatus = \"disabled\";\n-\n-\t\t\t\thlcdc-display-controller {\n-\t\t\t\t\tcompatible = \"atmel,hlcdc-display-controller\";\n-\t\t\t\t\t#address-cells = <1>;\n-\t\t\t\t\t#size-cells = <0>;\n-\n-\t\t\t\t\tport@0 {\n-\t\t\t\t\t\t#address-cells = <1>;\n-\t\t\t\t\t\t#size-cells = <0>;\n-\t\t\t\t\t\treg = <0>;\n-\t\t\t\t\t};\n-\t\t\t\t};\n-\n-\t\t\t\thlcdc_pwm: hlcdc-pwm {\n-\t\t\t\t\tcompatible = \"atmel,hlcdc-pwm\";\n-\t\t\t\t\tpinctrl-names = \"default\";\n-\t\t\t\t\tpinctrl-0 = <&pinctrl_lcd_pwm>;\n-\t\t\t\t\t#pwm-cells = <3>;\n-\t\t\t\t};\n \t\t\t};\n \n \t\t\tdma1: dma-controller@f0004000 {\ndiff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig\nindex d2db644fcf..3cc37f431b 100644\n--- a/arch/arm/mach-at91/Kconfig\n+++ b/arch/arm/mach-at91/Kconfig\n@@ -117,6 +117,7 @@ config TARGET_SAMA5D4_XPLAINED\n \tselect CPU_V7\n \tselect SUPPORT_SPL\n \tselect BOARD_EARLY_INIT_F\n+\tselect BOARD_LATE_INIT\n \n config TARGET_SAMA5D4EK\n \tbool \"SAMA5D4 Evaluation Kit\"\ndiff --git a/board/atmel/common/video_display.c b/board/atmel/common/video_display.c\nindex 39ad619819..b20abc7386 100644\n--- a/board/atmel/common/video_display.c\n+++ b/board/atmel/common/video_display.c\n@@ -43,7 +43,7 @@ int at91_video_show_board_info(void)\n \tnand_size = 0;\n #ifdef CONFIG_NAND_ATMEL\n \tfor (i = 0; i < CONFIG_SYS_MAX_NAND_DEVICE; i++)\n-\t\tnand_size += nand_info[i]->size;\n+\t\tnand_size += get_nand_dev_by_index(i)->size;\n #endif\n \n \tlen += sprintf(&buf[len], \"%ld MB SDRAM, %ld MB NAND\\n\",\ndiff --git a/board/atmel/sama5d4_xplained/sama5d4_xplained.c b/board/atmel/sama5d4_xplained/sama5d4_xplained.c\nindex 248a31b8c4..8fa84670f1 100644\n--- a/board/atmel/sama5d4_xplained/sama5d4_xplained.c\n+++ b/board/atmel/sama5d4_xplained/sama5d4_xplained.c\n@@ -14,11 +14,7 @@\n #include \n #include \n #include \n-#include \n #include \n-#include \n-#include \n-#include \n \n DECLARE_GLOBAL_DATA_PTR;\n \n@@ -73,98 +69,15 @@ static void sama5d4_xplained_usb_hw_init(void)\n }\n #endif\n \n-#ifdef CONFIG_LCD\n-vidinfo_t panel_info = {\n-\t.vl_col = 480,\n-\t.vl_row = 272,\n-\t.vl_clk = 9000000,\n-\t.vl_bpix = LCD_BPP,\n-\t.vl_tft = 1,\n-\t.vl_hsync_len = 41,\n-\t.vl_left_margin = 2,\n-\t.vl_right_margin = 2,\n-\t.vl_vsync_len = 11,\n-\t.vl_upper_margin = 2,\n-\t.vl_lower_margin = 2,\n-\t.mmio = ATMEL_BASE_LCDC,\n-};\n-\n-/* No power up/down pin for the LCD pannel */\n-void lcd_enable(void)\t{ /* Empty! */ }\n-void lcd_disable(void)\t{ /* Empty! */ }\n-\n-unsigned int has_lcdc(void)\n+#ifdef CONFIG_BOARD_LATE_INIT\n+int board_late_init(void)\n {\n-\treturn 1;\n-}\n-\n-static void sama5d4_xplained_lcd_hw_init(void)\n-{\n-\tat91_pio3_set_a_periph(AT91_PIO_PORTA, 24, 0);\t/* LCDPWM */\n-\tat91_pio3_set_a_periph(AT91_PIO_PORTA, 25, 0);\t/* LCDDISP */\n-\tat91_pio3_set_a_periph(AT91_PIO_PORTA, 26, 0);\t/* LCDVSYNC */\n-\tat91_pio3_set_a_periph(AT91_PIO_PORTA, 27, 0);\t/* LCDHSYNC */\n-\tat91_pio3_set_a_periph(AT91_PIO_PORTA, 28, 0);\t/* LCDDOTCK */\n-\tat91_pio3_set_a_periph(AT91_PIO_PORTA, 29, 0);\t/* LCDDEN */\n-\n-\tat91_pio3_set_a_periph(AT91_PIO_PORTA, 0, 0);\t/* LCDD0 */\n-\tat91_pio3_set_a_periph(AT91_PIO_PORTA, 1, 0);\t/* LCDD1 */\n-\tat91_pio3_set_a_periph(AT91_PIO_PORTA, 2, 0);\t/* LCDD2 */\n-\tat91_pio3_set_a_periph(AT91_PIO_PORTA, 3, 0);\t/* LCDD3 */\n-\tat91_pio3_set_a_periph(AT91_PIO_PORTA, 4, 0);\t/* LCDD4 */\n-\tat91_pio3_set_a_periph(AT91_PIO_PORTA, 5, 0);\t/* LCDD5 */\n-\tat91_pio3_set_a_periph(AT91_PIO_PORTA, 6, 0);\t/* LCDD6 */\n-\tat91_pio3_set_a_periph(AT91_PIO_PORTA, 7, 0);\t/* LCDD7 */\n-\n-\tat91_pio3_set_a_periph(AT91_PIO_PORTA, 8, 0);\t/* LCDD9 */\n-\tat91_pio3_set_a_periph(AT91_PIO_PORTA, 9, 0);\t/* LCDD8 */\n-\tat91_pio3_set_a_periph(AT91_PIO_PORTA, 10, 0);\t/* LCDD10 */\n-\tat91_pio3_set_a_periph(AT91_PIO_PORTA, 11, 0);\t/* LCDD11 */\n-\tat91_pio3_set_a_periph(AT91_PIO_PORTA, 12, 0);\t/* LCDD12 */\n-\tat91_pio3_set_a_periph(AT91_PIO_PORTA, 13, 0);\t/* LCDD13 */\n-\tat91_pio3_set_a_periph(AT91_PIO_PORTA, 14, 0);\t/* LCDD14 */\n-\tat91_pio3_set_a_periph(AT91_PIO_PORTA, 15, 0);\t/* LCDD15 */\n-\n-\tat91_pio3_set_a_periph(AT91_PIO_PORTA, 16, 0);\t/* LCDD16 */\n-\tat91_pio3_set_a_periph(AT91_PIO_PORTA, 17, 0);\t/* LCDD17 */\n-\tat91_pio3_set_a_periph(AT91_PIO_PORTA, 18, 0);\t/* LCDD18 */\n-\tat91_pio3_set_a_periph(AT91_PIO_PORTA, 19, 0);\t/* LCDD19 */\n-\tat91_pio3_set_a_periph(AT91_PIO_PORTA, 20, 0);\t/* LCDD20 */\n-\tat91_pio3_set_a_periph(AT91_PIO_PORTA, 21, 0);\t/* LCDD21 */\n-\tat91_pio3_set_a_periph(AT91_PIO_PORTA, 22, 0);\t/* LCDD22 */\n-\tat91_pio3_set_a_periph(AT91_PIO_PORTA, 23, 0);\t/* LCDD23 */\n-\n-\t/* Enable clock */\n-\tat91_periph_clk_enable(ATMEL_ID_LCDC);\n-}\n-\n-#ifdef CONFIG_LCD_INFO\n-void lcd_show_board_info(void)\n-{\n-\tulong dram_size, nand_size;\n-\tint i;\n-\tchar temp[32];\n-\n-\tlcd_printf(\"%s\\n\", U_BOOT_VERSION);\n-\tlcd_printf(\"2014 ATMEL Corp\\n\");\n-\tlcd_printf(\"%s CPU at %s MHz\\n\", get_cpu_name(),\n-\t\t strmhz(temp, get_cpu_clk_rate()));\n-\n-\tdram_size = 0;\n-\tfor (i = 0; i < CONFIG_NR_DRAM_BANKS; i++)\n-\t\tdram_size += gd->bd->bi_dram[i].size;\n-\n-\tnand_size = 0;\n-#ifdef CONFIG_NAND_ATMEL\n-\tfor (i = 0; i < CONFIG_SYS_MAX_NAND_DEVICE; i++)\n-\t\tnand_size += get_nand_dev_by_index(i)->size;\n+#ifdef CONFIG_DM_VIDEO\n+\tat91_video_show_board_info();\n #endif\n-\tlcd_printf(\"%ld MB SDRAM, %ld MB NAND\\n\",\n-\t\t dram_size >> 20, nand_size >> 20);\n+\treturn 0;\n }\n-#endif /* CONFIG_LCD_INFO */\n-\n-#endif /* CONFIG_LCD */\n+#endif\n \n #ifdef CONFIG_DEBUG_UART_BOARD_INIT\n static void sama5d4_xplained_serial3_hw_init(void)\n@@ -212,9 +125,6 @@ int board_init(void)\n #ifdef CONFIG_NAND_ATMEL\n \tsama5d4_xplained_nand_hw_init();\n #endif\n-#ifdef CONFIG_LCD\n-\tsama5d4_xplained_lcd_hw_init();\n-#endif\n #ifdef CONFIG_CMD_USB\n \tsama5d4_xplained_usb_hw_init();\n #endif\ndiff --git a/configs/sama5d4_xplained_mmc_defconfig b/configs/sama5d4_xplained_mmc_defconfig\nindex 928d828a1a..246d92f286 100644\n--- a/configs/sama5d4_xplained_mmc_defconfig\n+++ b/configs/sama5d4_xplained_mmc_defconfig\n@@ -74,3 +74,5 @@ CONFIG_USB_STORAGE=y\n CONFIG_USB_GADGET=y\n CONFIG_USB_GADGET_ATMEL_USBA=y\n CONFIG_FAT_WRITE=y\n+CONFIG_DM_VIDEO=y\n+CONFIG_ATMEL_HLCD=y\ndiff --git a/configs/sama5d4_xplained_nandflash_defconfig b/configs/sama5d4_xplained_nandflash_defconfig\nindex c61d235384..694d767998 100644\n--- a/configs/sama5d4_xplained_nandflash_defconfig\n+++ b/configs/sama5d4_xplained_nandflash_defconfig\n@@ -70,3 +70,5 @@ CONFIG_USB_EHCI_HCD=y\n CONFIG_USB_STORAGE=y\n CONFIG_USB_GADGET=y\n CONFIG_USB_GADGET_ATMEL_USBA=y\n+CONFIG_DM_VIDEO=y\n+CONFIG_ATMEL_HLCD=y\ndiff --git a/configs/sama5d4_xplained_spiflash_defconfig b/configs/sama5d4_xplained_spiflash_defconfig\nindex 7c8c7081e8..2e27e5f1ad 100644\n--- a/configs/sama5d4_xplained_spiflash_defconfig\n+++ b/configs/sama5d4_xplained_spiflash_defconfig\n@@ -72,3 +72,5 @@ CONFIG_USB_EHCI_HCD=y\n CONFIG_USB_STORAGE=y\n CONFIG_USB_GADGET=y\n CONFIG_USB_GADGET_ATMEL_USBA=y\n+CONFIG_DM_VIDEO=y\n+CONFIG_ATMEL_HLCD=y\ndiff --git a/include/configs/sama5d4_xplained.h b/include/configs/sama5d4_xplained.h\nindex 67a8574940..ddb48c335a 100644\n--- a/include/configs/sama5d4_xplained.h\n+++ b/include/configs/sama5d4_xplained.h\n@@ -49,17 +49,6 @@\n #define CONFIG_ATMEL_NAND_HW_PMECC\n #endif\n \n-/* LCD */\n-#ifdef CONFIG_LCD\n-#define LCD_BPP\t\t\t\tLCD_COLOR16\n-#define LCD_OUTPUT_BPP 24\n-#define CONFIG_LCD_LOGO\n-#define CONFIG_LCD_INFO\n-#define CONFIG_LCD_INFO_BELOW_LOGO\n-#define CONFIG_ATMEL_HLCD\n-#define CONFIG_ATMEL_LCD_RGB565\n-#endif\n-\n #ifdef CONFIG_SYS_USE_SERIALFLASH\n /* override the bootcmd, bootargs and other configuration for spi flash env */\n #elif CONFIG_SYS_USE_NANDFLASH\n","prefixes":["U-Boot","6/7"]}