{"id":795568,"url":"http://patchwork.ozlabs.org/api/1.2/patches/795568/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/patch/20170731060230.981-8-wenyou.yang@microchip.com/","project":{"id":18,"url":"http://patchwork.ozlabs.org/api/1.2/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-8-wenyou.yang@microchip.com>","list_archive_url":null,"date":"2017-07-31T06:02:30","name":"[U-Boot,7/7] board: at91sam9x5ek: Convert to support DM_VIDEO","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"bc6fa019d921e7258710d73c411c4e813aa7205e","submitter":{"id":69532,"url":"http://patchwork.ozlabs.org/api/1.2/people/69532/?format=json","name":"Wenyou Yang","email":"Wenyou.Yang@microchip.com"},"delegate":{"id":1700,"url":"http://patchwork.ozlabs.org/api/1.2/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-8-wenyou.yang@microchip.com/mbox/","series":[],"comments":"http://patchwork.ozlabs.org/api/patches/795568/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/795568/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 3xLTby0fkjz9sRW\n\tfor ;\n\tMon, 31 Jul 2017 16:11:26 +1000 (AEST)","by lists.denx.de (Postfix, from userid 105)\n\tid C06D1C22098; Mon, 31 Jul 2017 06:09:50 +0000 (UTC)","from lists.denx.de (localhost [IPv6:::1])\n\tby lists.denx.de (Postfix) with ESMTP id 73FEDC22039;\n\tMon, 31 Jul 2017 06:08:47 +0000 (UTC)","by lists.denx.de (Postfix, from userid 105)\n\tid 4DD60C21FC1; Mon, 31 Jul 2017 06:08:34 +0000 (UTC)","from eusmtp01.atmel.com (eusmtp01.atmel.com [212.144.249.242])\n\tby lists.denx.de (Postfix) with ESMTPS id 25F42C21FFF\n\tfor ; Mon, 31 Jul 2017 06:08:29 +0000 (UTC)","from apsmtp01.atmel.com (10.168.254.31) by eusmtp01.atmel.com\n\t(10.145.145.30) with Microsoft SMTP Server id 14.3.235.1;\n\tMon, 31 Jul 2017 08:08:25 +0200","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:17 +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:30 +0800","Message-ID":"<20170731060230.981-8-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 7/7] board: at91sam9x5ek: 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":"Convert the board to enable the driver model support for LCD/video.\n\nSigned-off-by: Wenyou Yang \n---\n\n arch/arm/mach-at91/Kconfig | 1 +\n board/atmel/at91sam9x5ek/at91sam9x5ek.c | 111 ++-----------------------------\n configs/at91sam9x5ek_dataflash_defconfig | 3 +-\n configs/at91sam9x5ek_mmc_defconfig | 3 +-\n configs/at91sam9x5ek_nandflash_defconfig | 3 +-\n configs/at91sam9x5ek_spiflash_defconfig | 3 +-\n include/configs/at91sam9x5ek.h | 10 ---\n 7 files changed, 16 insertions(+), 118 deletions(-)","diff":"diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig\nindex 3cc37f431b..9f39e210b1 100644\n--- a/arch/arm/mach-at91/Kconfig\n+++ b/arch/arm/mach-at91/Kconfig\n@@ -85,6 +85,7 @@ config TARGET_AT91SAM9X5EK\n \tselect CPU_ARM926EJS\n \tselect SUPPORT_SPL\n \tselect BOARD_EARLY_INIT_F\n+\tselect BOARD_LATE_INIT\n \n config TARGET_SAMA5D2_PTC\n \tbool \"SAMA5D2 PTC board\"\ndiff --git a/board/atmel/at91sam9x5ek/at91sam9x5ek.c b/board/atmel/at91sam9x5ek/at91sam9x5ek.c\nindex 2452e63881..3d1763b1e2 100644\n--- a/board/atmel/at91sam9x5ek/at91sam9x5ek.c\n+++ b/board/atmel/at91sam9x5ek/at91sam9x5ek.c\n@@ -13,12 +13,6 @@\n #include \n #include \n #include \n-#include \n-#include \n-#ifdef CONFIG_LCD_INFO\n-#include \n-#include \n-#endif\n #include \n \n DECLARE_GLOBAL_DATA_PTR;\n@@ -86,103 +80,15 @@ static void at91sam9x5ek_nand_hw_init(void)\n }\n #endif\n \n-#ifdef CONFIG_LCD\n-vidinfo_t panel_info = {\n-\t.vl_col\t= 800,\n-\t.vl_row = 480,\n-\t.vl_clk = 24000000,\n-\t.vl_sync = LCDC_LCDCFG5_HSPOL | LCDC_LCDCFG5_VSPOL,\n-\t.vl_bpix = LCD_BPP,\n-\t.vl_tft = 1,\n-\t.vl_clk_pol = 1,\n-\t.vl_hsync_len = 128,\n-\t.vl_left_margin = 64,\n-\t.vl_right_margin = 64,\n-\t.vl_vsync_len = 2,\n-\t.vl_upper_margin = 22,\n-\t.vl_lower_margin = 21,\n-\t.mmio = ATMEL_BASE_LCDC,\n-};\n-\n-void lcd_enable(void)\n-{\n-\tif (has_lcdc())\n-\t\tat91_pio3_set_a_periph(AT91_PIO_PORTC, 29, 1);\t/* power up */\n-}\n-\n-void lcd_disable(void)\n-{\n-\tif (has_lcdc())\n-\t\tat91_pio3_set_a_periph(AT91_PIO_PORTC, 29, 0);\t/* power down */\n-}\n-\n-static void at91sam9x5ek_lcd_hw_init(void)\n-{\n-\tif (has_lcdc()) {\n-\t\tat91_pio3_set_a_periph(AT91_PIO_PORTC, 26, 0);\t/* LCDPWM */\n-\t\tat91_pio3_set_a_periph(AT91_PIO_PORTC, 27, 0);\t/* LCDVSYNC */\n-\t\tat91_pio3_set_a_periph(AT91_PIO_PORTC, 28, 0);\t/* LCDHSYNC */\n-\t\tat91_pio3_set_a_periph(AT91_PIO_PORTC, 24, 0);\t/* LCDDISP */\n-\t\tat91_pio3_set_a_periph(AT91_PIO_PORTC, 29, 0);\t/* LCDDEN */\n-\t\tat91_pio3_set_a_periph(AT91_PIO_PORTC, 30, 0);\t/* LCDPCK */\n-\n-\t\tat91_pio3_set_a_periph(AT91_PIO_PORTC, 0, 0);\t/* LCDD0 */\n-\t\tat91_pio3_set_a_periph(AT91_PIO_PORTC, 1, 0);\t/* LCDD1 */\n-\t\tat91_pio3_set_a_periph(AT91_PIO_PORTC, 2, 0);\t/* LCDD2 */\n-\t\tat91_pio3_set_a_periph(AT91_PIO_PORTC, 3, 0);\t/* LCDD3 */\n-\t\tat91_pio3_set_a_periph(AT91_PIO_PORTC, 4, 0);\t/* LCDD4 */\n-\t\tat91_pio3_set_a_periph(AT91_PIO_PORTC, 5, 0);\t/* LCDD5 */\n-\t\tat91_pio3_set_a_periph(AT91_PIO_PORTC, 6, 0);\t/* LCDD6 */\n-\t\tat91_pio3_set_a_periph(AT91_PIO_PORTC, 7, 0);\t/* LCDD7 */\n-\t\tat91_pio3_set_a_periph(AT91_PIO_PORTC, 8, 0);\t/* LCDD8 */\n-\t\tat91_pio3_set_a_periph(AT91_PIO_PORTC, 9, 0);\t/* LCDD9 */\n-\t\tat91_pio3_set_a_periph(AT91_PIO_PORTC, 10, 0);\t/* LCDD10 */\n-\t\tat91_pio3_set_a_periph(AT91_PIO_PORTC, 11, 0);\t/* LCDD11 */\n-\t\tat91_pio3_set_a_periph(AT91_PIO_PORTC, 12, 0);\t/* LCDD12 */\n-\t\tat91_pio3_set_a_periph(AT91_PIO_PORTC, 13, 0);\t/* LCDD13 */\n-\t\tat91_pio3_set_a_periph(AT91_PIO_PORTC, 14, 0);\t/* LCDD14 */\n-\t\tat91_pio3_set_a_periph(AT91_PIO_PORTC, 15, 0);\t/* LCDD15 */\n-\t\tat91_pio3_set_a_periph(AT91_PIO_PORTC, 16, 0);\t/* LCDD16 */\n-\t\tat91_pio3_set_a_periph(AT91_PIO_PORTC, 17, 0);\t/* LCDD17 */\n-\t\tat91_pio3_set_a_periph(AT91_PIO_PORTC, 18, 0);\t/* LCDD18 */\n-\t\tat91_pio3_set_a_periph(AT91_PIO_PORTC, 19, 0);\t/* LCDD19 */\n-\t\tat91_pio3_set_a_periph(AT91_PIO_PORTC, 20, 0);\t/* LCDD20 */\n-\t\tat91_pio3_set_a_periph(AT91_PIO_PORTC, 21, 0);\t/* LCDD21 */\n-\t\tat91_pio3_set_a_periph(AT91_PIO_PORTC, 22, 0);\t/* LCDD22 */\n-\t\tat91_pio3_set_a_periph(AT91_PIO_PORTC, 23, 0);\t/* LCDD23 */\n-\n-\t\tat91_periph_clk_enable(ATMEL_ID_LCDC);\n-\t}\n-}\n-\n-#ifdef CONFIG_LCD_INFO\n-void lcd_show_board_info(void)\n+#ifdef CONFIG_BOARD_LATE_INIT\n+int board_late_init(void)\n {\n-\tulong dram_size, nand_size;\n-\tint i;\n-\tchar temp[32];\n-\n-\tif (has_lcdc()) {\n-\t\tlcd_printf(\"%s\\n\", U_BOOT_VERSION);\n-\t\tlcd_printf(\"(C) 2012 ATMEL Corp\\n\");\n-\t\tlcd_printf(\"at91support@atmel.com\\n\");\n-\t\tlcd_printf(\"%s CPU at %s MHz\\n\",\n-\t\t\tget_cpu_name(),\n-\t\t\tstrmhz(temp, get_cpu_clk_rate()));\n-\n-\t\tdram_size = 0;\n-\t\tfor (i = 0; i < CONFIG_NR_DRAM_BANKS; i++)\n-\t\t\tdram_size += gd->bd->bi_dram[i].size;\n-\t\tnand_size = 0;\n-\t\tfor (i = 0; i < CONFIG_SYS_MAX_NAND_DEVICE; i++)\n-\t\t\tnand_size += get_nand_dev_by_index(i)->size;\n-\t\tlcd_printf(\" %ld MB SDRAM, %ld MB NAND\\n\",\n-\t\t\tdram_size >> 20,\n-\t\t\tnand_size >> 20);\n-\t}\n+#ifdef CONFIG_DM_VIDEO\n+\tat91_video_show_board_info();\n+#endif\n+\treturn 0;\n }\n-#endif /* CONFIG_LCD_INFO */\n-#endif /* CONFIG_LCD */\n+#endif\n \n #ifdef CONFIG_DEBUG_UART_BOARD_INIT\n void board_debug_uart_init(void)\n@@ -216,9 +122,6 @@ int board_init(void)\n #if defined(CONFIG_USB_OHCI_NEW) || defined(CONFIG_USB_EHCI_HCD)\n \tat91_uhp_hw_init();\n #endif\n-#ifdef CONFIG_LCD\n-\tat91sam9x5ek_lcd_hw_init();\n-#endif\n \treturn 0;\n }\n \ndiff --git a/configs/at91sam9x5ek_dataflash_defconfig b/configs/at91sam9x5ek_dataflash_defconfig\nindex 8fc457b28c..fa1f7dffd9 100644\n--- a/configs/at91sam9x5ek_dataflash_defconfig\n+++ b/configs/at91sam9x5ek_dataflash_defconfig\n@@ -54,4 +54,5 @@ CONFIG_USB=y\n CONFIG_DM_USB=y\n CONFIG_USB_EHCI_HCD=y\n CONFIG_USB_STORAGE=y\n-CONFIG_LCD=y\n+CONFIG_DM_VIDEO=y\n+CONFIG_ATMEL_HLCD=y\ndiff --git a/configs/at91sam9x5ek_mmc_defconfig b/configs/at91sam9x5ek_mmc_defconfig\nindex 1b76127934..04ff0a21c8 100644\n--- a/configs/at91sam9x5ek_mmc_defconfig\n+++ b/configs/at91sam9x5ek_mmc_defconfig\n@@ -54,5 +54,6 @@ CONFIG_USB=y\n CONFIG_DM_USB=y\n CONFIG_USB_EHCI_HCD=y\n CONFIG_USB_STORAGE=y\n-CONFIG_LCD=y\n+CONFIG_DM_VIDEO=y\n+CONFIG_ATMEL_HLCD=y\n CONFIG_FAT_WRITE=y\ndiff --git a/configs/at91sam9x5ek_nandflash_defconfig b/configs/at91sam9x5ek_nandflash_defconfig\nindex 23ef8072a3..da983408b7 100644\n--- a/configs/at91sam9x5ek_nandflash_defconfig\n+++ b/configs/at91sam9x5ek_nandflash_defconfig\n@@ -54,4 +54,5 @@ CONFIG_USB=y\n CONFIG_DM_USB=y\n CONFIG_USB_EHCI_HCD=y\n CONFIG_USB_STORAGE=y\n-CONFIG_LCD=y\n+CONFIG_DM_VIDEO=y\n+CONFIG_ATMEL_HLCD=y\ndiff --git a/configs/at91sam9x5ek_spiflash_defconfig b/configs/at91sam9x5ek_spiflash_defconfig\nindex 48c2559c52..bc81f7ab50 100644\n--- a/configs/at91sam9x5ek_spiflash_defconfig\n+++ b/configs/at91sam9x5ek_spiflash_defconfig\n@@ -54,4 +54,5 @@ CONFIG_USB=y\n CONFIG_DM_USB=y\n CONFIG_USB_EHCI_HCD=y\n CONFIG_USB_STORAGE=y\n-CONFIG_LCD=y\n+CONFIG_DM_VIDEO=y\n+CONFIG_ATMEL_HLCD=y\ndiff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h\nindex 7e8a9e921a..7887791c37 100644\n--- a/include/configs/at91sam9x5ek.h\n+++ b/include/configs/at91sam9x5ek.h\n@@ -27,16 +27,6 @@\n /* general purpose I/O */\n #define CONFIG_ATMEL_LEGACY\t\t/* required until (g)pio is fixed */\n \n-/* LCD */\n-#define LCD_BPP\t\t\tLCD_COLOR16\n-#define LCD_OUTPUT_BPP\t\t24\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-\n-\n /*\n * BOOTP options\n */\n","prefixes":["U-Boot","7/7"]}