Makefile: drop unused cpp_cfg macro

[u-boot] / include / atmel_lcd.h

diff --git a/include/atmel_lcd.h b/include/atmel_lcd.h
index fa8aa294542f60e2af44a723417e6ec6183507ee..4aa955b6b2d4d7516225c0eac8a890910f3f5e25 100644 (file)
--- a/include/atmel_lcd.h
+++ b/include/atmel_lcd.h
@@ -1,19 +1,28 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * atmel_lcd.h - Atmel LCD Controller structures
  *
  * (C) Copyright 2001
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef _ATMEL_LCD_H_
 #define _ATMEL_LCD_H_
 
+/**
+ * struct atmel_lcd_platdata - platform data for Atmel LCDs with driver model
+ *
+ * @timing_index:      Index of LCD timing to use in device tree node
+ */
+struct atmel_lcd_platdata {
+       int timing_index;
+};
+
 typedef struct vidinfo {
        ushort vl_col;          /* Number of columns (i.e. 640) */
        ushort vl_row;          /* Number of rows (i.e. 480) */
-       u_long vl_clk;  /* pixel clock in ps    */
+       ushort vl_rot;          /* Rotation of Display (0, 1, 2, 3) */
+       u_long vl_clk;          /* pixel clock in ps    */
 
        /* LCD configuration register */
        u_long vl_sync;         /* Horizontal / vertical sync */
@@ -33,6 +42,15 @@ typedef struct vidinfo {
        u_long vl_lower_margin; /* Time from picture to sync */
 
        u_long  mmio;           /* Memory mapped registers */
+
+       u_int logo_width;
+       u_int logo_height;
+       int logo_x_offset;
+       int logo_y_offset;
+       u_long logo_addr;
 } vidinfo_t;
 
+void atmel_logo_info(vidinfo_t *info);
+void microchip_logo_info(vidinfo_t *info);
+
 #endif