From: Huang, Tao <huangtao@rock-chips.com>
Date: Thu, 21 May 2015 10:28:22 +0000 (+0800)
Subject: arm: rockchip: vcodec_service: allow no rockchip,grf in dts
X-Git-Tag: firefly_0821_release~4138
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=cdff984abff056096bd45a6e39f08a62aa4308f0;p=firefly-linux-kernel-4.4.55.git

arm: rockchip: vcodec_service: allow no rockchip,grf in dts

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
---

diff --git a/arch/arm/mach-rockchip/vcodec_service.c b/arch/arm/mach-rockchip/vcodec_service.c
index 3fa90d33f10e..548f9556c5a9 100644
--- a/arch/arm/mach-rockchip/vcodec_service.c
+++ b/arch/arm/mach-rockchip/vcodec_service.c
@@ -2137,8 +2137,12 @@ static void vcodec_read_property(struct device_node *np,
 	pservice->grf_base = (u32*)RK_GRF_VIRT;
 #endif
 	if (IS_ERR(pservice->grf_base)) {
+#ifdef CONFIG_ARM
+		pservice->grf_base = RK_GRF_VIRT;
+#else
 		vpu_err("can't find vpu grf property\n");
 		return;
+#endif
 	}
 	of_property_read_string(np, "name", (const char**)&pservice->name);
 }