From: xxx <xxx@rock-chips.com>
Date: Tue, 26 May 2015 06:53:55 +0000 (+0800)
Subject: modify smc call func id to Standard sip id for efuse and pm-rk3368
X-Git-Tag: firefly_0821_release~4113
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=3f5c5381d90e6703f49fd29da821261477c0d6dd;p=firefly-linux-kernel-4.4.55.git

modify smc call func id to Standard sip id for efuse and pm-rk3368
---

diff --git a/arch/arm/mach-rockchip/efuse.c b/arch/arm/mach-rockchip/efuse.c
index 4c83082376b3..70e82485d598 100644
--- a/arch/arm/mach-rockchip/efuse.c
+++ b/arch/arm/mach-rockchip/efuse.c
@@ -49,7 +49,7 @@ static struct rockchip_efuse efuse;
 #define SEC_REG_WR_32 (SEC_REG_WR | SEC_REG_32)
 #define SEC_REG_WR_64 (SEC_REG_WR | SEC_REG_64)
 
-#define PSCI_OS_ACCESS_REG		(0xa600ffb0)
+#define PSCI_SIP_ACCESS_REG		(0x82000002)
 static phys_addr_t efuse_phys;
 
 /*
@@ -96,7 +96,7 @@ static u32 secure_regs_rd_32(u64 addr_phy)
 {
 	u64 val = 0;
 
-	reg_rd_fn(PSCI_OS_ACCESS_REG, 0, addr_phy, SEC_REG_RD_32, &val);
+	reg_rd_fn(PSCI_SIP_ACCESS_REG, 0, addr_phy, SEC_REG_RD_32, &val);
 	return val;
 }
 
@@ -104,7 +104,7 @@ static u32 secure_regs_wr_32(u64 addr_phy, u32 val)
 {
 	u64 val_64 = val;
 
-	return reg_wr_fn(PSCI_OS_ACCESS_REG, val_64, addr_phy, SEC_REG_WR_32);
+	return reg_wr_fn(PSCI_SIP_ACCESS_REG, val_64, addr_phy, SEC_REG_WR_32);
 }
 
 static u32 efuse_readl(u32 offset)
diff --git a/arch/arm64/mach-rockchip/pm-rk3368.c b/arch/arm64/mach-rockchip/pm-rk3368.c
index 38bee1de7806..6f0626b78439 100644
--- a/arch/arm64/mach-rockchip/pm-rk3368.c
+++ b/arch/arm64/mach-rockchip/pm-rk3368.c
@@ -23,7 +23,7 @@
 #include <linux/of_address.h>
 #include <asm/compiler.h>
 
-#define PSCI_OS_SUSPEND_CTRBITS	(0xa600ffc0)
+#define PSCI_SIP_SUSPEND_CTRBITS	(0x82000003)
 
 #define SEC_REG_RW_SHT (0x0)
 #define SEC_REG_RD (0x0)
@@ -82,7 +82,7 @@ static int pmu_ctlbits_rd_32(u32 *val)
 {
 	u64 val_64;
 	int ret;
-	ret = invoke_regs_pm_rd_fn(PSCI_OS_SUSPEND_CTRBITS, 0, 0, SEC_REG_RD, &val_64);
+	ret = invoke_regs_pm_rd_fn(PSCI_SIP_SUSPEND_CTRBITS, 0, 0, SEC_REG_RD, &val_64);
 	*val = val_64;
 
 	return ret;
@@ -91,7 +91,7 @@ static int pmu_ctlbits_rd_32(u32 *val)
 static int pmu_ctlbits_wr_32(u32 val)
 {
 	u64 val_64 = val;
-	return invoke_regs_pm_wr_fn(PSCI_OS_SUSPEND_CTRBITS, val_64, 0, SEC_REG_WR);
+	return invoke_regs_pm_wr_fn(PSCI_SIP_SUSPEND_CTRBITS, val_64, 0, SEC_REG_WR);
 }
 
 static int __init  rk3688_suspend_init(void)