Commit fbf7a2e4 authored by Martin Kepplinger's avatar Martin Kepplinger
Browse files

arm64: dts: imx8mq-librem5: fix camera supplies description

CAMERA_PWR_EN controls different power supplies that cameras will use.
Describe that appropriately.
parent ba82d595
Pipeline #68913 passed with stage
in 67 minutes and 42 seconds
......@@ -19,8 +19,8 @@ &accel_gyro {
};
&i2c4 {
/delete-node/ camera2@2d;
camera2@10 {
/delete-node/ camera@2d;
camera@10 {
compatible = "samsung,s5k3l6xx";
reg = <0x10>;
pinctrl-names = "default";
......@@ -34,8 +34,9 @@ camera2@10 {
/* VDDD digital power 1,05V */
//vddreg-supply
/* I/O power supply 1,8V */
vddio-supply = <&reg_camera_pwr_en>;
vddio-supply = <&reg_csi_1v8>;
status = "okay";
port {
camera2_ep: endpoint {
data-lanes = <1 2>;
......
......@@ -168,13 +168,36 @@ reg_aud_1v8: regulator-audio-1v8 {
vin-supply = <&reg_audio_pwr_en>;
};
reg_camera_pwr_en: regulator-camera-pwr-en {
/*
* the pinctrl for reg_csi_1v8 and reg_vcam_1v8 is added to the PMIC
* since we can't have those 2 times on the 2 different regulators.
*/
reg_csi_1v8: regulator-csi-1v8 {
compatible = "regulator-fixed";
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_camera_pwr>;
regulator-name = "CAMERA_PWR_EN";
regulator-name = "CAMERA_VDDIO_1V8";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
vin-supply = <&reg_vdd_3v3>;
gpio = <&gpio1 0 GPIO_ACTIVE_HIGH>;
enable-active-high;
};
/* controlled by the CAMERA_POWER_KEY HKS */
reg_vcam_1v2: regulator-vcam-1v2 {
compatible = "regulator-fixed";
regulator-name = "CAMERA_VDDD_1V2";
regulator-min-microvolt = <1200000>;
regulator-max-microvolt = <1200000>;
vin-supply = <&reg_vdd_1v8>;
enable-active-high;
};
reg_vcam_2v8: regulator-vcam-2v8 {
compatible = "regulator-fixed";
regulator-name = "CAMERA_VDDA_2V8";
regulator-min-microvolt = <2800000>;
regulator-max-microvolt = <2800000>;
vin-supply = <&reg_vdd_3v3>;
gpio = <&gpio1 0 GPIO_ACTIVE_HIGH>;
enable-active-high;
};
......@@ -1054,7 +1077,7 @@ pmic: pmic@4b {
compatible = "rohm,bd71837";
reg = <0x4b>;
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_pmic>;
pinctrl-0 = <&pinctrl_pmic>, <&pinctrl_camera_pwr>;
clocks = <&pmic_osc>;
clock-names = "osc";
clock-output-names = "pmic_clk";
......@@ -1315,9 +1338,9 @@ camera_front: camera@20 {
pinctrl-0 = <&pinctrl_csi1>;
clocks = <&clk IMX8MQ_CLK_CLKO2>;
reset-gpios = <&gpio1 25 GPIO_ACTIVE_LOW>;
vddio-supply = <&reg_camera_pwr_en>;
vdda-supply = <&reg_camera_pwr_en>;
vddd-supply = <&reg_camera_pwr_en>;
vdda-supply = <&reg_vcam_2v8>;
vddd-supply = <&reg_vcam_1v2>;
vddio-supply = <&reg_csi_1v8>;
port {
camera1_ep: endpoint {
......@@ -1370,12 +1393,12 @@ &i2c4 {
vcm@c {
compatible = "dongwoon,dw9714";
reg = <0x0c>;
vcc-supply = <&reg_camera_pwr_en>;
vcc-supply = <&reg_csi_1v8>;
status = "okay";
};
/* Samsung S5K3L6XX - 13MP Rear-Facing Camera */
camera_back: camera2@2d {
camera_back: camera@2d {
compatible = "samsung,s5k3l6xx";
reg = <0x2d>;
pinctrl-names = "default";
......@@ -1389,8 +1412,9 @@ camera_back: camera2@2d {
/* VDDD digital power 1,05V */
//vddreg-supply
/* I/O power supply 1,8V */
vddio-supply = <&reg_camera_pwr_en>;
vddio-supply = <&reg_csi_1v8>;
status = "okay";
port {
camera2_ep: endpoint {
data-lanes = <1 2>;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment