-
Notifications
You must be signed in to change notification settings - Fork 5.4k
6.12/iob/topic/imx335 #6804
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
6.12/iob/topic/imx335 #6804
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
bb61ee0
media: imx335: Rectify name of mode struct
19af40e
media: imx335: Support vertical flip
4d86392
media: imx335: Set vblank immediately
Rahi374 b73f40d
media: imx335: Use correct register width for HNUM
796f522
defconfigs: Add IMX335 to all Pi defconfigs
kbingham 1d5ebb4
dtoverlays: Add overlay for the Sony IMX335 4-Lane camera
kbingham 59336a2
overlays: README: Fix 4 lane CSI2 documentation for Pi5
kbingham File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2754,7 +2754,7 @@ Params: rotation Mounting rotation of the camera sensor (0 or | |
| Compute Module (CSI0, i2c_vc, and cam0_reg). | ||
| vcm Configure a VCM focus drive on the sensor. | ||
| 4lane Enable 4 CSI2 lanes. This requires a Compute | ||
| Module (1, 3, or 4). | ||
| Module (1, 3, 4, or 5) or Pi 5. | ||
|
|
||
|
|
||
| Name: imx290 | ||
|
|
@@ -2763,7 +2763,7 @@ Info: Sony IMX290 camera module. | |
| variants. | ||
| Load: dtoverlay=imx290,<param> | ||
| Params: 4lane Enable 4 CSI2 lanes. This requires a Compute | ||
| Module (1, 3, or 4). | ||
| Module (1, 3, 4, or 5) or Pi 5. | ||
| clock-frequency Sets the clock frequency to match that used on | ||
| the board. | ||
| Modules from Vision Components use 37.125MHz | ||
|
|
@@ -2806,7 +2806,7 @@ Info: Sony IMX327 camera module. | |
| variants. | ||
| Load: dtoverlay=imx327,<param> | ||
| Params: 4lane Enable 4 CSI2 lanes. This requires a Compute | ||
| Module (1, 3, or 4). | ||
| Module (1, 3, 4, or 5) or Pi 5. | ||
| clock-frequency Sets the clock frequency to match that used on | ||
| the board. | ||
| Modules from Vision Components use 37.125MHz | ||
|
|
@@ -2823,6 +2823,25 @@ Params: 4lane Enable 4 CSI2 lanes. This requires a Compute | |
| Compute Module (CSI0, i2c_vc, and cam0_reg). | ||
|
|
||
|
|
||
| Name: imx335 | ||
| Info: Sony IMX335 camera module. | ||
| Uses Unicam 1, which is the standard camera connector on most Pi | ||
| variants. | ||
| Load: dtoverlay=imx335,<param> | ||
| Params: orientation Sensor orientation (0 = front, 1 = rear, | ||
| 2 = external, default external) | ||
| rotation Mounting rotation of the camera sensor (0 or | ||
| 180, default 0) | ||
| media-controller Configure use of Media Controller API for | ||
| configuring the sensor (default on) | ||
| link-frequency Allowable link frequency values to use in Hz: | ||
| 594000000 (default), 445500000. | ||
| cam0 Adopt the default configuration for CAM0 on a | ||
| Compute Module (CSI0, i2c_vc, and cam0_reg). | ||
| 4lane Enable 4 CSI2 lanes. This requires a Compute | ||
| Module (1, 3, 4, or 5) or Pi 5. | ||
|
|
||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 2 blank lines required here too.
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Ohh, sorry - I hadn't noticed there were two line gaps ... that's an easy fix too ;-) |
||
|
|
||
| Name: imx378 | ||
| Info: Sony IMX378 camera module. | ||
| Uses Unicam 1, which is the standard camera connector on most Pi | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,112 @@ | ||
| // SPDX-License-Identifier: GPL-2.0-only | ||
| // Definitions for IMX335 camera module on VC I2C bus | ||
| /dts-v1/; | ||
| /plugin/; | ||
|
|
||
| #include <dt-bindings/gpio/gpio.h> | ||
|
|
||
| /{ | ||
| compatible = "brcm,bcm2835"; | ||
|
|
||
| fragment@0 { | ||
| target = <&i2c0if>; | ||
| __overlay__ { | ||
| status = "okay"; | ||
| }; | ||
| }; | ||
|
|
||
| clk_frag: fragment@1 { | ||
| target = <&cam1_clk>; | ||
| __overlay__ { | ||
| status = "okay"; | ||
| clock-frequency = <24000000>; | ||
| }; | ||
| }; | ||
|
|
||
| fragment@2 { | ||
| target = <&i2c0mux>; | ||
| __overlay__ { | ||
| status = "okay"; | ||
| }; | ||
| }; | ||
|
|
||
| reg_frag: fragment@3 { | ||
| target = <&cam1_reg>; | ||
| cam_reg: __overlay__ { | ||
| startup-delay-us = <200000>; | ||
| off-on-delay-us = <30000>; | ||
| regulator-min-microvolt = <2900000>; | ||
| regulator-max-microvolt = <2900000>; | ||
| }; | ||
| }; | ||
|
|
||
| i2c_frag: fragment@100 { | ||
| target = <&i2c_csi_dsi>; | ||
| __overlay__ { | ||
| #address-cells = <1>; | ||
| #size-cells = <0>; | ||
| status = "okay"; | ||
|
|
||
| #include "imx335.dtsi" | ||
| }; | ||
| }; | ||
|
|
||
| csi_frag: fragment@101 { | ||
| target = <&csi1>; | ||
| csi: __overlay__ { | ||
| status = "okay"; | ||
|
|
||
| port { | ||
| csi_ep: endpoint { | ||
| remote-endpoint = <&cam_endpoint>; | ||
| clock-lanes = <0>; | ||
| data-lanes = <1 2>; | ||
| }; | ||
| }; | ||
| }; | ||
| }; | ||
|
|
||
| fragment@102 { | ||
| target = <&csi1>; | ||
| __dormant__ { | ||
| compatible = "brcm,bcm2835-unicam-legacy"; | ||
| }; | ||
| }; | ||
|
|
||
| fragment@201 { | ||
| target = <&csi_ep>; | ||
| __dormant__ { | ||
| data-lanes = <1 2 3 4>; | ||
| }; | ||
| }; | ||
|
|
||
| fragment@202 { | ||
| target = <&cam_endpoint>; | ||
| __dormant__ { | ||
| data-lanes = <1 2 3 4>; | ||
| }; | ||
| }; | ||
|
|
||
| __overrides__ { | ||
| rotation = <&cam_node>,"rotation:0"; | ||
| orientation = <&cam_node>,"orientation:0"; | ||
| media-controller = <0>,"!102"; | ||
|
|
||
| cam0 = <&i2c_frag>, "target:0=",<&i2c_csi_dsi0>, | ||
| <&csi_frag>, "target:0=",<&csi0>, | ||
| <&clk_frag>, "target:0=",<&cam0_clk>, | ||
| <®_frag>, "target:0=",<&cam0_reg>, | ||
| <&cam_node>, "clocks:0=",<&cam0_clk>, | ||
| <&cam_node>, "avdd-supply:0=",<&cam0_reg>; | ||
| link-frequency = <&cam_endpoint>,"link-frequencies#0"; | ||
| 4lane = <0>, "+201+202"; | ||
| }; | ||
| }; | ||
|
|
||
| &cam_node { | ||
| status = "okay"; | ||
| }; | ||
|
|
||
| &cam_endpoint { | ||
| remote-endpoint = <&csi_ep>; | ||
| }; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| // SPDX-License-Identifier: GPL-2.0-only | ||
| // Fragment that configures a Sony IMX335 | ||
|
|
||
| cam_node: imx335@1a { | ||
| compatible = "sony,imx335"; | ||
| reg = <0x1a>; | ||
| status = "disabled"; | ||
|
|
||
| clocks = <&cam1_clk>; | ||
| clock-names = "xclk"; | ||
|
|
||
| avdd-supply = <&cam1_reg>; /* Analog 2.9v */ | ||
| iovdd-supply = <&cam_dummy_reg>; /* Digital I/O 1.8v */ | ||
| dvdd-supply = <&cam_dummy_reg>; /* Digital Core 1.2v */ | ||
|
|
||
| rotation = <180>; | ||
| orientation = <2>; | ||
|
|
||
| port { | ||
| cam_endpoint: endpoint { | ||
| clock-lanes = <0>; | ||
| data-lanes = <1 2>; | ||
| link-frequencies = /bits/ 64 <594000000 445500000>; | ||
| }; | ||
| }; | ||
| }; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
2 blank lines required.