diff options
| author | Tom Rini <trini@konsulko.com> | 2015-12-07 08:13:02 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-12-07 08:13:02 -0500 |
| commit | dcf4cb068e19a7f39e4a295102b247376bd27c95 (patch) | |
| tree | 181457dc202707b9ee622d6dce5117aab8e102d5 /arch/arm/mach-zynq/include | |
| parent | 25ef4bea59dadbd25dec1dbb376ed84dfc735f02 (diff) | |
| parent | 8bebf03c73cd0830cb2cd234021004cde67c6412 (diff) | |
Merge branch 'zynq' of git://www.denx.de/git/u-boot-microblaze
Diffstat (limited to 'arch/arm/mach-zynq/include')
| -rw-r--r-- | arch/arm/mach-zynq/include/mach/hardware.h | 4 | ||||
| -rw-r--r-- | arch/arm/mach-zynq/include/mach/sys_proto.h | 3 |
2 files changed, 0 insertions, 7 deletions
diff --git a/arch/arm/mach-zynq/include/mach/hardware.h b/arch/arm/mach-zynq/include/mach/hardware.h index 9a51d6ba3b..830e1fea18 100644 --- a/arch/arm/mach-zynq/include/mach/hardware.h +++ b/arch/arm/mach-zynq/include/mach/hardware.h @@ -7,15 +7,11 @@ #ifndef _ASM_ARCH_HARDWARE_H #define _ASM_ARCH_HARDWARE_H -#define ZYNQ_SERIAL_BASEADDR0 0xE0000000 -#define ZYNQ_SERIAL_BASEADDR1 0xE0001000 #define ZYNQ_SYS_CTRL_BASEADDR 0xF8000000 #define ZYNQ_DEV_CFG_APB_BASEADDR 0xF8007000 #define ZYNQ_SCU_BASEADDR 0xF8F00000 #define ZYNQ_GEM_BASEADDR0 0xE000B000 #define ZYNQ_GEM_BASEADDR1 0xE000C000 -#define ZYNQ_SDHCI_BASEADDR0 0xE0100000 -#define ZYNQ_SDHCI_BASEADDR1 0xE0101000 #define ZYNQ_I2C_BASEADDR0 0xE0004000 #define ZYNQ_I2C_BASEADDR1 0xE0005000 #define ZYNQ_SPI_BASEADDR0 0xE0006000 diff --git a/arch/arm/mach-zynq/include/mach/sys_proto.h b/arch/arm/mach-zynq/include/mach/sys_proto.h index 9d50e2478f..882beabe13 100644 --- a/arch/arm/mach-zynq/include/mach/sys_proto.h +++ b/arch/arm/mach-zynq/include/mach/sys_proto.h @@ -20,9 +20,6 @@ extern void zynq_ddrc_init(void); extern unsigned int zynq_get_silicon_version(void); /* Driver extern functions */ -extern int zynq_sdhci_init(phys_addr_t regbase); -extern int zynq_sdhci_of_init(const void *blob); - extern void ps7_init(void); #endif /* _SYS_PROTO_H_ */ |