diff options
| author | Tom Rini <trini@ti.com> | 2014-10-27 09:08:42 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-10-27 09:08:42 -0400 |
| commit | 0ce4af99c07acebf4fce9a91f1099d2460629293 (patch) | |
| tree | d87d969bfc91662e7a90b3c4fcce35acf4a3cdaf /arch/arm/include/asm | |
| parent | 5aa7bece1045c28806ce919099616ebe8fa63325 (diff) | |
| parent | 3f97af5302ee15530411232b464d255eb2ff2ffb (diff) | |
| download | blackbird-obmc-uboot-0ce4af99c07acebf4fce9a91f1099d2460629293.tar.gz blackbird-obmc-uboot-0ce4af99c07acebf4fce9a91f1099d2460629293.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-imx
Diffstat (limited to 'arch/arm/include/asm')
| -rw-r--r-- | arch/arm/include/asm/imx-common/spi.h | 17 | ||||
| -rw-r--r-- | arch/arm/include/asm/imx-common/video.h | 5 |
2 files changed, 22 insertions, 0 deletions
diff --git a/arch/arm/include/asm/imx-common/spi.h b/arch/arm/include/asm/imx-common/spi.h new file mode 100644 index 0000000000..1d4473a04a --- /dev/null +++ b/arch/arm/include/asm/imx-common/spi.h @@ -0,0 +1,17 @@ +/* + * Copyright 2011 Freescale Semiconductor, Inc. + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#ifndef __MXC_SPI_H_ +#define __MXC_SPI_H_ + +/* + * Board-level chip-select callback + * Should return GPIO # to be used for chip-select + */ + +int board_spi_cs_gpio(unsigned bus, unsigned cs); + +#endif diff --git a/arch/arm/include/asm/imx-common/video.h b/arch/arm/include/asm/imx-common/video.h index 2d948508d5..1a907d44e4 100644 --- a/arch/arm/include/asm/imx-common/video.h +++ b/arch/arm/include/asm/imx-common/video.h @@ -21,4 +21,9 @@ struct display_info_t { extern int detect_hdmi(struct display_info_t const *dev); #endif +#ifdef CONFIG_IMX_VIDEO_SKIP +extern struct display_info_t const displays[]; +extern size_t display_count; +#endif + #endif |
