diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2018-10-09 12:00:43 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2018-10-09 12:00:43 +0200 |
| commit | 4283b66a953a37eaa5e9643c5cd0c6c89f7eac69 (patch) | |
| tree | 0459a6c991eb1dd74a28b19308b1b7d6b199c50b /arch/arm/mach-socfpga | |
| parent | 7f071269ddb8f3786f6c5ec1d4b91ae928833c96 (diff) | |
| parent | ca1ba604a379d05e570a05232e86b5364f166e49 (diff) | |
| download | barebox-4283b66a953a37eaa5e9643c5cd0c6c89f7eac69.tar.gz barebox-4283b66a953a37eaa5e9643c5cd0c6c89f7eac69.tar.xz | |
Merge branch 'for-next/socfpga'
Diffstat (limited to 'arch/arm/mach-socfpga')
| -rw-r--r-- | arch/arm/mach-socfpga/include/mach/generic.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-socfpga/include/mach/generic.h b/arch/arm/mach-socfpga/include/mach/generic.h index 72391f3552..c8ee73fe2e 100644 --- a/arch/arm/mach-socfpga/include/mach/generic.h +++ b/arch/arm/mach-socfpga/include/mach/generic.h @@ -65,19 +65,19 @@ static inline void socfpga_arria10_timer_init(void) { return; } -static void arria10_prepare_mmc(int barebox, int bitstream) +static inline void arria10_prepare_mmc(int barebox, int bitstream) { return; } -static void arria10_start_image(int offset) +static inline void arria10_start_image(int offset) { return; } -static int arria10_load_fpga(int offset, int size) +static inline int arria10_load_fpga(int offset, int size) { - return; + return 0; } -static int arria10_device_init(struct arria10_mainpll_cfg *mainpll, +static inline int arria10_device_init(struct arria10_mainpll_cfg *mainpll, struct arria10_perpll_cfg *perpll, uint32_t *pinmux) { |