board: sama5d2_xplained: Convert to CONFIG_DM_VIDEO
Convert the board to support the video driver model, add the device tree node, and remove the unnecessary code. Signed-off-by: Wenyou Yang <wenyou.yang@microchip.com> Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Wenyou Yang
Anatolij Gustschin
parent
ec4e99a4a2
commit
d2cd09bb44
7 changed files with 79 additions and 100 deletions
|
|
@ -41,6 +41,31 @@
|
|||
};
|
||||
|
||||
apb {
|
||||
hlcdc: hlcdc@f0000000 {
|
||||
atmel,vl-bpix = <4>;
|
||||
atmel,guard-time = <1>;
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&pinctrl_lcd_base &pinctrl_lcd_pwm &pinctrl_lcd_rgb666>;
|
||||
status = "okay";
|
||||
u-boot,dm-pre-reloc;
|
||||
|
||||
display-timings {
|
||||
u-boot,dm-pre-reloc;
|
||||
480x272 {
|
||||
clock-frequency = <9000000>;
|
||||
hactive = <480>;
|
||||
vactive = <272>;
|
||||
hsync-len = <41>;
|
||||
hfront-porch = <2>;
|
||||
hback-porch = <2>;
|
||||
vfront-porch = <2>;
|
||||
vback-porch = <2>;
|
||||
vsync-len = <11>;
|
||||
u-boot,dm-pre-reloc;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
qspi0: spi@f0020000 {
|
||||
status = "okay";
|
||||
|
||||
|
|
@ -117,6 +142,41 @@
|
|||
bias-disable;
|
||||
};
|
||||
|
||||
pinctrl_lcd_base: pinctrl_lcd_base {
|
||||
pinmux = <PIN_PC30__LCDVSYNC>,
|
||||
<PIN_PC31__LCDHSYNC>,
|
||||
<PIN_PD1__LCDDEN>,
|
||||
<PIN_PD0__LCDPCK>;
|
||||
bias-disable;
|
||||
};
|
||||
|
||||
pinctrl_lcd_pwm: pinctrl_lcd_pwm {
|
||||
pinmux = <PIN_PC28__LCDPWM>;
|
||||
bias-disable;
|
||||
};
|
||||
|
||||
pinctrl_lcd_rgb666: pinctrl_lcd_rgb666 {
|
||||
pinmux = <PIN_PC10__LCDDAT2>,
|
||||
<PIN_PC11__LCDDAT3>,
|
||||
<PIN_PC12__LCDDAT4>,
|
||||
<PIN_PC13__LCDDAT5>,
|
||||
<PIN_PC14__LCDDAT6>,
|
||||
<PIN_PC15__LCDDAT7>,
|
||||
<PIN_PC16__LCDDAT10>,
|
||||
<PIN_PC17__LCDDAT11>,
|
||||
<PIN_PC18__LCDDAT12>,
|
||||
<PIN_PC19__LCDDAT13>,
|
||||
<PIN_PC20__LCDDAT14>,
|
||||
<PIN_PC21__LCDDAT15>,
|
||||
<PIN_PC22__LCDDAT18>,
|
||||
<PIN_PC23__LCDDAT19>,
|
||||
<PIN_PC24__LCDDAT20>,
|
||||
<PIN_PC25__LCDDAT21>,
|
||||
<PIN_PC26__LCDDAT22>,
|
||||
<PIN_PC27__LCDDAT23>;
|
||||
bias-disable;
|
||||
};
|
||||
|
||||
pinctrl_macb0_phy_irq: macb0_phy_irq {
|
||||
pinmux = <PIN_PC9__GPIO>;
|
||||
bias-disable;
|
||||
|
|
|
|||
|
|
@ -69,6 +69,13 @@
|
|||
#size-cells = <1>;
|
||||
u-boot,dm-pre-reloc;
|
||||
|
||||
hlcdc: hlcdc@f0000000 {
|
||||
compatible = "atmel,at91sam9x5-hlcdc";
|
||||
reg = <0xf0000000 0x2000>;
|
||||
clocks = <&lcdc_clk>;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
pmc: pmc@f0014000 {
|
||||
compatible = "atmel,sama5d2-pmc", "syscon";
|
||||
reg = <0xf0014000 0x160>;
|
||||
|
|
|
|||
|
|
@ -153,6 +153,7 @@ config TARGET_SAMA5D2_XPLAINED
|
|||
select SAMA5D2
|
||||
select SUPPORT_SPL
|
||||
select BOARD_EARLY_INIT_F
|
||||
select BOARD_LATE_INIT
|
||||
|
||||
config TARGET_SAMA5D27_SOM1_EK
|
||||
bool "SAMA5D27 SOM1 EK board"
|
||||
|
|
|
|||
|
|
@ -6,10 +6,7 @@
|
|||
*/
|
||||
|
||||
#include <common.h>
|
||||
#include <atmel_hlcdc.h>
|
||||
#include <debug_uart.h>
|
||||
#include <lcd.h>
|
||||
#include <version.h>
|
||||
#include <asm/io.h>
|
||||
#include <asm/arch/at91_common.h>
|
||||
#include <asm/arch/atmel_pio4.h>
|
||||
|
|
@ -26,90 +23,15 @@ static void board_usb_hw_init(void)
|
|||
atmel_pio4_set_pio_output(AT91_PIO_PORTB, 10, 1);
|
||||
}
|
||||
|
||||
#ifdef CONFIG_LCD
|
||||
vidinfo_t panel_info = {
|
||||
.vl_col = 480,
|
||||
.vl_row = 272,
|
||||
.vl_clk = 9000000,
|
||||
.vl_bpix = LCD_BPP,
|
||||
.vl_tft = 1,
|
||||
.vl_hsync_len = 41,
|
||||
.vl_left_margin = 2,
|
||||
.vl_right_margin = 2,
|
||||
.vl_vsync_len = 11,
|
||||
.vl_upper_margin = 2,
|
||||
.vl_lower_margin = 2,
|
||||
.mmio = ATMEL_BASE_LCDC,
|
||||
};
|
||||
|
||||
/* No power up/down pin for the LCD pannel */
|
||||
void lcd_enable(void) { /* Empty! */ }
|
||||
void lcd_disable(void) { /* Empty! */ }
|
||||
|
||||
unsigned int has_lcdc(void)
|
||||
#ifdef CONFIG_BOARD_LATE_INIT
|
||||
int board_late_init(void)
|
||||
{
|
||||
return 1;
|
||||
#ifdef CONFIG_DM_VIDEO
|
||||
at91_video_show_board_info();
|
||||
#endif
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void board_lcd_hw_init(void)
|
||||
{
|
||||
atmel_pio4_set_a_periph(AT91_PIO_PORTC, 28, 0); /* LCDPWM */
|
||||
atmel_pio4_set_a_periph(AT91_PIO_PORTC, 29, 0); /* LCDDISP */
|
||||
atmel_pio4_set_a_periph(AT91_PIO_PORTC, 30, 0); /* LCDVSYNC */
|
||||
atmel_pio4_set_a_periph(AT91_PIO_PORTC, 31, 0); /* LCDHSYNC */
|
||||
atmel_pio4_set_a_periph(AT91_PIO_PORTD, 0, 0); /* LCDPCK */
|
||||
atmel_pio4_set_a_periph(AT91_PIO_PORTD, 1, 0); /* LCDDEN */
|
||||
|
||||
/* LCDDAT0 */
|
||||
/* LCDDAT1 */
|
||||
atmel_pio4_set_a_periph(AT91_PIO_PORTC, 10, 0); /* LCDDAT2 */
|
||||
atmel_pio4_set_a_periph(AT91_PIO_PORTC, 11, 0); /* LCDDAT3 */
|
||||
atmel_pio4_set_a_periph(AT91_PIO_PORTC, 12, 0); /* LCDDAT4 */
|
||||
atmel_pio4_set_a_periph(AT91_PIO_PORTC, 13, 0); /* LCDDAT5 */
|
||||
atmel_pio4_set_a_periph(AT91_PIO_PORTC, 14, 0); /* LCDDAT6 */
|
||||
atmel_pio4_set_a_periph(AT91_PIO_PORTC, 15, 0); /* LCDDAT7 */
|
||||
|
||||
/* LCDDAT8 */
|
||||
/* LCDDAT9 */
|
||||
atmel_pio4_set_a_periph(AT91_PIO_PORTC, 16, 0); /* LCDDAT10 */
|
||||
atmel_pio4_set_a_periph(AT91_PIO_PORTC, 17, 0); /* LCDDAT11 */
|
||||
atmel_pio4_set_a_periph(AT91_PIO_PORTC, 18, 0); /* LCDDAT12 */
|
||||
atmel_pio4_set_a_periph(AT91_PIO_PORTC, 19, 0); /* LCDDAT13 */
|
||||
atmel_pio4_set_a_periph(AT91_PIO_PORTC, 20, 0); /* LCDDAT14 */
|
||||
atmel_pio4_set_a_periph(AT91_PIO_PORTC, 21, 0); /* LCDDAT15 */
|
||||
|
||||
/* LCDD16 */
|
||||
/* LCDD17 */
|
||||
atmel_pio4_set_a_periph(AT91_PIO_PORTC, 22, 0); /* LCDDAT18 */
|
||||
atmel_pio4_set_a_periph(AT91_PIO_PORTC, 23, 0); /* LCDDAT19 */
|
||||
atmel_pio4_set_a_periph(AT91_PIO_PORTC, 24, 0); /* LCDDAT20 */
|
||||
atmel_pio4_set_a_periph(AT91_PIO_PORTC, 25, 0); /* LCDDAT21 */
|
||||
atmel_pio4_set_a_periph(AT91_PIO_PORTC, 26, 0); /* LCDDAT22 */
|
||||
atmel_pio4_set_a_periph(AT91_PIO_PORTC, 27, 0); /* LCDDAT23 */
|
||||
|
||||
at91_periph_clk_enable(ATMEL_ID_LCDC);
|
||||
}
|
||||
|
||||
#ifdef CONFIG_LCD_INFO
|
||||
void lcd_show_board_info(void)
|
||||
{
|
||||
ulong dram_size;
|
||||
int i;
|
||||
char temp[32];
|
||||
|
||||
lcd_printf("%s\n", U_BOOT_VERSION);
|
||||
lcd_printf("2015 ATMEL Corp\n");
|
||||
lcd_printf("%s CPU at %s MHz\n", get_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;
|
||||
|
||||
lcd_printf("%ld MB SDRAM\n", dram_size >> 20);
|
||||
}
|
||||
#endif /* CONFIG_LCD_INFO */
|
||||
#endif /* CONFIG_LCD */
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_DEBUG_UART_BOARD_INIT
|
||||
static void board_uart1_hw_init(void)
|
||||
|
|
@ -142,9 +64,6 @@ int board_init(void)
|
|||
/* address of boot parameters */
|
||||
gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
|
||||
|
||||
#ifdef CONFIG_LCD
|
||||
board_lcd_hw_init();
|
||||
#endif
|
||||
#ifdef CONFIG_CMD_USB
|
||||
board_usb_hw_init();
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -82,3 +82,5 @@ CONFIG_USB_EHCI_HCD=y
|
|||
CONFIG_USB_STORAGE=y
|
||||
CONFIG_USB_GADGET=y
|
||||
CONFIG_USB_GADGET_ATMEL_USBA=y
|
||||
CONFIG_DM_VIDEO=y
|
||||
CONFIG_ATMEL_HLCD=y
|
||||
|
|
|
|||
|
|
@ -79,3 +79,5 @@ CONFIG_USB_EHCI_HCD=y
|
|||
CONFIG_USB_STORAGE=y
|
||||
CONFIG_USB_GADGET=y
|
||||
CONFIG_USB_GADGET_ATMEL_USBA=y
|
||||
CONFIG_DM_VIDEO=y
|
||||
CONFIG_ATMEL_HLCD=y
|
||||
|
|
|
|||
|
|
@ -35,18 +35,6 @@
|
|||
#define CONFIG_SF_DEFAULT_SPEED 30000000
|
||||
#endif
|
||||
|
||||
/* LCD */
|
||||
|
||||
#ifdef CONFIG_LCD
|
||||
#define LCD_BPP LCD_COLOR16
|
||||
#define LCD_OUTPUT_BPP 24
|
||||
#define CONFIG_LCD_LOGO
|
||||
#define CONFIG_LCD_INFO
|
||||
#define CONFIG_LCD_INFO_BELOW_LOGO
|
||||
#define CONFIG_ATMEL_HLCD
|
||||
#define CONFIG_ATMEL_LCD_RGB565
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_SD_BOOT
|
||||
|
||||
/* bootstrap + u-boot + env in sd card */
|
||||
|
|
|
|||
Loading…
Reference in a new issue