Hi Pavel, On Thu, Mar 02, 2017 at 11:16:04AM +0100, Pavel Machek wrote: > Hi! > > > > > >> +++ b/drivers/media/platform/omap3isp/ispccp2.c > > > > >> @@ -160,6 +163,33 @@ static int ccp2_if_enable(struct isp_ccp2_device > > > > >> *ccp2, u8 enable) return ret; > > > > >> > > > > >> } > > > > >> > > > > >> + if (isp->revision == ISP_REVISION_2_0) { > > > > > > > > > > The isp_csiphy.c code checks phy->isp->phy_type for the same purpose, > > > > > shouldn't you use that too ? > > > > > > > > Do you want me to do phy->isp->phy_type == ISP_PHY_TYPE_3430 check > > > > here? Can do... > > > > > > Yes that's what I meant. > > > > Ok, that's something I can do. > > > > But code is still somewhat "interesting". Code in omap3isp_csiphy_acquire() > > assumes csi2, and I don't need most of it.. so I'll just not use it, > > but it looks strange. I'll post new patch shortly. > > Ok, how about this one? > > Pavel > > omap3isp: add rest of CSI1 support > > CSI1 needs one more bit to be set up. Do just that. > > It is not as straightforward as I'd like, see the comments in the code > for explanation. > > Signed-off-by: Pavel Machek <pa...@ucw.cz> > > index ca09523..b6e055e 100644 > --- a/drivers/media/platform/omap3isp/ispccp2.c > +++ b/drivers/media/platform/omap3isp/ispccp2.c > @@ -21,6 +23,7 @@ > #include <linux/mutex.h> > #include <linux/uaccess.h> > #include <linux/regulator/consumer.h> > +#include <linux/regmap.h> > > #include "isp.h" > #include "ispreg.h" > @@ -160,6 +163,22 @@ static int ccp2_if_enable(struct isp_ccp2_device *ccp2, > u8 enable) > return ret; > } > > + if (isp->phy_type == ISP_PHY_TYPE_3430) { > + struct media_pad *pad; > + struct v4l2_subdev *sensor; > + const struct isp_ccp2_cfg *buscfg; > + > + pad = media_entity_remote_pad(&ccp2->pads[CCP2_PAD_SINK]); > + sensor = media_entity_to_v4l2_subdev(pad->entity); > + /* Struct isp_bus_cfg has union inside */ > + buscfg = &((struct isp_bus_cfg *)sensor->host_priv)->bus.ccp2; > + > + csiphy_routing_cfg_3430(&isp->isp_csiphy2, > + ISP_INTERFACE_CCP2B_PHY1, > + enable, !!buscfg->phy_layer, > + buscfg->strobe_clk_pol);
You should do this through omap3isp_csiphy_acquire(), and not call csiphy_routing_cfg_3430() directly from here. > + } > + > /* Enable/Disable all the LCx channels */ > for (i = 0; i < CCP2_LCx_CHANS_NUM; i++) > isp_reg_clr_set(isp, OMAP3_ISP_IOMEM_CCP2, ISPCCP2_LCx_CTRL(i), > @@ -1137,10 +1159,19 @@ int omap3isp_ccp2_init(struct isp_device *isp) > if (isp->revision == ISP_REVISION_2_0) { > ccp2->vdds_csib = devm_regulator_get(isp->dev, "vdds_csib"); > if (IS_ERR(ccp2->vdds_csib)) { > + if (PTR_ERR(ccp2->vdds_csib) == -EPROBE_DEFER) > + return -EPROBE_DEFER; This should go to a separate patch. > dev_dbg(isp->dev, > "Could not get regulator vdds_csib\n"); > ccp2->vdds_csib = NULL; > } > + /* > + * If we set up ccp2->phy here, > + * omap3isp_csiphy_acquire() will go ahead and assume > + * csi2, dereferencing some null pointers. > + * > + * ccp2->phy = &isp->isp_csiphy2; That needs to be fixed separately. > + */ > } else if (isp->revision == ISP_REVISION_15_0) { > ccp2->phy = &isp->isp_csiphy1; > } > diff --git a/drivers/media/platform/omap3isp/ispcsiphy.c > b/drivers/media/platform/omap3isp/ispcsiphy.c > index 871d4fe..897097b 100644 > --- a/drivers/media/platform/omap3isp/ispcsiphy.c > +++ b/drivers/media/platform/omap3isp/ispcsiphy.c > @@ -68,8 +68,8 @@ static void csiphy_routing_cfg_3630(struct isp_csiphy *phy, > regmap_write(phy->isp->syscon, phy->isp->syscon_offset, reg); > } > > -static void csiphy_routing_cfg_3430(struct isp_csiphy *phy, u32 iface, bool > on, > - bool ccp2_strobe) > +void csiphy_routing_cfg_3430(struct isp_csiphy *phy, u32 iface, bool on, > + bool ccp2_strobe, bool strobe_clk_pol) > { > u32 csirxfe = OMAP343X_CONTROL_CSIRXFE_PWRDNZ > | OMAP343X_CONTROL_CSIRXFE_RESET; > @@ -85,6 +85,9 @@ static void csiphy_routing_cfg_3430(struct isp_csiphy *phy, > u32 iface, bool on, > > if (ccp2_strobe) > csirxfe |= OMAP343X_CONTROL_CSIRXFE_SELFORM; > + > + if (strobe_clk_pol) > + csirxfe |= OMAP343X_CONTROL_CSIRXFE_CSIB_INV; > > regmap_write(phy->isp->syscon, phy->isp->syscon_offset, csirxfe); > } > @@ -108,7 +111,7 @@ static void csiphy_routing_cfg(struct isp_csiphy *phy, > if (phy->isp->phy_type == ISP_PHY_TYPE_3630 && on) > return csiphy_routing_cfg_3630(phy, iface, ccp2_strobe); > if (phy->isp->phy_type == ISP_PHY_TYPE_3430) > - return csiphy_routing_cfg_3430(phy, iface, on, ccp2_strobe); > + return csiphy_routing_cfg_3430(phy, iface, on, ccp2_strobe, > false); > } > > /* > diff --git a/drivers/media/platform/omap3isp/ispcsiphy.h > b/drivers/media/platform/omap3isp/ispcsiphy.h > index 28b63b2..88c5c1e8 100644 > --- a/drivers/media/platform/omap3isp/ispcsiphy.h > +++ b/drivers/media/platform/omap3isp/ispcsiphy.h > @@ -40,4 +40,7 @@ int omap3isp_csiphy_acquire(struct isp_csiphy *phy); > void omap3isp_csiphy_release(struct isp_csiphy *phy); > int omap3isp_csiphy_init(struct isp_device *isp); > > +void csiphy_routing_cfg_3430(struct isp_csiphy *phy, u32 iface, bool on, > + bool ccp2_strobe, bool strobe_clk_pol); > + > #endif /* OMAP3_ISP_CSI_PHY_H */ > > > -- Kind regards, Sakari Ailus e-mail: sakari.ai...@iki.fi XMPP: sai...@retiisi.org.uk