arm: rockchip: vcodec_service: allow no rockchip,grf in dts
authorHuang, Tao <huangtao@rock-chips.com>
Thu, 21 May 2015 10:28:22 +0000 (18:28 +0800)
committerHuang, Tao <huangtao@rock-chips.com>
Thu, 21 May 2015 10:33:08 +0000 (18:33 +0800)
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
arch/arm/mach-rockchip/vcodec_service.c

index 3fa90d33f10e685668096fbf2e850ff4bdea5830..548f9556c5a98ca90e72f2d8377a1b5c3aa5dad8 100644 (file)
@@ -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);
 }