From: chenjh <chenjh@rock-chips.com>
Date: Wed, 26 Apr 2017 06:54:23 +0000 (+0800)
Subject: firmware: rockchip: rename 'sip_smc_ddr_cfg' to 'sip_smc_dram'
X-Git-Tag: release-20171130_firefly~4^2~737
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=a753c7d485d2ed1ea5ca0543ac819930260f8142;p=firefly-linux-kernel-4.4.55.git

firmware: rockchip: rename 'sip_smc_ddr_cfg' to 'sip_smc_dram'

Change-Id: I07767d9eb26194c04fd4e3f92e8ae24b47621c5a
Signed-off-by: chenjh <chenjh@rock-chips.com>
---

diff --git a/drivers/firmware/rockchip_sip.c b/drivers/firmware/rockchip_sip.c
index 4d12d2d65856..c454fff98661 100644
--- a/drivers/firmware/rockchip_sip.c
+++ b/drivers/firmware/rockchip_sip.c
@@ -38,9 +38,9 @@ static struct arm_smccc_res __invoke_sip_fn_smc(unsigned long function_id,
 	return res;
 }
 
-struct arm_smccc_res sip_smc_ddr_cfg(u32 arg0, u32 arg1, u32 arg2)
+struct arm_smccc_res sip_smc_dram(u32 arg0, u32 arg1, u32 arg2)
 {
-	return __invoke_sip_fn_smc(SIP_DDR_CFG, arg0, arg1, arg2);
+	return __invoke_sip_fn_smc(SIP_DRAM_CONFIG, arg0, arg1, arg2);
 }
 
 struct arm_smccc_res sip_smc_get_atf_version(void)
diff --git a/include/linux/rockchip/rockchip_sip.h b/include/linux/rockchip/rockchip_sip.h
index c9265cb91b28..3ecef04b5051 100644
--- a/include/linux/rockchip/rockchip_sip.h
+++ b/include/linux/rockchip/rockchip_sip.h
@@ -26,7 +26,7 @@
 #define SIP_ACCESS_CHIP_STATE64		0xc2000006
 #define SIP_SECURE_MEM_CONFIG		0x82000007
 #define SIP_ACCESS_CHIP_EXTRA_STATE64	0xc2000007
-#define SIP_DDR_CFG			0x82000008
+#define SIP_DRAM_CONFIG			0x82000008
 #define SIP_SHARE_MEM			0x82000009
 #define SIP_SIP_VERSION			0x8200000a
 #define SIP_REMOTECTL_CFG		0x8200000b
@@ -96,7 +96,7 @@ typedef enum {
  */
 struct arm_smccc_res sip_smc_get_atf_version(void);
 struct arm_smccc_res sip_smc_get_sip_version(void);
-struct arm_smccc_res sip_smc_ddr_cfg(u32 arg0, u32 arg1, u32 arg2);
+struct arm_smccc_res sip_smc_dram(u32 arg0, u32 arg1, u32 arg2);
 struct arm_smccc_res sip_smc_request_share_mem(u32 page_num,
 					       share_page_type_t page_type);
 struct arm_smccc_res sip_smc_mcu_el3fiq(u32 arg0, u32 arg1, u32 arg2);