Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 15 additions & 7 deletions lib/sw_apps/zynqmp_fsbl/src/xfsbl_board.c
Original file line number Diff line number Diff line change
Expand Up @@ -820,12 +820,24 @@ static void XFsbl_PcieReset(void)
*/
static u32 InitGpios()
{
#if defined(XPAR_PSU_SPI_0_DEVICE_ID) && defined (XPAR_PSU_GPIO_0_DEVICE_ID)
XGpioPs_Config* gpio_conf;
u32 spi_dev_id;
u32 RegVal;
XStatus Status;
XGpioPs_Config* gpio_conf;
XGpioPs gpio_inst;

#if defined(SDT) && defined(XPAR_XGPIOPS_0_BASEADDR) && defined(XPAR_SPI0_BASEADDR)
gpio_conf = XGpioPs_LookupConfig(XPAR_XGPIOPS_0_BASEADDR);
spi_dev_id = XPAR_SPI0_BASEADDR;
#elif defined(XPAR_PSU_GPIO_0_DEVICE_ID) && defined(XPAR_PSU_SPI_0_DEVICE_ID)
gpio_conf = XGpioPs_LookupConfig(XPAR_PSU_GPIO_0_DEVICE_ID);
spi_dev_id = XPAR_PSU_SPI_0_DEVICE_ID;
#else
/* fail fast if either PS GPIO0 or PS SPI0 are missing in the BSP */
XFsbl_Printf(DEBUG_GENERAL, "XFSBL_GZU_NOSPI0_NOGPIO0\r\n");
return XST_FAILURE;
#endif

gpio_conf = XGpioPs_LookupConfig(XPAR_PSU_GPIO_0_DEVICE_ID);
if (NULL == gpio_conf) {
XFsbl_Printf(DEBUG_GENERAL, "XFSBL_GZU_GPIO_FAIL\r\n");
Expand All @@ -846,7 +858,7 @@ static u32 InitGpios()
(void)usleep(1);

//Init GPIO Expander
if (XST_SUCCESS != (Status = SpiGpioInit(MCP23S08_SPI_DEVID, MCP23S08_SS_ID)))
if (XST_SUCCESS != (Status = SpiGpioInit(spi_dev_id, MCP23S08_SS_ID)))
{
XFsbl_Printf(DEBUG_GENERAL, "XFSBL_GZU_GPIOE_INITFAIL\r\n");
return XST_FAILURE;
Expand Down Expand Up @@ -891,10 +903,6 @@ static u32 InitGpios()
}

return XST_SUCCESS;
#else
XFsbl_Printf(DEBUG_GENERAL, "XFSBL_GZU_NOSPI0_NOGPIO0\r\n");
return XST_FAILURE;
#endif
}
#endif

Expand Down