diff options
| author | Tom Rini <trini@konsulko.com> | 2016-01-26 09:48:07 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-01-26 09:48:07 -0500 |
| commit | b72ae192e39f933100b0eb034768cb4daeebf67a (patch) | |
| tree | 34d7b00636a472040f81b3ee1ae7f1a0a09ec1b7 /arch/arm/mach-mvebu/include/mach | |
| parent | d6ea6d88769e85f6873a94065a1ba167c9b592da (diff) | |
| parent | 7588c312528eea9e24ef5c1b9a29a256ac5024d4 (diff) | |
| download | u-boot-imx-b72ae192e39f933100b0eb034768cb4daeebf67a.zip u-boot-imx-b72ae192e39f933100b0eb034768cb4daeebf67a.tar.gz u-boot-imx-b72ae192e39f933100b0eb034768cb4daeebf67a.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-video
Diffstat (limited to 'arch/arm/mach-mvebu/include/mach')
| -rw-r--r-- | arch/arm/mach-mvebu/include/mach/cpu.h | 13 | ||||
| -rw-r--r-- | arch/arm/mach-mvebu/include/mach/soc.h | 1 |
2 files changed, 14 insertions, 0 deletions
diff --git a/arch/arm/mach-mvebu/include/mach/cpu.h b/arch/arm/mach-mvebu/include/mach/cpu.h index 47f45c1..017d55f 100644 --- a/arch/arm/mach-mvebu/include/mach/cpu.h +++ b/arch/arm/mach-mvebu/include/mach/cpu.h @@ -145,5 +145,18 @@ int serdes_phy_config(void); * drivers/ddr/marvell */ int ddr3_init(void); + +struct mvebu_lcd_info { + u32 fb_base; + int x_res; + int y_res; + int x_fp; /* frontporch */ + int y_fp; + int x_bp; /* backporch */ + int y_bp; +}; + +int mvebu_lcd_register_init(struct mvebu_lcd_info *lcd_info); + #endif /* __ASSEMBLY__ */ #endif /* _MVEBU_CPU_H */ diff --git a/arch/arm/mach-mvebu/include/mach/soc.h b/arch/arm/mach-mvebu/include/mach/soc.h index cb216bc..b317940 100644 --- a/arch/arm/mach-mvebu/include/mach/soc.h +++ b/arch/arm/mach-mvebu/include/mach/soc.h @@ -67,6 +67,7 @@ #define MVEBU_SATA0_BASE (MVEBU_REGISTER(0xa8000)) #define MVEBU_NAND_BASE (MVEBU_REGISTER(0xd0000)) #define MVEBU_SDIO_BASE (MVEBU_REGISTER(0xd8000)) +#define MVEBU_LCD_BASE (MVEBU_REGISTER(0xe0000)) #define SOC_COHERENCY_FABRIC_CTRL_REG (MVEBU_REGISTER(0x20200)) #define MBUS_ERR_PROP_EN (1 << 8) |