diff options
| author | Sakari Ailus <sakari.ailus@iki.fi> | 2015-03-25 22:57:35 (GMT) |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-04-02 19:45:07 (GMT) |
| commit | 8644cdf972dd6dfebf98161025900f6a9d1ad58a (patch) | |
| tree | 58e04bf1a5776d2457ea298180a50b6e4adb54ce /drivers/media/platform/omap3isp/isp.h | |
| parent | 503596a15225e00bdf24f0805567d5195f6c749f (diff) | |
| download | linux-8644cdf972dd6dfebf98161025900f6a9d1ad58a.tar.xz | |
[media] omap3isp: Replace many MMIO regions by two
The omap3isp MMIO register block is contiguous in the MMIO register space
apart from the fact that the ISP IOMMU register block is in the middle of
the area. Ioremap it at two occasions, and keep the rest of the layout of
the register space internal to the omap3isp driver.
Signed-off-by: Sakari Ailus <sakari.ailus@iki.fi>
Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/platform/omap3isp/isp.h')
| -rw-r--r-- | drivers/media/platform/omap3isp/isp.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/platform/omap3isp/isp.h b/drivers/media/platform/omap3isp/isp.h index 03d2129..dcb7d20 100644 --- a/drivers/media/platform/omap3isp/isp.h +++ b/drivers/media/platform/omap3isp/isp.h @@ -99,7 +99,7 @@ struct regmap; /* * struct isp_res_mapping - Map ISP io resources to ISP revision. * @isp_rev: ISP_REVISION_x_x - * @map: bitmap for enum isp_mem_resources + * @offset: register offsets of various ISP sub-blocks * @syscon_offset: offset of the syscon register for 343x / 3630 * (CONTROL_CSIRXFE / CONTROL_CAMERA_PHY_CTRL, respectively) * from the syscon base address @@ -107,7 +107,7 @@ struct regmap; */ struct isp_res_mapping { u32 isp_rev; - u32 map; + u32 offset[OMAP3_ISP_IOMEM_LAST]; u32 syscon_offset; u32 phy_type; }; |