Add support for Omnivision OV5647
Subsystems (4)
v5 cover Add support for Omnivision OV5647
Hello,
This patch adds support for the Omnivision OV5647 sensor.
At the moment it only supports 640x480 in Raw 8.
This is the fifth version of the OV5647 camera driver patchset.
v5:
- Refactor code
- Change comments
- Add missing error handling in some functions
v4:
- Add correct license
- Revert debugging info to generic infrastructure
- Turn defines into enums
- Correct code style issues
- Remove unused defines
- Make sure all errors where being handled
- Rename some functions to make code more readable
- Add some debugging info
v3:
- No changes. Re-submitted due to lack of responses
v2:
- Corrections in DT documentation
Ramiro Oliveira (2):
Add OV5647 device tree documentation
Add support for OV5647 sensor
.../devicetree/bindings/media/i2c/ov5647.txt | 19 + MAINTAINERS | 7 + drivers/media/i2c/Kconfig | 12 + drivers/media/i2c/Makefile | 1 + drivers/media/i2c/ov5647.c | 866 +++++++++++++++++++++ 5 files changed, 905 insertions(+) create mode 100644 Documentation/devicetree/bindings/media/i2c/ov5647.txt create mode 100644 drivers/media/i2c/ov5647.c
Signature · 7 lines
2.10.2 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH v5 1/2 Add OV5647 device tree documentation
Add device tree documentation.
--- .../devicetree/bindings/media/i2c/ov5647.txt | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 Documentation/devicetree/bindings/media/i2c/ov5647.txt
Documentation/devicetree/bindings/media/i2c/ov5647.txt new file +19 -0
@@ -0,0 +1,19 @@ +Omnivision OV5647 raw image sensor +--------------------------------- + +OV5647 is a raw image sensor with MIPI CSI-2 and CCP2 image data interfaces +and CCI (I2C compatible) control bus. + +Required properties: + +- compatible : "ovti,ov5647"; +- reg : I2C slave address of the sensor; + +The common video interfaces bindings (see video-interfaces.txt) should be +used to specify link to the image data receiver. The OV5647 device +node should contain one 'port' child node with an 'endpoint' subnode. + +Following properties are valid for the endpoint node: + +- data-lanes : (optional) specifies MIPI CSI-2 data lanes as covered in + video-interfaces.txt. The sensor supports only two data lanes.
Signature · 7 lines
2.10.2 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v5 1/2] Add OV5647 device tree documentation
Hi Ramiro,
Thank you for the patch.
Quoted 23 lines · Ramiro Oliveira
Add device tree documentation.
--- .../devicetree/bindings/media/i2c/ov5647.txt | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 Documentation/devicetree/bindings/media/i2c/ov5647.txtDocumentation/devicetree/bindings/media/i2c/ov5647.txt new file +9
-0@@ -0,0 +1,19 @@ +Omnivision OV5647 raw image sensor +--------------------------------- + +OV5647 is a raw image sensor with MIPI CSI-2 and CCP2 image data interfaces +and CCI (I2C compatible) control bus. + +Required properties: + +- compatible : "ovti,ov5647";
Documentation/devicetree/bindings/media/i2c/ov5647.txt line 19
Quoted 10 lines
Documentation/devicetree/bindings/media/i2c/ov5647.txt new file +10
-0+- reg : I2C slave address of the sensor; + +The common video interfaces bindings (see video-interfaces.txt) should be +used to specify link to the image data receiver. The OV5647 device +node should contain one 'port' child node with an 'endpoint' subnode. + +Following properties are valid for the endpoint node: + +- data-lanes : (optional) specifies MIPI CSI-2 data lanes as covered in + video-interfaces.txt. The sensor supports only two data lanes.
Doesn't this sensor require a external clock, a reset GPIO and / or a regulator or a few? Do you need data-lanes, unless you can change the order or the number?
An example DT snippet wouldn't hurt.
Signature · 8 lines
Kind regards, Sakari Ailus e-mail: [email protected] XMPP: [email protected] -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v5 1/2] Add OV5647 device tree documentation
Hi Sakari,
Thank you for the feedback.
Quoted 34 lines · Sakari Ailus
Hi Ramiro,
Thank you for the patch.
Quoted 29 lines · Ramiro Oliveira
Add device tree documentation.
Signed-off-by Ramiro Oliveira <[email protected]>--- .../devicetree/bindings/media/i2c/ov5647.txt | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 Documentation/devicetree/bindings/media/i2c/ov5647.txtDocumentation/devicetree/bindings/media/i2c/ov5647.txt new file +15
-0@@ -0,0 +1,19 @@ +Omnivision OV5647 raw image sensor +--------------------------------- + +OV5647 is a raw image sensor with MIPI CSI-2 and CCP2 image data interfaces +and CCI (I2C compatible) control bus. + +Required properties: + +- compatible : "ovti,ov5647"; +- reg : I2C slave address of the sensor; + +The common video interfaces bindings (see video-interfaces.txt) should be +used to specify link to the image data receiver. The OV5647 device +node should contain one 'port' child node with an 'endpoint' subnode. +
Quoted 8 lines
Documentation/devicetree/bindings/media/i2c/ov5647.txt line 19
Quoted 4 lines
Documentation/devicetree/bindings/media/i2c/ov5647.txt new file +4
-0+Following properties are valid for the endpoint node: + +- data-lanes : (optional) specifies MIPI CSI-2 data lanes as covered in + video-interfaces.txt. The sensor supports only two data lanes.Doesn't this sensor require a external clock, a reset GPIO and / or a regulator or a few? Do you need data-lanes, unless you can change the order or the number?
In the setup I'm using, I'm not aware of any reset GPIO or regulator. I do use a external clock but it's fixed and not controlled by SW. Should I add a property for this?
Quoted 2 lines
An example DT snippet wouldn't hurt.
Sure, I can add a example snippet.
Quoted 1 line
Re: [PATCH v5 1/2] Add OV5647 device tree documentation
Hi Ramiro,
Quoted 48 lines · Ramiro Oliveira
Hi Sakari,
Thank you for the feedback.
Quoted 34 lines · Sakari Ailus
Hi Ramiro,
Thank you for the patch.
Quoted 29 lines · Ramiro Oliveira
Add device tree documentation.
--- .../devicetree/bindings/media/i2c/ov5647.txt | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 Documentation/devicetree/bindings/media/i2c/ov5647.txtDocumentation/devicetree/bindings/media/i2c/ov5647.txt new file +15
-0@@ -0,0 +1,19 @@ +Omnivision OV5647 raw image sensor +--------------------------------- + +OV5647 is a raw image sensor with MIPI CSI-2 and CCP2 image data interfaces +and CCI (I2C compatible) control bus. + +Required properties: + +- compatible : "ovti,ov5647"; +- reg : I2C slave address of the sensor; + +The common video interfaces bindings (see video-interfaces.txt) should be +used to specify link to the image data receiver. The OV5647 device +node should contain one 'port' child node with an 'endpoint' subnode. +Quoted 8 lines
Documentation/devicetree/bindings/media/i2c/ov5647.txt line 19
Quoted 4 lines
Documentation/devicetree/bindings/media/i2c/ov5647.txt new file +4
-0+Following properties are valid for the endpoint node: + +- data-lanes : (optional) specifies MIPI CSI-2 data lanes as covered in + video-interfaces.txt. The sensor supports only two data lanes.Doesn't this sensor require a external clock, a reset GPIO and / or a regulator or a few? Do you need data-lanes, unless you can change the order or the number?
Quoted 3 lines
In the setup I'm using, I'm not aware of any reset GPIO or regulator. I do use a external clock but it's fixed and not controlled by SW. Should I add a property for this?
The sensor datasheet defines a power-up and power-down sequence for the device. If you don't implement these sequences in the driver on a DT based system, nothing suggests that they're implemented correctly. Could it be that the boot loader simply enables the regulators or another device requires them to be enabled?
I presume at least the reset GPIO should be controlled explicitly in order to ensure correct function. Although hardware can be surprising: I have one production system that has no reset GPIO for the sensor albeit the sensor datasheet says that's part of the power up sequence.
Quoted 8 lines
Quoted 3 lines
An example DT snippet wouldn't hurt.
Sure, I can add a example snippet.
Quoted 1 line
Signature · 8 lines
Kind regards, Sakari Ailus e-mail: [email protected] XMPP: [email protected] -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v5 1/2] Add OV5647 device tree documentation
Hi Sakari
Quoted 61 lines · Sakari Ailus
Hi Ramiro,
Quoted 48 lines · Ramiro Oliveira
Hi Sakari,
Thank you for the feedback.
Quoted 34 lines · Sakari Ailus
Hi Ramiro,
Thank you for the patch.
Quoted 29 lines · Ramiro Oliveira
Add device tree documentation.
--- .../devicetree/bindings/media/i2c/ov5647.txt | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 Documentation/devicetree/bindings/media/i2c/ov5647.txtDocumentation/devicetree/bindings/media/i2c/ov5647.txt new file +15
-0@@ -0,0 +1,19 @@ +Omnivision OV5647 raw image sensor +--------------------------------- + +OV5647 is a raw image sensor with MIPI CSI-2 and CCP2 image data interfaces +and CCI (I2C compatible) control bus. + +Required properties: + +- compatible : "ovti,ov5647"; +- reg : I2C slave address of the sensor; + +The common video interfaces bindings (see video-interfaces.txt) should be +used to specify link to the image data receiver. The OV5647 device +node should contain one 'port' child node with an 'endpoint' subnode. +Quoted 8 lines
Documentation/devicetree/bindings/media/i2c/ov5647.txt line 19
Quoted 4 lines
Documentation/devicetree/bindings/media/i2c/ov5647.txt new file +4
-0+Following properties are valid for the endpoint node: + +- data-lanes : (optional) specifies MIPI CSI-2 data lanes as covered in + video-interfaces.txt. The sensor supports only two data lanes.Doesn't this sensor require a external clock, a reset GPIO and / or a regulator or a few? Do you need data-lanes, unless you can change the order or the number?
Quoted 3 lines
In the setup I'm using, I'm not aware of any reset GPIO or regulator. I do use a external clock but it's fixed and not controlled by SW. Should I add a property for this?
The sensor datasheet defines a power-up and power-down sequence for the device. If you don't implement these sequences in the driver on a DT based system, nothing suggests that they're implemented correctly. Could it be that the boot loader simply enables the regulators or another device requires them to be enabled?
Quoted 5 lines
I presume at least the reset GPIO should be controlled explicitly in order to ensure correct function. Although hardware can be surprising: I have one production system that has no reset GPIO for the sensor albeit the sensor datasheet says that's part of the power up sequence.
Sorry for the misunderstanding. I wanted to say that, there is no SW controlled reset. In the board we're using to connect the sensor to our D-PHY we have a GPIO controller that when it receives power, it removes the sensor from reset, so I have no control over that.
Regarding the clock, should I create a new property?
And also, regarding the data-lanes, AFAIK it isn't possible to change the order of the data and clock lanes so should I remove that property?
Quoted 9 lines
Quoted 8 lines
Quoted 3 lines
An example DT snippet wouldn't hurt.
Sure, I can add a example snippet.
Quoted 1 line
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v5 1/2] Add OV5647 device tree documentation
Hi Ramiro,
Quoted 70 lines · Ramiro Oliveira
Hi Sakari
Quoted 61 lines · Sakari Ailus
Hi Ramiro,
Quoted 48 lines · Ramiro Oliveira
Hi Sakari,
Thank you for the feedback.
Quoted 34 lines · Sakari Ailus
Hi Ramiro,
Thank you for the patch.
Quoted 29 lines · Ramiro Oliveira
Add device tree documentation.
--- .../devicetree/bindings/media/i2c/ov5647.txt | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 Documentation/devicetree/bindings/media/i2c/ov5647.txtDocumentation/devicetree/bindings/media/i2c/ov5647.txt new file +15
-0@@ -0,0 +1,19 @@ +Omnivision OV5647 raw image sensor +--------------------------------- + +OV5647 is a raw image sensor with MIPI CSI-2 and CCP2 image data interfaces +and CCI (I2C compatible) control bus. + +Required properties: + +- compatible : "ovti,ov5647"; +- reg : I2C slave address of the sensor; + +The common video interfaces bindings (see video-interfaces.txt) should be +used to specify link to the image data receiver. The OV5647 device +node should contain one 'port' child node with an 'endpoint' subnode. +Quoted 8 lines
Documentation/devicetree/bindings/media/i2c/ov5647.txt line 19
Quoted 4 lines
Documentation/devicetree/bindings/media/i2c/ov5647.txt new file +4
-0+Following properties are valid for the endpoint node: + +- data-lanes : (optional) specifies MIPI CSI-2 data lanes as covered in + video-interfaces.txt. The sensor supports only two data lanes.Doesn't this sensor require a external clock, a reset GPIO and / or a regulator or a few? Do you need data-lanes, unless you can change the order or the number?
Quoted 3 lines
In the setup I'm using, I'm not aware of any reset GPIO or regulator. I do use a external clock but it's fixed and not controlled by SW. Should I add a property for this?
The sensor datasheet defines a power-up and power-down sequence for the device. If you don't implement these sequences in the driver on a DT based system, nothing suggests that they're implemented correctly. Could it be that the boot loader simply enables the regulators or another device requires them to be enabled?
Quoted 5 lines
I presume at least the reset GPIO should be controlled explicitly in order to ensure correct function. Although hardware can be surprising: I have one production system that has no reset GPIO for the sensor albeit the sensor datasheet says that's part of the power up sequence.
Quoted 4 lines
Sorry for the misunderstanding. I wanted to say that, there is no SW controlled reset. In the board we're using to connect the sensor to our D-PHY we have a GPIO controller that when it receives power, it removes the sensor from reset, so I have no control over that.
Do you mean to say that there's a GPIO controller but there's not (yet?) a driver for that or that the reset line is actually hard-wired to something else?
Quoted 2 lines
Regarding the clock, should I create a new property?
Yes. The sensor does require a clock.
Quoted 3 lines
And also, regarding the data-lanes, AFAIK it isn't possible to change the order of the data and clock lanes so should I remove that property?
Sounds good to me.
Quoted 14 lines
Quoted 10 lines
Quoted 9 lines
Quoted 4 lines
An example DT snippet wouldn't hurt.
Sure, I can add a example snippet.
Quoted 1 line
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Signature · 6 lines
Sakari Ailus e-mail: [email protected] XMPP: [email protected] -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v5 1/2] Add OV5647 device tree documentation
Hi Sakari
Quoted 73 lines · Sakari Ailus
Hi Ramiro,
Quoted 70 lines · Ramiro Oliveira
Hi Sakari
Quoted 66 lines · Sakari Ailus
Hi Ramiro,
Quoted 48 lines · Ramiro Oliveira
Hi Sakari,
Thank you for the feedback.
Quoted 34 lines · Sakari Ailus
Hi Ramiro,
Thank you for the patch.
Quoted 29 lines · Ramiro Oliveira
Add device tree documentation.
Signed-off-by Ramiro Oliveira <[email protected]>--- .../devicetree/bindings/media/i2c/ov5647.txt | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 Documentation/devicetree/bindings/media/i2c/ov5647.txtDocumentation/devicetree/bindings/media/i2c/ov5647.txt new file +15
-0@@ -0,0 +1,19 @@ +Omnivision OV5647 raw image sensor +--------------------------------- + +OV5647 is a raw image sensor with MIPI CSI-2 and CCP2 image data interfaces +and CCI (I2C compatible) control bus. + +Required properties: + +- compatible : "ovti,ov5647"; +- reg : I2C slave address of the sensor; + +The common video interfaces bindings (see video-interfaces.txt) should be +used to specify link to the image data receiver. The OV5647 device +node should contain one 'port' child node with an 'endpoint' subnode. +Quoted 8 lines
Documentation/devicetree/bindings/media/i2c/ov5647.txt line 19
Quoted 4 lines
Documentation/devicetree/bindings/media/i2c/ov5647.txt new file +4
-0+Following properties are valid for the endpoint node: + +- data-lanes : (optional) specifies MIPI CSI-2 data lanes as covered in + video-interfaces.txt. The sensor supports only two data lanes.Doesn't this sensor require a external clock, a reset GPIO and / or a regulator or a few? Do you need data-lanes, unless you can change the order or the number?
Quoted 3 lines
In the setup I'm using, I'm not aware of any reset GPIO or regulator. I do use a external clock but it's fixed and not controlled by SW. Should I add a property for this?
The sensor datasheet defines a power-up and power-down sequence for the device. If you don't implement these sequences in the driver on a DT based system, nothing suggests that they're implemented correctly. Could it be that the boot loader simply enables the regulators or another device requires them to be enabled?
I presume at least the reset GPIO should be controlled explicitly in order to ensure correct function. Although hardware can be surprising: I have one production system that has no reset GPIO for the sensor albeit the sensor datasheet says that's part of the power up sequence.
Quoted 9 lines
Quoted 4 lines
Sorry for the misunderstanding. I wanted to say that, there is no SW controlled reset. In the board we're using to connect the sensor to our D-PHY we have a GPIO controller that when it receives power, it removes the sensor from reset, so I have no control over that.
Do you mean to say that there's a GPIO controller but there's not (yet?) a driver for that or that the reset line is actually hard-wired to something else?
The reset line is hardwired to a GPIO controller that when powered-on removes the sensor from reset. However I have no control over the GPIO controller.
Quoted 26 lines
Quoted 2 lines
Regarding the clock, should I create a new property?
Yes. The sensor does require a clock.
Quoted 3 lines
And also, regarding the data-lanes, AFAIK it isn't possible to change the order of the data and clock lanes so should I remove that property?
Sounds good to me.
Quoted 14 lines
Quoted 10 lines
Quoted 9 lines
Quoted 4 lines
An example DT snippet wouldn't hurt.
Sure, I can add a example snippet.
Quoted 1 line
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v5 1/2] Add OV5647 device tree documentation
Hi Ramiro,
Quoted 81 lines · Ramiro Oliveira
Hi Sakari
Quoted 78 lines · Sakari Ailus
Hi Ramiro,
Quoted 74 lines · Ramiro Oliveira
Hi Sakari
Quoted 61 lines · Sakari Ailus
Hi Ramiro,
Quoted 48 lines · Ramiro Oliveira
Hi Sakari,
Thank you for the feedback.
Quoted 34 lines · Sakari Ailus
Hi Ramiro,
Thank you for the patch.
Quoted 29 lines · Ramiro Oliveira
Add device tree documentation.
--- .../devicetree/bindings/media/i2c/ov5647.txt | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 Documentation/devicetree/bindings/media/i2c/ov5647.txtDocumentation/devicetree/bindings/media/i2c/ov5647.txt new file +15
-0@@ -0,0 +1,19 @@ +Omnivision OV5647 raw image sensor +--------------------------------- + +OV5647 is a raw image sensor with MIPI CSI-2 and CCP2 image data interfaces +and CCI (I2C compatible) control bus. + +Required properties: + +- compatible : "ovti,ov5647"; +- reg : I2C slave address of the sensor; + +The common video interfaces bindings (see video-interfaces.txt) should be +used to specify link to the image data receiver. The OV5647 device +node should contain one 'port' child node with an 'endpoint' subnode. +Quoted 8 lines
Documentation/devicetree/bindings/media/i2c/ov5647.txt line 19
Quoted 4 lines
Documentation/devicetree/bindings/media/i2c/ov5647.txt new file +4
-0+Following properties are valid for the endpoint node: + +- data-lanes : (optional) specifies MIPI CSI-2 data lanes as covered in + video-interfaces.txt. The sensor supports only two data lanes.Doesn't this sensor require a external clock, a reset GPIO and / or a regulator or a few? Do you need data-lanes, unless you can change the order or the number?
Quoted 3 lines
In the setup I'm using, I'm not aware of any reset GPIO or regulator. I do use a external clock but it's fixed and not controlled by SW. Should I add a property for this?
The sensor datasheet defines a power-up and power-down sequence for the device. If you don't implement these sequences in the driver on a DT based system, nothing suggests that they're implemented correctly. Could it be that the boot loader simply enables the regulators or another device requires them to be enabled?
Quoted 5 lines
I presume at least the reset GPIO should be controlled explicitly in order to ensure correct function. Although hardware can be surprising: I have one production system that has no reset GPIO for the sensor albeit the sensor datasheet says that's part of the power up sequence.
Sorry for the misunderstanding. I wanted to say that, there is no SW controlled reset. In the board we're using to connect the sensor to our D-PHY we have a GPIO controller that when it receives power, it removes the sensor from reset, so I have no control over that.
Quoted 7 lines
Quoted 4 lines
Do you mean to say that there's a GPIO controller but there's not (yet?) a driver for that or that the reset line is actually hard-wired to something else?
The reset line is hardwired to a GPIO controller that when powered-on removes the sensor from reset. However I have no control over the GPIO controller.
A GPIO controller is a piece of hardware that lets software to, typically, both configure the direction and change and read the state of its input / output pins. You seem to have something else on the board, such as chip giving a power good signal.
If there really is no software control to to these resources, I suggest not to implement the power up / down sequences as you can't test them anyway. We can always add the DT properties (as optional) to the DT documentation.
You still should have the clock frequency in DT and check that in the driver, even if you don't get a clock. Presumably your current register lists assume a particular frequency but AFAIR that wasn't clearly visible anywhere.
Signature · 8 lines
Kind regards, Sakari Ailus e-mail: [email protected] XMPP: [email protected] -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH v5 2/2 Add support for OV5647 sensor
In reply to Ramiro OliveiraAdd support for OV5647 sensor.
Modes supported:
- 640x480 RAW 8
--- MAINTAINERS | 7 + drivers/media/i2c/Kconfig | 12 + drivers/media/i2c/Makefile | 1 + drivers/media/i2c/ov5647.c | 866 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 886 insertions(+) create mode 100644 drivers/media/i2c/ov5647.c
MAINTAINERS +7 -0
@@ -8923,6 +8923,13 @@ M: Harald Welte <[email protected]> S: Maintained F: drivers/char/pcmcia/cm4040_cs.* +OMNIVISION OV5647 SENSOR DRIVER +M: Ramiro Oliveira <roliveir-HKixBCOQz3hWk0Htik3J/[email protected]> +L: [email protected] +T: git git://linuxtv.org/media_tree.git +S: Maintained +F: drivers/media/i2c/ov5647.c + OMNIVISION OV7670 SENSOR DRIVER M: Jonathan Corbet <[email protected]> L: [email protected]
drivers/media/i2c/Kconfig +12 -0
@@ -531,6 +531,18 @@ config VIDEO_OV2659 To compile this driver as a module, choose M here: the module will be called ov2659. +config VIDEO_OV5647 + tristate "OmniVision OV5647 sensor support" + depends on OF + depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API + depends on MEDIA_CAMERA_SUPPORT + ---help--- + This is a Video4Linux2 sensor-level driver for the OmniVision + OV5647 camera. + + To compile this driver as a module, choose M here: the + module will be called ov5647. + config VIDEO_OV7640 tristate "OmniVision OV7640 sensor support" depends on I2C && VIDEO_V4L2
drivers/media/i2c/Makefile +1 -0
@@ -82,3 +82,4 @@ obj-$(CONFIG_VIDEO_IR_I2C) += ir-kbd-i2c.o obj-$(CONFIG_VIDEO_ML86V7667) += ml86v7667.o obj-$(CONFIG_VIDEO_OV2659) += ov2659.o obj-$(CONFIG_VIDEO_TC358743) += tc358743.o +obj-$(CONFIG_VIDEO_OV5647) += ov5647.o
drivers/media/i2c/ov5647.c new file +866 -0
866 lines not on this page · raw message
Signature · 7 lines
2.10.2 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v5 2/2] Add support for OV5647 sensor
Hi Ramiro,
Quoted 37 lines · Ramiro Oliveira
Add support for OV5647 sensor.
Modes supported:
- 640x480 RAW 8Signed-off-by Ramiro Oliveira <[email protected]>--- MAINTAINERS | 7 + drivers/media/i2c/Kconfig | 12 + drivers/media/i2c/Makefile | 1 + drivers/media/i2c/ov5647.c | 866 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 886 insertions(+) create mode 100644 drivers/media/i2c/ov5647.cMAINTAINERS +7
-0@@ -8923,6 +8923,13 @@ M: Harald Welte <[email protected]> S: Maintained F: drivers/char/pcmcia/cm4040_cs.* +OMNIVISION OV5647 SENSOR DRIVER +M: Ramiro Oliveira <[email protected]> +L: [email protected] +T: git git://linuxtv.org/media_tree.git +S: Maintained +F: drivers/media/i2c/ov5647.c + OMNIVISION OV7670 SENSOR DRIVER M: Jonathan Corbet <[email protected]> L: [email protected]drivers/media/i2c/Kconfig +0
-0
drivers/media/i2c/Kconfig config VIDEO_OV2659 · line 536
Quoted 6 lines
drivers/media/i2c/Kconfig +3
-0@@ -531,6 +531,18 @@ config VIDEO_OV2659 To compile this driver as a module, choose M here: the module will be called ov2659. +config VIDEO_OV5647 + tristate "OmniVision OV5647 sensor support" + depends on OF
How does this driver depend on OF, other than matching the compatible string?
Quoted 49 lines
drivers/media/i2c/Kconfig +9
-0+ depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API + depends on MEDIA_CAMERA_SUPPORT + ---help--- + This is a Video4Linux2 sensor-level driver for the OmniVision + OV5647 camera. + + To compile this driver as a module, choose M here: the + module will be called ov5647. + config VIDEO_OV7640 tristate "OmniVision OV7640 sensor support" depends on I2C && VIDEO_V4L2drivers/media/i2c/Makefile +1
-0@@ -82,3 +82,4 @@ obj-$(CONFIG_VIDEO_IR_I2C) += ir-kbd-i2c.o obj-$(CONFIG_VIDEO_ML86V7667) += ml86v7667.o obj-$(CONFIG_VIDEO_OV2659) += ov2659.o obj-$(CONFIG_VIDEO_TC358743) += tc358743.o +obj-$(CONFIG_VIDEO_OV5647) += ov5647.odrivers/media/i2c/ov5647.c new file +22
-0@@ -0,0 +1,866 @@ +/* +* A V4L2 driver for OmniVision OV5647 cameras. +* +* Based on Samsung S5K6AAFX SXGA 1/6" 1.3M CMOS Image Sensor driver +* Copyright (C) 2011 Sylwester Nawrocki <[email protected]> +* +* Based on Omnivision OV7670 Camera Driver +* Copyright (C) 2006-7 Jonathan Corbet <[email protected]> +* +* Copyright (C) 2016, Synopsys, Inc. +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License as +* published by the Free Software Foundation version 2. +* +* This program is distributed .as is. WITHOUT ANY WARRANTY of any +* kind, whether express or implied; without even the implied warranty +* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +*/ +#include <linux/init.h> +#include <linux/module.h>
drivers/media/i2c/ov5647.c line 32
Quoted 10 lines
drivers/media/i2c/ov5647.c new file +10
-0+#include <linux/slab.h> +#include <linux/i2c.h> +#include <linux/delay.h> +#include <linux/videodev2.h> +#include <media/v4l2-device.h> +#include <media/v4l2-ctrls.h> +#include <media/v4l2-mediabus.h> +#include <media/v4l2-image-sizes.h> +#include <media/v4l2-of.h> +#include <linux/io.h>
Alphabetical order, please.
Quoted 61 lines
drivers/media/i2c/ov5647.c new file +61
-0+ +#define SENSOR_NAME "ov5647" + +#define OV5647_SW_RESET 0x1003 +#define OV5647_REG_CHIPID_H 0x300A +#define OV5647_REG_CHIPID_L 0x300B + +#define REG_TERM 0xfffe +#define VAL_TERM 0xfe +#define REG_DLY 0xffff + +#define OV5647_ROW_START 0x01 +#define OV5647_ROW_START_MIN 0 +#define OV5647_ROW_START_MAX 2004 +#define OV5647_ROW_START_DEF 54 + +#define OV5647_COLUMN_START 0x02 +#define OV5647_COLUMN_START_MIN 0 +#define OV5647_COLUMN_START_MAX 2750 +#define OV5647_COLUMN_START_DEF 16 + +#define OV5647_WINDOW_HEIGHT 0x03 +#define OV5647_WINDOW_HEIGHT_MIN 2 +#define OV5647_WINDOW_HEIGHT_MAX 2006 +#define OV5647_WINDOW_HEIGHT_DEF 1944 + +#define OV5647_WINDOW_WIDTH 0x04 +#define OV5647_WINDOW_WIDTH_MIN 2 +#define OV5647_WINDOW_WIDTH_MAX 2752 +#define OV5647_WINDOW_WIDTH_DEF 2592 + +struct regval_list { +u16 addr; +u8 data; +}; + +struct cfg_array { +struct regval_list *regs; +int size; +}; + +struct sensor_win_size { +int width; +int height; +unsigned int hoffset; +unsigned int voffset; +unsigned int hts; +unsigned int vts; +unsigned int pclk; +unsigned int mipi_bps; +unsigned int fps_fixed; +unsigned int bin_factor; +unsigned int intg_min; +unsigned int intg_max; +void *regs; +int regs_size; +int (*set_size)(struct v4l2_subdev *sd); +}; + + +struct ov5647 {
drivers/media/i2c/ov5647.c line 103
Quoted 10 lines
drivers/media/i2c/ov5647.c new file +10
-0+struct device *dev; +struct v4l2_subdev sd; +struct media_pad pad; +struct mutex lock; +struct v4l2_mbus_framefmt format; +struct sensor_format_struct *fmt; +unsigned int width; +unsigned int height; +unsigned int capture_mode; +int hue;
At least capture_mode and hue are unused. Please remove unused fields.
Quoted 12 lines
drivers/media/i2c/ov5647.c new file +12
-0+struct v4l2_fract tpf; +struct sensor_win_size *current_wins; +}; + +static inline struct ov5647 *to_state (struct v4l2_subdev *sd) +{ + return container_of(sd, struct ov5647, sd); +} + +static struct regval_list sensor_oe_disable_regs[] = { + {0x3000 ,0x00 }, + {0x3001 ,0x00 },
drivers/media/i2c/ov5647.c line 125
Quoted 10 lines
drivers/media/i2c/ov5647.c new file +10
-0+ {0x3002, 0x00}, +}; + +static struct regval_list sensor_oe_enable_regs[] = { + {0x3000 ,0x0f }, + {0x3001 ,0xff }, + {0x3002 ,0xe4 }, +}; + +static struct regval_list ov5647_640x480[] = {
Does this list expect a certain external clock frequency? If it does, should you check that the actual frequency matches with the expectation?
Quoted 219 lines
drivers/media/i2c/ov5647.c new file +219
-0+ {0x0100, 0x00}, + {0x0103, 0x01}, + {0x3034, 0x08}, + {0x3035, 0x21}, + {0x3036, 0x46}, + {0x303c, 0x11}, + {0x3106, 0xf5}, + {0x3821, 0x07}, + {0x3820, 0x41}, + {0x3827, 0xec}, + {0x370c, 0x0f}, + {0x3612, 0x59}, + {0x3618, 0x00}, + {0x5000, 0x06}, + {0x5001, 0x01}, + {0x5002, 0x41}, + {0x5003, 0x08}, + {0x5a00, 0x08}, + {0x3000, 0x00}, + {0x3001, 0x00}, + {0x3002, 0x00}, + {0x3016, 0x08}, + {0x3017, 0xe0}, + {0x3018, 0x44}, + {0x301c, 0xf8}, + {0x301d, 0xf0}, + {0x3a18, 0x00}, + {0x3a19, 0xf8}, + {0x3c01, 0x80}, + {0x3b07, 0x0c}, + {0x380c, 0x07}, + {0x380d, 0x68}, + {0x380e, 0x03}, + {0x380f, 0xd8}, + {0x3814, 0x31}, + {0x3815, 0x31}, + {0x3708, 0x64}, + {0x3709, 0x52}, + {0x3808, 0x02}, + {0x3809, 0x80}, + {0x380a, 0x01}, + {0x380b, 0xE0}, + {0x3801, 0x00}, + {0x3802, 0x00}, + {0x3803, 0x00}, + {0x3804, 0x0a}, + {0x3805, 0x3f}, + {0x3806, 0x07}, + {0x3807, 0xa1}, + {0x3811, 0x08}, + {0x3813, 0x02}, + {0x3630, 0x2e}, + {0x3632, 0xe2}, + {0x3633, 0x23}, + {0x3634, 0x44}, + {0x3636, 0x06}, + {0x3620, 0x64}, + {0x3621, 0xe0}, + {0x3600, 0x37}, + {0x3704, 0xa0}, + {0x3703, 0x5a}, + {0x3715, 0x78}, + {0x3717, 0x01}, + {0x3731, 0x02}, + {0x370b, 0x60}, + {0x3705, 0x1a}, + {0x3f05, 0x02}, + {0x3f06, 0x10}, + {0x3f01, 0x0a}, + {0x3a08, 0x01}, + {0x3a09, 0x27}, + {0x3a0a, 0x00}, + {0x3a0b, 0xf6}, + {0x3a0d, 0x04}, + {0x3a0e, 0x03}, + {0x3a0f, 0x58}, + {0x3a10, 0x50}, + {0x3a1b, 0x58}, + {0x3a1e, 0x50}, + {0x3a11, 0x60}, + {0x3a1f, 0x28}, + {0x4001, 0x02}, + {0x4004, 0x02}, + {0x4000, 0x09}, + {0x4837, 0x24}, + {0x4050, 0x6e}, + {0x4051, 0x8f}, + {0x0100, 0x01}, +}; + +struct sensor_format_struct ; + +/** +* @short I2C Write operation +* @param[in] i2c_client I2C client +* @param[in] reg register address +* @param[in] val value to write +* @return Error code +*/ +static int ov5647_write (struct v4l2_subdev *sd,u16 reg,u8 val) +{ +int ret; +unsigned char data[3 ] = { reg >>8 , reg &0xff , val}; +struct i2c_client *client =v4l2_get_subdevdata (sd); + + ret =i2c_master_send (client, data,3 ); +if (ret !=3 ) { +dev_dbg (&client->dev,"%s: i2c write error, reg: %x\n" , + __func__, reg); +return ret <0 ? ret : -EIO ; + } +return 0 ; +} + +/** +* @short I2C Read operation +* @param[in] i2c_client I2C client +* @param[in] reg register address +* @param[out] val value read +* @return Error code +*/ +static int ov5647_read (struct v4l2_subdev *sd,u16 reg,u8 *val) +{ +int ret; +unsigned char data_w[2 ] = { reg >>8 , reg &0xff }; +struct i2c_client *client =v4l2_get_subdevdata (sd); + + + ret =i2c_master_send (client, data_w,2 ); + +if (ret <2 ) { +dev_dbg (&client->dev,"%s: i2c read error, reg: %x\n" , + __func__, reg); +return ret <0 ? ret : -EIO ; + } + + + ret =i2c_master_recv (client, val,1 ); + +if (ret <1 ) { +dev_dbg (&client->dev,"%s: i2c read error, reg: %x\n" , + __func__, reg); +return ret <0 ? ret : -EIO ; + } +return 0 ; +} + +static int ov5647_write_array (struct v4l2_subdev *sd, +struct regval_list *regs,int array_size) +{ +int i =0 ; +int ret =0 ; + +if (!regs) +return -EINVAL ; + +while (i < array_size) { + ret =ov5647_write (sd, regs->addr, regs->data); +if (ret <0 ) +return ret; + i++; + regs++; + } +return 0 ; +} + +static void ov5647_set_virtual_channel (struct v4l2_subdev *sd,int channel) +{ +u8 channel_id; + +ov5647_read (sd,0x4814 , &channel_id); + channel_id &= ~(3 <<6 ); +ov5647_write (sd,0x4814 , channel_id | (channel <<6 )); +} + +void ov5647_stream_on (struct v4l2_subdev *sd) +{ +struct i2c_client *client =v4l2_get_subdevdata (sd); + +ov5647_write (sd,0x4202 ,0x00 ); +dev_dbg (&client->dev,"Stream on" ); +ov5647_write (sd,0x300D ,0x00 ); +} + +void ov5647_stream_off (struct v4l2_subdev *sd) +{ +struct i2c_client *client =v4l2_get_subdevdata (sd); + +ov5647_write (sd,0x4202 ,0x0f ); +dev_dbg (&client->dev,"Stream off" ); +ov5647_write (sd,0x300D ,0x01 ); +} + +/****************************************************************************/ + +/** +* @short Set SW standby +* @param[in] sd v4l2 sd +* @param[in] stanby standby mode status (on or off) +* @return Error code +*/ +static int set_sw_standby (struct v4l2_subdev *sd,bool standby) +{ +int ret; +unsigned char rdval; + + ret =ov5647_read (sd,0x0100 , &rdval); +if (ret !=0 ) +return ret; + +if (standby) + rdval &=0xfe ; +else + rdval |=0x01 ; + + ret =ov5647_write (sd,0x0100 , rdval); + +return ret; +}
drivers/media/i2c/ov5647.c line 354
Quoted 10 lines
drivers/media/i2c/ov5647.c new file +10
-0+ +/** +* @short Store information about the video data format. +*/ +static struct sensor_format_struct { + u8 *desc; + u32 mbus_code; + struct regval_list *regs; + int regs_size; + int bpp;
At least desc and bpp are unused.
Quoted 137 lines
drivers/media/i2c/ov5647.c new file +137
-0+} sensor_formats[] = { + { + .desc = "Raw RGB Bayer", + .mbus_code = MEDIA_BUS_FMT_SBGGR8_1X8, + .regs = ov5647_640x480, + .regs_size = ARRAY_SIZE(ov5647_640x480), + .bpp = 1 + }, +}; +#define N_FMTS ARRAY_SIZE(sensor_formats) + +/* ----------------------------------------------------------------------- */ + +/** + * @short Initialize sensor + * @param[in] sd v4l2 subdev + * @param[in] val not used + * @return Error code + */ +static int __sensor_init(struct v4l2_subdev *sd) +{ + int ret; + u8 resetval; + u8 rdval; + struct i2c_client *client = v4l2_get_subdevdata(sd); + + dev_dbg(&client->dev, "sensor init\n"); + + ret = ov5647_read(sd, 0x0100, &rdval); + if (ret != 0) + return ret; + + ov5647_write(sd, 0x4800, 0x25); + ov5647_stream_off(sd); + + ret = ov5647_write_array(sd, ov5647_640x480, + ARRAY_SIZE(ov5647_640x480)); + if (ret < 0) { + dev_err(&client->dev, "write sensor_default_regs error\n"); + return ret; + } + + ov5647_set_virtual_channel(sd, 0); + + ov5647_read(sd, 0x0100, &resetval); + if (!(resetval & 0x01)) { + dev_err(&client->dev, "Device was in SW standby"); + ov5647_write(sd, 0x0100, 0x01); + } + + ov5647_write(sd, 0x4800, 0x04); + ov5647_stream_on(sd); + + return 0; +} + +/** + * @short Control sensor power state + * @param[in] sd v4l2 subdev + * @param[in] on Sensor power + * @return Error code + */ +static int sensor_power(struct v4l2_subdev *sd, int on) +{ + int ret; + struct ov5647 *ov5647 = to_state(sd); + struct i2c_client *client = v4l2_get_subdevdata(sd); + + ret = 0; + mutex_lock(&ov5647->lock); + + if (on) { + dev_dbg(&client->dev, "OV5647 power on\n"); + + ret = ov5647_write_array(sd, sensor_oe_enable_regs, + ARRAY_SIZE(sensor_oe_enable_regs)); + + ret = __sensor_init(sd); + + if (ret < 0) + dev_err(&client->dev, + "Camera not available, check Power\n"); + } else { + dev_dbg(&client->dev, "OV5647 power off\n"); + + dev_dbg(&client->dev, "disable oe\n"); + ret = ov5647_write_array(sd, sensor_oe_disable_regs, + ARRAY_SIZE(sensor_oe_disable_regs)); + + if (ret < 0) + dev_dbg(&client->dev, "disable oe failed\n"); + + ret = set_sw_standby(sd, true); + + if (ret < 0) + dev_dbg(&client->dev, "soft stby failed\n"); + + } + + mutex_unlock(&ov5647->lock); + + return ret; +} + +#ifdef CONFIG_VIDEO_ADV_DEBUG +/** + * @short Get register value + * @param[in] sd v4l2 subdev + * @param[in] reg register struct + * @return Error code + */ +static int sensor_get_register(struct v4l2_subdev *sd, + struct v4l2_dbg_register *reg) +{ + unsigned char val = 0; + int ret; + + ret = ov5647_read(sd, reg->reg & 0xff, &val); + if (ret != 0) + return ret; + + reg->val = val; + reg->size = 1; + + return ret; +} + +/** + * @short Set register value + * @param[in] sd v4l2 subdev + * @param[in] reg register struct + * @return Error code + */ +static int sensor_set_register(struct v4l2_subdev *sd, + const struct v4l2_dbg_register *reg) +{ + return ov5647_write(sd, reg->reg & 0xff, reg->val & 0xff);
drivers/media/i2c/ov5647.c line 501
Quoted 10 lines
drivers/media/i2c/ov5647.c new file +10
-0+} +#endif + +/* ----------------------------------------------------------------------- */ + +/** +* @short Subdev core operations registration +*/ +static const struct v4l2_subdev_core_ops sensor_core_ops = { + .s_power = sensor_power,
The s_power() op will be called by the bridge (ISP) driver as well. You should expect that it may be enabled more than once before being disabled equal number of times.
Quoted 62 lines
drivers/media/i2c/ov5647.c new file +62
-0+#ifdef CONFIG_VIDEO_ADV_DEBUG + .g_register = sensor_get_register, + .s_register = sensor_set_register, +#endif +}; + +/* ----------------------------------------------------------------------- */ + + + +/** +* @short Enumerate available image formats +* @param[in] sd v4l2 subdev +* @param[in] index index +* @param[in] code MBUS Pixel code +* @return Error code +*/ +static int sensor_enum_fmt (struct v4l2_subdev *sd, +struct v4l2_subdev_pad_config *cfg, +struct v4l2_subdev_mbus_code_enum *code) +{ +if (code->pad || code->index >=N_FMTS ) +return -EINVAL ; + + code->code = sensor_formats[code->index].mbus_code; +return 0 ; +} + +/** +* @short Try frame format internal function +* @param[in] sd v4l2 subdev +* @param[in] fmt frame format +* @return Error code +*/ +static int sensor_try_fmt_internal (struct v4l2_subdev *sd, +struct v4l2_mbus_framefmt *fmt,struct sensor_format_struct **ret_fmt, +struct sensor_win_size **ret_wsize) +{ +int index; + +for (index =0 ; index <N_FMTS ; index++) +if (sensor_formats[index].mbus_code == fmt->code) +break ; + +if (index >=N_FMTS ) +return -EINVAL ; + +if (ret_fmt !=NULL ) + *ret_fmt = sensor_formats + index; + + fmt->field =V4L2_FIELD_NONE ; + +return 0 ; +} + +/** +* @short Set frame format +* @param[in] sd v4l2 subdev +* @param[in] fmt frame format +* @return Error code +*/ +static int sensor_s_fmt(struct v4l2_subdev *sd,
drivers/media/i2c/ov5647.c line 573
Quoted 10 lines
drivers/media/i2c/ov5647.c new file +10
-0+struct v4l2_subdev_pad_config *cfg, + struct v4l2_subdev_format *fmt) +{ + int ret; +struct sensor_format_struct *sensor_fmt; +struct sensor_win_size *wsize; +struct ov5647 *info =to_state (sd); + +ov5647_write_array (sd, sensor_oe_disable_regs, +ARRAY_SIZE (sensor_oe_disable_regs));
Should you check the error code here?
drivers/media/i2c/ov5647.c line 576
Quoted 3 lines
drivers/media/i2c/ov5647.c new file +3
-0+ + ret =sensor_try_fmt_internal (sd, &fmt->format, + &sensor_fmt, &wsize);
Do you set wsize somewhere?
drivers/media/i2c/ov5647.c line 580
Quoted 4 lines
drivers/media/i2c/ov5647.c new file +4
-0+if (ret) +return ret; + +ov5647_write_array (sd, sensor_fmt->regs, sensor_fmt->regs_size);
And here.
drivers/media/i2c/ov5647.c line 582
Quoted 2 lines
drivers/media/i2c/ov5647.c new file +2
-0+ + ret =0 ;
ret was already zero.
Quoted 57 lines
drivers/media/i2c/ov5647.c new file +57
-0+ +if (wsize->regs) +ov5647_write_array (sd, wsize->regs, wsize->regs_size); + +if (wsize->set_size) + wsize->set_size (sd); + + info->fmt = sensor_fmt; + info->width = wsize->width; + info->height = wsize->height; + +ov5647_write_array (sd, sensor_oe_enable_regs, +ARRAY_SIZE (sensor_oe_enable_regs)); + +return 0 ; +} + +/** +* @short Set stream parameters +* @param[in] sd v4l2 subdev +* @param[in] parms stream parameters +* @return Error code +*/ +static int sensor_s_parm (struct v4l2_subdev *sd,struct v4l2_streamparm *parms) +{ +struct v4l2_captureparm *cp = &parms->parm.capture; +struct ov5647 *info =to_state (sd); + +if (parms->type !=V4L2_BUF_TYPE_VIDEO_CAPTURE ) +return -EINVAL ; + +if (info->tpf.numerator ==0 ) +return -EINVAL ; + + info->capture_mode = cp->capturemode; + +return 0 ; +} + +/** +* @short Get stream parameters +* @param[in] sd v4l2 subdev +* @param[in] parms stream parameters +* @return Error code +*/ +static int sensor_g_parm (struct v4l2_subdev *sd,struct v4l2_streamparm *parms) +{ +struct v4l2_captureparm *cp = &parms->parm.capture; +struct ov5647 *info =to_state (sd); + +if (parms->type !=V4L2_BUF_TYPE_VIDEO_CAPTURE ) +return -EINVAL ; + +memset (cp,0 ,sizeof (struct v4l2_captureparm )); + cp->capability =V4L2_CAP_TIMEPERFRAME ; + cp->capturemode = info->capture_mode; +
drivers/media/i2c/ov5647.c line 649
Quoted 10 lines
drivers/media/i2c/ov5647.c new file +10
-0+return 0 ; +} + +/** +* @short Subdev video operations registration +* +*/ +static const struct v4l2_subdev_video_ops sensor_video_ops = { + .s_parm = sensor_s_parm, + .g_parm = sensor_g_parm,
Please use the g/s_frame_interval() instead. That's what sub-device drivers generally use for the purpose.
Quoted 54 lines
drivers/media/i2c/ov5647.c new file +54
-0+}; + +/* ----------------------------------------------------------------------- */ + +/** +* @short Subdev operations registration +* +*/ +static const struct v4l2_subdev_ops subdev_ops = { + .core = &sensor_core_ops, + .video = &sensor_video_ops, +}; + +/* ----------------------------------------------------------------------------- +* V4L2 subdev internal operations +*/ + +/** +* @short Detect camera version and model +* @param[in] sd v4l2 subdev +* @return Error code +*/ +int ov5647_detect (struct v4l2_subdev *sd) +{ +unsigned char v; +int ret; +struct i2c_client *client =v4l2_get_subdevdata (sd); + + ret =ov5647_write (sd,OV5647_SW_RESET ,0x01 ); +if (ret <0 ) +return ret; + ret =ov5647_read (sd,OV5647_REG_CHIPID_H , &v); +if (ret <0 ) +return ret; +if (v !=0x56 ) { +dev_err (&client->dev,"Wrong model version detected" ); +return -ENODEV ; + } + ret =ov5647_read (sd,OV5647_REG_CHIPID_L , &v); +if (ret <0 ) +return ret; +if (v !=0x47 ) { +dev_err (&client->dev,"Wrong model version detected" ); +return -ENODEV ; + } + + ret =ov5647_write (sd,OV5647_SW_RESET ,0x00 ); +if (ret <0 ) +return ret; + +return 0 ; +} + +/**
drivers/media/i2c/ov5647.c line 713
Quoted 10 lines
drivers/media/i2c/ov5647.c new file +10
-0+* @short Detect if camera is registered +* @param[in] sd v4l2 subdev +* @return Error code +*/ +static int ov5647_registered (struct v4l2_subdev *sd) +{ +struct i2c_client *client =v4l2_get_subdevdata (sd); + +dev_info (&client->dev,"OV5647 detected at address 0x%02x\n" , + client->addr);
I might omit this. If there's a need to debug this then the information should be printed by the framework instead using debug level messages.
Quoted 55 lines
drivers/media/i2c/ov5647.c new file +55
-0+ +return 0 ; +} + +/** +* @short Open device +* @param[in] sd v4l2 subdev +* @param[in] fh v4l2 file handler +* @return Error code +*/ +static int ov5647_open (struct v4l2_subdev *sd,struct v4l2_subdev_fh *fh) +{ +struct v4l2_mbus_framefmt *format = +v4l2_subdev_get_try_format (sd, fh->pad,0 ); +struct v4l2_rect *crop = +v4l2_subdev_get_try_crop (sd, fh->pad,0 ); + + crop->left =OV5647_COLUMN_START_DEF ; + crop->top =OV5647_ROW_START_DEF ; + crop->width =OV5647_WINDOW_WIDTH_DEF ; + crop->height =OV5647_WINDOW_HEIGHT_DEF ; + + format->code =MEDIA_BUS_FMT_SBGGR8_1X8 ; + + format->width =OV5647_WINDOW_WIDTH_DEF ; + format->height =OV5647_WINDOW_HEIGHT_DEF ; + format->field =V4L2_FIELD_NONE ; + format->colorspace =V4L2_COLORSPACE_SRGB ; + +return sensor_power (sd, true); +} + +/** +* @short Open device +* @param[in] sd v4l2 subdev +* @param[in] fh v4l2 file handler +* @return Error code +*/ +static int ov5647_close (struct v4l2_subdev *sd,struct v4l2_subdev_fh *fh) +{ +return sensor_power (sd, false); +} + +/** +* @short Subdev internal operations registration +* +*/ +static const struct v4l2_subdev_internal_ops ov5647_subdev_internal_ops = { + .registered = ov5647_registered, + .open = ov5647_open, + .close = ov5647_close, +}; + +/** +* @short Initialization routine - Entry point of the driver
drivers/media/i2c/ov5647.c line 778
Quoted 10 lines
drivers/media/i2c/ov5647.c new file +10
-0+* @param[in] client pointer to the i2c client structure +* @param[in] id pointer to the i2c device id structure +* @return 0 on success and a negative number on failure +*/ +static int ov5647_probe (struct i2c_client *client, +const struct i2c_device_id *id) +{ +struct device *dev = &client->dev; +struct ov5647 *sensor; +int ret =0 ;
No need to initialise ret here.
Quoted 88 lines
drivers/media/i2c/ov5647.c new file +88
-0+struct v4l2_subdev *sd; + +dev_info (&client->dev,"Installing OmniVision OV5647 camera driver\n" ); + + sensor =devm_kzalloc (dev,sizeof (*sensor),GFP_KERNEL ); +if (sensor ==NULL ) +return -ENOMEM ; + +mutex_init (&sensor->lock); + sensor->dev = dev; + + sd = &sensor->sd; +v4l2_i2c_subdev_init (sd, client, &subdev_ops); + sensor->sd.flags |=V4L2_SUBDEV_FL_HAS_DEVNODE ; + + sensor->pad.flags =MEDIA_PAD_FL_SOURCE ; + sd->entity.function =MEDIA_ENT_F_CAM_SENSOR ; + ret =media_entity_pads_init (&sd->entity,1 , &sensor->pad); +if (ret <0 ) + goto mutex_remove; + + ret =ov5647_detect (sd); +if (ret <0 ) + goto error; + + ret =v4l2_async_register_subdev (sd); +if (ret <0 ) + goto error; + +return 0 ; +error: +media_entity_cleanup (&sd->entity); +mutex_remove: +mutex_destroy (&sensor->lock); +return ret; +} + +/** +* @short Exit routine - Exit point of the driver +* @param[in] client pointer to the i2c client structure +* @return 0 on success and a negative number on failure +*/ +static int ov5647_remove (struct i2c_client *client) +{ +struct v4l2_subdev *sd =i2c_get_clientdata (client); +struct ov5647 *ov5647 =to_state (sd); + +v4l2_async_unregister_subdev (&ov5647->sd); +media_entity_cleanup (&ov5647->sd.entity); +v4l2_device_unregister_subdev (sd); +mutex_destroy (&ov5647->lock); + +return 0 ; +} + +static const struct i2c_device_id ov5647_id[] = { + {"ov5647" ,0 }, + { } +}; +MODULE_DEVICE_TABLE (i2c, ov5647_id); + +#if IS_ENABLED (CONFIG_OF ) +static const struct of_device_id ov5647_of_match[] = { + { .compatible ="ovti,ov5647" }, + {/* sentinel */ }, +}; +MODULE_DEVICE_TABLE (of, ov5647_of_match); +#endif + +/** +* @short i2c driver structure +*/ +static struct i2c_driver ov5647_driver = { + .driver = { + .of_match_table =of_match_ptr (ov5647_of_match), + .owner =THIS_MODULE , + .name ="ov5647" , + }, + .probe = ov5647_probe, + .remove = ov5647_remove, + .id_table = ov5647_id, +}; + +module_i2c_driver (ov5647_driver); + +MODULE_AUTHOR ("Ramiro Oliveira <[email protected]>" ); +MODULE_DESCRIPTION ("A low-level driver for OmniVision ov5647 sensors" ); +MODULE_LICENSE ("GPL v2" );
Signature · 4 lines
Kind regards, Sakari Ailus e-mail: [email protected] XMPP: [email protected]
Re: [PATCH v5 2/2] Add support for OV5647 sensor
Hi Sakari
Quoted 43 lines · Sakari Ailus
Hi Ramiro,
Quoted 40 lines · Ramiro Oliveira
Add support for OV5647 sensor.
Modes supported:
- 640x480 RAW 8--- MAINTAINERS | 7 + drivers/media/i2c/Kconfig | 12 + drivers/media/i2c/Makefile | 1 + drivers/media/i2c/ov5647.c | 866 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 886 insertions(+) create mode 100644 drivers/media/i2c/ov5647.cMAINTAINERS +7
-0@@ -8923,6 +8923,13 @@ M: Harald Welte <[email protected]> S: Maintained F: drivers/char/pcmcia/cm4040_cs.* +OMNIVISION OV5647 SENSOR DRIVER +M: Ramiro Oliveira <roliveir-HKixBCOQz3hWk0Htik3J/[email protected]> +L: [email protected] +T: git git://linuxtv.org/media_tree.git +S: Maintained +F: drivers/media/i2c/ov5647.c + OMNIVISION OV7670 SENSOR DRIVER M: Jonathan Corbet <[email protected]> L: [email protected]drivers/media/i2c/Kconfig +0
-0@@ -531,6 +531,18 @@ config VIDEO_OV2659 To compile this driver as a module, choose M here: the module will be called ov2659.
Quoted 7 lines
drivers/media/i2c/Kconfig config VIDEO_OV2659 · line 536
Quoted 3 lines
drivers/media/i2c/Kconfig +3
-0+config VIDEO_OV5647 + tristate "OmniVision OV5647 sensor support" + depends on OFHow does this driver depend on OF, other than matching the compatible string?
It doesn't, should I proceed diferently?
Quoted 153 lines
Quoted 49 lines
drivers/media/i2c/Kconfig +9
-0+ depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API + depends on MEDIA_CAMERA_SUPPORT + ---help--- + This is a Video4Linux2 sensor-level driver for the OmniVision + OV5647 camera. + + To compile this driver as a module, choose M here: the + module will be called ov5647. + config VIDEO_OV7640 tristate "OmniVision OV7640 sensor support" depends on I2C && VIDEO_V4L2drivers/media/i2c/Makefile +1
-0@@ -82,3 +82,4 @@ obj-$(CONFIG_VIDEO_IR_I2C) += ir-kbd-i2c.o obj-$(CONFIG_VIDEO_ML86V7667) += ml86v7667.o obj-$(CONFIG_VIDEO_OV2659) += ov2659.o obj-$(CONFIG_VIDEO_TC358743) += tc358743.o +obj-$(CONFIG_VIDEO_OV5647) += ov5647.odrivers/media/i2c/ov5647.c new file +22
-0@@ -0,0 +1,866 @@ +/* +* A V4L2 driver for OmniVision OV5647 cameras. +* +* Based on Samsung S5K6AAFX SXGA 1/6" 1.3M CMOS Image Sensor driver +* Copyright (C) 2011 Sylwester Nawrocki <[email protected]> +* +* Based on Omnivision OV7670 Camera Driver +* Copyright (C) 2006-7 Jonathan Corbet <[email protected]> +* +* Copyright (C) 2016, Synopsys, Inc. +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License as +* published by the Free Software Foundation version 2. +* +* This program is distributed .as is. WITHOUT ANY WARRANTY of any +* kind, whether express or implied; without even the implied warranty +* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +*/ +#include <linux/init.h> +#include <linux/module.h> drivers/media/i2c/ov5647.c line 32
Quoted 10 lines
drivers/media/i2c/ov5647.c new file +10
-0+#include <linux/slab.h> +#include <linux/i2c.h> +#include <linux/delay.h> +#include <linux/videodev2.h> +#include <media/v4l2-device.h> +#include <media/v4l2-ctrls.h> +#include <media/v4l2-mediabus.h> +#include <media/v4l2-image-sizes.h> +#include <media/v4l2-of.h> +#include <linux/io.h> Alphabetical order, please.
Quoted 61 lines
drivers/media/i2c/ov5647.c new file +61
-0+ +#define SENSOR_NAME "ov5647" + +#define OV5647_SW_RESET 0x1003 +#define OV5647_REG_CHIPID_H 0x300A +#define OV5647_REG_CHIPID_L 0x300B + +#define REG_TERM 0xfffe +#define VAL_TERM 0xfe +#define REG_DLY 0xffff + +#define OV5647_ROW_START 0x01 +#define OV5647_ROW_START_MIN 0 +#define OV5647_ROW_START_MAX 2004 +#define OV5647_ROW_START_DEF 54 + +#define OV5647_COLUMN_START 0x02 +#define OV5647_COLUMN_START_MIN 0 +#define OV5647_COLUMN_START_MAX 2750 +#define OV5647_COLUMN_START_DEF 16 + +#define OV5647_WINDOW_HEIGHT 0x03 +#define OV5647_WINDOW_HEIGHT_MIN 2 +#define OV5647_WINDOW_HEIGHT_MAX 2006 +#define OV5647_WINDOW_HEIGHT_DEF 1944 + +#define OV5647_WINDOW_WIDTH 0x04 +#define OV5647_WINDOW_WIDTH_MIN 2 +#define OV5647_WINDOW_WIDTH_MAX 2752 +#define OV5647_WINDOW_WIDTH_DEF 2592 + +struct regval_list { +u16 addr; +u8 data; +}; + +struct cfg_array { +struct regval_list *regs; +int size; +}; + +struct sensor_win_size { +int width; +int height; +unsigned int hoffset; +unsigned int voffset; +unsigned int hts; +unsigned int vts; +unsigned int pclk; +unsigned int mipi_bps; +unsigned int fps_fixed; +unsigned int bin_factor; +unsigned int intg_min; +unsigned int intg_max; +void *regs; +int regs_size; +int (*set_size)(struct v4l2_subdev *sd); +}; + + +struct ov5647 {drivers/media/i2c/ov5647.c line 103
Quoted 10 lines
drivers/media/i2c/ov5647.c new file +10
-0+struct device *dev; +struct v4l2_subdev sd; +struct media_pad pad; +struct mutex lock; +struct v4l2_mbus_framefmt format; +struct sensor_format_struct *fmt; +unsigned int width; +unsigned int height; +unsigned int capture_mode; +int hue;At least
capture_modeand hue are unused. Please remove unused fields.Quoted 17 lines
drivers/media/i2c/ov5647.c new file +17
-0+struct v4l2_fract tpf; +struct sensor_win_size *current_wins; +}; + +static inline struct ov5647 *to_state (struct v4l2_subdev *sd) +{ + return container_of(sd, struct ov5647, sd); +} + +static struct regval_list sensor_oe_disable_regs[] = { + {0x3000 ,0x00 }, + {0x3001 ,0x00 }, + {0x3002 ,0x00 }, +}; + +static struct regval_list sensor_oe_enable_regs[] = { + {0x3000 ,0x0f },
Quoted 9 lines
drivers/media/i2c/ov5647.c line 125
Quoted 5 lines
drivers/media/i2c/ov5647.c new file +5
-0+ {0x3001, 0xff}, + {0x3002, 0xe4}, +}; + +static struct regval_list ov5647_640x480[] = {Does this list expect a certain external clock frequency? If it does, should you check that the actual frequency matches with the expectation?
Yes. But like I said in the DT patch the external clock has a fixed frequency. I can add a check if you thinks it's better.
Quoted 375 lines
Quoted 219 lines
drivers/media/i2c/ov5647.c new file +219
-0+ {0x0100, 0x00}, + {0x0103, 0x01}, + {0x3034, 0x08}, + {0x3035, 0x21}, + {0x3036, 0x46}, + {0x303c, 0x11}, + {0x3106, 0xf5}, + {0x3821, 0x07}, + {0x3820, 0x41}, + {0x3827, 0xec}, + {0x370c, 0x0f}, + {0x3612, 0x59}, + {0x3618, 0x00}, + {0x5000, 0x06}, + {0x5001, 0x01}, + {0x5002, 0x41}, + {0x5003, 0x08}, + {0x5a00, 0x08}, + {0x3000, 0x00}, + {0x3001, 0x00}, + {0x3002, 0x00}, + {0x3016, 0x08}, + {0x3017, 0xe0}, + {0x3018, 0x44}, + {0x301c, 0xf8}, + {0x301d, 0xf0}, + {0x3a18, 0x00}, + {0x3a19, 0xf8}, + {0x3c01, 0x80}, + {0x3b07, 0x0c}, + {0x380c, 0x07}, + {0x380d, 0x68}, + {0x380e, 0x03}, + {0x380f, 0xd8}, + {0x3814, 0x31}, + {0x3815, 0x31}, + {0x3708, 0x64}, + {0x3709, 0x52}, + {0x3808, 0x02}, + {0x3809, 0x80}, + {0x380a, 0x01}, + {0x380b, 0xE0}, + {0x3801, 0x00}, + {0x3802, 0x00}, + {0x3803, 0x00}, + {0x3804, 0x0a}, + {0x3805, 0x3f}, + {0x3806, 0x07}, + {0x3807, 0xa1}, + {0x3811, 0x08}, + {0x3813, 0x02}, + {0x3630, 0x2e}, + {0x3632, 0xe2}, + {0x3633, 0x23}, + {0x3634, 0x44}, + {0x3636, 0x06}, + {0x3620, 0x64}, + {0x3621, 0xe0}, + {0x3600, 0x37}, + {0x3704, 0xa0}, + {0x3703, 0x5a}, + {0x3715, 0x78}, + {0x3717, 0x01}, + {0x3731, 0x02}, + {0x370b, 0x60}, + {0x3705, 0x1a}, + {0x3f05, 0x02}, + {0x3f06, 0x10}, + {0x3f01, 0x0a}, + {0x3a08, 0x01}, + {0x3a09, 0x27}, + {0x3a0a, 0x00}, + {0x3a0b, 0xf6}, + {0x3a0d, 0x04}, + {0x3a0e, 0x03}, + {0x3a0f, 0x58}, + {0x3a10, 0x50}, + {0x3a1b, 0x58}, + {0x3a1e, 0x50}, + {0x3a11, 0x60}, + {0x3a1f, 0x28}, + {0x4001, 0x02}, + {0x4004, 0x02}, + {0x4000, 0x09}, + {0x4837, 0x24}, + {0x4050, 0x6e}, + {0x4051, 0x8f}, + {0x0100, 0x01}, +}; + +struct sensor_format_struct ; + +/** +* @short I2C Write operation +* @param[in] i2c_client I2C client +* @param[in] reg register address +* @param[in] val value to write +* @return Error code +*/ +static int ov5647_write (struct v4l2_subdev *sd,u16 reg,u8 val) +{ +int ret; +unsigned char data[3 ] = { reg >>8 , reg &0xff , val}; +struct i2c_client *client =v4l2_get_subdevdata (sd); + + ret =i2c_master_send (client, data,3 ); +if (ret !=3 ) { +dev_dbg (&client->dev,"%s: i2c write error, reg: %x\n" , + __func__, reg); +return ret <0 ? ret : -EIO ; + } +return 0 ; +} + +/** +* @short I2C Read operation +* @param[in] i2c_client I2C client +* @param[in] reg register address +* @param[out] val value read +* @return Error code +*/ +static int ov5647_read (struct v4l2_subdev *sd,u16 reg,u8 *val) +{ +int ret; +unsigned char data_w[2 ] = { reg >>8 , reg &0xff }; +struct i2c_client *client =v4l2_get_subdevdata (sd); + + + ret =i2c_master_send (client, data_w,2 ); + +if (ret <2 ) { +dev_dbg (&client->dev,"%s: i2c read error, reg: %x\n" , + __func__, reg); +return ret <0 ? ret : -EIO ; + } + + + ret =i2c_master_recv (client, val,1 ); + +if (ret <1 ) { +dev_dbg (&client->dev,"%s: i2c read error, reg: %x\n" , + __func__, reg); +return ret <0 ? ret : -EIO ; + } +return 0 ; +} + +static int ov5647_write_array (struct v4l2_subdev *sd, +struct regval_list *regs,int array_size) +{ +int i =0 ; +int ret =0 ; + +if (!regs) +return -EINVAL ; + +while (i < array_size) { + ret =ov5647_write (sd, regs->addr, regs->data); +if (ret <0 ) +return ret; + i++; + regs++; + } +return 0 ; +} + +static void ov5647_set_virtual_channel (struct v4l2_subdev *sd,int channel) +{ +u8 channel_id; + +ov5647_read (sd,0x4814 , &channel_id); + channel_id &= ~(3 <<6 ); +ov5647_write (sd,0x4814 , channel_id | (channel <<6 )); +} + +void ov5647_stream_on (struct v4l2_subdev *sd) +{ +struct i2c_client *client =v4l2_get_subdevdata (sd); + +ov5647_write (sd,0x4202 ,0x00 ); +dev_dbg (&client->dev,"Stream on" ); +ov5647_write (sd,0x300D ,0x00 ); +} + +void ov5647_stream_off (struct v4l2_subdev *sd) +{ +struct i2c_client *client =v4l2_get_subdevdata (sd); + +ov5647_write (sd,0x4202 ,0x0f ); +dev_dbg (&client->dev,"Stream off" ); +ov5647_write (sd,0x300D ,0x01 ); +} + +/****************************************************************************/ + +/** +* @short Set SW standby +* @param[in] sd v4l2 sd +* @param[in] stanby standby mode status (on or off) +* @return Error code +*/ +static int set_sw_standby (struct v4l2_subdev *sd,bool standby) +{ +int ret; +unsigned char rdval; + + ret =ov5647_read (sd,0x0100 , &rdval); +if (ret !=0 ) +return ret; + +if (standby) + rdval &=0xfe ; +else + rdval |=0x01 ; + + ret =ov5647_write (sd,0x0100 , rdval); + +return ret; +}drivers/media/i2c/ov5647.c line 354
Quoted 10 lines
drivers/media/i2c/ov5647.c new file +10
-0+ +/** +* @short Store information about the video data format. +*/ +static struct sensor_format_struct { + u8 *desc; + u32 mbus_code; + struct regval_list *regs; + int regs_size; + int bpp;At least desc and bpp are unused.
Quoted 143 lines
drivers/media/i2c/ov5647.c new file +143
-0+} sensor_formats[] = { + { + .desc = "Raw RGB Bayer", + .mbus_code = MEDIA_BUS_FMT_SBGGR8_1X8, + .regs = ov5647_640x480, + .regs_size = ARRAY_SIZE(ov5647_640x480), + .bpp = 1 + }, +}; +#define N_FMTS ARRAY_SIZE(sensor_formats) + +/* ----------------------------------------------------------------------- */ + +/** + * @short Initialize sensor + * @param[in] sd v4l2 subdev + * @param[in] val not used + * @return Error code + */ +static int __sensor_init(struct v4l2_subdev *sd) +{ + int ret; + u8 resetval; + u8 rdval; + struct i2c_client *client = v4l2_get_subdevdata(sd); + + dev_dbg(&client->dev, "sensor init\n"); + + ret = ov5647_read(sd, 0x0100, &rdval); + if (ret != 0) + return ret; + + ov5647_write(sd, 0x4800, 0x25); + ov5647_stream_off(sd); + + ret = ov5647_write_array(sd, ov5647_640x480, + ARRAY_SIZE(ov5647_640x480)); + if (ret < 0) { + dev_err(&client->dev, "write sensor_default_regs error\n"); + return ret; + } + + ov5647_set_virtual_channel(sd, 0); + + ov5647_read(sd, 0x0100, &resetval); + if (!(resetval & 0x01)) { + dev_err(&client->dev, "Device was in SW standby"); + ov5647_write(sd, 0x0100, 0x01); + } + + ov5647_write(sd, 0x4800, 0x04); + ov5647_stream_on(sd); + + return 0; +} + +/** + * @short Control sensor power state + * @param[in] sd v4l2 subdev + * @param[in] on Sensor power + * @return Error code + */ +static int sensor_power(struct v4l2_subdev *sd, int on) +{ + int ret; + struct ov5647 *ov5647 = to_state(sd); + struct i2c_client *client = v4l2_get_subdevdata(sd); + + ret = 0; + mutex_lock(&ov5647->lock); + + if (on) { + dev_dbg(&client->dev, "OV5647 power on\n"); + + ret = ov5647_write_array(sd, sensor_oe_enable_regs, + ARRAY_SIZE(sensor_oe_enable_regs)); + + ret = __sensor_init(sd); + + if (ret < 0) + dev_err(&client->dev, + "Camera not available, check Power\n"); + } else { + dev_dbg(&client->dev, "OV5647 power off\n"); + + dev_dbg(&client->dev, "disable oe\n"); + ret = ov5647_write_array(sd, sensor_oe_disable_regs, + ARRAY_SIZE(sensor_oe_disable_regs)); + + if (ret < 0) + dev_dbg(&client->dev, "disable oe failed\n"); + + ret = set_sw_standby(sd, true); + + if (ret < 0) + dev_dbg(&client->dev, "soft stby failed\n"); + + } + + mutex_unlock(&ov5647->lock); + + return ret; +} + +#ifdef CONFIG_VIDEO_ADV_DEBUG +/** + * @short Get register value + * @param[in] sd v4l2 subdev + * @param[in] reg register struct + * @return Error code + */ +static int sensor_get_register(struct v4l2_subdev *sd, + struct v4l2_dbg_register *reg) +{ + unsigned char val = 0; + int ret; + + ret = ov5647_read(sd, reg->reg & 0xff, &val); + if (ret != 0) + return ret; + + reg->val = val; + reg->size = 1; + + return ret; +} + +/** + * @short Set register value + * @param[in] sd v4l2 subdev + * @param[in] reg register struct + * @return Error code + */ +static int sensor_set_register(struct v4l2_subdev *sd, + const struct v4l2_dbg_register *reg) +{ + return ov5647_write(sd, reg->reg & 0xff, reg->val & 0xff); +} +#endif + +/* ----------------------------------------------------------------------- */ + +/**
Quoted 9 lines
drivers/media/i2c/ov5647.c line 501
Quoted 4 lines
drivers/media/i2c/ov5647.c new file +4
-0+* @short Subdev core operations registration +*/ +static const struct v4l2_subdev_core_ops sensor_core_ops = { + .s_power = sensor_power,The
s_power()op will be called by the bridge (ISP) driver as well. You should expect that it may be enabled more than once before being disabled equal number of times.
Should I add an IF check to verify if the sensor is powered on before running the power on/off routine.
Quoted 380 lines
Quoted 62 lines
drivers/media/i2c/ov5647.c new file +62
-0+#ifdef CONFIG_VIDEO_ADV_DEBUG + .g_register = sensor_get_register, + .s_register = sensor_set_register, +#endif +}; + +/* ----------------------------------------------------------------------- */ + + + +/** +* @short Enumerate available image formats +* @param[in] sd v4l2 subdev +* @param[in] index index +* @param[in] code MBUS Pixel code +* @return Error code +*/ +static int sensor_enum_fmt (struct v4l2_subdev *sd, +struct v4l2_subdev_pad_config *cfg, +struct v4l2_subdev_mbus_code_enum *code) +{ +if (code->pad || code->index >=N_FMTS ) +return -EINVAL ; + + code->code = sensor_formats[code->index].mbus_code; +return 0 ; +} + +/** +* @short Try frame format internal function +* @param[in] sd v4l2 subdev +* @param[in] fmt frame format +* @return Error code +*/ +static int sensor_try_fmt_internal (struct v4l2_subdev *sd, +struct v4l2_mbus_framefmt *fmt,struct sensor_format_struct **ret_fmt, +struct sensor_win_size **ret_wsize) +{ +int index; + +for (index =0 ; index <N_FMTS ; index++) +if (sensor_formats[index].mbus_code == fmt->code) +break ; + +if (index >=N_FMTS ) +return -EINVAL ; + +if (ret_fmt !=NULL ) + *ret_fmt = sensor_formats + index; + + fmt->field =V4L2_FIELD_NONE ; + +return 0 ; +} + +/** +* @short Set frame format +* @param[in] sd v4l2 subdev +* @param[in] fmt frame format +* @return Error code +*/ +static int sensor_s_fmt(struct v4l2_subdev *sd,drivers/media/i2c/ov5647.c line 573
Quoted 10 lines
drivers/media/i2c/ov5647.c new file +10
-0+struct v4l2_subdev_pad_config *cfg, + struct v4l2_subdev_format *fmt) +{ + int ret; +struct sensor_format_struct *sensor_fmt; +struct sensor_win_size *wsize; +struct ov5647 *info =to_state (sd); + +ov5647_write_array (sd, sensor_oe_disable_regs, +ARRAY_SIZE (sensor_oe_disable_regs));Should you check the error code here?
drivers/media/i2c/ov5647.c line 576
Quoted 3 lines
drivers/media/i2c/ov5647.c new file +3
-0+ + ret =sensor_try_fmt_internal (sd, &fmt->format, + &sensor_fmt, &wsize);Do you set wsize somewhere?
drivers/media/i2c/ov5647.c line 580
Quoted 4 lines
drivers/media/i2c/ov5647.c new file +4
-0+if (ret) +return ret; + +ov5647_write_array (sd, sensor_fmt->regs, sensor_fmt->regs_size);And here.
drivers/media/i2c/ov5647.c line 582
Quoted 2 lines
drivers/media/i2c/ov5647.c new file +2
-0+ + ret =0 ;ret was already zero.
Quoted 57 lines
drivers/media/i2c/ov5647.c new file +57
-0+ +if (wsize->regs) +ov5647_write_array (sd, wsize->regs, wsize->regs_size); + +if (wsize->set_size) + wsize->set_size (sd); + + info->fmt = sensor_fmt; + info->width = wsize->width; + info->height = wsize->height; + +ov5647_write_array (sd, sensor_oe_enable_regs, +ARRAY_SIZE (sensor_oe_enable_regs)); + +return 0 ; +} + +/** +* @short Set stream parameters +* @param[in] sd v4l2 subdev +* @param[in] parms stream parameters +* @return Error code +*/ +static int sensor_s_parm (struct v4l2_subdev *sd,struct v4l2_streamparm *parms) +{ +struct v4l2_captureparm *cp = &parms->parm.capture; +struct ov5647 *info =to_state (sd); + +if (parms->type !=V4L2_BUF_TYPE_VIDEO_CAPTURE ) +return -EINVAL ; + +if (info->tpf.numerator ==0 ) +return -EINVAL ; + + info->capture_mode = cp->capturemode; + +return 0 ; +} + +/** +* @short Get stream parameters +* @param[in] sd v4l2 subdev +* @param[in] parms stream parameters +* @return Error code +*/ +static int sensor_g_parm (struct v4l2_subdev *sd,struct v4l2_streamparm *parms) +{ +struct v4l2_captureparm *cp = &parms->parm.capture; +struct ov5647 *info =to_state (sd); + +if (parms->type !=V4L2_BUF_TYPE_VIDEO_CAPTURE ) +return -EINVAL ; + +memset (cp,0 ,sizeof (struct v4l2_captureparm )); + cp->capability =V4L2_CAP_TIMEPERFRAME ; + cp->capturemode = info->capture_mode; +drivers/media/i2c/ov5647.c line 649
Quoted 10 lines
drivers/media/i2c/ov5647.c new file +10
-0+return 0 ; +} + +/** +* @short Subdev video operations registration +* +*/ +static const struct v4l2_subdev_video_ops sensor_video_ops = { + .s_parm = sensor_s_parm, + .g_parm = sensor_g_parm,Please use the g/s_frame_interval() instead. That's what sub-device drivers generally use for the purpose.
Quoted 54 lines
drivers/media/i2c/ov5647.c new file +54
-0+}; + +/* ----------------------------------------------------------------------- */ + +/** +* @short Subdev operations registration +* +*/ +static const struct v4l2_subdev_ops subdev_ops = { + .core = &sensor_core_ops, + .video = &sensor_video_ops, +}; + +/* ----------------------------------------------------------------------------- +* V4L2 subdev internal operations +*/ + +/** +* @short Detect camera version and model +* @param[in] sd v4l2 subdev +* @return Error code +*/ +int ov5647_detect (struct v4l2_subdev *sd) +{ +unsigned char v; +int ret; +struct i2c_client *client =v4l2_get_subdevdata (sd); + + ret =ov5647_write (sd,OV5647_SW_RESET ,0x01 ); +if (ret <0 ) +return ret; + ret =ov5647_read (sd,OV5647_REG_CHIPID_H , &v); +if (ret <0 ) +return ret; +if (v !=0x56 ) { +dev_err (&client->dev,"Wrong model version detected" ); +return -ENODEV ; + } + ret =ov5647_read (sd,OV5647_REG_CHIPID_L , &v); +if (ret <0 ) +return ret; +if (v !=0x47 ) { +dev_err (&client->dev,"Wrong model version detected" ); +return -ENODEV ; + } + + ret =ov5647_write (sd,OV5647_SW_RESET ,0x00 ); +if (ret <0 ) +return ret; + +return 0 ; +} + +/** drivers/media/i2c/ov5647.c line 713
Quoted 10 lines
drivers/media/i2c/ov5647.c new file +10
-0+* @short Detect if camera is registered +* @param[in] sd v4l2 subdev +* @return Error code +*/ +static int ov5647_registered (struct v4l2_subdev *sd) +{ +struct i2c_client *client =v4l2_get_subdevdata (sd); + +dev_info (&client->dev,"OV5647 detected at address 0x%02x\n" , + client->addr);I might omit this. If there's a need to debug this then the information should be printed by the framework instead using debug level messages.
Quoted 55 lines
drivers/media/i2c/ov5647.c new file +55
-0+ +return 0 ; +} + +/** +* @short Open device +* @param[in] sd v4l2 subdev +* @param[in] fh v4l2 file handler +* @return Error code +*/ +static int ov5647_open (struct v4l2_subdev *sd,struct v4l2_subdev_fh *fh) +{ +struct v4l2_mbus_framefmt *format = +v4l2_subdev_get_try_format (sd, fh->pad,0 ); +struct v4l2_rect *crop = +v4l2_subdev_get_try_crop (sd, fh->pad,0 ); + + crop->left =OV5647_COLUMN_START_DEF ; + crop->top =OV5647_ROW_START_DEF ; + crop->width =OV5647_WINDOW_WIDTH_DEF ; + crop->height =OV5647_WINDOW_HEIGHT_DEF ; + + format->code =MEDIA_BUS_FMT_SBGGR8_1X8 ; + + format->width =OV5647_WINDOW_WIDTH_DEF ; + format->height =OV5647_WINDOW_HEIGHT_DEF ; + format->field =V4L2_FIELD_NONE ; + format->colorspace =V4L2_COLORSPACE_SRGB ; + +return sensor_power (sd, true); +} + +/** +* @short Open device +* @param[in] sd v4l2 subdev +* @param[in] fh v4l2 file handler +* @return Error code +*/ +static int ov5647_close (struct v4l2_subdev *sd,struct v4l2_subdev_fh *fh) +{ +return sensor_power (sd, false); +} + +/** +* @short Subdev internal operations registration +* +*/ +static const struct v4l2_subdev_internal_ops ov5647_subdev_internal_ops = { + .registered = ov5647_registered, + .open = ov5647_open, + .close = ov5647_close, +}; + +/** +* @short Initialization routine - Entry point of the driver drivers/media/i2c/ov5647.c line 778
Quoted 10 lines
drivers/media/i2c/ov5647.c new file +10
-0+* @param[in] client pointer to the i2c client structure +* @param[in] id pointer to the i2c device id structure +* @return 0 on success and a negative number on failure +*/ +static int ov5647_probe (struct i2c_client *client, +const struct i2c_device_id *id) +{ +struct device *dev = &client->dev; +struct ov5647 *sensor; +int ret =0 ;No need to initialise ret here.
Quoted 80 lines
drivers/media/i2c/ov5647.c new file +80
-0+struct v4l2_subdev *sd; + +dev_info (&client->dev,"Installing OmniVision OV5647 camera driver\n" ); + + sensor =devm_kzalloc (dev,sizeof (*sensor),GFP_KERNEL ); +if (sensor ==NULL ) +return -ENOMEM ; + +mutex_init (&sensor->lock); + sensor->dev = dev; + + sd = &sensor->sd; +v4l2_i2c_subdev_init (sd, client, &subdev_ops); + sensor->sd.flags |=V4L2_SUBDEV_FL_HAS_DEVNODE ; + + sensor->pad.flags =MEDIA_PAD_FL_SOURCE ; + sd->entity.function =MEDIA_ENT_F_CAM_SENSOR ; + ret =media_entity_pads_init (&sd->entity,1 , &sensor->pad); +if (ret <0 ) + goto mutex_remove; + + ret =ov5647_detect (sd); +if (ret <0 ) + goto error; + + ret =v4l2_async_register_subdev (sd); +if (ret <0 ) + goto error; + +return 0 ; +error: +media_entity_cleanup (&sd->entity); +mutex_remove: +mutex_destroy (&sensor->lock); +return ret; +} + +/** +* @short Exit routine - Exit point of the driver +* @param[in] client pointer to the i2c client structure +* @return 0 on success and a negative number on failure +*/ +static int ov5647_remove (struct i2c_client *client) +{ +struct v4l2_subdev *sd =i2c_get_clientdata (client); +struct ov5647 *ov5647 =to_state (sd); + +v4l2_async_unregister_subdev (&ov5647->sd); +media_entity_cleanup (&ov5647->sd.entity); +v4l2_device_unregister_subdev (sd); +mutex_destroy (&ov5647->lock); + +return 0 ; +} + +static const struct i2c_device_id ov5647_id[] = { + {"ov5647" ,0 }, + { } +}; +MODULE_DEVICE_TABLE (i2c, ov5647_id); + +#if IS_ENABLED (CONFIG_OF ) +static const struct of_device_id ov5647_of_match[] = { + { .compatible ="ovti,ov5647" }, + {/* sentinel */ }, +}; +MODULE_DEVICE_TABLE (of, ov5647_of_match); +#endif + +/** +* @short i2c driver structure +*/ +static struct i2c_driver ov5647_driver = { + .driver = { + .of_match_table =of_match_ptr (ov5647_of_match), + .owner =THIS_MODULE , + .name ="ov5647" , + }, + .probe = ov5647_probe, + .remove = ov5647_remove,
Quoted 9 lines
drivers/media/i2c/ov5647.c line 866
Quoted 8 lines
drivers/media/i2c/ov5647.c new file +8
-0+ .id_table = ov5647_id, +}; + +module_i2c_driver (ov5647_driver); + +MODULE_AUTHOR ("Ramiro Oliveira <roliveir-HKixBCOQz3hWk0Htik3J/[email protected]>" ); +MODULE_DESCRIPTION ("A low-level driver for OmniVision ov5647 sensors" ); +MODULE_LICENSE ("GPL v2" );
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v5 2/2] Add support for OV5647 sensor
Hi Ramiro,
Quoted 54 lines · Ramiro Oliveira
Hi Sakari
Quoted 43 lines · Sakari Ailus
Hi Ramiro,
Quoted 40 lines · Ramiro Oliveira
Add support for OV5647 sensor.
Modes supported:
- 640x480 RAW 8--- MAINTAINERS | 7 + drivers/media/i2c/Kconfig | 12 + drivers/media/i2c/Makefile | 1 + drivers/media/i2c/ov5647.c | 866 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 886 insertions(+) create mode 100644 drivers/media/i2c/ov5647.cMAINTAINERS +7
-0@@ -8923,6 +8923,13 @@ M: Harald Welte <[email protected]> S: Maintained F: drivers/char/pcmcia/cm4040_cs.* +OMNIVISION OV5647 SENSOR DRIVER +M: Ramiro Oliveira <roliveir-HKixBCOQz3hWk0Htik3J/[email protected]> +L: [email protected] +T: git git://linuxtv.org/media_tree.git +S: Maintained +F: drivers/media/i2c/ov5647.c + OMNIVISION OV7670 SENSOR DRIVER M: Jonathan Corbet <[email protected]> L: [email protected]drivers/media/i2c/Kconfig +0
-0@@ -531,6 +531,18 @@ config VIDEO_OV2659 To compile this driver as a module, choose M here: the module will be called ov2659.Quoted 7 lines
drivers/media/i2c/Kconfig config VIDEO_OV2659 · line 536
Quoted 3 lines
drivers/media/i2c/Kconfig +3
-0+config VIDEO_OV5647 + tristate "OmniVision OV5647 sensor support" + depends on OFHow does this driver depend on OF, other than matching the compatible string?
Quoted 1 line
It doesn't, should I proceed diferently?
You should drop the dependency if you don't need it. But I bet you will actually need it.
Quoted 552 lines
Quoted 154 lines
Quoted 50 lines
drivers/media/i2c/Kconfig +9
-0+ depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API + depends on MEDIA_CAMERA_SUPPORT + ---help--- + This is a Video4Linux2 sensor-level driver for the OmniVision + OV5647 camera. + + To compile this driver as a module, choose M here: the + module will be called ov5647. + config VIDEO_OV7640 tristate "OmniVision OV7640 sensor support" depends on I2C && VIDEO_V4L2drivers/media/i2c/Makefile +1
-0@@ -82,3 +82,4 @@ obj-$(CONFIG_VIDEO_IR_I2C) += ir-kbd-i2c.o obj-$(CONFIG_VIDEO_ML86V7667) += ml86v7667.o obj-$(CONFIG_VIDEO_OV2659) += ov2659.o obj-$(CONFIG_VIDEO_TC358743) += tc358743.o +obj-$(CONFIG_VIDEO_OV5647) += ov5647.odrivers/media/i2c/ov5647.c new file +22
-0@@ -0,0 +1,866 @@ +/* +* A V4L2 driver for OmniVision OV5647 cameras. +* +* Based on Samsung S5K6AAFX SXGA 1/6" 1.3M CMOS Image Sensor driver +* Copyright (C) 2011 Sylwester Nawrocki <[email protected]> +* +* Based on Omnivision OV7670 Camera Driver +* Copyright (C) 2006-7 Jonathan Corbet <[email protected]> +* +* Copyright (C) 2016, Synopsys, Inc. +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License as +* published by the Free Software Foundation version 2. +* +* This program is distributed .as is. WITHOUT ANY WARRANTY of any +* kind, whether express or implied; without even the implied warranty +* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +*/ +#include <linux/init.h> +#include <linux/module.h> drivers/media/i2c/ov5647.c line 32
Quoted 10 lines
drivers/media/i2c/ov5647.c new file +10
-0+#include <linux/slab.h> +#include <linux/i2c.h> +#include <linux/delay.h> +#include <linux/videodev2.h> +#include <media/v4l2-device.h> +#include <media/v4l2-ctrls.h> +#include <media/v4l2-mediabus.h> +#include <media/v4l2-image-sizes.h> +#include <media/v4l2-of.h> +#include <linux/io.h> Alphabetical order, please.
Quoted 61 lines
drivers/media/i2c/ov5647.c new file +61
-0+ +#define SENSOR_NAME "ov5647" + +#define OV5647_SW_RESET 0x1003 +#define OV5647_REG_CHIPID_H 0x300A +#define OV5647_REG_CHIPID_L 0x300B + +#define REG_TERM 0xfffe +#define VAL_TERM 0xfe +#define REG_DLY 0xffff + +#define OV5647_ROW_START 0x01 +#define OV5647_ROW_START_MIN 0 +#define OV5647_ROW_START_MAX 2004 +#define OV5647_ROW_START_DEF 54 + +#define OV5647_COLUMN_START 0x02 +#define OV5647_COLUMN_START_MIN 0 +#define OV5647_COLUMN_START_MAX 2750 +#define OV5647_COLUMN_START_DEF 16 + +#define OV5647_WINDOW_HEIGHT 0x03 +#define OV5647_WINDOW_HEIGHT_MIN 2 +#define OV5647_WINDOW_HEIGHT_MAX 2006 +#define OV5647_WINDOW_HEIGHT_DEF 1944 + +#define OV5647_WINDOW_WIDTH 0x04 +#define OV5647_WINDOW_WIDTH_MIN 2 +#define OV5647_WINDOW_WIDTH_MAX 2752 +#define OV5647_WINDOW_WIDTH_DEF 2592 + +struct regval_list { +u16 addr; +u8 data; +}; + +struct cfg_array { +struct regval_list *regs; +int size; +}; + +struct sensor_win_size { +int width; +int height; +unsigned int hoffset; +unsigned int voffset; +unsigned int hts; +unsigned int vts; +unsigned int pclk; +unsigned int mipi_bps; +unsigned int fps_fixed; +unsigned int bin_factor; +unsigned int intg_min; +unsigned int intg_max; +void *regs; +int regs_size; +int (*set_size)(struct v4l2_subdev *sd); +}; + + +struct ov5647 {drivers/media/i2c/ov5647.c line 103
Quoted 10 lines
drivers/media/i2c/ov5647.c new file +10
-0+struct device *dev; +struct v4l2_subdev sd; +struct media_pad pad; +struct mutex lock; +struct v4l2_mbus_framefmt format; +struct sensor_format_struct *fmt; +unsigned int width; +unsigned int height; +unsigned int capture_mode; +int hue;At least
capture_modeand hue are unused. Please remove unused fields.Quoted 17 lines
drivers/media/i2c/ov5647.c new file +17
-0+struct v4l2_fract tpf; +struct sensor_win_size *current_wins; +}; + +static inline struct ov5647 *to_state (struct v4l2_subdev *sd) +{ + return container_of(sd, struct ov5647, sd); +} + +static struct regval_list sensor_oe_disable_regs[] = { + {0x3000 ,0x00 }, + {0x3001 ,0x00 }, + {0x3002 ,0x00 }, +}; + +static struct regval_list sensor_oe_enable_regs[] = { + {0x3000 ,0x0f },Quoted 9 lines
drivers/media/i2c/ov5647.c line 125
Quoted 5 lines
drivers/media/i2c/ov5647.c new file +5
-0+ {0x3001, 0xff}, + {0x3002, 0xe4}, +}; + +static struct regval_list ov5647_640x480[] = {Does this list expect a certain external clock frequency? If it does, should you check that the actual frequency matches with the expectation?
Yes. But like I said in the DT patch the external clock has a fixed frequency. I can add a check if you thinks it's better.
Quoted 375 lines
Quoted 219 lines
drivers/media/i2c/ov5647.c new file +219
-0+ {0x0100, 0x00}, + {0x0103, 0x01}, + {0x3034, 0x08}, + {0x3035, 0x21}, + {0x3036, 0x46}, + {0x303c, 0x11}, + {0x3106, 0xf5}, + {0x3821, 0x07}, + {0x3820, 0x41}, + {0x3827, 0xec}, + {0x370c, 0x0f}, + {0x3612, 0x59}, + {0x3618, 0x00}, + {0x5000, 0x06}, + {0x5001, 0x01}, + {0x5002, 0x41}, + {0x5003, 0x08}, + {0x5a00, 0x08}, + {0x3000, 0x00}, + {0x3001, 0x00}, + {0x3002, 0x00}, + {0x3016, 0x08}, + {0x3017, 0xe0}, + {0x3018, 0x44}, + {0x301c, 0xf8}, + {0x301d, 0xf0}, + {0x3a18, 0x00}, + {0x3a19, 0xf8}, + {0x3c01, 0x80}, + {0x3b07, 0x0c}, + {0x380c, 0x07}, + {0x380d, 0x68}, + {0x380e, 0x03}, + {0x380f, 0xd8}, + {0x3814, 0x31}, + {0x3815, 0x31}, + {0x3708, 0x64}, + {0x3709, 0x52}, + {0x3808, 0x02}, + {0x3809, 0x80}, + {0x380a, 0x01}, + {0x380b, 0xE0}, + {0x3801, 0x00}, + {0x3802, 0x00}, + {0x3803, 0x00}, + {0x3804, 0x0a}, + {0x3805, 0x3f}, + {0x3806, 0x07}, + {0x3807, 0xa1}, + {0x3811, 0x08}, + {0x3813, 0x02}, + {0x3630, 0x2e}, + {0x3632, 0xe2}, + {0x3633, 0x23}, + {0x3634, 0x44}, + {0x3636, 0x06}, + {0x3620, 0x64}, + {0x3621, 0xe0}, + {0x3600, 0x37}, + {0x3704, 0xa0}, + {0x3703, 0x5a}, + {0x3715, 0x78}, + {0x3717, 0x01}, + {0x3731, 0x02}, + {0x370b, 0x60}, + {0x3705, 0x1a}, + {0x3f05, 0x02}, + {0x3f06, 0x10}, + {0x3f01, 0x0a}, + {0x3a08, 0x01}, + {0x3a09, 0x27}, + {0x3a0a, 0x00}, + {0x3a0b, 0xf6}, + {0x3a0d, 0x04}, + {0x3a0e, 0x03}, + {0x3a0f, 0x58}, + {0x3a10, 0x50}, + {0x3a1b, 0x58}, + {0x3a1e, 0x50}, + {0x3a11, 0x60}, + {0x3a1f, 0x28}, + {0x4001, 0x02}, + {0x4004, 0x02}, + {0x4000, 0x09}, + {0x4837, 0x24}, + {0x4050, 0x6e}, + {0x4051, 0x8f}, + {0x0100, 0x01}, +}; + +struct sensor_format_struct ; + +/** +* @short I2C Write operation +* @param[in] i2c_client I2C client +* @param[in] reg register address +* @param[in] val value to write +* @return Error code +*/ +static int ov5647_write (struct v4l2_subdev *sd,u16 reg,u8 val) +{ +int ret; +unsigned char data[3 ] = { reg >>8 , reg &0xff , val}; +struct i2c_client *client =v4l2_get_subdevdata (sd); + + ret =i2c_master_send (client, data,3 ); +if (ret !=3 ) { +dev_dbg (&client->dev,"%s: i2c write error, reg: %x\n" , + __func__, reg); +return ret <0 ? ret : -EIO ; + } +return 0 ; +} + +/** +* @short I2C Read operation +* @param[in] i2c_client I2C client +* @param[in] reg register address +* @param[out] val value read +* @return Error code +*/ +static int ov5647_read (struct v4l2_subdev *sd,u16 reg,u8 *val) +{ +int ret; +unsigned char data_w[2 ] = { reg >>8 , reg &0xff }; +struct i2c_client *client =v4l2_get_subdevdata (sd); + + + ret =i2c_master_send (client, data_w,2 ); + +if (ret <2 ) { +dev_dbg (&client->dev,"%s: i2c read error, reg: %x\n" , + __func__, reg); +return ret <0 ? ret : -EIO ; + } + + + ret =i2c_master_recv (client, val,1 ); + +if (ret <1 ) { +dev_dbg (&client->dev,"%s: i2c read error, reg: %x\n" , + __func__, reg); +return ret <0 ? ret : -EIO ; + } +return 0 ; +} + +static int ov5647_write_array (struct v4l2_subdev *sd, +struct regval_list *regs,int array_size) +{ +int i =0 ; +int ret =0 ; + +if (!regs) +return -EINVAL ; + +while (i < array_size) { + ret =ov5647_write (sd, regs->addr, regs->data); +if (ret <0 ) +return ret; + i++; + regs++; + } +return 0 ; +} + +static void ov5647_set_virtual_channel (struct v4l2_subdev *sd,int channel) +{ +u8 channel_id; + +ov5647_read (sd,0x4814 , &channel_id); + channel_id &= ~(3 <<6 ); +ov5647_write (sd,0x4814 , channel_id | (channel <<6 )); +} + +void ov5647_stream_on (struct v4l2_subdev *sd) +{ +struct i2c_client *client =v4l2_get_subdevdata (sd); + +ov5647_write (sd,0x4202 ,0x00 ); +dev_dbg (&client->dev,"Stream on" ); +ov5647_write (sd,0x300D ,0x00 ); +} + +void ov5647_stream_off (struct v4l2_subdev *sd) +{ +struct i2c_client *client =v4l2_get_subdevdata (sd); + +ov5647_write (sd,0x4202 ,0x0f ); +dev_dbg (&client->dev,"Stream off" ); +ov5647_write (sd,0x300D ,0x01 ); +} + +/****************************************************************************/ + +/** +* @short Set SW standby +* @param[in] sd v4l2 sd +* @param[in] stanby standby mode status (on or off) +* @return Error code +*/ +static int set_sw_standby (struct v4l2_subdev *sd,bool standby) +{ +int ret; +unsigned char rdval; + + ret =ov5647_read (sd,0x0100 , &rdval); +if (ret !=0 ) +return ret; + +if (standby) + rdval &=0xfe ; +else + rdval |=0x01 ; + + ret =ov5647_write (sd,0x0100 , rdval); + +return ret; +}drivers/media/i2c/ov5647.c line 354
Quoted 10 lines
drivers/media/i2c/ov5647.c new file +10
-0+ +/** +* @short Store information about the video data format. +*/ +static struct sensor_format_struct { + u8 *desc; + u32 mbus_code; + struct regval_list *regs; + int regs_size; + int bpp;At least desc and bpp are unused.
Quoted 143 lines
drivers/media/i2c/ov5647.c new file +143
-0+} sensor_formats[] = { + { + .desc = "Raw RGB Bayer", + .mbus_code = MEDIA_BUS_FMT_SBGGR8_1X8, + .regs = ov5647_640x480, + .regs_size = ARRAY_SIZE(ov5647_640x480), + .bpp = 1 + }, +}; +#define N_FMTS ARRAY_SIZE(sensor_formats) + +/* ----------------------------------------------------------------------- */ + +/** + * @short Initialize sensor + * @param[in] sd v4l2 subdev + * @param[in] val not used + * @return Error code + */ +static int __sensor_init(struct v4l2_subdev *sd) +{ + int ret; + u8 resetval; + u8 rdval; + struct i2c_client *client = v4l2_get_subdevdata(sd); + + dev_dbg(&client->dev, "sensor init\n"); + + ret = ov5647_read(sd, 0x0100, &rdval); + if (ret != 0) + return ret; + + ov5647_write(sd, 0x4800, 0x25); + ov5647_stream_off(sd); + + ret = ov5647_write_array(sd, ov5647_640x480, + ARRAY_SIZE(ov5647_640x480)); + if (ret < 0) { + dev_err(&client->dev, "write sensor_default_regs error\n"); + return ret; + } + + ov5647_set_virtual_channel(sd, 0); + + ov5647_read(sd, 0x0100, &resetval); + if (!(resetval & 0x01)) { + dev_err(&client->dev, "Device was in SW standby"); + ov5647_write(sd, 0x0100, 0x01); + } + + ov5647_write(sd, 0x4800, 0x04); + ov5647_stream_on(sd); + + return 0; +} + +/** + * @short Control sensor power state + * @param[in] sd v4l2 subdev + * @param[in] on Sensor power + * @return Error code + */ +static int sensor_power(struct v4l2_subdev *sd, int on) +{ + int ret; + struct ov5647 *ov5647 = to_state(sd); + struct i2c_client *client = v4l2_get_subdevdata(sd); + + ret = 0; + mutex_lock(&ov5647->lock); + + if (on) { + dev_dbg(&client->dev, "OV5647 power on\n"); + + ret = ov5647_write_array(sd, sensor_oe_enable_regs, + ARRAY_SIZE(sensor_oe_enable_regs)); + + ret = __sensor_init(sd); + + if (ret < 0) + dev_err(&client->dev, + "Camera not available, check Power\n"); + } else { + dev_dbg(&client->dev, "OV5647 power off\n"); + + dev_dbg(&client->dev, "disable oe\n"); + ret = ov5647_write_array(sd, sensor_oe_disable_regs, + ARRAY_SIZE(sensor_oe_disable_regs)); + + if (ret < 0) + dev_dbg(&client->dev, "disable oe failed\n"); + + ret = set_sw_standby(sd, true); + + if (ret < 0) + dev_dbg(&client->dev, "soft stby failed\n"); + + } + + mutex_unlock(&ov5647->lock); + + return ret; +} + +#ifdef CONFIG_VIDEO_ADV_DEBUG +/** + * @short Get register value + * @param[in] sd v4l2 subdev + * @param[in] reg register struct + * @return Error code + */ +static int sensor_get_register(struct v4l2_subdev *sd, + struct v4l2_dbg_register *reg) +{ + unsigned char val = 0; + int ret; + + ret = ov5647_read(sd, reg->reg & 0xff, &val); + if (ret != 0) + return ret; + + reg->val = val; + reg->size = 1; + + return ret; +} + +/** + * @short Set register value + * @param[in] sd v4l2 subdev + * @param[in] reg register struct + * @return Error code + */ +static int sensor_set_register(struct v4l2_subdev *sd, + const struct v4l2_dbg_register *reg) +{ + return ov5647_write(sd, reg->reg & 0xff, reg->val & 0xff); +} +#endif + +/* ----------------------------------------------------------------------- */ + +/**Quoted 9 lines
drivers/media/i2c/ov5647.c line 501
Quoted 4 lines
drivers/media/i2c/ov5647.c new file +4
-0+* @short Subdev core operations registration +*/ +static const struct v4l2_subdev_core_ops sensor_core_ops = { + .s_power = sensor_power,The
s_power()op will be called by the bridge (ISP) driver as well. You should expect that it may be enabled more than once before being disabled equal number of times.
Quoted 2 lines
Should I add an IF check to verify if the sensor is powered on before running the power on/off routine.
You need a counter. One way to do that is in the driver itself, or you can do what I recently did in the smiapp driver, using runtime PM so you don't explicitly need to manage it:
Or, before the runtime PM conversion:
The use of runtime PM in sub-device drivers is new and I'm not entirely happy how it's implemented in the smiapp driver right now, hence it might be better not to use it (yet). Up to you.
Quoted 390 lines
Quoted 390 lines
Quoted 63 lines
drivers/media/i2c/ov5647.c new file +62
-0+#ifdef CONFIG_VIDEO_ADV_DEBUG + .g_register = sensor_get_register, + .s_register = sensor_set_register, +#endif +}; + +/* ----------------------------------------------------------------------- */ + + + +/** +* @short Enumerate available image formats +* @param[in] sd v4l2 subdev +* @param[in] index index +* @param[in] code MBUS Pixel code +* @return Error code +*/ +static int sensor_enum_fmt (struct v4l2_subdev *sd, +struct v4l2_subdev_pad_config *cfg, +struct v4l2_subdev_mbus_code_enum *code) +{ +if (code->pad || code->index >=N_FMTS ) +return -EINVAL ; + + code->code = sensor_formats[code->index].mbus_code; +return 0 ; +} + +/** +* @short Try frame format internal function +* @param[in] sd v4l2 subdev +* @param[in] fmt frame format +* @return Error code +*/ +static int sensor_try_fmt_internal (struct v4l2_subdev *sd, +struct v4l2_mbus_framefmt *fmt,struct sensor_format_struct **ret_fmt, +struct sensor_win_size **ret_wsize) +{ +int index; + +for (index =0 ; index <N_FMTS ; index++) +if (sensor_formats[index].mbus_code == fmt->code) +break ; + +if (index >=N_FMTS ) +return -EINVAL ; + +if (ret_fmt !=NULL ) + *ret_fmt = sensor_formats + index; + + fmt->field =V4L2_FIELD_NONE ; + +return 0 ; +} + +/** +* @short Set frame format +* @param[in] sd v4l2 subdev +* @param[in] fmt frame format +* @return Error code +*/ +static int sensor_s_fmt(struct v4l2_subdev *sd,drivers/media/i2c/ov5647.c line 573
Quoted 10 lines
drivers/media/i2c/ov5647.c new file +10
-0+struct v4l2_subdev_pad_config *cfg, + struct v4l2_subdev_format *fmt) +{ + int ret; +struct sensor_format_struct *sensor_fmt; +struct sensor_win_size *wsize; +struct ov5647 *info =to_state (sd); + +ov5647_write_array (sd, sensor_oe_disable_regs, +ARRAY_SIZE (sensor_oe_disable_regs));Should you check the error code here?
drivers/media/i2c/ov5647.c line 576
Quoted 3 lines
drivers/media/i2c/ov5647.c new file +3
-0+ + ret =sensor_try_fmt_internal (sd, &fmt->format, + &sensor_fmt, &wsize);Do you set wsize somewhere?
drivers/media/i2c/ov5647.c line 580
Quoted 4 lines
drivers/media/i2c/ov5647.c new file +4
-0+if (ret) +return ret; + +ov5647_write_array (sd, sensor_fmt->regs, sensor_fmt->regs_size);And here.
drivers/media/i2c/ov5647.c line 582
Quoted 2 lines
drivers/media/i2c/ov5647.c new file +2
-0+ + ret =0 ;ret was already zero.
Quoted 57 lines
drivers/media/i2c/ov5647.c new file +57
-0+ +if (wsize->regs) +ov5647_write_array (sd, wsize->regs, wsize->regs_size); + +if (wsize->set_size) + wsize->set_size (sd); + + info->fmt = sensor_fmt; + info->width = wsize->width; + info->height = wsize->height; + +ov5647_write_array (sd, sensor_oe_enable_regs, +ARRAY_SIZE (sensor_oe_enable_regs)); + +return 0 ; +} + +/** +* @short Set stream parameters +* @param[in] sd v4l2 subdev +* @param[in] parms stream parameters +* @return Error code +*/ +static int sensor_s_parm (struct v4l2_subdev *sd,struct v4l2_streamparm *parms) +{ +struct v4l2_captureparm *cp = &parms->parm.capture; +struct ov5647 *info =to_state (sd); + +if (parms->type !=V4L2_BUF_TYPE_VIDEO_CAPTURE ) +return -EINVAL ; + +if (info->tpf.numerator ==0 ) +return -EINVAL ; + + info->capture_mode = cp->capturemode; + +return 0 ; +} + +/** +* @short Get stream parameters +* @param[in] sd v4l2 subdev +* @param[in] parms stream parameters +* @return Error code +*/ +static int sensor_g_parm (struct v4l2_subdev *sd,struct v4l2_streamparm *parms) +{ +struct v4l2_captureparm *cp = &parms->parm.capture; +struct ov5647 *info =to_state (sd); + +if (parms->type !=V4L2_BUF_TYPE_VIDEO_CAPTURE ) +return -EINVAL ; + +memset (cp,0 ,sizeof (struct v4l2_captureparm )); + cp->capability =V4L2_CAP_TIMEPERFRAME ; + cp->capturemode = info->capture_mode; +drivers/media/i2c/ov5647.c line 649
Quoted 10 lines
drivers/media/i2c/ov5647.c new file +10
-0+return 0 ; +} + +/** +* @short Subdev video operations registration +* +*/ +static const struct v4l2_subdev_video_ops sensor_video_ops = { + .s_parm = sensor_s_parm, + .g_parm = sensor_g_parm,Please use the g/s_frame_interval() instead. That's what sub-device drivers generally use for the purpose.
Quoted 54 lines
drivers/media/i2c/ov5647.c new file +54
-0+}; + +/* ----------------------------------------------------------------------- */ + +/** +* @short Subdev operations registration +* +*/ +static const struct v4l2_subdev_ops subdev_ops = { + .core = &sensor_core_ops, + .video = &sensor_video_ops, +}; + +/* ----------------------------------------------------------------------------- +* V4L2 subdev internal operations +*/ + +/** +* @short Detect camera version and model +* @param[in] sd v4l2 subdev +* @return Error code +*/ +int ov5647_detect (struct v4l2_subdev *sd) +{ +unsigned char v; +int ret; +struct i2c_client *client =v4l2_get_subdevdata (sd); + + ret =ov5647_write (sd,OV5647_SW_RESET ,0x01 ); +if (ret <0 ) +return ret; + ret =ov5647_read (sd,OV5647_REG_CHIPID_H , &v); +if (ret <0 ) +return ret; +if (v !=0x56 ) { +dev_err (&client->dev,"Wrong model version detected" ); +return -ENODEV ; + } + ret =ov5647_read (sd,OV5647_REG_CHIPID_L , &v); +if (ret <0 ) +return ret; +if (v !=0x47 ) { +dev_err (&client->dev,"Wrong model version detected" ); +return -ENODEV ; + } + + ret =ov5647_write (sd,OV5647_SW_RESET ,0x00 ); +if (ret <0 ) +return ret; + +return 0 ; +} + +/** drivers/media/i2c/ov5647.c line 713
Quoted 10 lines
drivers/media/i2c/ov5647.c new file +10
-0+* @short Detect if camera is registered +* @param[in] sd v4l2 subdev +* @return Error code +*/ +static int ov5647_registered (struct v4l2_subdev *sd) +{ +struct i2c_client *client =v4l2_get_subdevdata (sd); + +dev_info (&client->dev,"OV5647 detected at address 0x%02x\n" , + client->addr);I might omit this. If there's a need to debug this then the information should be printed by the framework instead using debug level messages.
Quoted 55 lines
drivers/media/i2c/ov5647.c new file +55
-0+ +return 0 ; +} + +/** +* @short Open device +* @param[in] sd v4l2 subdev +* @param[in] fh v4l2 file handler +* @return Error code +*/ +static int ov5647_open (struct v4l2_subdev *sd,struct v4l2_subdev_fh *fh) +{ +struct v4l2_mbus_framefmt *format = +v4l2_subdev_get_try_format (sd, fh->pad,0 ); +struct v4l2_rect *crop = +v4l2_subdev_get_try_crop (sd, fh->pad,0 ); + + crop->left =OV5647_COLUMN_START_DEF ; + crop->top =OV5647_ROW_START_DEF ; + crop->width =OV5647_WINDOW_WIDTH_DEF ; + crop->height =OV5647_WINDOW_HEIGHT_DEF ; + + format->code =MEDIA_BUS_FMT_SBGGR8_1X8 ; + + format->width =OV5647_WINDOW_WIDTH_DEF ; + format->height =OV5647_WINDOW_HEIGHT_DEF ; + format->field =V4L2_FIELD_NONE ; + format->colorspace =V4L2_COLORSPACE_SRGB ; + +return sensor_power (sd, true); +} + +/** +* @short Open device +* @param[in] sd v4l2 subdev +* @param[in] fh v4l2 file handler +* @return Error code +*/ +static int ov5647_close (struct v4l2_subdev *sd,struct v4l2_subdev_fh *fh) +{ +return sensor_power (sd, false); +} + +/** +* @short Subdev internal operations registration +* +*/ +static const struct v4l2_subdev_internal_ops ov5647_subdev_internal_ops = { + .registered = ov5647_registered, + .open = ov5647_open, + .close = ov5647_close, +}; + +/** +* @short Initialization routine - Entry point of the driver drivers/media/i2c/ov5647.c line 778
Quoted 10 lines
drivers/media/i2c/ov5647.c new file +10
-0+* @param[in] client pointer to the i2c client structure +* @param[in] id pointer to the i2c device id structure +* @return 0 on success and a negative number on failure +*/ +static int ov5647_probe (struct i2c_client *client, +const struct i2c_device_id *id) +{ +struct device *dev = &client->dev; +struct ov5647 *sensor; +int ret =0 ;No need to initialise ret here.
Quoted 88 lines
drivers/media/i2c/ov5647.c new file +88
-0+struct v4l2_subdev *sd; + +dev_info (&client->dev,"Installing OmniVision OV5647 camera driver\n" ); + + sensor =devm_kzalloc (dev,sizeof (*sensor),GFP_KERNEL ); +if (sensor ==NULL ) +return -ENOMEM ; + +mutex_init (&sensor->lock); + sensor->dev = dev; + + sd = &sensor->sd; +v4l2_i2c_subdev_init (sd, client, &subdev_ops); + sensor->sd.flags |=V4L2_SUBDEV_FL_HAS_DEVNODE ; + + sensor->pad.flags =MEDIA_PAD_FL_SOURCE ; + sd->entity.function =MEDIA_ENT_F_CAM_SENSOR ; + ret =media_entity_pads_init (&sd->entity,1 , &sensor->pad); +if (ret <0 ) + goto mutex_remove; + + ret =ov5647_detect (sd); +if (ret <0 ) + goto error; + + ret =v4l2_async_register_subdev (sd); +if (ret <0 ) + goto error; + +return 0 ; +error: +media_entity_cleanup (&sd->entity); +mutex_remove: +mutex_destroy (&sensor->lock); +return ret; +} + +/** +* @short Exit routine - Exit point of the driver +* @param[in] client pointer to the i2c client structure +* @return 0 on success and a negative number on failure +*/ +static int ov5647_remove (struct i2c_client *client) +{ +struct v4l2_subdev *sd =i2c_get_clientdata (client); +struct ov5647 *ov5647 =to_state (sd); + +v4l2_async_unregister_subdev (&ov5647->sd); +media_entity_cleanup (&ov5647->sd.entity); +v4l2_device_unregister_subdev (sd); +mutex_destroy (&ov5647->lock); + +return 0 ; +} + +static const struct i2c_device_id ov5647_id[] = { + {"ov5647" ,0 }, + { } +}; +MODULE_DEVICE_TABLE (i2c, ov5647_id); + +#if IS_ENABLED (CONFIG_OF ) +static const struct of_device_id ov5647_of_match[] = { + { .compatible ="ovti,ov5647" }, + {/* sentinel */ }, +}; +MODULE_DEVICE_TABLE (of, ov5647_of_match); +#endif + +/** +* @short i2c driver structure +*/ +static struct i2c_driver ov5647_driver = { + .driver = { + .of_match_table =of_match_ptr (ov5647_of_match), + .owner =THIS_MODULE , + .name ="ov5647" , + }, + .probe = ov5647_probe, + .remove = ov5647_remove, + .id_table = ov5647_id, +}; + +module_i2c_driver (ov5647_driver); + +MODULE_AUTHOR ("Ramiro Oliveira <roliveir-HKixBCOQz3hWk0Htik3J/[email protected]>" ); +MODULE_DESCRIPTION ("A low-level driver for OmniVision ov5647 sensors" ); +MODULE_LICENSE ("GPL v2" );
Signature · 6 lines
Sakari Ailus e-mail: [email protected] XMPP: [email protected] -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html