From 8255c72de313852800fc2648771815c1ebc384b6 Mon Sep 17 00:00:00 2001 From: Mirela Simonovic Date: Sun, 31 May 2015 21:13:51 -0700 Subject: [PATCH] PMUFW: PM: slave: GIC Proxy macros - using definitions from lpd_slcr.h MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -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 Acked-by: Sören Brinkmann Acked-by: Jyotheeswar Reddy Mutthareddyvari --- lib/sw_apps/zynqmp_pmufw/src/pm_slave.c | 13 +++++++------ lib/sw_apps/zynqmp_pmufw/src/pm_slave.h | 4 ---- lib/sw_apps/zynqmp_pmufw/src/xpfw_version.h | 2 +- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/lib/sw_apps/zynqmp_pmufw/src/pm_slave.c b/lib/sw_apps/zynqmp_pmufw/src/pm_slave.c index 91926bd8..6dc710ea 100644 --- a/lib/sw_apps/zynqmp_pmufw/src/pm_slave.c +++ b/lib/sw_apps/zynqmp_pmufw/src/pm_slave.c @@ -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); diff --git a/lib/sw_apps/zynqmp_pmufw/src/pm_slave.h b/lib/sw_apps/zynqmp_pmufw/src/pm_slave.h index 915b3067..96f88444 100644 --- a/lib/sw_apps/zynqmp_pmufw/src/pm_slave.h +++ b/lib/sw_apps/zynqmp_pmufw/src/pm_slave.h @@ -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 diff --git a/lib/sw_apps/zynqmp_pmufw/src/xpfw_version.h b/lib/sw_apps/zynqmp_pmufw/src/xpfw_version.h index 2d7a133c..29571a21 100644 --- a/lib/sw_apps/zynqmp_pmufw/src/xpfw_version.h +++ b/lib/sw_apps/zynqmp_pmufw/src/xpfw_version.h @@ -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