qspips: Removed PS7 definitions in driver src.

This patch replaces PS7 definitions with canonical definitions
in driver src.

Signed-off-by: P L Sai Krishna <lakshmis@xilinx.com>
This commit is contained in:
P L Sai Krishna 2015-01-13 19:24:05 +05:30 committed by Nava kishore Manne
parent 1e9828ef43
commit 23f3c299b9
2 changed files with 6 additions and 8 deletions

View file

@ -1057,7 +1057,9 @@ int XQspiPs_LqspiRead(XQspiPs *InstancePtr, u8 *RecvBufPtr,
Xil_AssertNonvoid(ByteCount > 0);
Xil_AssertNonvoid(InstancePtr->IsReady == XIL_COMPONENT_IS_READY);
#ifdef XPAR_PS7_QSPI_LINEAR_0_S_AXI_BASEADDR
#ifndef XPAR_PS7_QSPI_LINEAR_0_S_AXI_BASEADDR
#define XPAR_PS7_QSPI_LINEAR_0_S_AXI_BASEADDR 0xFC000000
#endif
/*
* Enable the controller
*/
@ -1079,10 +1081,6 @@ int XQspiPs_LqspiRead(XQspiPs *InstancePtr, u8 *RecvBufPtr,
*/
XQspiPs_Disable(InstancePtr);
#else
return XST_FAILURE;
#endif
}
/*****************************************************************************/

View file

@ -188,17 +188,17 @@ void XQspiPs_LinearInit(u32 BaseAddress)
* enable linear mode and use fast read.
*/
if(XPAR_PS7_QSPI_0_QSPI_MODE == XQSPIPS_CONNECTION_MODE_SINGLE){
if(XPAR_XQSPIPS_0_QSPI_MODE == XQSPIPS_CONNECTION_MODE_SINGLE){
LinearCfg = XQSPIPS_LQSPI_CR_RST_STATE;
}else if(XPAR_PS7_QSPI_0_QSPI_MODE ==
}else if(XPAR_XQSPIPS_0_QSPI_MODE ==
XQSPIPS_CONNECTION_MODE_STACKED){
LinearCfg = XQSPIPS_LQSPI_CR_RST_STATE |
XQSPIPS_LQSPI_CR_TWO_MEM_MASK;
}else if(XPAR_PS7_QSPI_0_QSPI_MODE ==
}else if(XPAR_XQSPIPS_0_QSPI_MODE ==
XQSPIPS_CONNECTION_MODE_PARALLEL){
LinearCfg = XQSPIPS_LQSPI_CR_RST_STATE |