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

PMUFW: PM: slave: GIC Proxy macros - using definitions from lpd_slcr.h

Browse source 
-Replaced PM defined macro definitions with macros defined in
 lpd_slcr.h
-Other macros that are defined in pm_slave.h do not exist as is,
 therefore are still used

Signed-off-by: Mirela Simonovic <mirela.simonovic@aggios.com>
Acked-by: Sören Brinkmann <soren.brinkmann@xilinx.com>
Acked-by: Jyotheeswar Reddy Mutthareddyvari <jyothee@xilinx.com>
This commit is contained in:
Mirela Simonovic 2015-05-31 21:13:51 -07:00 • committed by Nava kishore Manne
parent 4c9c9b51a9
commit 8255c72de3
3 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
lib/sw_apps/zynqmp_pmufw/src/pm_slave.c
View file

@ -41,6 +41,7 @@
#include "pm_usb.h"
#include "pm_periph.h"
#include "pm_power.h"
#include "lpd_slcr.h"
/* Used for tracking number of enabled interrupts in each GIC Proxy group */
PmGicProxyProperties gicProxyGroups_g[FPD_GICP_GROUP_MAX] = {
@ -401,11 +402,11 @@ void PmSlaveWakeEnable(PmSlave* const slave)
}
/* Enable GIC Proxy IRQ */
XPfw_Write32(slave->wake->proxyGroup->baseAddr + FPD_GICP_IRQ_ENABLE_OFFSET,
slave->wake->proxyIrqMask);
XPfw_Write32(slave->wake->proxyGroup->baseAddr +
FPD_GICP_IRQ_ENABLE_OFFSET, slave->wake->proxyIrqMask);
/* Enable GIC Proxy group */
XPfw_Write32(FPD_GICP_PMU_IRQ_ENABLE, slave->wake->proxyGroup->pmuIrqBit);
XPfw_Write32(LPD_SLCR_GICP_PMU_IRQ_ENABLE,
slave->wake->proxyGroup->pmuIrqBit);
/* Enable GPI1 FPD GIC Proxy wake event */
ENABLE_WAKE(PMU_LOCAL_GPI1_ENABLE_FPD_WAKE_GIC_PROX_MASK);
@ -428,9 +429,9 @@ void PmSlaveWakeDisable(PmSlave* const slave)
XPfw_Write32(slave->wake->proxyGroup->baseAddr + FPD_GICP_IRQ_DISABLE_OFFSET,
slave->wake->proxyIrqMask);
if (FPD_GICP_ALL_IRQ_MASKED_IN_GROUP ==
XPfw_Read32(slave->wake->proxyGroup->baseAddr + FPD_GICP_MASK_OFFSET)) {
XPfw_Read32(slave->wake->proxyGroup->baseAddr + FPD_GICP_MASK_OFFSET)) {
/* Disable group */
XPfw_Write32(FPD_GICP_PMU_IRQ_DISABLE, slave->wake->proxyGroup->pmuIrqBit);
XPfw_Write32(LPD_SLCR_GICP_PMU_IRQ_DISABLE, slave->wake->proxyGroup->pmuIrqBit);
if (false == PmWaitingForGicProxyWake()) {
/* Disable FPD GPI1 wake event */
DISABLE_WAKE(PMU_LOCAL_GPI1_ENABLE_FPD_WAKE_GIC_PROX_MASK);

4
lib/sw_apps/zynqmp_pmufw/src/pm_slave.h
View file

@ -64,10 +64,6 @@ typedef int (*const PmSlaveFsmHandler)(PmSlave* const slave,
#define FPD_GICP_IRQ_ENABLE_OFFSET 0x8U
#define FPD_GICP_IRQ_DISABLE_OFFSET 0xCU
/* FPD GIC Proxy pmu registers */
#define FPD_GICP_PMU_IRQ_ENABLE 0xFF4180A8U
#define FPD_GICP_PMU_IRQ_DISABLE 0xFF4180ACU
/* FPD GIC Proxy group indentifiers */
#define FPD_GICP_GROUP0 0U
#define FPD_GICP_GROUP1 1U

2
lib/sw_apps/zynqmp_pmufw/src/xpfw_version.h
View file

@ -1,4 +1,4 @@
#ifndef ZYNQMP_XPFW_VERSION__H_
#define ZYNQMP_XPFW_VERSION__H_
#define ZYNQMP_XPFW_VERSION "2015.1-swbeta2-35-g982c8e2201f1"
#define ZYNQMP_XPFW_VERSION "2015.1-swbeta2-36-gccb91daa0515"
#endif