arria10_finish_io() doesn't use mainpll_cfg, perpll_cfg.
Remove them from the parameter list.
Signed-off-by: Steffen Trumtrar <s.trumtrar@xxxxxxxxxxxxxx>
---
arch/arm/boards/enclustra-aa1/lowlevel.c | 4 ++--
arch/arm/boards/reflex-achilles/lowlevel.c | 4 ++--
arch/arm/mach-socfpga/arria10-init.c | 4 +---
include/mach/socfpga/generic.h | 3 +--
4 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/arch/arm/boards/enclustra-aa1/lowlevel.c b/arch/arm/boards/enclustra-aa1/lowlevel.c
index 10a2095e19..fc6b2779c9 100644
--- a/arch/arm/boards/enclustra-aa1/lowlevel.c
+++ b/arch/arm/boards/enclustra-aa1/lowlevel.c
@@ -83,7 +83,7 @@ ENTRY_FUNCTION_WITHSTACK(start_socfpga_aa1_xload, ARRIA10_STACKTOP, r0, r1, r2)
arria10_load_fpga(bitstream, SZ_32M);
- arria10_finish_io(&mainpll_cfg, &perpll_cfg, pinmux);
+ arria10_finish_io(pinmux);
arria10_ddr_calibration_sequence();
@@ -115,7 +115,7 @@ ENTRY_FUNCTION_WITHSTACK(start_socfpga_aa1_bringup, ARRIA10_STACKTOP, r0, r1, r2
/* wait for fpga_usermode */
a10_wait_for_usermode(0x1000000);
- arria10_finish_io(&mainpll_cfg, &perpll_cfg, pinmux);
+ arria10_finish_io(pinmux);
arria10_ddr_calibration_sequence();
diff --git a/arch/arm/boards/reflex-achilles/lowlevel.c b/arch/arm/boards/reflex-achilles/lowlevel.c
index 12ead6d6dd..a6548605ec 100644
--- a/arch/arm/boards/reflex-achilles/lowlevel.c
+++ b/arch/arm/boards/reflex-achilles/lowlevel.c
@@ -74,7 +74,7 @@ ENTRY_FUNCTION_WITHSTACK(start_socfpga_achilles_xload, ARRIA10_STACKTOP, r0, r1,
arria10_load_fpga(bitstream, SZ_64M);
- arria10_finish_io(&mainpll_cfg, &perpll_cfg, pinmux);
+ arria10_finish_io(pinmux);
arria10_ddr_calibration_sequence();
@@ -105,7 +105,7 @@ ENTRY_FUNCTION_WITHSTACK(start_socfpga_achilles_bringup, ARRIA10_STACKTOP, r0, r
/* wait for fpga_usermode */
a10_wait_for_usermode(0x1000000);
- arria10_finish_io(&mainpll_cfg, &perpll_cfg, pinmux);
+ arria10_finish_io(pinmux);
arria10_ddr_calibration_sequence();
diff --git a/arch/arm/mach-socfpga/arria10-init.c b/arch/arm/mach-socfpga/arria10-init.c
index d1586c2d40..f8a15ec8b4 100644
--- a/arch/arm/mach-socfpga/arria10-init.c
+++ b/arch/arm/mach-socfpga/arria10-init.c
@@ -127,9 +127,7 @@ static void arria10_mask_ecc_errors(void)
writel(0x0007FFFF, ARRIA10_SYSMGR_ADDR + 0x94);
}
-void arria10_finish_io(struct arria10_mainpll_cfg *mainpll,
- struct arria10_perpll_cfg *perpll,
- uint32_t *pinmux)
+void arria10_finish_io(uint32_t *pinmux)
{
int i;
diff --git a/include/mach/socfpga/generic.h b/include/mach/socfpga/generic.h
index 270c309d7b..23fcdabc3e 100644
--- a/include/mach/socfpga/generic.h
+++ b/include/mach/socfpga/generic.h
@@ -17,8 +17,7 @@ struct arria10_pinmux_cfg;
void arria10_init(struct arria10_mainpll_cfg *mainpll,
struct arria10_perpll_cfg *perpll, uint32_t *pinmux);
-void arria10_finish_io(struct arria10_mainpll_cfg *mainpll,
- struct arria10_perpll_cfg *perpll, uint32_t *pinmux);
+void arria10_finish_io(uint32_t *pinmux);
void socfpga_lowlevel_init(struct socfpga_cm_config *cm_config,
struct socfpga_io_config *io_config);
--
2.43.2
