diff options
| author | Tom Warren <twarren@nvidia.com> | 2011-11-15 10:33:39 -0700 |
|---|---|---|
| committer | Gerrit <chrome-bot@google.com> | 2011-11-15 11:48:33 -0800 |
| commit | e219a201f8b97905bea5dbb63b4a6654548b2246 (patch) | |
| tree | 266aa3b53c238d4a97186075081c27e850032f63 /arch/arm/include/asm | |
| parent | 63cb6cdeb7e5c9cd9fdd23b1ea4b2de32d900aaf (diff) | |
arm: Tegra: make some header files common for Tegra3 LCD use
Signed-off-by: Tom Warren <twarren@nvidia.com>
BUG=none
TEST=built Seaboard and Waluigi AOK
Change-Id: Ia860abf5ef3af66b3a39d4c57192455986b7a4f4
Reviewed-on: https://gerrit.chromium.org/gerrit/11704
Reviewed-by: Simon Glass <sjg@chromium.org>
Tested-by: Tom Warren <twarren@nvidia.com>
Commit-Ready: Doug Anderson <dianders@chromium.org>
Diffstat (limited to 'arch/arm/include/asm')
| -rw-r--r-- | arch/arm/include/asm/arch-tegra/dc.h (renamed from arch/arm/include/asm/arch-tegra2/dc.h) | 8 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-tegra/display.h (renamed from arch/arm/include/asm/arch-tegra2/display.h) | 8 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-tegra/pwfm.h (renamed from arch/arm/include/asm/arch-tegra2/pwfm.h) | 7 |
3 files changed, 14 insertions, 9 deletions
diff --git a/arch/arm/include/asm/arch-tegra2/dc.h b/arch/arm/include/asm/arch-tegra/dc.h index faa1a2da1e..0e99950680 100644 --- a/arch/arm/include/asm/arch-tegra2/dc.h +++ b/arch/arm/include/asm/arch-tegra/dc.h @@ -21,10 +21,10 @@ * MA 02111-1307 USA */ -#ifndef __DC_H -#define __DC_H +#ifndef __ASM_ARCH_TEGRA_DC_H +#define __ASM_ARCH_TEGRA_DC_H -/* Register definitions for the Tegra2 display controller */ +/* Register definitions for the Tegra display controller */ /* CMD register 0x000 ~ 0x43 */ struct dc_cmd_reg { @@ -527,4 +527,4 @@ enum { #define H_DDA_INC_RANGE 15:0 #define V_DDA_INC_RANGE 31:16 -#endif /* __DC_H */ +#endif /* __ASM_ARCH_TEGRA_DC_H */ diff --git a/arch/arm/include/asm/arch-tegra2/display.h b/arch/arm/include/asm/arch-tegra/display.h index 626d520534..758dd3b0af 100644 --- a/arch/arm/include/asm/arch-tegra2/display.h +++ b/arch/arm/include/asm/arch-tegra/display.h @@ -21,10 +21,10 @@ * MA 02111-1307 USA */ -#ifndef __DRIVERS_VIDEO_TEGRA_DC_DC_H -#define __DRIVERS_VIDEO_TEGRA_DC_DC_H +#ifndef __ASM_ARCH_TEGRA_DISPLAY_H +#define __ASM_ARCH_TEGRA_DISPLAY_H -#include <asm/arch/dc.h> +#include <asm/arch-tegra/dc.h> /* This holds information about a window which can be displayed */ struct disp_ctl_win { @@ -47,4 +47,4 @@ struct fdt_lcd; /* Register a new display based on the given configuration */ void tegra2_display_register(struct fdt_lcd *config); -#endif /*__DRIVERS_VIDEO_TEGRA_DC_DC_REG_H*/ +#endif /*__ASM_ARCH_TEGRA_DISPLAY_H*/ diff --git a/arch/arm/include/asm/arch-tegra2/pwfm.h b/arch/arm/include/asm/arch-tegra/pwfm.h index 9e6abc212a..995c7b9222 100644 --- a/arch/arm/include/asm/arch-tegra2/pwfm.h +++ b/arch/arm/include/asm/arch-tegra/pwfm.h @@ -19,7 +19,10 @@ * MA 02111-1307 USA */ -/* Tegra2 pulse width frequency modulator definitions */ +#ifndef __ASM_ARCH_TEGRA_PWFM_H +#define __ASM_ARCH_TEGRA_PWFM_H + +/* Tegra pulse width frequency modulator definitions */ /* This is a single PWFM channel */ struct pwfm_ctlr { @@ -42,3 +45,5 @@ struct pwfm_ctlr { */ void pwfm_setup(struct pwfm_ctlr *pwfm, int enable, int pulse_width, int freq_divider); + +#endif /* __ASM_ARCH_TEGRA_PWFM_H */ |