diff options
| author | Tom Rini <trini@konsulko.com> | 2015-11-05 07:46:28 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-11-05 07:46:28 -0500 |
| commit | 28824407f341fa424535e18e164ea94b5e2cfa8a (patch) | |
| tree | e6b0e14c4845444645b28ae3a104deb3f6a8a809 /arch/arm | |
| parent | 8168ee38c26be586012743ded262145081d49d05 (diff) | |
| parent | a55f28624e97e1e43ac333c39713b8b9435fcbd3 (diff) | |
| download | talos-obmc-uboot-28824407f341fa424535e18e164ea94b5e2cfa8a.tar.gz talos-obmc-uboot-28824407f341fa424535e18e164ea94b5e2cfa8a.zip | |
Merge git://git.denx.de/u-boot-socfpga
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/dts/socfpga_cyclone5_socdk.dts | 2 | ||||
| -rw-r--r-- | arch/arm/mach-socfpga/include/mach/reset_manager.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/dts/socfpga_cyclone5_socdk.dts b/arch/arm/dts/socfpga_cyclone5_socdk.dts index 546560979b..9eb5a2209c 100644 --- a/arch/arm/dts/socfpga_cyclone5_socdk.dts +++ b/arch/arm/dts/socfpga_cyclone5_socdk.dts @@ -89,7 +89,7 @@ #size-cells = <1>; compatible = "n25q00"; reg = <0>; /* chip select */ - spi-max-frequency = <50000000>; + spi-max-frequency = <100000000>; m25p,fast-read; page-size = <256>; block-size = <16>; /* 2^16, 64KB */ diff --git a/arch/arm/mach-socfpga/include/mach/reset_manager.h b/arch/arm/mach-socfpga/include/mach/reset_manager.h index 8e59578f37..666a2ef8df 100644 --- a/arch/arm/mach-socfpga/include/mach/reset_manager.h +++ b/arch/arm/mach-socfpga/include/mach/reset_manager.h @@ -69,9 +69,9 @@ struct socfpga_reset_manager { #define RSTMGR_UART0 RSTMGR_DEFINE(1, 16) #define RSTMGR_SPIM0 RSTMGR_DEFINE(1, 18) #define RSTMGR_SPIM1 RSTMGR_DEFINE(1, 19) -#define RSTMGR_QSPI RSTMGR_DEFINE(0, 5) -#define RSTMGR_SDMMC RSTMGR_DEFINE(0, 22) -#define RSTMGR_DMA RSTMGR_DEFINE(0, 28) +#define RSTMGR_QSPI RSTMGR_DEFINE(1, 5) +#define RSTMGR_SDMMC RSTMGR_DEFINE(1, 22) +#define RSTMGR_DMA RSTMGR_DEFINE(1, 28) #define RSTMGR_SDR RSTMGR_DEFINE(1, 29) /* Create a human-readable reference to SoCFPGA reset. */ |
