iep/rockchip: revise build fail when CONFIG_RK_IOMMU disabled

When CONFIG_RK_IOMMU disabled, iep build will throw out error
information for some mismatch definitions.

Change-Id: I0fb22550eaaebd62523d794e45de7b94fae8db63
Signed-off-by: alpha lin <alpha.lin@rock-chips.com>

diff --git a/drivers/video/rockchip/iep/iep_drv.c b/drivers/video/rockchip/iep/iep_drv.c
index 7ed253eb9a54d858194966b118b9b5094cf4ef2e..d1a4036870f3eba9951ededd6008d321268c7568 100644 (file)
--- a/drivers/video/rockchip/iep/iep_drv.c
+++ b/drivers/video/rockchip/iep/iep_drv.c
@@ -1005,10 +1005,10 @@ static int iep_drv_probe(struct platform_device *pdev)
        int ret = 0;
        struct resource *res = NULL;
        u32 version;
+       struct device_node *np = pdev->dev.of_node;
 #if defined(CONFIG_IEP_IOMMU)
        u32 iommu_en = 0;
        struct device *mmu_dev = NULL;
-       struct device_node *np = pdev->dev.of_node;
        of_property_read_u32(np, "iommu_enabled", &iommu_en);
 #endif
 

diff --git a/drivers/video/rockchip/iep/iep_drv.h b/drivers/video/rockchip/iep/iep_drv.h
index 496e0d04cf155f7d57091750e04e45d4aa25cdcc..f0787342fd7436eca14e3a7da15419d371065ddd 100644 (file)
--- a/drivers/video/rockchip/iep/iep_drv.h
+++ b/drivers/video/rockchip/iep/iep_drv.h
@@ -144,8 +144,8 @@ typedef struct iep_service_info {
 
 #ifdef CONFIG_IEP_IOMMU
        struct ion_client *ion_client;
-       struct device *iommu_dev;
 #endif
+       struct device *iommu_dev;
 } iep_service_info;
 
 struct iep_reg {