diff options
| author | Tom Rini | 2016-07-11 18:50:29 -0400 |
|---|---|---|
| committer | Tom Rini | 2016-07-11 18:50:29 -0400 |
| commit | bff97dde8c8cf6fd5f04bb26fca83f61eadc1741 (patch) | |
| tree | 544f4a0d7d5668388eaf8a157c16cf6bb8ead134 /include | |
| parent | 94fbd3e37d6bdbf5490a185607ca20f862637220 (diff) | |
| parent | 96907c0fe50a856f66f60ade68864a2d7949bf15 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-spi
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/k2g_evm.h | 6 | ||||
| -rw-r--r-- | include/configs/ti_armv7_keystone2.h | 4 | ||||
| -rw-r--r-- | include/dm/device.h | 13 |
3 files changed, 23 insertions, 0 deletions
diff --git a/include/configs/k2g_evm.h b/include/configs/k2g_evm.h index f8bba6710db..71b00378ffb 100644 --- a/include/configs/k2g_evm.h +++ b/include/configs/k2g_evm.h @@ -73,4 +73,10 @@ #define CONFIG_SF_DEFAULT_BUS 1 #define CONFIG_SF_DEFAULT_CS 0 +#ifndef CONFIG_SPL_BUILD +#define CONFIG_CADENCE_QSPI +#define CONFIG_CQSPI_REF_CLK 384000000 +#define CONFIG_CQSPI_DECODER 0x0 +#endif + #endif /* __CONFIG_K2G_EVM_H */ diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h index 2ee26c40367..4aa262e1a87 100644 --- a/include/configs/ti_armv7_keystone2.h +++ b/include/configs/ti_armv7_keystone2.h @@ -89,6 +89,10 @@ #define CONFIG_SYS_SPI2 #define CONFIG_SYS_SPI2_BASE KS2_SPI2_BASE #define CONFIG_SYS_SPI2_NUM_CS 4 +#ifdef CONFIG_SPL_BUILD +#undef CONFIG_DM_SPI +#undef CONFIG_DM_SPI_FLASH +#endif /* Network Configuration */ #define CONFIG_PHYLIB diff --git a/include/dm/device.h b/include/dm/device.h index f03bcd3b49e..1bfcf3bcbc0 100644 --- a/include/dm/device.h +++ b/include/dm/device.h @@ -467,6 +467,19 @@ fdt_addr_t dev_get_addr(struct udevice *dev); void *dev_get_addr_ptr(struct udevice *dev); /** + * dev_map_physmem() - Read device address from reg property of the + * device node and map the address into CPU address + * space. + * + * @dev: Pointer to device + * @size: size of the memory to map + * + * @return mapped address, or NULL if the device does not have reg + * property. + */ +void *dev_map_physmem(struct udevice *dev, unsigned long size); + +/** * dev_get_addr_index() - Get the indexed reg property of a device * * @dev: Pointer to a device |