On Tue, Feb 06, 2024 at 03:08:38PM +0200, Laurent Pinchart wrote:
> On Tue, Feb 06, 2024 at 12:07:05PM +0000, Sakari Ailus wrote:
> > Hi Mauro, Hans,
> >
> > This PR reverts a faulty ov08x40 patch and re-applies the same with the bad
> > DT binding and source changes removed.
> >
> > Note that this HAS TO be merged before sending the current media stage tree
> > further to Linus.
> >
> > Thanks to Laurent for spotting the bad changes.
>
> I spotted it thanks to sheer luck. The interesting question is to to
> prevent this happening again.
Indeed. There's nothing in my workflow that I whink could have caused this.
I basically did b4 shazam (which was clean, I checked), then edited that
driver file only, followed by git commit --amend -a. And there it was.
link-frequencies never was an array of 32-bit integers anyway. I may have
written this some years ago for testing purposes but I no longer have such
patches as files in my work tree, including the git stash.
$ git diff 88a058cbd080..034b58342662
diff --git a/Documentation/devicetree/bindings/media/video-interfaces.yaml b/Documentation/devicetree/bindings/media/video-interfaces.yaml
index 26e3e7d7c67b..ea511f2fed98 100644
--- a/Documentation/devicetree/bindings/media/video-interfaces.yaml
+++ b/Documentation/devicetree/bindings/media/video-interfaces.yaml
@@ -190,7 +190,7 @@ properties:
Allow MIPI CSI-2 non-continuous clock mode.
link-frequencies:
- $ref: /schemas/types.yaml#/definitions/uint64-array
+ $ref: /schemas/types.yaml#/definitions/uint32-array
description:
Allowed data bus frequencies. For MIPI CSI-2, for instance, this is the
actual frequency of the bus, not bits per clock per lane value. An array
diff --git a/arch/arm/boot/dts/ti/omap/omap3-n9.dts b/arch/arm/boot/dts/ti/omap/omap3-n9.dts
index a3cf3f443785..728a8fcf25b3 100644
--- a/arch/arm/boot/dts/ti/omap/omap3-n9.dts
+++ b/arch/arm/boot/dts/ti/omap/omap3-n9.dts
@@ -26,7 +26,7 @@ smia_1: camera@10 {
flash-leds = <&as3645a_flash &as3645a_indicator>;
port {
smia_1_1: endpoint {
- link-frequencies = /bits/ 64 <199200000 210000000 499200000>;
+ link-frequencies = /bits/ 32 <199200000 210000000 499200000>;
clock-lanes = <0>;
data-lanes = <1 2>;
remote-endpoint = <&csi2a_ep>;
diff --git a/drivers/media/i2c/ov08x40.c b/drivers/media/i2c/ov08x40.c
index d28d31ddc2a7..5631e7d1f328 100644
--- a/drivers/media/i2c/ov08x40.c
+++ b/drivers/media/i2c/ov08x40.c
@@ -1361,8 +1361,6 @@ static int ov08x40_burst_fill_regs(struct ov08x40 *ov08x, u16 first_reg,
return -EIO;
}
- dev_dbg(&client->dev, "I2C burst transfer succeeded\n");
-
return 0;
}
--
Sakari Ailus
