From 7b0d2427a56d5c1c2ca90997eca3a3739e379671 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 2 Aug 2021 14:30:15 +0100 Subject: [PATCH 526/552] dtoverlays: Add orientation (and rotation) parameter to sensor overlays Add the orientation parameter to all the camera sensor overlays to avoid libcamera complaining, and add the rotation parameter where it hadn't been added before. Signed-off-by: Dave Stevenson --- arch/arm/boot/dts/overlays/README | 26 ++++++++++++++++--- arch/arm/boot/dts/overlays/imx219-overlay.dts | 2 ++ .../boot/dts/overlays/imx290_327-overlay.dtsi | 5 ++++ .../boot/dts/overlays/imx477_378-overlay.dtsi | 2 ++ arch/arm/boot/dts/overlays/ov5647-overlay.dts | 2 ++ arch/arm/boot/dts/overlays/ov7251-overlay.dts | 8 ++++++ arch/arm/boot/dts/overlays/ov9281-overlay.dts | 7 +++++ 7 files changed, 48 insertions(+), 4 deletions(-) diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README index 022aae287ed7..fafec158c1bb 100644 --- a/arch/arm/boot/dts/overlays/README +++ b/arch/arm/boot/dts/overlays/README @@ -1682,6 +1682,8 @@ Info: Sony IMX219 camera module. Load: dtoverlay=imx219,= Params: rotation Mounting rotation of the camera sensor (0 or 180, default 180) + orientation Sensor orientation (0 = front, 1 = rear, + 2 = external, default external) Name: imx290 @@ -1698,6 +1700,10 @@ Params: 4lane Enable 4 CSI2 lanes. This requires a Compute (the default), whilst those from Innomaker use 74.25MHz. mono Denote that the module is a mono sensor. + orientation Sensor orientation (0 = front, 1 = rear, + 2 = external, default external) + rotation Mounting rotation of the camera sensor (0 or + 180, default 0) Name: imx378 @@ -1707,6 +1713,8 @@ Info: Sony IMX378 camera module. Load: dtoverlay=imx378,= Params: rotation Mounting rotation of the camera sensor (0 or 180, default 180) + orientation Sensor orientation (0 = front, 1 = rear, + 2 = external, default external) Name: imx477 @@ -1716,6 +1724,8 @@ Info: Sony IMX477 camera module. Load: dtoverlay=imx477,= Params: rotation Mounting rotation of the camera sensor (0 or 180, default 180) + orientation Sensor orientation (0 = front, 1 = rear, + 2 = external, default external) Name: iqaudio-codec @@ -2141,22 +2151,30 @@ Info: Omnivision OV5647 camera module. Load: dtoverlay=ov5647,= Params: rotation Mounting rotation of the camera sensor (0 or 180, default 0) + orientation Sensor orientation (0 = front, 1 = rear, + 2 = external, default external) Name: ov7251 Info: Omnivision OV7251 camera module. Uses Unicam 1, which is the standard camera connector on most Pi variants. -Load: dtoverlay=ov7251 -Params: +Load: dtoverlay=ov7251,= +Params: rotation Mounting rotation of the camera sensor (0 or + 180, default 0) + orientation Sensor orientation (0 = front, 1 = rear, + 2 = external, default external) Name: ov9281 Info: Omnivision OV9281 camera module. Uses Unicam 1, which is the standard camera connector on most Pi variants. -Load: dtoverlay=ov9281 -Params: +Load: dtoverlay=ov9281,= +Params: rotation Mounting rotation of the camera sensor (0 or + 180, default 0) + orientation Sensor orientation (0 = front, 1 = rear, + 2 = external, default external) Name: papirus diff --git a/arch/arm/boot/dts/overlays/imx219-overlay.dts b/arch/arm/boot/dts/overlays/imx219-overlay.dts index 0840e8b23b1a..0c065bf09f54 100644 --- a/arch/arm/boot/dts/overlays/imx219-overlay.dts +++ b/arch/arm/boot/dts/overlays/imx219-overlay.dts @@ -28,6 +28,7 @@ imx219: imx219@10 { VDDL-supply = <&imx219_vddl>; /* 1.2v */ rotation = <180>; + orientation = <2>; port { imx219_0: endpoint { @@ -109,5 +110,6 @@ __overlay__ { __overrides__ { rotation = <&imx219>,"rotation:0"; + orientation = <&imx219>,"orientation:0"; }; }; diff --git a/arch/arm/boot/dts/overlays/imx290_327-overlay.dtsi b/arch/arm/boot/dts/overlays/imx290_327-overlay.dtsi index 6ecafdddbf0a..d4a5ed6dbbcf 100644 --- a/arch/arm/boot/dts/overlays/imx290_327-overlay.dtsi +++ b/arch/arm/boot/dts/overlays/imx290_327-overlay.dtsi @@ -24,6 +24,9 @@ imx290: imx290@1a { clock-names = "xclk"; clock-frequency = <37125000>; + rotation = <0>; + orientation = <2>; + vdda-supply = <&cam1_reg>; /* 2.8v */ vdddo-supply = <&imx290_vdddo>; /* 1.8v */ vddd-supply = <&imx290_vddd>; /* 1.5v */ @@ -135,5 +138,7 @@ __overrides__ { 4lane = <0>, "-6+7-8+9"; clock-frequency = <&imx290_clk>,"clock-frequency:0", <&imx290>,"clock-frequency:0"; + rotation = <&imx290>,"rotation:0"; + orientation = <&imx290>,"orientation:0"; }; }; diff --git a/arch/arm/boot/dts/overlays/imx477_378-overlay.dtsi b/arch/arm/boot/dts/overlays/imx477_378-overlay.dtsi index 4e444709cc16..bb9a9acdbbd7 100644 --- a/arch/arm/boot/dts/overlays/imx477_378-overlay.dtsi +++ b/arch/arm/boot/dts/overlays/imx477_378-overlay.dtsi @@ -23,6 +23,7 @@ imx477: imx477@1a { VDDL-supply = <&imx477_vddl>; /* 1.8v */ rotation = <180>; + orientation = <2>; port { imx477_0: endpoint { @@ -104,5 +105,6 @@ __overlay__ { __overrides__ { rotation = <&imx477>,"rotation:0"; + orientation = <&imx477>,"orientation:0"; }; }; diff --git a/arch/arm/boot/dts/overlays/ov5647-overlay.dts b/arch/arm/boot/dts/overlays/ov5647-overlay.dts index fd1e7a457f69..d7ed4703c9b0 100644 --- a/arch/arm/boot/dts/overlays/ov5647-overlay.dts +++ b/arch/arm/boot/dts/overlays/ov5647-overlay.dts @@ -22,6 +22,7 @@ ov5647: ov5647@36 { clocks = <&ov5647_clk>; rotation = <0>; + orientation = <2>; port { ov5647_0: endpoint { @@ -88,5 +89,6 @@ ov5647_clk: camera-clk { __overrides__ { rotation = <&ov5647>,"rotation:0"; + orientation = <&ov5647>,"orientation:0"; }; }; diff --git a/arch/arm/boot/dts/overlays/ov7251-overlay.dts b/arch/arm/boot/dts/overlays/ov7251-overlay.dts index da77a95c1296..09dbeda39d06 100644 --- a/arch/arm/boot/dts/overlays/ov7251-overlay.dts +++ b/arch/arm/boot/dts/overlays/ov7251-overlay.dts @@ -28,6 +28,9 @@ ov7251: ov7251@60 { vdda-supply = <&cam1_reg>; vddd-supply = <&ov7251_dvdd>; + rotation = <0>; + orientation = <2>; + port { ov7251_0: endpoint { remote-endpoint = <&csi1_ep>; @@ -102,4 +105,9 @@ __overlay__ { regulator-max-microvolt = <2800000>; }; }; + + __overrides__ { + rotation = <&ov7251>,"rotation:0"; + orientation = <&ov7251>,"orientation:0"; + }; }; diff --git a/arch/arm/boot/dts/overlays/ov9281-overlay.dts b/arch/arm/boot/dts/overlays/ov9281-overlay.dts index b7a9c8c539da..277236c03358 100644 --- a/arch/arm/boot/dts/overlays/ov9281-overlay.dts +++ b/arch/arm/boot/dts/overlays/ov9281-overlay.dts @@ -27,6 +27,9 @@ ov9281: ov9281@60 { dovdd-supply = <&ov9281_dovdd>; dvdd-supply = <&ov9281_dvdd>; + rotation = <0>; + orientation = <2>; + port { ov9281_0: endpoint { remote-endpoint = <&csi1_ep>; @@ -103,4 +106,8 @@ __overlay__ { }; }; + __overrides__ { + rotation = <&ov9281>,"rotation:0"; + orientation = <&ov9281>,"orientation:0"; + }; }; -- 2.33.0