Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions arch/arm/boot/dts/bcm2708-rpi-b-plus.dts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#include "bcm283x-rpi-smsc9514.dtsi"
#include "bcm283x-rpi-csi1-2lane.dtsi"
#include "bcm283x-rpi-i2c0mux_0_28.dtsi"
#include "bcm283x-rpi-cam1-regulator.dtsi"

/ {
compatible = "raspberrypi,model-b-plus", "brcm,bcm2835";
Expand Down Expand Up @@ -111,6 +112,10 @@
pinctrl-0 = <&audio_pins>;
};

&cam1_reg {
gpio = <&gpio 41 GPIO_ACTIVE_HIGH>;
};

/ {
__overrides__ {
act_led_gpio = <&act_led>,"gpios:4";
Expand Down
5 changes: 5 additions & 0 deletions arch/arm/boot/dts/bcm2708-rpi-b-rev1.dts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
#include "bcm2708-rpi.dtsi"
#include "bcm283x-rpi-smsc9512.dtsi"
#include "bcm283x-rpi-csi1-2lane.dtsi"
#include "bcm283x-rpi-cam1-regulator.dtsi"

/ {
compatible = "raspberrypi,model-b", "brcm,bcm2835";
Expand Down Expand Up @@ -118,6 +119,10 @@ i2c_csi_dsi: &i2c1 {
pinctrl-0 = <&audio_pins>;
};

&cam1_reg {
gpio = <&gpio 27 GPIO_ACTIVE_HIGH>;
};

/ {
__overrides__ {
act_led_gpio = <&act_led>,"gpios:4";
Expand Down
5 changes: 5 additions & 0 deletions arch/arm/boot/dts/bcm2708-rpi-b.dts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#include "bcm283x-rpi-smsc9512.dtsi"
#include "bcm283x-rpi-csi1-2lane.dtsi"
#include "bcm283x-rpi-i2c0mux_0_28.dtsi"
#include "bcm283x-rpi-cam1-regulator.dtsi"

/ {
compatible = "raspberrypi,model-b", "brcm,bcm2835";
Expand Down Expand Up @@ -105,6 +106,10 @@
pinctrl-0 = <&audio_pins>;
};

&cam1_reg {
gpio = <&gpio 21 GPIO_ACTIVE_HIGH>;
};

/ {
__overrides__ {
act_led_gpio = <&act_led>,"gpios:4";
Expand Down
15 changes: 15 additions & 0 deletions arch/arm/boot/dts/bcm2708-rpi-cm.dts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,21 @@
/ {
compatible = "raspberrypi,compute-module", "brcm,bcm2835";
model = "Raspberry Pi Compute Module";

cam1_reg: cam1_reg {
compatible = "regulator-fixed";
regulator-name = "cam1-regulator";
gpio = <&gpio 2 GPIO_ACTIVE_HIGH>;
enable-active-high;
status = "disabled";
};
cam0_reg: cam0_reg {
compatible = "regulator-fixed";
regulator-name = "cam0-regulator";
gpio = <&gpio 30 GPIO_ACTIVE_HIGH>;
enable-active-high;
status = "disabled";
};
};

&uart0 {
Expand Down
5 changes: 5 additions & 0 deletions arch/arm/boot/dts/bcm2708-rpi-zero-w.dts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#include "bcm283x-rpi-csi1-2lane.dtsi"
#include "bcm283x-rpi-i2c0mux_0_28.dtsi"
#include "bcm2708-rpi-bt.dtsi"
#include "bcm283x-rpi-cam1-regulator.dtsi"

/ {
compatible = "raspberrypi,model-zero-w", "brcm,bcm2835";
Expand Down Expand Up @@ -155,6 +156,10 @@
brcm,disable-headphones = <1>;
};

&cam1_reg {
gpio = <&gpio 44 GPIO_ACTIVE_HIGH>;
};

/ {
__overrides__ {
act_led_gpio = <&act_led>,"gpios:4";
Expand Down
5 changes: 5 additions & 0 deletions arch/arm/boot/dts/bcm2708-rpi-zero.dts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
#include "bcm2708-rpi.dtsi"
#include "bcm283x-rpi-csi1-2lane.dtsi"
#include "bcm283x-rpi-i2c0mux_0_28.dtsi"
#include "bcm283x-rpi-cam1-regulator.dtsi"

/ {
compatible = "raspberrypi,model-zero", "brcm,bcm2835";
Expand Down Expand Up @@ -109,6 +110,10 @@
brcm,disable-headphones = <1>;
};

&cam1_reg {
gpio = <&gpio 41 GPIO_ACTIVE_HIGH>;
};

/ {
__overrides__ {
act_led_gpio = <&act_led>,"gpios:4";
Expand Down
5 changes: 5 additions & 0 deletions arch/arm/boot/dts/bcm2709-rpi-2-b.dts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#include "bcm283x-rpi-smsc9514.dtsi"
#include "bcm283x-rpi-csi1-2lane.dtsi"
#include "bcm283x-rpi-i2c0mux_0_28.dtsi"
#include "bcm283x-rpi-cam1-regulator.dtsi"

/ {
compatible = "raspberrypi,2-model-b", "brcm,bcm2836";
Expand Down Expand Up @@ -111,6 +112,10 @@
pinctrl-0 = <&audio_pins>;
};

&cam1_reg {
gpio = <&gpio 41 GPIO_ACTIVE_HIGH>;
};

/ {
__overrides__ {
act_led_gpio = <&act_led>,"gpios:4";
Expand Down
5 changes: 5 additions & 0 deletions arch/arm/boot/dts/bcm2710-rpi-2-b.dts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#include "bcm283x-rpi-smsc9514.dtsi"
#include "bcm283x-rpi-csi1-2lane.dtsi"
#include "bcm283x-rpi-i2c0mux_0_28.dtsi"
#include "bcm283x-rpi-cam1-regulator.dtsi"

/ {
compatible = "raspberrypi,2-model-b-rev2", "brcm,bcm2837";
Expand Down Expand Up @@ -111,6 +112,10 @@
pinctrl-0 = <&audio_pins>;
};

&cam1_reg {
gpio = <&gpio 41 GPIO_ACTIVE_HIGH>;
};

/ {
__overrides__ {
act_led_gpio = <&act_led>,"gpios:4";
Expand Down
5 changes: 5 additions & 0 deletions arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
#include "bcm283x-rpi-csi1-2lane.dtsi"
#include "bcm283x-rpi-i2c0mux_0_44.dtsi"
#include "bcm271x-rpi-bt.dtsi"
#include "bcm283x-rpi-cam1-regulator.dtsi"

/ {
compatible = "raspberrypi,3-model-b-plus", "brcm,bcm2837";
Expand Down Expand Up @@ -176,6 +177,10 @@
microchip,downshift-after = <2>;
};

&cam1_reg {
gpio = <&expgpio 5 GPIO_ACTIVE_HIGH>;
};

/ {
__overrides__ {
act_led_gpio = <&act_led>,"gpios:4";
Expand Down
5 changes: 5 additions & 0 deletions arch/arm/boot/dts/bcm2710-rpi-3-b.dts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
#include "bcm283x-rpi-csi1-2lane.dtsi"
#include "bcm283x-rpi-i2c0mux_0_44.dtsi"
#include "bcm271x-rpi-bt.dtsi"
#include "bcm283x-rpi-cam1-regulator.dtsi"

/ {
compatible = "raspberrypi,3-model-b", "brcm,bcm2837";
Expand Down Expand Up @@ -185,6 +186,10 @@
pinctrl-0 = <&audio_pins>;
};

&cam1_reg {
gpio = <&expgpio 5 GPIO_ACTIVE_HIGH>;
};

/ {
__overrides__ {
act_led_gpio = <&act_led>,"gpios:4";
Expand Down
15 changes: 15 additions & 0 deletions arch/arm/boot/dts/bcm2710-rpi-cm3.dts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,21 @@
/ {
compatible = "raspberrypi,3-compute-module", "brcm,bcm2837";
model = "Raspberry Pi Compute Module 3";

cam1_reg: cam1_reg {
compatible = "regulator-fixed";
regulator-name = "cam1-regulator";
gpio = <&gpio 2 GPIO_ACTIVE_HIGH>;
enable-active-high;
status = "disabled";
};
cam0_reg: cam0_reg {
compatible = "regulator-fixed";
regulator-name = "cam0-regulator";
gpio = <&gpio 30 GPIO_ACTIVE_HIGH>;
enable-active-high;
status = "disabled";
};
};

&uart0 {
Expand Down
5 changes: 5 additions & 0 deletions arch/arm/boot/dts/bcm2711-rpi-4-b.dts
Original file line number Diff line number Diff line change
Expand Up @@ -319,6 +319,7 @@
#include "bcm2711-rpi.dtsi"
#include "bcm283x-rpi-csi1-2lane.dtsi"
#include "bcm283x-rpi-i2c0mux_0_44.dtsi"
#include "bcm283x-rpi-cam1-regulator.dtsi"

/ {
chosen {
Expand Down Expand Up @@ -585,6 +586,10 @@
pinctrl-0 = <&audio_pins>;
};

&cam1_reg {
gpio = <&expgpio 5 GPIO_ACTIVE_HIGH>;
};

/ {
__overrides__ {
act_led_gpio = <&act_led>,"gpios:4";
Expand Down
8 changes: 8 additions & 0 deletions arch/arm/boot/dts/bcm2711-rpi-cm4.dts
Original file line number Diff line number Diff line change
Expand Up @@ -327,6 +327,14 @@
};

/delete-node/ wifi-pwrseq;

cam0_reg: cam1_reg: cam1_reg {
compatible = "regulator-fixed";
regulator-name = "cam1-reg";
gpio = <&expgpio 5 GPIO_ACTIVE_HIGH>;
enable-active-high;
status = "disabled";
};
};

&mmcnr {
Expand Down
10 changes: 10 additions & 0 deletions arch/arm/boot/dts/bcm283x-rpi-cam1-regulator.dtsi
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
// SPDX-License-Identifier: GPL-2.0

/ {
cam1_reg: cam1_reg {
compatible = "regulator-fixed";
regulator-name = "cam1-reg";
enable-active-high;
status = "disabled";
};
};
18 changes: 6 additions & 12 deletions arch/arm/boot/dts/overlays/imx219-overlay.dts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
clocks = <&imx219_clk>;
clock-names = "xclk";

VANA-supply = <&imx219_vana>; /* 2.8v */
VANA-supply = <&cam1_reg>; /* 2.8v */
VDIG-supply = <&imx219_vdig>; /* 1.8v */
VDDL-supply = <&imx219_vddl>; /* 1.2v */

Expand Down Expand Up @@ -69,14 +69,6 @@
fragment@3 {
target-path="/";
__overlay__ {
imx219_vana: fixedregulator@0 {
compatible = "regulator-fixed";
regulator-name = "imx219_vana";
regulator-min-microvolt = <2800000>;
regulator-max-microvolt = <2800000>;
gpio = <&gpio 41 GPIO_ACTIVE_HIGH>;
enable-active-high;
};
imx219_vdig: fixedregulator@1 {
compatible = "regulator-fixed";
regulator-name = "imx219_vdig";
Expand Down Expand Up @@ -106,10 +98,12 @@
};

fragment@5 {
target-path="/__overrides__";
target = <&cam1_reg>;
__overlay__ {
cam0-pwdn-ctrl = <&imx219_vana>,"gpio:0";
cam0-pwdn = <&imx219_vana>,"gpio:4";
status = "okay";
regulator-name = "imx219_vana";
regulator-min-microvolt = <2800000>;
regulator-max-microvolt = <2800000>;
};
};

Expand Down
18 changes: 6 additions & 12 deletions arch/arm/boot/dts/overlays/imx290_327-overlay.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
clock-names = "xclk";
clock-frequency = <37125000>;

vdda-supply = <&imx290_vdda>; /* 2.8v */
vdda-supply = <&cam1_reg>; /* 2.8v */
vdddo-supply = <&imx290_vdddo>; /* 1.8v */
vddd-supply = <&imx290_vddd>; /* 1.5v */

Expand Down Expand Up @@ -61,14 +61,6 @@
fragment@3 {
target-path="/";
__overlay__ {
imx290_vdda: fixedregulator@0 {
compatible = "regulator-fixed";
regulator-name = "imx290_vdda";
regulator-min-microvolt = <2800000>;
regulator-max-microvolt = <2800000>;
gpio = <&gpio 41 GPIO_ACTIVE_HIGH>;
enable-active-high;
};
imx290_vdddo: fixedregulator@1 {
compatible = "regulator-fixed";
regulator-name = "imx290_vdddo";
Expand Down Expand Up @@ -98,10 +90,12 @@
};

fragment@5 {
target-path="/__overrides__";
target = <&cam1_reg>;
__overlay__ {
cam0-pwdn-ctrl = <&imx290_vdda>,"gpio:0";
cam0-pwdn = <&imx290_vdda>,"gpio:4";
status = "okay";
regulator-name = "imx290_vdda";
regulator-min-microvolt = <2800000>;
regulator-max-microvolt = <2800000>;
};
};

Expand Down
24 changes: 9 additions & 15 deletions arch/arm/boot/dts/overlays/imx477-overlay.dts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
clocks = <&imx477_clk>;
clock-names = "xclk";

VANA-supply = <&imx477_vana>; /* 2.8v */
VANA-supply = <&cam1_reg>; /* 2.8v */
VDIG-supply = <&imx477_vdig>; /* 1.05v */
VDDL-supply = <&imx477_vddl>; /* 1.8v */

Expand Down Expand Up @@ -69,22 +69,13 @@
fragment@3 {
target-path="/";
__overlay__ {
imx477_vana: fixedregulator@0 {
compatible = "regulator-fixed";
regulator-name = "imx477_vana";
regulator-min-microvolt = <2800000>;
regulator-max-microvolt = <2800000>;
gpio = <&gpio 41 GPIO_ACTIVE_HIGH>;
enable-active-high;
startup-delay-us = <300000>;
};
imx477_vdig: fixedregulator@1 {
imx477_vdig: fixedregulator@0 {
compatible = "regulator-fixed";
regulator-name = "imx477_vdig";
regulator-min-microvolt = <1050000>;
regulator-max-microvolt = <1050000>;
};
imx477_vddl: fixedregulator@2 {
imx477_vddl: fixedregulator@1 {
compatible = "regulator-fixed";
regulator-name = "imx477_vddl";
regulator-min-microvolt = <1800000>;
Expand All @@ -106,10 +97,13 @@
};

fragment@5 {
target-path="/__overrides__";
target = <&cam1_reg>;
__overlay__ {
cam0-pwdn-ctrl = <&imx477_vana>,"gpio:0";
cam0-pwdn = <&imx477_vana>,"gpio:4";
status = "okay";
regulator-name = "imx477_vana";
startup-delay-us = <300000>;
regulator-min-microvolt = <2800000>;
regulator-max-microvolt = <2800000>;
};
};

Expand Down
Loading