From 7a0b1f713e723b2bb7fe8a9bf16abf2a8441519d Mon Sep 17 00:00:00 2001
From: Ilko Iliev <iliev@ronetix.at>
Date: Mon, 11 Mar 2019 13:06:24 +0100
Subject: [PATCH] board: pm9261: Convert to CONFIG_DM_USB and CONFIG_DM_VIDEO

Convert the board to support the USB and video driver model and remove
the unnecessary code.
---
 board/ronetix/pm9261/pm9261.c | 105 ----------------------------------
 configs/pm9261_defconfig      |   3 +
 2 files changed, 3 insertions(+), 105 deletions(-)

diff --git a/board/ronetix/pm9261/pm9261.c b/board/ronetix/pm9261/pm9261.c
index 0c7b4ee415..f1e7aab629 100644
--- a/board/ronetix/pm9261/pm9261.c
+++ b/board/ronetix/pm9261/pm9261.c
@@ -17,9 +17,6 @@
 #include <asm/arch/at91_matrix.h>
 #include <asm/arch/clk.h>
 #include <asm/arch/gpio.h>
-
-#include <lcd.h>
-#include <atmel_lcdc.h>
 #if defined(CONFIG_RESET_PHY_R) && defined(CONFIG_DRIVER_DM9000)
 #include <net.h>
 #endif
@@ -110,105 +107,6 @@ static void pm9261_dm9000_hw_init(void)
 }
 #endif
 
-#ifdef CONFIG_LCD
-vidinfo_t panel_info = {
-	.vl_col =		240,
-	.vl_row =		320,
-	.vl_clk =		4965000,
-	.vl_sync =		ATMEL_LCDC_INVLINE_INVERTED |
-				ATMEL_LCDC_INVFRAME_INVERTED,
-	.vl_bpix =		3,
-	.vl_tft =		1,
-	.vl_hsync_len =		5,
-	.vl_left_margin =	1,
-	.vl_right_margin =	33,
-	.vl_vsync_len =		1,
-	.vl_upper_margin =	1,
-	.vl_lower_margin =	0,
-	.mmio =			ATMEL_BASE_LCDC,
-};
-
-void lcd_enable(void)
-{
-	at91_set_pio_value(AT91_PIO_PORTA, 22, 0);  /* power up */
-}
-
-void lcd_disable(void)
-{
-	at91_set_pio_value(AT91_PIO_PORTA, 22, 1);  /* power down */
-}
-
-static void pm9261_lcd_hw_init(void)
-{
-	at91_set_a_periph(AT91_PIO_PORTB, 1, 0);	/* LCDHSYNC */
-	at91_set_a_periph(AT91_PIO_PORTB, 2, 0);	/* LCDDOTCK */
-	at91_set_a_periph(AT91_PIO_PORTB, 3, 0);	/* LCDDEN */
-	at91_set_a_periph(AT91_PIO_PORTB, 4, 0);	/* LCDCC */
-	at91_set_a_periph(AT91_PIO_PORTB, 7, 0);	/* LCDD2 */
-	at91_set_a_periph(AT91_PIO_PORTB, 8, 0);	/* LCDD3 */
-	at91_set_a_periph(AT91_PIO_PORTB, 9, 0);	/* LCDD4 */
-	at91_set_a_periph(AT91_PIO_PORTB, 10, 0);	/* LCDD5 */
-	at91_set_a_periph(AT91_PIO_PORTB, 11, 0);	/* LCDD6 */
-	at91_set_a_periph(AT91_PIO_PORTB, 12, 0);	/* LCDD7 */
-	at91_set_a_periph(AT91_PIO_PORTB, 15, 0);	/* LCDD10 */
-	at91_set_a_periph(AT91_PIO_PORTB, 16, 0);	/* LCDD11 */
-	at91_set_a_periph(AT91_PIO_PORTB, 17, 0);	/* LCDD12 */
-	at91_set_a_periph(AT91_PIO_PORTB, 18, 0);	/* LCDD13 */
-	at91_set_a_periph(AT91_PIO_PORTB, 19, 0);	/* LCDD14 */
-	at91_set_a_periph(AT91_PIO_PORTB, 20, 0);	/* LCDD15 */
-	at91_set_b_periph(AT91_PIO_PORTB, 23, 0);	/* LCDD18 */
-	at91_set_b_periph(AT91_PIO_PORTB, 24, 0);	/* LCDD19 */
-	at91_set_b_periph(AT91_PIO_PORTB, 25, 0);	/* LCDD20 */
-	at91_set_b_periph(AT91_PIO_PORTB, 26, 0);	/* LCDD21 */
-	at91_set_b_periph(AT91_PIO_PORTB, 27, 0);	/* LCDD22 */
-	at91_set_b_periph(AT91_PIO_PORTB, 28, 0);	/* LCDD23 */
-
-	at91_system_clk_enable(AT91_PMC_HCK1);
-
-	gd->fb_base = ATMEL_BASE_SRAM;
-}
-
-#ifdef CONFIG_LCD_INFO
-#include <nand.h>
-#include <version.h>
-
-extern flash_info_t flash_info[];
-
-void lcd_show_board_info(void)
-{
-	ulong dram_size, nand_size, flash_size;
-	int i;
-	char temp[32];
-
-	lcd_printf ("%s\n", U_BOOT_VERSION);
-	lcd_printf ("(C) 2009 Ronetix GmbH\n");
-	lcd_printf ("support@ronetix.at\n");
-	lcd_printf ("%s CPU at %s MHz",
-		CONFIG_SYS_AT91_CPU_NAME,
-		strmhz(temp, get_cpu_clk_rate()));
-
-	dram_size = 0;
-	for (i = 0; i < CONFIG_NR_DRAM_BANKS; i++)
-		dram_size += gd->bd->bi_dram[i].size;
-
-	nand_size = 0;
-	for (i = 0; i < CONFIG_SYS_MAX_NAND_DEVICE; i++)
-		nand_size += get_nand_dev_by_index(i)->size;
-
-	flash_size = 0;
-	for (i = 0; i < CONFIG_SYS_MAX_FLASH_BANKS; i++)
-		flash_size += flash_info[i].size;
-
-	lcd_printf ("%ld MB SDRAM, %ld MB NAND\n%ld MB NOR Flash\n"
-			"%ld MB DataFlash\n",
-		dram_size >> 20,
-		nand_size >> 20,
-		flash_size >> 20);
-}
-#endif /* CONFIG_LCD_INFO */
-
-#endif /* CONFIG_LCD */
-
 int board_early_init_f(void)
 {
 	return 0;
@@ -227,9 +125,6 @@ int board_init(void)
 #endif
 #ifdef CONFIG_DRIVER_DM9000
 	pm9261_dm9000_hw_init();
-#endif
-#ifdef CONFIG_LCD
-	pm9261_lcd_hw_init();
 #endif
 	return 0;
 }
diff --git a/configs/pm9261_defconfig b/configs/pm9261_defconfig
index 4a749321a0..33bf85865d 100644
--- a/configs/pm9261_defconfig
+++ b/configs/pm9261_defconfig
@@ -33,6 +33,7 @@ CONFIG_DEFAULT_DEVICE_TREE="at91sam9261ek"
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_ENV_SECT_SIZE=0x10000
 CONFIG_DM=y
+CONFIG_BLK=y
 CONFIG_CLK=y
 CONFIG_CLK_AT91=y
 CONFIG_DM_GPIO=y
@@ -54,5 +55,7 @@ CONFIG_ATMEL_USART=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_USB=y
+CONFIG_DM_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_LCD=y
+CONFIG_DM_VIDEO=y
-- 
2.25.1