From 03898b614e64d32de0a86579a7b6cfd6f7631464 Mon Sep 17 00:00:00 2001 From: Alpha Lin Date: Wed, 7 Jan 2015 09:57:43 +0800 Subject: [PATCH] VPU, fix undefined reference to `syscon_regmap_lookup_by_phandle'. Signed-off-by: Alpha Lin --- arch/arm/mach-rockchip/vcodec_service.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-rockchip/vcodec_service.c b/arch/arm/mach-rockchip/vcodec_service.c index faae1061ef63..b472d3ad47df 100644 --- a/arch/arm/mach-rockchip/vcodec_service.c +++ b/arch/arm/mach-rockchip/vcodec_service.c @@ -36,7 +36,7 @@ #include #include #include -#ifdef CONFIG_REGMAP +#ifdef CONFIG_MFD_SYSCON #include #endif #include @@ -449,7 +449,7 @@ typedef struct vpu_service_info { u32 mode_ctrl; u32 *reg_base; u32 ioaddr; -#ifdef CONFIG_REGMAP +#ifdef CONFIG_MFD_SYSCON struct regmap *grf_base; #else u32 *grf_base; @@ -530,7 +530,7 @@ static void vcodec_enter_mode(struct vpu_subdev_data *data) } #endif bits = 1 << pservice->mode_bit; -#ifdef CONFIG_REGMAP +#ifdef CONFIG_MFD_SYSCON regmap_read(pservice->grf_base, pservice->mode_ctrl, &raw); if (data->mode == VCODEC_RUNNING_MODE_HEVC) @@ -2118,7 +2118,7 @@ static void vcodec_read_property(struct device_node *np, of_property_read_u32(np, "mode_bit", &pservice->mode_bit); of_property_read_u32(np, "mode_ctrl", &pservice->mode_ctrl); } -#ifdef CONFIG_REGMAP +#ifdef CONFIG_MFD_SYSCON pservice->grf_base = syscon_regmap_lookup_by_phandle(np, "rockchip,grf"); #else pservice->grf_base = (u32*)RK_GRF_VIRT; -- 2.34.1