Consolidate HD headers and place the result into video/tegra20
since it is used only by devices from this directory.
Tested-by: Agneli # Toshiba AC100 T20
Tested-by: Robert Eckelmann # ASUS TF101
Tested-by: Andreas Westman Dorcsak # ASUS Grouper E1565
Tested-by: Ion Agorria # HTC One X
Tested-by: Svyatoslav Ryhel # Nvidia Tegratab T114
Signed-off-by: Svyatoslav Ryhel
---
arch/arm/include/asm/arch-tegra/dc.h | 8
arch/arm/include/asm/arch-tegra114/display.h | 28 -
arch/arm/include/asm/arch-tegra20/display.h | 28 -
arch/arm/include/asm/arch-tegra30/display.h | 28 -
drivers/video/tegra20/tegra-dc.c | 3 +-
drivers/video/tegra20/tegra-dc.h | 41
drivers/video/tegra20/tegra-dsi.c| 2 +-
drivers/video/tegra20/tegra-pwm-backlight.c | 3 +-
8 files changed, 46 insertions(+), 95 deletions(-)
delete mode 100644 arch/arm/include/asm/arch-tegra114/display.h
delete mode 100644 arch/arm/include/asm/arch-tegra20/display.h
delete mode 100644 arch/arm/include/asm/arch-tegra30/display.h
create mode 100644 drivers/video/tegra20/tegra-dc.h
diff --git a/arch/arm/include/asm/arch-tegra/dc.h
b/arch/arm/include/asm/arch-tegra/dc.h
index 7613d84f22..6444af2993 100644
--- a/arch/arm/include/asm/arch-tegra/dc.h
+++ b/arch/arm/include/asm/arch-tegra/dc.h
@@ -569,12 +569,4 @@ enum {
#define DC_N_WINDOWS 5
#define DC_REG_SAVE_SPACE (DC_N_WINDOWS + 5)
-#define TEGRA_DSI_A"dsi@5430"
-#define TEGRA_DSI_B"dsi@5440"
-
-struct tegra_dc_plat {
- struct udevice *dev;/* Display controller device */
- struct dc_ctlr *dc; /* Display controller regmap */
-};
-
#endif /* __ASM_ARCH_TEGRA_DC_H */
diff --git a/arch/arm/include/asm/arch-tegra114/display.h
b/arch/arm/include/asm/arch-tegra114/display.h
deleted file mode 100644
index 9411525799..00
--- a/arch/arm/include/asm/arch-tegra114/display.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * (C) Copyright 2010
- * NVIDIA Corporation
- */
-
-#ifndef __ASM_ARCH_TEGRA_DISPLAY_H
-#define __ASM_ARCH_TEGRA_DISPLAY_H
-
-#include
-
-/* This holds information about a window which can be displayed */
-struct disp_ctl_win {
- enum win_color_depth_id fmt;/* Color depth/format */
- unsigned intbpp;/* Bits per pixel */
- phys_addr_t phys_addr; /* Physical address in memory */
- unsigned intx; /* Horizontal address offset (bytes) */
- unsigned inty; /* Veritical address offset (bytes) */
- unsigned intw; /* Width of source window */
- unsigned inth; /* Height of source window */
- unsigned intstride; /* Number of bytes per line */
- unsigned intout_x; /* Left edge of output window (col) */
- unsigned intout_y; /* Top edge of output window (row) */
- unsigned intout_w; /* Width of output window in pixels */
- unsigned intout_h; /* Height of output window in pixels */
-};
-
-#endif /*__ASM_ARCH_TEGRA_DISPLAY_H*/
diff --git a/arch/arm/include/asm/arch-tegra20/display.h
b/arch/arm/include/asm/arch-tegra20/display.h
deleted file mode 100644
index e7b3cffd46..00
--- a/arch/arm/include/asm/arch-tegra20/display.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * (C) Copyright 2010
- * NVIDIA Corporation
- */
-
-#ifndef __ASM_ARCH_TEGRA_DISPLAY_H
-#define __ASM_ARCH_TEGRA_DISPLAY_H
-
-#include
-
-/* This holds information about a window which can be displayed */
-struct disp_ctl_win {
- enum win_color_depth_id fmt;/* Color depth/format */
- unsignedbpp;/* Bits per pixel */
- phys_addr_t phys_addr; /* Physical address in memory */
- unsignedx; /* Horizontal address offset (bytes) */
- unsignedy; /* Veritical address offset (bytes) */
- unsignedw; /* Width of source window */
- unsignedh; /* Height of source window */
- unsignedstride; /* Number of bytes per line */
- unsignedout_x; /* Left edge of output window (col) */
- unsignedout_y; /* Top edge of output window (row) */
- unsignedout_w; /* Width of output window in pixels */
- unsignedout_h; /* Height of output window in pixels */
-};
-
-#endif /*__ASM_ARCH_TEGRA_DISPLAY_H*/
diff --git a/arch/arm/include/asm/arch-tegra30/display.h
b/arch/arm/include/asm/arch-tegra30/display.h
deleted file mode 100644
index 9411525799..00
--- a/arch/arm/include/asm/arch-tegra30/display.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- *
