fpga: arria10: Fix error in fpga pin configuration
PATCH 1/1 fpga: arria10: Fix error in fpga pin configuration
From: Dalon Westergreen <[email protected]>
Pin configuration of the FPGA devicetree block should be done after core configuration in the arria10 fpga driver. This fix corrects the check of status, and ensures that the fpga pin mux is configured on correct configuration of the core fpga image.
--- drivers/fpga/socfpga_arria10.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/fpga/socfpga_arria10.c +5 -4
@@ -936,10 +936,11 @@ int socfpga_load(Altera_desc *desc, const void *rbf_data, size_t rbf_size)fpgamgr_program_write (rbf_data, rbf_size); status =fpgamgr_program_finish (); -if (status) { -config_pins (gd->fdt_blob,"fpga" ); -puts ("FPGA: Enter user mode.\n" ); - } +if (status) +return status; + +config_pins (gd->fdt_blob,"fpga" ); +puts ("FPGA: Enter user mode.\n" );return status; }
Signature · 1 line
2.21.0
Marek Vasut
AppliedPATCH 1/1 fpga: arria10: Fix error in fpga pin configuration
Quoted 23 lines · Dalon Westergreen
From: Dalon Westergreen <[email protected]>
Pin configuration of the FPGA devicetree block should be done after core configuration in the arria10 fpga driver. This fix corrects the check of status, and ensures that the fpga pin mux is configured on correct configuration of the core fpga image.
Signed-off-by Dalon Westergreen <[email protected]>--- drivers/fpga/socfpga_arria10.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)drivers/fpga/socfpga_arria10.c +0
-2@@ -936,10 +936,11 @@ int socfpga_load(Altera_desc *desc, const void *rbf_data, size_t rbf_size)fpgamgr_program_write (rbf_data, rbf_size); status =fpgamgr_program_finish (); -if (status) { -config_pins (gd->fdt_blob,"fpga" );
drivers/fpga/socfpga_arria10.c int socfpga_load(Altera_desc *desc, const void *rbf_data, size_t rbf_size) · line 946
Quoted 10 lines
drivers/fpga/socfpga_arria10.c +5
-2-puts ("FPGA: Enter user mode.\n" ); - } +if (status) +return status; + +config_pins (gd->fdt_blob,"fpga" ); +puts ("FPGA: Enter user mode.\n" );return status; }
Applied, thanks.