stv0g/embeddedsw
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

sdps: Used MB_Sleep API for microblaze.

Browse source 
This patch use MB_Sleep API for microblaze design
and removed sleep.h inclusion in xsdps.h file.

Signed-off-by: P L Sai Krishna <lakshmis@xilinx.com>
Reviewed-by: Harini Katakam <harinik@xilinx.com>
This commit is contained in:
P L Sai Krishna 2015-07-30 15:18:48 +05:30 • committed by Nava kishore Manne
parent dff2a597f9
commit ad401f70a5
3 changed files with 25 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
XilinxProcessorIPLib/drivers/sdps/src/xsdps.c
View file

@ -69,7 +69,7 @@
* The header sleep.h and API usleep() can only be used with an arm design.
* MB_Sleep() is used for microblaze design.
*/
#ifdef __arm__
#if defined (__arm__) || defined (__aarch64__)
#include "sleep.h"
@ -165,8 +165,18 @@ s32 XSdPs_CfgInitialize(XSdPs *InstancePtr, XSdPs_Config *ConfigPtr,
XSDPS_POWER_CTRL_OFFSET, 0U);
/* Delay to poweroff card */
#if defined (__arm__) || defined (__aarch64__)
(void)sleep(1U);
#endif
#ifdef __MICROBLAZE__
MB_Sleep(1000U);
#endif
/* "Software reset for all" is initiated */
XSdPs_WriteReg8(InstancePtr->Config.BaseAddress, XSDPS_SW_RST_OFFSET,
XSDPS_SWRST_ALL_MASK);
@ -698,7 +708,7 @@ static s32 XSdPs_IdentifyCard(XSdPs *InstancePtr)
Xil_AssertNonvoid(InstancePtr->IsReady == XIL_COMPONENT_IS_READY);
/* 74 CLK delay after card is powered up, before the first command. */
#ifdef __arm__
#if defined (__arm__) || defined (__aarch64__)
usleep(XSDPS_INIT_DELAY);
@ -788,8 +798,18 @@ static s32 XSdPs_Switch_Voltage(XSdPs *InstancePtr)
CtrlReg);
/* Wait minimum 5mSec */
#if defined (__arm__) || defined (__aarch64__)
(void)usleep(5000U);
#endif
#ifdef __MICROBLAZE__
MB_Sleep(5U);
#endif
/* Enabling 1.8V in controller */
CtrlReg = XSdPs_ReadReg16(InstancePtr->Config.BaseAddress,
XSDPS_HOST_CTRL2_OFFSET);

1
XilinxProcessorIPLib/drivers/sdps/src/xsdps.h
View file

@ -133,7 +133,6 @@ extern "C" {
#include "xil_printf.h"
#include "xil_cache.h"
#include "sleep.h"
#include "xstatus.h"
#include "xsdps_hw.h"
#include <string.h>

6
XilinxProcessorIPLib/drivers/sdps/src/xsdps_options.c
View file

@ -62,7 +62,7 @@
* The header sleep.h and API usleep() can only be used with an arm design.
* MB_Sleep() is used for microblaze design.
*/
#ifdef __arm__
#if defined (__arm__) || defined (__aarch64__)
#include "sleep.h"
@ -295,7 +295,7 @@ s32 XSdPs_Change_BusWidth(XSdPs *InstancePtr)
}
}
#ifdef __arm__
#if defined (__arm__) || defined (__aarch64__)
usleep(XSDPS_MMC_DELAY_FOR_SWITCH);
@ -544,7 +544,7 @@ s32 XSdPs_Change_BusSpeed(XSdPs *InstancePtr)
}
}
#ifdef __arm__
#if defined (__arm__) || defined (__aarch64__)
usleep(XSDPS_MMC_DELAY_FOR_SWITCH);