From cb15b20fa505c721bf4d10687be5ab6a28be4c09 Mon Sep 17 00:00:00 2001 From: P L Sai Krishna Date: Wed, 18 Feb 2015 16:26:55 +0530 Subject: [PATCH] qspips_v3_2: SLCR_LOCKSTA register checked. This patch checked the SLCR_LOCKSTA register instead of SLC register. Signed-off-by: P L Sai Krishna --- XilinxProcessorIPLib/drivers/qspips/src/xqspips.c | 2 +- XilinxProcessorIPLib/drivers/qspips/src/xqspips_hw.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/XilinxProcessorIPLib/drivers/qspips/src/xqspips.c b/XilinxProcessorIPLib/drivers/qspips/src/xqspips.c index ad51b354..e24c9fc6 100644 --- a/XilinxProcessorIPLib/drivers/qspips/src/xqspips.c +++ b/XilinxProcessorIPLib/drivers/qspips/src/xqspips.c @@ -319,7 +319,7 @@ void XQspiPs_Abort(XQspiPs *InstancePtr) /* * QSPI Software Reset */ - IsLock = XQspiPs_ReadReg(XPAR_XSLCR_0_BASEADDR, 0x0); + IsLock = XQspiPs_ReadReg(XPAR_XSLCR_0_BASEADDR, SLCR_LOCKSTA); if (IsLock) { XQspiPs_WriteReg(XPAR_XSLCR_0_BASEADDR, SLCR_UNLOCK, SLCR_UNLOCK_MASK); diff --git a/XilinxProcessorIPLib/drivers/qspips/src/xqspips_hw.h b/XilinxProcessorIPLib/drivers/qspips/src/xqspips_hw.h index a7f08160..4a3e86f5 100644 --- a/XilinxProcessorIPLib/drivers/qspips/src/xqspips_hw.h +++ b/XilinxProcessorIPLib/drivers/qspips/src/xqspips_hw.h @@ -338,6 +338,7 @@ extern "C" { #define SLCR_LOCK 0x00000004 /**< SLCR Write Protection Lock */ #define SLCR_UNLOCK 0x00000008 /**< SLCR Write Protection Unlock */ #define LQSPI_RST_CTRL 0x00000230 /**< Quad SPI Software Reset Control */ +#define SLCR_LOCKSTA 0x0000000C /**< SLCR Write Protection status */ /* @} */