1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
|
From ea59741f2679e30d765b6a9e0d45265e3033a38c Mon Sep 17 00:00:00 2001
From: Dave Stevenson <dave.stevenson@raspberrypi.org>
Date: Tue, 18 Sep 2018 10:47:38 +0100
Subject: [PATCH 418/454] dtoverlays: Correct DT handling camera GPIOs
The firmware has support for updating overrides with the correct
GPIO settings for the camera GPIOs, but the wrong device tree
setup ended up being merged.
Correct the DT configuration so that the firmware does set it
up correctly.
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
---
arch/arm/boot/dts/bcm270x.dtsi | 7 +++++++
arch/arm/boot/dts/overlays/README | 10 +---------
arch/arm/boot/dts/overlays/ov5647-overlay.dts | 12 ++++++++++--
3 files changed, 18 insertions(+), 11 deletions(-)
--- a/arch/arm/boot/dts/bcm270x.dtsi
+++ b/arch/arm/boot/dts/bcm270x.dtsi
@@ -152,6 +152,13 @@
regulator-max-microvolt = <3300000>;
regulator-always-on;
};
+
+ __overrides__ {
+ cam0-pwdn-ctrl;
+ cam0-pwdn;
+ cam0-led-ctrl;
+ cam0-led;
+ };
};
/* Configure and use the auxilliary interrupt controller */
--- a/arch/arm/boot/dts/overlays/README
+++ b/arch/arm/boot/dts/overlays/README
@@ -1283,15 +1283,7 @@ Info: Omnivision OV5647 camera module.
Uses Unicam 1, which is the standard camera connector on most Pi
variants.
Load: dtoverlay=ov5647,<param>=<val>
-Params: cam0-pwdn GPIO used to control the sensor powerdown line.
-
- cam0-led GPIO used to control the sensor led
- Both these fields should be automatically filled
- in by the firmware to reflect the default GPIO
- configuration of the particular Pi variant in
- use.
-
- i2c_pins_28_29 Use pins 28&29 for the I2C instead of 44&45.
+Params: i2c_pins_28_29 Use pins 28&29 for the I2C instead of 44&45.
This is required for Pi B+, 2, 0, and 0W.
--- a/arch/arm/boot/dts/overlays/ov5647-overlay.dts
+++ b/arch/arm/boot/dts/overlays/ov5647-overlay.dts
@@ -78,9 +78,17 @@
};
};
+ fragment@5 {
+ target-path="/__overrides__";
+ __overlay__ {
+ cam0-pwdn-ctrl = <&ov5647>,"pwdn-gpios:0";
+ cam0-pwdn = <&ov5647>,"pwdn-gpios:4";
+ cam0-led-ctrl = <&ov5647>,"pwdn-gpios:12";
+ cam0-led = <&ov5647>,"pwdn-gpios:16";
+ };
+ };
+
__overrides__ {
i2c_pins_28_29 = <0>,"+4-5";
- cam0-pwdn = <&ov5647>,"pwdn-gpios:4";
- cam0-led = <&ov5647>,"pwdn-gpios:16";
};
};
|
