Skip to content

Commit a59df15

Browse files
committed
ARM: dts: Fix camera sync parameters
The camera sync parameter declarations include are invalid in that they have both embedded string values and following cell values. The intention here was to use the cell values, but the embedded "0" was not removed as it should have been. The implication of this mistake is that inverted sync flags would be ignored because the 0 value corresponds to GPIO_ACTIVE_HIGH. The extra cell value would be treated as the start of another override, but then ignored because the end of the parameter is reached. These errors should have been picked up by the automated checks, but the base dts files weren't subjected to the same validation. This has now been corrected. Signed-off-by: Phil Elwell <[email protected]>
1 parent 0a19b52 commit a59df15

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

arch/arm/boot/dts/broadcom/bcm270x-rpi.dtsi

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,16 +100,16 @@
100100

101101
cam1_sync = <&csi1>, "sync-gpios:0=", <&gpio>,
102102
<&csi1>, "sync-gpios:4",
103-
<&csi1>, "sync-gpios:8=0", <GPIO_ACTIVE_HIGH>;
103+
<&csi1>, "sync-gpios:8=", <GPIO_ACTIVE_HIGH>;
104104
cam1_sync_inverted = <&csi1>, "sync-gpios:0=", <&gpio>,
105105
<&csi1>, "sync-gpios:4",
106-
<&csi1>, "sync-gpios:8=0", <GPIO_ACTIVE_LOW>;
106+
<&csi1>, "sync-gpios:8=", <GPIO_ACTIVE_LOW>;
107107
cam0_sync = <&csi0>, "sync-gpios:0=", <&gpio>,
108108
<&csi0>, "sync-gpios:4",
109-
<&csi0>, "sync-gpios:8=0", <GPIO_ACTIVE_HIGH>;
109+
<&csi0>, "sync-gpios:8=", <GPIO_ACTIVE_HIGH>;
110110
cam0_sync_inverted = <&csi0>, "sync-gpios:0=", <&gpio>,
111111
<&csi0>, "sync-gpios:4",
112-
<&csi0>, "sync-gpios:8=0", <GPIO_ACTIVE_LOW>;
112+
<&csi0>, "sync-gpios:8=", <GPIO_ACTIVE_LOW>;
113113

114114
strict_gpiod = <&chosen>, "bootargs=pinctrl_bcm2835.persist_gpio_outputs=n";
115115
};

0 commit comments

Comments
 (0)