yair/u-boot-tk1-som
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of git://git.denx.de/u-boot-video

Browse Source
This commit is contained in:
Tom Rini
2016-01-26 09:48:07 -05:00
parent d6ea6d8876 7588c31252
commit b72ae192e3
15 changed files with 594 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
arch/arm/mach-mvebu/include/mach/cpu.h
View File

@@ -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 */

1
arch/arm/mach-mvebu/include/mach/soc.h
View File

@@ -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)