From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B2EBAEB64D9 for ; Mon, 10 Jul 2023 17:45:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230527AbjGJRpJ (ORCPT ); Mon, 10 Jul 2023 13:45:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56040 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230133AbjGJRpI (ORCPT ); Mon, 10 Jul 2023 13:45:08 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E119EDD; Mon, 10 Jul 2023 10:45:06 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 75C5561169; Mon, 10 Jul 2023 17:45:06 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1B492C433C8; Mon, 10 Jul 2023 17:45:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1689011105; bh=JYkWJasgvckBZ5AB6t/6gw7izBFHjFqNwBX/W6Q7n2E=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=pEgXBy9VXc/yXTnnLhVCIsDLJUjNz4cwRaxzrg4INUE5BYM3JyF1PLdsG+HhfWFma ieCM0QEA+X322SDIl4SapO+6AhAW/rwZUewqlYe9HpyFIuRPjdlucY9SUvHZuWeji/ EGh7w22R+wwwXkJEROT3EoSjJ4zcu3B+FV4p2eKBPxWzjWaB3/YtU3JntbN/xn2Ubo Ir5mIv6fnL1kMNTdZliTB4UjFiZ2QH3xr3q5ch4bCg3/f7WCvJNJ4o+OaAc8Ze1ay5 nQFkq4fNl2hIDG6blt/m2DV4PbD1FWv7dSZZc+P4ufwh+UA3BsU4JG9WxTrrc04u3k 5FRkpdMX35Z9g== Date: Mon, 10 Jul 2023 18:45:00 +0100 From: Conor Dooley To: Rob Herring Cc: Mauro Carvalho Chehab , Krzysztof Kozlowski , Conor Dooley , Daniel Scally , Dafna Hirschfeld , Heiko Stuebner , Tommaso Merciai , Helen Koike , linux-media@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH] media: dt-bindings: Merge OV5695 into OV5693 binding Message-ID: <20230710-unsold-simplify-5a339036ff38@spud> References: <20230707210604.868002-1-robh@kernel.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="t+svSrsy1jWs8uVm" Content-Disposition: inline In-Reply-To: <20230707210604.868002-1-robh@kernel.org> Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org --t+svSrsy1jWs8uVm Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Jul 07, 2023 at 03:06:04PM -0600, Rob Herring wrote: > The OV5695 binding is almost the same as the OV5693 binding. The only > difference is 'clock-names' is defined for OV5695. However, the lack of > clock-names is an omission as the Linux OV5693 driver expects the same > 'xvclk' clock name. >=20 > 'link-frequencies' is required by OV5693, but not OV5695. Just drop it > from being required. Expressing it conditionally would be ugly. It > shouldn't really be required either as the driver only supports 1 > frequency anyways. I suppose the intent here is something like "the driver only supports 1 frequency and never bothers to read the property"? Either way, Reviewed-by: Conor Dooley Cheers, Conor. >=20 > The rockchip-isp1 binding example is missing required properties, so it > has to be updated as well. >=20 > Signed-off-by: Rob Herring > --- > .../devicetree/bindings/media/i2c/ov5695.txt | 41 ------------------- > .../bindings/media/i2c/ovti,ov5693.yaml | 19 +++++---- > .../bindings/media/rockchip-isp1.yaml | 1 + > 3 files changed, 13 insertions(+), 48 deletions(-) > delete mode 100644 Documentation/devicetree/bindings/media/i2c/ov5695.txt >=20 > diff --git a/Documentation/devicetree/bindings/media/i2c/ov5695.txt b/Doc= umentation/devicetree/bindings/media/i2c/ov5695.txt > deleted file mode 100644 > index 640a63717d96..000000000000 > --- a/Documentation/devicetree/bindings/media/i2c/ov5695.txt > +++ /dev/null > @@ -1,41 +0,0 @@ > -* Omnivision OV5695 MIPI CSI-2 sensor > - > -Required Properties: > -- compatible: shall be "ovti,ov5695" > -- clocks: reference to the xvclk input clock > -- clock-names: shall be "xvclk" > -- avdd-supply: Analog voltage supply, 2.8 volts > -- dovdd-supply: Digital I/O voltage supply, 1.8 volts > -- dvdd-supply: Digital core voltage supply, 1.2 volts > -- reset-gpios: Low active reset gpio > - > -The device node shall contain one 'port' child node with an > -'endpoint' subnode for its digital output video port, > -in accordance with the video interface bindings defined in > -Documentation/devicetree/bindings/media/video-interfaces.txt. > -The endpoint optional property 'data-lanes' shall be "<1 2>". > - > -Example: > -&i2c7 { > - ov5695: camera-sensor@36 { > - compatible =3D "ovti,ov5695"; > - reg =3D <0x36>; > - pinctrl-names =3D "default"; > - pinctrl-0 =3D <&clk_24m_cam>; > - > - clocks =3D <&cru SCLK_TESTCLKOUT1>; > - clock-names =3D "xvclk"; > - > - avdd-supply =3D <&pp2800_cam>; > - dovdd-supply =3D <&pp1800>; > - dvdd-supply =3D <&pp1250_cam>; > - reset-gpios =3D <&gpio2 5 GPIO_ACTIVE_LOW>; > - > - port { > - wcam_out: endpoint { > - remote-endpoint =3D <&mipi_in_wcam>; > - data-lanes =3D <1 2>; > - }; > - }; > - }; > -}; > diff --git a/Documentation/devicetree/bindings/media/i2c/ovti,ov5693.yaml= b/Documentation/devicetree/bindings/media/i2c/ovti,ov5693.yaml > index 359dc08440a8..a3d73a87d797 100644 > --- a/Documentation/devicetree/bindings/media/i2c/ovti,ov5693.yaml > +++ b/Documentation/devicetree/bindings/media/i2c/ovti,ov5693.yaml > @@ -5,26 +5,29 @@ > $id: http://devicetree.org/schemas/media/i2c/ovti,ov5693.yaml# > $schema: http://devicetree.org/meta-schemas/core.yaml# > =20 > -title: Omnivision OV5693 CMOS Sensor > +title: Omnivision OV5693/OV5695 CMOS Sensors > =20 > maintainers: > - Tommaso Merciai > =20 > description: | > - The Omnivision OV5693 is a high performance, 1/4-inch, 5 megapixel, CM= OS > - image sensor that delivers 2592x1944 at 30fps. It provides full-frame, > + The Omnivision OV5693/OV5695 are high performance, 1/4-inch, 5 megapix= el, CMOS > + image sensors that deliver 2592x1944 at 30fps. It provides full-frame, > sub-sampled, and windowed 10-bit MIPI images in various formats via the > Serial Camera Control Bus (SCCB) interface. > =20 > - OV5693 is controlled via I2C and two-wire Serial Camera Control Bus (S= CCB). > - The sensor output is available via CSI-2 serial data output (up to 2-l= ane). > + OV5693/OV5695 are controlled via I2C and two-wire Serial Camera Contro= l Bus > + (SCCB). The sensor output is available via CSI-2 serial data output (u= p to > + 2-lane). > =20 > allOf: > - $ref: /schemas/media/video-interface-devices.yaml# > =20 > properties: > compatible: > - const: ovti,ov5693 > + enum: > + - ovti,ov5693 > + - ovti,ov5695 > =20 > reg: > maxItems: 1 > @@ -34,6 +37,9 @@ properties: > System input clock (aka XVCLK). From 6 to 27 MHz. > maxItems: 1 > =20 > + clock-names: > + const: xvclk > + > dovdd-supply: > description: > Digital I/O voltage supply, 1.8V. > @@ -72,7 +78,6 @@ properties: > =20 > required: > - data-lanes > - - link-frequencies > =20 > required: > - compatible > diff --git a/Documentation/devicetree/bindings/media/rockchip-isp1.yaml b= /Documentation/devicetree/bindings/media/rockchip-isp1.yaml > index 0bad7e640148..e466dff8286d 100644 > --- a/Documentation/devicetree/bindings/media/rockchip-isp1.yaml > +++ b/Documentation/devicetree/bindings/media/rockchip-isp1.yaml > @@ -199,6 +199,7 @@ examples: > wcam: camera@36 { > compatible =3D "ovti,ov5695"; > reg =3D <0x36>; > + clocks =3D <&cru SCLK_TESTCLKOUT1>; > =20 > port { > wcam_out: endpoint { > --=20 > 2.40.1 >=20 --t+svSrsy1jWs8uVm Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEABYIAB0WIQRh246EGq/8RLhDjO14tDGHoIJi0gUCZKxDnAAKCRB4tDGHoIJi 0qn2AP0Wcor69ow4Yy2tBjgcVPKKkO5rO0cMvw977bU0zkbU2wEA03fAzCzyJ+yv Ng2oGxRY7uXq/PVcTmI/dsBcudBCXwY= =1DQl -----END PGP SIGNATURE----- --t+svSrsy1jWs8uVm--