diff options
author | Sakari Ailus <sakari.ailus@iki.fi> | 2015-03-25 18:57:38 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-04-02 15:47:48 -0400 |
commit | da7f3843d2c797419af6befcc0fdd54f6e13b6f4 (patch) | |
tree | 7c18177fdb337c9e8cdfea0cf8702496b026fd87 /drivers/media/platform/omap3isp/ispcsiphy.c | |
parent | b6eec1c4939962838ff51b10a8feb7a49bccc0d2 (diff) |
[media] omap3isp: Add support for the Device Tree
Add the ISP device to omap3 DT include file and add support to the driver to
use it.
Also obtain information on the external entities and the ISP configuration
related to them through the Device Tree in addition to the platform data.
Signed-off-by: Sakari Ailus <sakari.ailus@iki.fi>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.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/ispcsiphy.c')
-rw-r--r-- | drivers/media/platform/omap3isp/ispcsiphy.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/media/platform/omap3isp/ispcsiphy.c b/drivers/media/platform/omap3isp/ispcsiphy.c index d91dde19eb14..495447d66cfd 100644 --- a/drivers/media/platform/omap3isp/ispcsiphy.c +++ b/drivers/media/platform/omap3isp/ispcsiphy.c | |||
@@ -173,6 +173,13 @@ static int omap3isp_csiphy_config(struct isp_csiphy *phy) | |||
173 | unsigned int i; | 173 | unsigned int i; |
174 | u32 reg; | 174 | u32 reg; |
175 | 175 | ||
176 | if (!buscfg) { | ||
177 | struct isp_async_subdev *isd = | ||
178 | container_of(pipe->external->asd, | ||
179 | struct isp_async_subdev, asd); | ||
180 | buscfg = &isd->bus; | ||
181 | } | ||
182 | |||
176 | if (buscfg->interface == ISP_INTERFACE_CCP2B_PHY1 | 183 | if (buscfg->interface == ISP_INTERFACE_CCP2B_PHY1 |
177 | || buscfg->interface == ISP_INTERFACE_CCP2B_PHY2) | 184 | || buscfg->interface == ISP_INTERFACE_CCP2B_PHY2) |
178 | lanes = &buscfg->bus.ccp2.lanecfg; | 185 | lanes = &buscfg->bus.ccp2.lanecfg; |