Commit 71538ec0 authored Sep 18, 2018 by Dave Stevenson Committed by Phil Elwell Sep 18, 2018

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>

parent f92b55d5

arch/arm/boot/dts/bcm270x.dtsi

+7 −0

Original line number	Diff line number	Diff line
		@@ -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 */

arch/arm/boot/dts/overlays/README

+1 −9

Original line number	Diff line number	Diff line
		@@ -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.

arch/arm/boot/dts/overlays/ov5647-overlay.dts

+10 −2

Original line number	Diff line number	Diff line
		@@ -78,9 +78,17 @@
		};
		};

		__overrides__ {
		i2c_pins_28_29 = <0>,"+4-5";
		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";
		};
		};