diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2015-06-09 09:26:44 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2015-06-09 09:26:44 +0200 |
| commit | 3a32e7acd4867705f0b2b822f3dd88b25cae987a (patch) | |
| tree | 0e932fd49debf707f4f514be693f84fb2642760e /arch/arm/mach-socfpga/include/mach | |
| parent | 61c79464481936281c83ad6a11e6df8c1c4d7743 (diff) | |
| parent | 04a2c84fda15659f1ad594c88ff67f239ab9f5a6 (diff) | |
| download | barebox-3a32e7acd4867705f0b2b822f3dd88b25cae987a.tar.gz barebox-3a32e7acd4867705f0b2b822f3dd88b25cae987a.tar.xz | |
Merge branch 'for-next/spi-nor'
Diffstat (limited to 'arch/arm/mach-socfpga/include/mach')
| -rw-r--r-- | arch/arm/mach-socfpga/include/mach/generic.h | 5 | ||||
| -rw-r--r-- | arch/arm/mach-socfpga/include/mach/socfpga-regs.h | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/mach-socfpga/include/mach/generic.h b/arch/arm/mach-socfpga/include/mach/generic.h index 2f5cda0d02..1f4247f803 100644 --- a/arch/arm/mach-socfpga/include/mach/generic.h +++ b/arch/arm/mach-socfpga/include/mach/generic.h @@ -15,4 +15,9 @@ static inline void __udelay(unsigned us) for (i = 0; i < us * 3; i++); } +struct socfpga_barebox_part { + unsigned int nor_offset; + unsigned int nor_size; +}; + #endif /* __MACH_SOCFPGA_GENERIC_H */ diff --git a/arch/arm/mach-socfpga/include/mach/socfpga-regs.h b/arch/arm/mach-socfpga/include/mach/socfpga-regs.h index b124ed675c..e88daf7189 100644 --- a/arch/arm/mach-socfpga/include/mach/socfpga-regs.h +++ b/arch/arm/mach-socfpga/include/mach/socfpga-regs.h @@ -2,6 +2,8 @@ #define __MACH_SOCFPGA_REGS_H #define CYCLONE5_SDMMC_ADDRESS 0xff704000 +#define CYCLONE5_QSPI_CTRL_ADDRESS 0xff705000 +#define CYCLONE5_QSPI_DATA_ADDRESS 0xffa00000 #define CYCLONE5_FPGAMGRREGS_ADDRESS 0xff706000 #define CYCLONE5_GPIO0_BASE 0xff708000 #define CYCLONE5_GPIO1_BASE 0xff709000 |