From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from atrey.karlin.mff.cuni.cz ([195.113.26.193]:47056 "EHLO atrey.karlin.mff.cuni.cz" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751506AbdB0UHj (ORCPT ); Mon, 27 Feb 2017 15:07:39 -0500 Date: Mon, 27 Feb 2017 20:43:05 +0100 From: Pavel Machek To: Sakari Ailus Cc: sre@kernel.org, pali.rohar@gmail.com, linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, laurent.pinchart@ideasonboard.com, mchehab@kernel.org, ivo.g.dimitrov.75@gmail.com Subject: Re: [PATCH 1/4] v4l2: device_register_subdev_nodes: allow calling multiple times Message-ID: <20170227194304.GA26135@amd> References: <20170220103114.GA9800@amd> <20170220130912.GT16975@valkosipuli.retiisi.org.uk> <20170220135636.GU16975@valkosipuli.retiisi.org.uk> <20170221110721.GD5021@amd> <20170221111104.GD16975@valkosipuli.retiisi.org.uk> <20170225221255.GA6411@amd> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="X1bOJ3K7DJ5YkBrT" Content-Disposition: inline In-Reply-To: <20170225221255.GA6411@amd> Sender: linux-media-owner@vger.kernel.org List-ID: --X1bOJ3K7DJ5YkBrT Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi! > > > On Mon 2017-02-20 15:56:36, Sakari Ailus wrote: > > > > On Mon, Feb 20, 2017 at 03:09:13PM +0200, Sakari Ailus wrote: > > > > > I've tested ACPI, will test DT soon... > > > >=20 > > > > DT case works, too (Nokia N9). > > >=20 > > > Hmm. Good to know. Now to figure out how to get N900 case to work... > > >=20 > > > AFAICT N9 has CSI2, not CSI1 support, right? Some of the core changes > > > seem to be in, so I'll need to figure out which, and will still need > > > omap3isp modifications... > >=20 > > Indeed, I've only tested for CSI-2 as I have no functional CSI-1 device= s. > >=20 > > It's essentially the functionality in the four patches. The data-lane a= nd > > clock-name properties have been renamed as data-lanes and clock-lanes (= i.e. > > plural) to match the property documentation. >=20 > Yes, it seems to work. >=20 > Here's a patch. It has checkpatch issues, I can fix them. More > support is needed on the ispcsiphy.c side... Could you take (fixed) > version of this to your fwnode branch? Any feedback would be welcome :-) Pavel > omap3isp: add support for CSI1 bus > =20 > Signed-off-by: Pavel Machek > =20 > diff --git a/drivers/media/platform/omap3isp/isp.c b/drivers/media/platfo= rm/omap3isp/isp.c > index 245225a..4b10cfe 100644 > --- a/drivers/media/platform/omap3isp/isp.c > +++ b/drivers/media/platform/omap3isp/isp.c > @@ -2032,6 +2034,7 @@ static int isp_fwnode_parse(struct device *dev, str= uct fwnode_handle *fwn, > struct v4l2_fwnode_endpoint vfwn; > unsigned int i; > int ret; > + int csi1 =3D 0; > =20 > ret =3D v4l2_fwnode_endpoint_parse(fwn, &vfwn); > if (ret) > @@ -2059,38 +2062,82 @@ static int isp_fwnode_parse(struct device *dev, s= truct fwnode_handle *fwn, > =20 > case ISP_OF_PHY_CSIPHY1: > case ISP_OF_PHY_CSIPHY2: > - /* FIXME: always assume CSI-2 for now. */ > + switch (vfwn.bus_type) { > + case V4L2_MBUS_CSI2: > + dev_dbg(dev, "csi2 configuration\n"); > + csi1 =3D 0; > + break; > + case V4L2_MBUS_CCP2: > + case V4L2_MBUS_CSI1: > + dev_dbg(dev, "csi1 configuration\n"); > + csi1 =3D 1; > + break; > + default: > + dev_err(dev, "unkonwn bus type\n"); > + } > + > switch (vfwn.base.port) { > case ISP_OF_PHY_CSIPHY1: > - buscfg->interface =3D ISP_INTERFACE_CSI2C_PHY1; > + if (csi1) > + buscfg->interface =3D ISP_INTERFACE_CCP2B_PHY1; > + else > + buscfg->interface =3D ISP_INTERFACE_CSI2C_PHY1; > break; > case ISP_OF_PHY_CSIPHY2: > - buscfg->interface =3D ISP_INTERFACE_CSI2A_PHY2; > + if (csi1) > + buscfg->interface =3D ISP_INTERFACE_CCP2B_PHY2; > + else > + buscfg->interface =3D ISP_INTERFACE_CSI2A_PHY2; > break; > + default: > + dev_err(dev, "bad port\n"); > } > - buscfg->bus.csi2.lanecfg.clk.pos =3D vfwn.bus.mipi_csi2.clock_lane; > - buscfg->bus.csi2.lanecfg.clk.pol =3D > - vfwn.bus.mipi_csi2.lane_polarities[0]; > - dev_dbg(dev, "clock lane polarity %u, pos %u\n", > - buscfg->bus.csi2.lanecfg.clk.pol, > - buscfg->bus.csi2.lanecfg.clk.pos); > - > - for (i =3D 0; i < ISP_CSIPHY2_NUM_DATA_LANES; i++) { > - buscfg->bus.csi2.lanecfg.data[i].pos =3D > - vfwn.bus.mipi_csi2.data_lanes[i]; > - buscfg->bus.csi2.lanecfg.data[i].pol =3D > - vfwn.bus.mipi_csi2.lane_polarities[i + 1]; > + if (csi1) { > + buscfg->bus.ccp2.lanecfg.clk.pos =3D vfwn.bus.mipi_csi1.clock_lane; > + buscfg->bus.ccp2.lanecfg.clk.pol =3D > + vfwn.bus.mipi_csi1.lane_polarity[0]; > + dev_dbg(dev, "clock lane polarity %u, pos %u\n", > + buscfg->bus.ccp2.lanecfg.clk.pol, > + buscfg->bus.ccp2.lanecfg.clk.pos); > + > + buscfg->bus.ccp2.lanecfg.data[0].pos =3D 1; > + buscfg->bus.ccp2.lanecfg.data[0].pol =3D 0; > + > dev_dbg(dev, "data lane %u polarity %u, pos %u\n", i, > - buscfg->bus.csi2.lanecfg.data[i].pol, > - buscfg->bus.csi2.lanecfg.data[i].pos); > + buscfg->bus.ccp2.lanecfg.data[0].pol, > + buscfg->bus.ccp2.lanecfg.data[0].pos); > + > + buscfg->bus.ccp2.strobe_clk_pol =3D vfwn.bus.mipi_csi1.clock_inv; > + buscfg->bus.ccp2.phy_layer =3D vfwn.bus.mipi_csi1.strobe; > + buscfg->bus.ccp2.ccp2_mode =3D vfwn.bus_type =3D=3D V4L2_MBUS_CCP2; > + buscfg->bus.ccp2.vp_clk_pol =3D 1; > + =09 > + buscfg->bus.ccp2.crc =3D 1; =09 > + } else { > + buscfg->bus.csi2.lanecfg.clk.pos =3D vfwn.bus.mipi_csi2.clock_lane; > + buscfg->bus.csi2.lanecfg.clk.pol =3D > + vfwn.bus.mipi_csi2.lane_polarities[0]; > + dev_dbg(dev, "clock lane polarity %u, pos %u\n", > + buscfg->bus.csi2.lanecfg.clk.pol, > + buscfg->bus.csi2.lanecfg.clk.pos); > + > + for (i =3D 0; i < ISP_CSIPHY2_NUM_DATA_LANES; i++) { > + buscfg->bus.csi2.lanecfg.data[i].pos =3D > + vfwn.bus.mipi_csi2.data_lanes[i]; > + buscfg->bus.csi2.lanecfg.data[i].pol =3D > + vfwn.bus.mipi_csi2.lane_polarities[i + 1]; > + dev_dbg(dev, "data lane %u polarity %u, pos %u\n", i, > + buscfg->bus.csi2.lanecfg.data[i].pol, > + buscfg->bus.csi2.lanecfg.data[i].pos); > + } > + /* > + * FIXME: now we assume the CRC is always there. > + * Implement a way to obtain this information from the > + * sensor. Frame descriptors, perhaps? > + */ > + > + buscfg->bus.csi2.crc =3D 1; > } > - > - /* > - * FIXME: now we assume the CRC is always there. > - * Implement a way to obtain this information from the > - * sensor. Frame descriptors, perhaps? > - */ > - buscfg->bus.csi2.crc =3D 1; > break; > =20 > default: >=20 >=20 --=20 (english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blo= g.html --X1bOJ3K7DJ5YkBrT Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iEYEARECAAYFAli0gUgACgkQMOfwapXb+vJ01gCgqGzd43qzRfhF30pR4E8PaQiR 42IAmwWUr2YaWJc+iE35hTJ8bRj6Y6EF =3VAU -----END PGP SIGNATURE----- --X1bOJ3K7DJ5YkBrT--