Skip to content

Commit e267db1

Browse files
committed
dtoverlays: Update sensor overlays to use cam1_reg where possible
Update those overlays that use the regulator framework to use the new cam1_reg node to control the camera shutdown line, and remove the firmware workaround nodes. Signed-off-by: Dave Stevenson <[email protected]>
1 parent 87a8e51 commit e267db1

File tree

5 files changed

+34
-63
lines changed

5 files changed

+34
-63
lines changed

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

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
clocks = <&imx219_clk>;
2424
clock-names = "xclk";
2525

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

@@ -69,14 +69,6 @@
6969
fragment@3 {
7070
target-path="/";
7171
__overlay__ {
72-
imx219_vana: fixedregulator@0 {
73-
compatible = "regulator-fixed";
74-
regulator-name = "imx219_vana";
75-
regulator-min-microvolt = <2800000>;
76-
regulator-max-microvolt = <2800000>;
77-
gpio = <&gpio 41 GPIO_ACTIVE_HIGH>;
78-
enable-active-high;
79-
};
8072
imx219_vdig: fixedregulator@1 {
8173
compatible = "regulator-fixed";
8274
regulator-name = "imx219_vdig";
@@ -106,10 +98,12 @@
10698
};
10799

108100
fragment@5 {
109-
target-path="/__overrides__";
101+
target = <&cam1_reg>;
110102
__overlay__ {
111-
cam0-pwdn-ctrl = <&imx219_vana>,"gpio:0";
112-
cam0-pwdn = <&imx219_vana>,"gpio:4";
103+
status = "okay";
104+
regulator-name = "imx219_vana";
105+
regulator-min-microvolt = <2800000>;
106+
regulator-max-microvolt = <2800000>;
113107
};
114108
};
115109

arch/arm/boot/dts/overlays/imx290_327-overlay.dtsi

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
clock-names = "xclk";
2525
clock-frequency = <37125000>;
2626

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

@@ -61,14 +61,6 @@
6161
fragment@3 {
6262
target-path="/";
6363
__overlay__ {
64-
imx290_vdda: fixedregulator@0 {
65-
compatible = "regulator-fixed";
66-
regulator-name = "imx290_vdda";
67-
regulator-min-microvolt = <2800000>;
68-
regulator-max-microvolt = <2800000>;
69-
gpio = <&gpio 41 GPIO_ACTIVE_HIGH>;
70-
enable-active-high;
71-
};
7264
imx290_vdddo: fixedregulator@1 {
7365
compatible = "regulator-fixed";
7466
regulator-name = "imx290_vdddo";
@@ -98,10 +90,12 @@
9890
};
9991

10092
fragment@5 {
101-
target-path="/__overrides__";
93+
target = <&cam1_reg>;
10294
__overlay__ {
103-
cam0-pwdn-ctrl = <&imx290_vdda>,"gpio:0";
104-
cam0-pwdn = <&imx290_vdda>,"gpio:4";
95+
status = "okay";
96+
regulator-name = "imx290_vdda";
97+
regulator-min-microvolt = <2800000>;
98+
regulator-max-microvolt = <2800000>;
10599
};
106100
};
107101

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

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
clocks = <&imx477_clk>;
2424
clock-names = "xclk";
2525

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

@@ -69,22 +69,13 @@
6969
fragment@3 {
7070
target-path="/";
7171
__overlay__ {
72-
imx477_vana: fixedregulator@0 {
73-
compatible = "regulator-fixed";
74-
regulator-name = "imx477_vana";
75-
regulator-min-microvolt = <2800000>;
76-
regulator-max-microvolt = <2800000>;
77-
gpio = <&gpio 41 GPIO_ACTIVE_HIGH>;
78-
enable-active-high;
79-
startup-delay-us = <300000>;
80-
};
81-
imx477_vdig: fixedregulator@1 {
72+
imx477_vdig: fixedregulator@0 {
8273
compatible = "regulator-fixed";
8374
regulator-name = "imx477_vdig";
8475
regulator-min-microvolt = <1050000>;
8576
regulator-max-microvolt = <1050000>;
8677
};
87-
imx477_vddl: fixedregulator@2 {
78+
imx477_vddl: fixedregulator@1 {
8879
compatible = "regulator-fixed";
8980
regulator-name = "imx477_vddl";
9081
regulator-min-microvolt = <1800000>;
@@ -106,10 +97,13 @@
10697
};
10798

10899
fragment@5 {
109-
target-path="/__overrides__";
100+
target = <&cam1_reg>;
110101
__overlay__ {
111-
cam0-pwdn-ctrl = <&imx477_vana>,"gpio:0";
112-
cam0-pwdn = <&imx477_vana>,"gpio:4";
102+
status = "okay";
103+
regulator-name = "imx477_vana";
104+
startup-delay-us = <300000>;
105+
regulator-min-microvolt = <2800000>;
106+
regulator-max-microvolt = <2800000>;
113107
};
114108
};
115109

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

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,9 @@
2525
clock-frequency = <24000000>;
2626

2727
vdddo-supply = <&ov7251_dovdd>;
28-
vdda-supply = <&ov7251_avdd>;
28+
vdda-supply = <&cam1_reg>;
2929
vddd-supply = <&ov7251_dvdd>;
3030

31-
enable-gpios = <&gpio 41 GPIO_ACTIVE_HIGH>;
32-
3331
port {
3432
ov7251_0: endpoint {
3533
remote-endpoint = <&csi1_ep>;
@@ -68,12 +66,6 @@
6866
fragment@3 {
6967
target-path="/";
7068
__overlay__ {
71-
ov7251_avdd: fixedregulator@0 {
72-
compatible = "regulator-fixed";
73-
regulator-name = "ov7251_avdd";
74-
regulator-min-microvolt = <2800000>;
75-
regulator-max-microvolt = <2800000>;
76-
};
7769
ov7251_dovdd: fixedregulator@1 {
7870
compatible = "regulator-fixed";
7971
regulator-name = "ov7251_dovdd";
@@ -102,10 +94,12 @@
10294
};
10395

10496
fragment@5 {
105-
target-path="/__overrides__";
97+
target = <&cam1_reg>;
10698
__overlay__ {
107-
cam0-pwdn-ctrl = <&ov7251>,"enable-gpios:0";
108-
cam0-pwdn = <&ov7251>,"enable-gpios:4";
99+
status = "okay";
100+
regulator-name = "ov7251_avdd";
101+
regulator-min-microvolt = <2800000>;
102+
regulator-max-microvolt = <2800000>;
109103
};
110104
};
111105
};

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

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
clocks = <&ov9281_clk>;
2424
clock-names = "xvclk";
2525

26-
avdd-supply = <&ov9281_avdd>;
26+
avdd-supply = <&cam1_reg>;
2727
dovdd-supply = <&ov9281_dovdd>;
2828
dvdd-supply = <&ov9281_dvdd>;
2929

@@ -66,14 +66,6 @@
6666
fragment@3 {
6767
target-path="/";
6868
__overlay__ {
69-
ov9281_avdd: fixedregulator@0 {
70-
compatible = "regulator-fixed";
71-
regulator-name = "ov9281_avdd";
72-
regulator-min-microvolt = <2800000>;
73-
regulator-max-microvolt = <2800000>;
74-
gpio = <&gpio 41 GPIO_ACTIVE_HIGH>;
75-
enable-active-high;
76-
};
7769
ov9281_dovdd: fixedregulator@1 {
7870
compatible = "regulator-fixed";
7971
regulator-name = "ov9281_dovdd";
@@ -102,10 +94,13 @@
10294
};
10395

10496
fragment@5 {
105-
target-path="/__overrides__";
97+
target = <&cam1_reg>;
10698
__overlay__ {
107-
cam0-pwdn-ctrl = <&ov9281_avdd>,"gpio:0";
108-
cam0-pwdn = <&ov9281_avdd>,"gpio:4";
99+
status = "okay";
100+
regulator-name = "ov9281_avdd";
101+
regulator-min-microvolt = <2800000>;
102+
regulator-max-microvolt = <2800000>;
109103
};
110104
};
105+
111106
};

0 commit comments

Comments
 (0)