media: introduce microchip csi2dc driver
Subsystems (3)
v2 cover media: introduce microchip csi2dc driver
Hi,
This series adds support for the Microchip csi2dc csi-2 demux controller.
I was not fully sure where is the best place for such a helper chip, thus I added the driver in a separate 'misc' menu under the media menu.
There are references in the binding driver to the Synopsys IDI interface, which is not yet in kernel mainline, as per the patch series at [1].
As this driver is still new, it still can get plenty of improvement, so, waiting for feedback.
Thanks everyone for reviewing !
Changes in v2:
- fixed warnings for binding yaml check
[1] https://lwn.net/Articles/790917/
Eugen Hristev (4):
dt-bindings: media: csi2dc: add bindings for microchip csi2dc
media: misc: introduce miscellaneous menu for helper chips
media: misc: introduce microchip_csi2dc driver
MAINTAINERS: add microchip csi2dc
.../bindings/media/microchip,csi2dc.yaml | 185 +++++ MAINTAINERS | 7 + drivers/media/Kconfig | 1 + drivers/media/Makefile | 2 +- drivers/media/misc/Kconfig | 22 + drivers/media/misc/Makefile | 2 + drivers/media/misc/microchip_csi2dc.c | 705 ++++++++++++++++++ 7 files changed, 923 insertions(+), 1 deletion(-) create mode 100644 Documentation/devicetree/bindings/media/microchip,csi2dc.yaml create mode 100644 drivers/media/misc/Kconfig create mode 100644 drivers/media/misc/Makefile create mode 100644 drivers/media/misc/microchip_csi2dc.c
Signature · 1 line
2.25.1
PATCH v2 1/4 dt-bindings: media: csi2dc: add bindings for microchip csi2dc
Add bindings documentation for microchip CSI2 Demultiplexer controller.
CSI2DC is a demultiplexer from Synopsys IDI interface specification to parallel interface connection or direct memory access.
Signed-off-by Eugen Hristev <[email protected]>
---
Changes in v2:
- fixed warnings reported by dt_binding_check
.../bindings/media/microchip,csi2dc.yaml | 185 ++++++++++++++++++ 1 file changed, 185 insertions(+) create mode 100644 Documentation/devicetree/bindings/media/microchip,csi2dc.yaml
Documentation/devicetree/bindings/media/microchip,csi2dc.yaml new file +185 -0
@@ -0,0 +1,185 @@ +# SPDX-License-Identifier: GPL-2.0-only +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/media/microchip,csi2dc.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Microchip CSI2 Demux Controller (CSI2DC) + +maintainers: + - Eugen Hristev <[email protected]> + +description: + CSI2DC - Camera Serial Interface 2 Demux Controller + + CSI2DC is a hardware block that receives incoming data from an IDI interface + and filters packets based on their data type and virtual channel identifier, + then converts the byte stream into a cross clock domain to a pixel stream + to a parallel interface that can be read by a sensor controller. + + CSI2DC provides two pipes, one video pipe and one data pipe. Video pipe + is connected to a sensor controller and the data pipe is accessible + as a DMA slave port to a DMA controller. + + CSI2DC supports a single 'port' node as a source pad with Synopsys 32-bit + IDI interface. The connected endpoint must be a IDI interface compatible + device (like Synopsys CSI2HOST) , that can provide 32-bit IDI interface + connection as sink pad. + It should contain one 'port' child node with one child 'endpoint' node. + This node should always have the 'reg' property as 0, being the first child + node. + For media entity and endpoints please refer to the bindings defined in + Documentation/devicetree/bindings/media/video-interfaces.txt. + For Synopsys IDI interface please refer to + Documentation/devicetree/bindings/media/snps,dw-csi-plat.txt + + CSI2DC supports one 'port' node as sink pad with parallel interface. This is + called video pipe. + The reg property inside this 'port' node must have the 'reg' property as 1, + being the second child node. + This node must have one 'endpoint', and this 'endpoint' is related to the + virtual channel identifier. + The 'reg' property inside this 'endpoint' represents the CSI2 virtual channel + identifier. + This 'endpoint' can then be used as a source pad for another controller + (next in pipeline). + Please refer to the bindings defined in + Documentation/devicetree/bindings/media/video-interfaces.txt. + + CSI2DC must have two clocks to function correctly. One clock is the + peripheral clock for the inside functionality of the hardware block. + This is named 'pclk'. The second clock must be the cross domain clock, + in which CSI2DC will perform clock crossing. This clock must be fed + by the next controller in pipeline, which usually is a sensor controller. + Normally this clock should be given by this sensor controller who + is also a clock source. This clock is named 'scck', sensor controller clock. + + CSI2DC also supports direct access to the data through AHB, via DMA channel, + called data pipe. + Because of this, the sink 'port' child node (second) is not mandatory. + If the sink 'port' child node is missing, only data pipe is available. + +properties: + compatible: + const: microchip,sama7g5-csi2dc + + reg: + description: + Physical base address and length of the registers set for the device. + maxItems: 1 + + clocks: + maxItems: 2 + + clock-names: + items: + - const: pclk + - const: scck + + microchip,clk-gated: + type: boolean + description: + If present, indicates that the clock is gated. + Otherwise, the clock is free-running. + + microchip,inter-line-delay: + allOf: + - $ref: /schemas/types.yaml#/definitions/uint32 + - minimum: 1 + - maximum: 16 + default: 16 + description: + Indicates how many clock cycles should be introduced between each line. + + port@0: + type: object + description: + Input port node, single endpoint describing the input pad. + + properties: + reg: + const: 0 + + endpoint: + type: object + + properties: + remote-endpoint: true + + required: + - remote-endpoint + + additionalProperties: false + + additionalProperties: false + + port@1: + type: object + description: + Output port node, single endpoint, describing the output pad. + + properties: + '#address-cells': + const: 1 + + '#size-cells': + const: 0 + + reg: + const: 1 + + patternProperties: + "^endpoint@[0-9a-f]$": + type: object + + properties: + reg: + enum: [0, 1, 2, 3] + description: virtual channel for the endpoint + + remote-endpoint: true + + required: + - remote-endpoint + - reg + + additionalProperties: false + + additionalProperties: false + +required: + - compatible + - reg + - clocks + - clock-names + - port@0 + +examples: + - | + csi2dc@e1404000 { + compatible = "microchip,sama7g5-csi2dc"; + #address-cells = <1>; + #size-cells = <0>; + reg = <0xe1404000 0x500>; + clocks = <&pclk>, <&scck>; + clock-names = "pclk", "scck"; + + port@0 { + reg = <0>; /* must be 0, first child port */ + csi2dc_in: endpoint { /* input from IDI interface */ + remote-endpoint = <&csi2host_out>; + }; + }; + + port@1 { + #address-cells = <1>; + #size-cells = <0>; + reg = <1>; /* must be 1, second child port */ + csi2dc_out: endpoint@2 { + reg = <2>; /* virtual channel identifier */ + remote-endpoint = <&xisc_in>; /* output to sensor controller */ + }; + }; + }; + +...
Signature · 1 line
2.25.1
Rob Herring
maintainerRe: [PATCH v2 1/4] dt-bindings: media: csi2dc: add bindings for microchip csi2dc
Quoted 21 lines · Eugen Hristev
Add bindings documentation for microchip CSI2 Demultiplexer controller.
CSI2DC is a demultiplexer from Synopsys IDI interface specification to parallel interface connection or direct memory access.
Signed-off-by Eugen Hristev <[email protected]>---
Changes in v2:
- fixed warnings reported bydt_binding_check.../bindings/media/microchip,csi2dc.yaml | 185 ++++++++++++++++++ 1 file changed, 185 insertions(+) create mode 100644 Documentation/devicetree/bindings/media/microchip,csi2dc.yamlDocumentation/devicetree/bindings/media/microchip,csi2dc.yaml new file +0
-0
Documentation/devicetree/bindings/media/microchip,csi2dc.yaml line 1
Quoted 1 line
Documentation/devicetree/bindings/media/microchip,csi2dc.yaml new file +1
-0@@ -0,0 +1,185 @@ +# SPDX-License-Identifier: GPL-2.0-only
New bindings should be:
(GPL-2.0-only OR BSD-2-Clause)
Quoted 19 lines
Documentation/devicetree/bindings/media/microchip,csi2dc.yaml new file +19
-0+%YAML 1.2 +--- +$id: http://devicetree.org/schemas/media/microchip,csi2dc.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Microchip CSI2 Demux Controller (CSI2DC) + +maintainers: + - Eugen Hristev <[email protected]> + +description: + CSI2DC - Camera Serial Interface 2 Demux Controller + + CSI2DC is a hardware block that receives incoming data from an IDI interface + and filters packets based on their data type and virtual channel identifier, + then converts the byte stream into a cross clock domain to a pixel stream + to a parallel interface that can be read by a sensor controller. + + CSI2DC provides two pipes, one video pipe and one data pipe. Video pipe
Documentation/devicetree/bindings/media/microchip,csi2dc.yaml line 30
Quoted 10 lines
Documentation/devicetree/bindings/media/microchip,csi2dc.yaml new file +10
-0+ is connected to a sensor controller and the data pipe is accessible + as a DMA slave port to a DMA controller. + + CSI2DC supports a single 'port' node as a source pad with Synopsys 32-bit + IDI interface. The connected endpoint must be a IDI interface compatible + device (like Synopsys CSI2HOST) , that can provide 32-bit IDI interface + connection as sink pad. + It should contain one 'port' child node with one child 'endpoint' node. + This node should always have the 'reg' property as 0, being the first child + node.
This information should be expressed as a schema.
Quoted 8 lines
Documentation/devicetree/bindings/media/microchip,csi2dc.yaml new file +7
-0+ For media entity and endpoints please refer to the bindings defined in + Documentation/devicetree/bindings/media/video-interfaces.txt. + For Synopsys IDI interface please refer to + Documentation/devicetree/bindings/media/snps,dw-csi-plat.txt + + CSI2DC supports one 'port' node as sink pad with parallel interface. This is + called video pipe.
Documentation/devicetree/bindings/media/microchip,csi2dc.yaml line 47
Quoted 10 lines
Documentation/devicetree/bindings/media/microchip,csi2dc.yaml new file +10
-0+ The reg property inside this 'port' node must have the 'reg' property as 1, + being the second child node. + This node must have one 'endpoint', and this 'endpoint' is related to the + virtual channel identifier. + The 'reg' property inside this 'endpoint' represents the CSI2 virtual channel + identifier. + This 'endpoint' can then be used as a source pad for another controller + (next in pipeline). + Please refer to the bindings defined in + Documentation/devicetree/bindings/media/video-interfaces.txt.
And all this.
Documentation/devicetree/bindings/media/microchip,csi2dc.yaml line 55
Quoted 8 lines
Documentation/devicetree/bindings/media/microchip,csi2dc.yaml new file +8
-0+ + CSI2DC must have two clocks to function correctly. One clock is the + peripheral clock for the inside functionality of the hardware block. + This is named 'pclk'. The second clock must be the cross domain clock, + in which CSI2DC will perform clock crossing. This clock must be fed + by the next controller in pipeline, which usually is a sensor controller. + Normally this clock should be given by this sensor controller who + is also a clock source. This clock is named 'scck', sensor controller clock.
Better to be part of 'clocks'.
Documentation/devicetree/bindings/media/microchip,csi2dc.yaml line 68
Quoted 13 lines
Documentation/devicetree/bindings/media/microchip,csi2dc.yaml new file +13
-0+ + CSI2DC also supports direct access to the data through AHB, via DMA channel, + called data pipe. + Because of this, the sink 'port' child node (second) is not mandatory. + If the sink 'port' child node is missing, only data pipe is available. + +properties: + compatible: + const: microchip,sama7g5-csi2dc + + reg: + description: + Physical base address and length of the registers set for the device.
That is every 'reg' prop. Drop.
Quoted 54 lines
Documentation/devicetree/bindings/media/microchip,csi2dc.yaml new file +54
-0+ maxItems: 1 + + clocks: + maxItems: 2 + + clock-names: + items: + - const: pclk + - const: scck + + microchip,clk-gated: + type: boolean + description: + If present, indicates that the clock is gated. + Otherwise, the clock is free-running. + + microchip,inter-line-delay: + allOf: + - $ref: /schemas/types.yaml#/definitions/uint32 + - minimum: 1 + - maximum: 16 + default: 16 + description: + Indicates how many clock cycles should be introduced between each line. + + port@0: + type: object + description: + Input port node, single endpoint describing the input pad. + + properties: + reg: + const: 0 + + endpoint: + type: object + + properties: + remote-endpoint: true + + required: + - remote-endpoint + + additionalProperties: false + + additionalProperties: false + + port@1: + type: object + description: + Output port node, single endpoint, describing the output pad. + + properties: + '#address-cells':
Documentation/devicetree/bindings/media/microchip,csi2dc.yaml line 132
Quoted 10 lines
Documentation/devicetree/bindings/media/microchip,csi2dc.yaml new file +10
-0+ const: 1 + + '#size-cells': + const: 0 + + reg: + const: 1 + + patternProperties: + "^endpoint@[0-9a-f]$":
Looks like only [0-3] is valid.
Quoted 56 lines
Documentation/devicetree/bindings/media/microchip,csi2dc.yaml new file +53
-0+ type: object + + properties: + reg: + enum: [0, 1, 2, 3] + description: virtual channel for the endpoint + + remote-endpoint: true + + required: + - remote-endpoint + - reg + + additionalProperties: false + + additionalProperties: false + +required: + - compatible + - reg + - clocks + - clock-names + - port@0 + +examples: + - | + csi2dc@e1404000 { + compatible = "microchip,sama7g5-csi2dc"; + #address-cells = <1>; + #size-cells = <0>; + reg = <0xe1404000 0x500>; + clocks = <&pclk>, <&scck>; + clock-names = "pclk", "scck"; + + port@0 { + reg = <0>; /* must be 0, first child port */ + csi2dc_in: endpoint { /* input from IDI interface */ + remote-endpoint = <&csi2host_out>; + }; + }; + + port@1 { + #address-cells = <1>; + #size-cells = <0>; + reg = <1>; /* must be 1, second child port */ + csi2dc_out: endpoint@2 { + reg = <2>; /* virtual channel identifier */ + remote-endpoint = <&xisc_in>; /* output to sensor controller */ + }; + }; + }; + +...Signature · 1 line
2.25.1
Re: [PATCH v2 1/4] dt-bindings: media: csi2dc: add bindings for microchip csi2dc
Quoted 53 lines · Rob Herring
EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
Quoted 21 lines · Eugen Hristev
Add bindings documentation for microchip CSI2 Demultiplexer controller.
CSI2DC is a demultiplexer from Synopsys IDI interface specification to parallel interface connection or direct memory access.
Signed-off-by Eugen Hristev <[email protected]>---
Changes in v2:
- fixed warnings reported bydt_binding_check.../bindings/media/microchip,csi2dc.yaml | 185 ++++++++++++++++++ 1 file changed, 185 insertions(+)create mode 100644
Documentation/devicetree/bindings/media/microchip,csi2dc.yamlDocumentation/devicetree/bindings/media/microchip,csi2dc.yaml new file +0
-0Documentation/devicetree/bindings/media/microchip,csi2dc.yaml line 1
Quoted 1 line
Documentation/devicetree/bindings/media/microchip,csi2dc.yaml new file +1
-0@@ -0,0 +1,185 @@ +# SPDX-License-Identifier: GPL-2.0-onlyNew bindings should be:
(GPL-2.0-only OR BSD-2-Clause)
Quoted 23 lines
Documentation/devicetree/bindings/media/microchip,csi2dc.yaml new file +23
-0+%YAML 1.2 +--- +$id: http://devicetree.org/schemas/media/microchip,csi2dc.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Microchip CSI2 Demux Controller (CSI2DC) + +maintainers: + - Eugen Hristev <[email protected]> + +description: + CSI2DC - Camera Serial Interface 2 Demux Controller + + CSI2DC is a hardware block that receives incoming data from an IDI interface + and filters packets based on their data type and virtual channel identifier, + then converts the byte stream into a cross clock domain to a pixel stream + to a parallel interface that can be read by a sensor controller. + + CSI2DC provides two pipes, one video pipe and one data pipe. Video pipe + is connected to a sensor controller and the data pipe is accessible + as a DMA slave port to a DMA controller. + + CSI2DC supports a single 'port' node as a source pad with Synopsys 32-bit
Quoted 8 lines
Documentation/devicetree/bindings/media/microchip,csi2dc.yaml line 30
Quoted 6 lines
Documentation/devicetree/bindings/media/microchip,csi2dc.yaml new file +6
-0+ IDI interface. The connected endpoint must be a IDI interface compatible + device (like Synopsys CSI2HOST) , that can provide 32-bit IDI interface + connection as sink pad. + It should contain one 'port' child node with one child 'endpoint' node. + This node should always have the 'reg' property as 0, being the first child + node.This information should be expressed as a schema.
Hello Rob,
Do you mean that I should add these explanations inside the schema properties description ?
Or I should enforce these in some other way ? The schema already includes what is written here (for example, const reg 0 for the child node, etc.)
Or maybe you wanted to tell me something else ?
Thanks,
Eugen
Quoted 172 lines
Quoted 9 lines
Documentation/devicetree/bindings/media/microchip,csi2dc.yaml new file +7
-0+ For media entity and endpoints please refer to the bindings defined in + Documentation/devicetree/bindings/media/video-interfaces.txt. + For Synopsys IDI interface please refer to + Documentation/devicetree/bindings/media/snps,dw-csi-plat.txt + + CSI2DC supports one 'port' node as sink pad with parallel interface. This is + called video pipe.Documentation/devicetree/bindings/media/microchip,csi2dc.yaml line 47
Quoted 10 lines
Documentation/devicetree/bindings/media/microchip,csi2dc.yaml new file +10
-0+ The reg property inside this 'port' node must have the 'reg' property as 1, + being the second child node. + This node must have one 'endpoint', and this 'endpoint' is related to the + virtual channel identifier. + The 'reg' property inside this 'endpoint' represents the CSI2 virtual channel + identifier. + This 'endpoint' can then be used as a source pad for another controller + (next in pipeline). + Please refer to the bindings defined in + Documentation/devicetree/bindings/media/video-interfaces.txt.And all this.
Documentation/devicetree/bindings/media/microchip,csi2dc.yaml line 55
Quoted 8 lines
Documentation/devicetree/bindings/media/microchip,csi2dc.yaml new file +8
-0+ + CSI2DC must have two clocks to function correctly. One clock is the + peripheral clock for the inside functionality of the hardware block. + This is named 'pclk'. The second clock must be the cross domain clock, + in which CSI2DC will perform clock crossing. This clock must be fed + by the next controller in pipeline, which usually is a sensor controller. + Normally this clock should be given by this sensor controller who + is also a clock source. This clock is named 'scck', sensor controller clock.Better to be part of 'clocks'.
Documentation/devicetree/bindings/media/microchip,csi2dc.yaml line 68
Quoted 13 lines
Documentation/devicetree/bindings/media/microchip,csi2dc.yaml new file +13
-0+ + CSI2DC also supports direct access to the data through AHB, via DMA channel, + called data pipe. + Because of this, the sink 'port' child node (second) is not mandatory. + If the sink 'port' child node is missing, only data pipe is available. + +properties: + compatible: + const: microchip,sama7g5-csi2dc + + reg: + description: + Physical base address and length of the registers set for the device.That is every 'reg' prop. Drop.
Quoted 54 lines
Documentation/devicetree/bindings/media/microchip,csi2dc.yaml new file +54
-0+ maxItems: 1 + + clocks: + maxItems: 2 + + clock-names: + items: + - const: pclk + - const: scck + + microchip,clk-gated: + type: boolean + description: + If present, indicates that the clock is gated. + Otherwise, the clock is free-running. + + microchip,inter-line-delay: + allOf: + - $ref: /schemas/types.yaml#/definitions/uint32 + - minimum: 1 + - maximum: 16 + default: 16 + description: + Indicates how many clock cycles should be introduced between each line. + + port@0: + type: object + description: + Input port node, single endpoint describing the input pad. + + properties: + reg: + const: 0 + + endpoint: + type: object + + properties: + remote-endpoint: true + + required: + - remote-endpoint + + additionalProperties: false + + additionalProperties: false + + port@1: + type: object + description: + Output port node, single endpoint, describing the output pad. + + properties: + '#address-cells':Documentation/devicetree/bindings/media/microchip,csi2dc.yaml line 132
Quoted 10 lines
Documentation/devicetree/bindings/media/microchip,csi2dc.yaml new file +10
-0+ const: 1 + + '#size-cells': + const: 0 + + reg: + const: 1 + + patternProperties: + "^endpoint@[0-9a-f]$":Looks like only [0-3] is valid.
Quoted 56 lines
Documentation/devicetree/bindings/media/microchip,csi2dc.yaml new file +53
-1+ type: object + + properties: + reg: + enum: [0, 1, 2, 3] + description: virtual channel for the endpoint + + remote-endpoint: true + + required: + - remote-endpoint + - reg + + additionalProperties: false + + additionalProperties: false + +required: + - compatible + - reg + - clocks + - clock-names + - port@0 + +examples: + - | + csi2dc@e1404000 { + compatible = "microchip,sama7g5-csi2dc"; + #address-cells = <1>; + #size-cells = <0>; + reg = <0xe1404000 0x500>; + clocks = <&pclk>, <&scck>; + clock-names = "pclk", "scck"; + + port@0 { + reg = <0>; /* must be 0, first child port */ + csi2dc_in: endpoint { /* input from IDI interface */ + remote-endpoint = <&csi2host_out>; + }; + }; + + port@1 { + #address-cells = <1>; + #size-cells = <0>; + reg = <1>; /* must be 1, second child port */ + csi2dc_out: endpoint@2 { + reg = <2>; /* virtual channel identifier */ + remote-endpoint = <&xisc_in>; /* output to sensor controller */ + }; + }; + }; + +... --2.25.1
Re: [PATCH v2 1/4] dt-bindings: media: csi2dc: add bindings for microchip csi2dc
In reply to Eugen HristevHi Eugen,
Quoted 1 line · Eugen Hristev
Add bindings documentation for microchip CSI2 Demultiplexer controller.
...
Quoted 13 lines
Documentation/devicetree/bindings/media/microchip,csi2dc.yaml new file +13
-0+ port@1: + type: object + description: + Output port node, single endpoint, describing the output pad. + + properties: + '#address-cells': + const: 1 + + '#size-cells': + const: 0 + + reg:
Documentation/devicetree/bindings/media/microchip,csi2dc.yaml line 138
Quoted 10 lines
Documentation/devicetree/bindings/media/microchip,csi2dc.yaml new file +10
-0+ const: 1 + + patternProperties: + "^endpoint@[0-9a-f]$": + type: object + + properties: + reg: + enum: [0, 1, 2, 3] + description: virtual channel for the endpoint
Unless you need this right now I'd just hard code this to zero in the driver. You can't have more endpoints for active devices anyway, can you?
Signature · 1 line
Sakari Ailus
Re: [PATCH v2 1/4] dt-bindings: media: csi2dc: add bindings for microchip csi2dc
Quoted 25 lines · Sakari Ailus
Hi Eugen,
Quoted 1 line · Eugen Hristev
Add bindings documentation for microchip CSI2 Demultiplexer controller.
...
Quoted 18 lines
Documentation/devicetree/bindings/media/microchip,csi2dc.yaml new file +18
-0+ port@1: + type: object + description: + Output port node, single endpoint, describing the output pad. + + properties: + '#address-cells': + const: 1 + + '#size-cells': + const: 0 + + reg: + const: 1 + + patternProperties: + "^endpoint@[0-9a-f]$": + type: object
Quoted 8 lines
Documentation/devicetree/bindings/media/microchip,csi2dc.yaml line 138
Quoted 5 lines
Documentation/devicetree/bindings/media/microchip,csi2dc.yaml new file +5
-0+ + properties: + reg: + enum: [0, 1, 2, 3] + description: virtual channel for the endpointUnless you need this right now I'd just hard code this to zero in the driver. You can't have more endpoints for active devices anyway, can you?
Hello Sakari,
You are right, but, the virtual ID must be written in hardware registers. So I can take the virtual ID from this property. Otherwise, if I hardcode this in the driver, another virtual ID would be impossible to use without changing the driver. And if the binding is accepted without this property, it will be 'set in stone' and difficult to change afterwards.
What do you think ?
Eugen
Quoted 4 lines
--
Sakari Ailus
Re: [PATCH v2 1/4] dt-bindings: media: csi2dc: add bindings for microchip csi2dc
In reply to Eugen HristevQuoted 38 lines · Eugen Hristev
Add bindings documentation for microchip CSI2 Demultiplexer controller.
CSI2DC is a demultiplexer from Synopsys IDI interface specification to parallel interface connection or direct memory access.
Signed-off-by Eugen Hristev <[email protected]>---
Changes in v2:
- fixed warnings reported bydt_binding_check.../bindings/media/microchip,csi2dc.yaml | 185 ++++++++++++++++++ 1 file changed, 185 insertions(+)create mode 100644
Documentation/devicetree/bindings/media/microchip,csi2dc.yamlDocumentation/devicetree/bindings/media/microchip,csi2dc.yaml new file +17
-0@@ -0,0 +1,185 @@ +# SPDX-License-Identifier: GPL-2.0-only +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/media/microchip,csi2dc.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Microchip CSI2 Demux Controller (CSI2DC) + +maintainers: + - Eugen Hristev <[email protected]> + +description: + CSI2DC - Camera Serial Interface 2 Demux Controller + + CSI2DC is a hardware block that receives incoming data from an IDI interface + and filters packets based on their data type and virtual channel identifier, + then converts the byte stream into a cross clock domain to a pixel stream
Documentation/devicetree/bindings/media/microchip,csi2dc.yaml line 27
Quoted 10 lines
Documentation/devicetree/bindings/media/microchip,csi2dc.yaml new file +10
-0+ to a parallel interface that can be read by a sensor controller. + + CSI2DC provides two pipes, one video pipe and one data pipe. Video pipe + is connected to a sensor controller and the data pipe is accessible + as a DMA slave port to a DMA controller. + + CSI2DC supports a single 'port' node as a source pad with Synopsys 32-bit + IDI interface. The connected endpoint must be a IDI interface compatible + device (like Synopsys CSI2HOST) , that can provide 32-bit IDI interface + connection as sink pad.
Hello Sakari,
Could you have a look at my binding, especially this paragraph above. This controller that we have requires the Synopsys IDI interface as source pad. As this interface is not yet in kernel, do you think it's fine to mention it here ? Or how should I proceed ?
In my tests and the example at the end of this binding, I just use the port and endpoints without any specific properties.
The CSI2DC will actually wait an async completion (with a notifier) for that device to be registered, and then use it as a subdevice. In turn, CSI2DC registers a subdev for the next port in pipeline, towards the upper level ( the image sensor controller)
However, the connection with the subdevice in this case will likely default to parallel, and not be at all in any of the cases in the video-interfaces.txt :
- bus-type: data bus type. Possible values are:
1 - MIPI CSI-2 C-PHY
2 - MIPI CSI1
3 - CCP2
4 - MIPI CSI-2 D-PHY
5 - Parallel
6 - Bt.656
as this interface type is actually Synopsys IDI.
Do you think this is fine ?
Thanks,
Eugen
Quoted 159 lines
Documentation/devicetree/bindings/media/microchip,csi2dc.yaml new file +158
-0+ It should contain one 'port' child node with one child 'endpoint' node. + This node should always have the 'reg' property as 0, being the first child + node. + For media entity and endpoints please refer to the bindings defined in + Documentation/devicetree/bindings/media/video-interfaces.txt. + For Synopsys IDI interface please refer to + Documentation/devicetree/bindings/media/snps,dw-csi-plat.txt + + CSI2DC supports one 'port' node as sink pad with parallel interface. This is + called video pipe. + The reg property inside this 'port' node must have the 'reg' property as 1, + being the second child node. + This node must have one 'endpoint', and this 'endpoint' is related to the + virtual channel identifier. + The 'reg' property inside this 'endpoint' represents the CSI2 virtual channel + identifier. + This 'endpoint' can then be used as a source pad for another controller + (next in pipeline). + Please refer to the bindings defined in + Documentation/devicetree/bindings/media/video-interfaces.txt. + + CSI2DC must have two clocks to function correctly. One clock is the + peripheral clock for the inside functionality of the hardware block. + This is named 'pclk'. The second clock must be the cross domain clock, + in which CSI2DC will perform clock crossing. This clock must be fed + by the next controller in pipeline, which usually is a sensor controller. + Normally this clock should be given by this sensor controller who + is also a clock source. This clock is named 'scck', sensor controller clock. + + CSI2DC also supports direct access to the data through AHB, via DMA channel, + called data pipe. + Because of this, the sink 'port' child node (second) is not mandatory. + If the sink 'port' child node is missing, only data pipe is available. + +properties: + compatible: + const: microchip,sama7g5-csi2dc + + reg: + description: + Physical base address and length of the registers set for the device. + maxItems: 1 + + clocks: + maxItems: 2 + + clock-names: + items: + - const: pclk + - const: scck + + microchip,clk-gated: + type: boolean + description: + If present, indicates that the clock is gated. + Otherwise, the clock is free-running. + + microchip,inter-line-delay: + allOf: + - $ref: /schemas/types.yaml#/definitions/uint32 + - minimum: 1 + - maximum: 16 + default: 16 + description: + Indicates how many clock cycles should be introduced between each line. + + port@0: + type: object + description: + Input port node, single endpoint describing the input pad. + + properties: + reg: + const: 0 + + endpoint: + type: object + + properties: + remote-endpoint: true + + required: + - remote-endpoint + + additionalProperties: false + + additionalProperties: false + + port@1: + type: object + description: + Output port node, single endpoint, describing the output pad. + + properties: + '#address-cells': + const: 1 + + '#size-cells': + const: 0 + + reg: + const: 1 + + patternProperties: + "^endpoint@[0-9a-f]$": + type: object + + properties: + reg: + enum: [0, 1, 2, 3] + description: virtual channel for the endpoint + + remote-endpoint: true + + required: + - remote-endpoint + - reg + + additionalProperties: false + + additionalProperties: false + +required: + - compatible + - reg + - clocks + - clock-names + - port@0 + +examples: + - | + csi2dc@e1404000 { + compatible = "microchip,sama7g5-csi2dc"; + #address-cells = <1>; + #size-cells = <0>; + reg = <0xe1404000 0x500>; + clocks = <&pclk>, <&scck>; + clock-names = "pclk", "scck"; + + port@0 { + reg = <0>; /* must be 0, first child port */ + csi2dc_in: endpoint { /* input from IDI interface */ + remote-endpoint = <&csi2host_out>; + }; + }; + + port@1 { + #address-cells = <1>; + #size-cells = <0>; + reg = <1>; /* must be 1, second child port */ + csi2dc_out: endpoint@2 { + reg = <2>; /* virtual channel identifier */ + remote-endpoint = <&xisc_in>; /* output to sensor controller */ + }; + }; + }; + +...
PATCH v2 2/4 media: misc: introduce miscellaneous menu for helper chips
In reply to Eugen HristevIntroduce misc directory for misc driver: various helper chips on different platforms.
Signed-off-by Eugen Hristev <[email protected]>
--- drivers/media/Kconfig | 1 + drivers/media/Makefile | 2 +- drivers/media/misc/Kconfig | 13 +++++++++++++ drivers/media/misc/Makefile | 1 + 4 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 drivers/media/misc/Kconfig create mode 100644 drivers/media/misc/Makefile
drivers/media/Kconfig +1 -0
@@ -258,6 +258,7 @@ source "drivers/media/i2c/Kconfig" source "drivers/media/spi/Kconfig" source "drivers/media/tuners/Kconfig" source "drivers/media/dvb-frontends/Kconfig" +source "drivers/media/misc/Kconfig" endmenu
drivers/media/Makefile +1 -1
@@ -29,6 +29,6 @@ obj-$(CONFIG_CEC_CORE) += cec/ # Finally, merge the drivers that require the core # -obj-y += common/ platform/ pci/ usb/ mmc/ firewire/ spi/ test-drivers/ +obj-y += common/ platform/ pci/ usb/ mmc/ firewire/ spi/ test-drivers/ misc/ obj-$(CONFIG_VIDEO_DEV) += radio/
drivers/media/misc/Kconfig new file +13 -0
@@ -0,0 +1,13 @@ +# +# Multimedia Video Miscellaneous device configuration +# + +if VIDEO_V4L2 + +menu "Miscellaneous helper chips" + +comment "Various helper chips" + +endmenu + +endif
drivers/media/misc/Makefile new file +1 -0
@@ -0,0 +1 @@ +# SPDX-License-Identifier: GPL-2.0
Signature · 1 line
2.25.1
PATCH v2 3/4 media: misc: introduce microchip_csi2dc driver
In reply to Eugen HristevMicrochip CSI2DC (CSI2 Demultiplexer Controller) is a misc bridge device that converts a byte stream in IDI Synopsys format (coming from a CSI2HOST) to a pixel stream that can be captured by a sensor controller.
Signed-off-by Eugen Hristev <[email protected]>
--- drivers/media/misc/Kconfig | 9 + drivers/media/misc/Makefile | 1 + drivers/media/misc/microchip_csi2dc.c | 705 ++++++++++++++++++++++++++ 3 files changed, 715 insertions(+) create mode 100644 drivers/media/misc/microchip_csi2dc.c
drivers/media/misc/Kconfig +9 -0
@@ -8,6 +8,15 @@ menu "Miscellaneous helper chips" comment "Various helper chips" +config VIDEO_MICROCHIP_CSI2DC + tristate "Microchip CSI2 Demux Controller" + depends on VIDEO_V4L2 + help + CSI2 Demux Controller driver. CSI2DC is a helper chip + that converts IDI interface byte stream to a parallel pixel stream. + It supports various RAW formats as input. + Performs clock domain crossing between hardware blocks. + endmenu endif
drivers/media/misc/Makefile +1 -0
@@ -1 +1,2 @@ # SPDX-License-Identifier: GPL-2.0 +obj-$(CONFIG_VIDEO_MICROCHIP_CSI2DC) += microchip_csi2dc.o
drivers/media/misc/microchip_csi2dc.c new file +705 -0
705 lines not on this page · raw message
Signature · 1 line
2.25.1
Re: [PATCH v2 3/4] media: misc: introduce microchip_csi2dc driver
Hi Eugen,
Thanks for the patch.
Quoted 141 lines · Eugen Hristev
Microchip CSI2DC (CSI2 Demultiplexer Controller) is a misc bridge device that converts a byte stream in IDI Synopsys format (coming from a CSI2HOST) to a pixel stream that can be captured by a sensor controller.
Signed-off-by Eugen Hristev <[email protected]>--- drivers/media/misc/Kconfig | 9 + drivers/media/misc/Makefile | 1 + drivers/media/misc/microchip_csi2dc.c | 705 ++++++++++++++++++++++++++ 3 files changed, 715 insertions(+) create mode 100644 drivers/media/misc/microchip_csi2dc.cdrivers/media/misc/Kconfig +9
-0@@ -8,6 +8,15 @@ menu "Miscellaneous helper chips" comment "Various helper chips" +config VIDEO_MICROCHIP_CSI2DC + tristate "Microchip CSI2 Demux Controller" + depends on VIDEO_V4L2 + help + CSI2 Demux Controller driver. CSI2DC is a helper chip + that converts IDI interface byte stream to a parallel pixel stream. + It supports various RAW formats as input. + Performs clock domain crossing between hardware blocks. + endmenu endifdrivers/media/misc/Makefile +1
-0@@ -1 +1,2 @@ # SPDX-License-Identifier: GPL-2.0 +obj-$(CONFIG_VIDEO_MICROCHIP_CSI2DC) += microchip_csi2dc.odrivers/media/misc/microchip_csi2dc.c new file +96
-0@@ -0,0 +1,705 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Microchip CSI2 Demux Controller (CSI2DC) driver +* +* Copyright (C) 2018-2020 Microchip Technology, Inc. +* +* Author: Eugen Hristev <[email protected]> +* +*/ + +#include <linux/clk.h> +#include <linux/module.h> +#include <linux/of.h> +#include <linux/of_graph.h> +#include <linux/platform_device.h> +#include <linux/pm_runtime.h> +#include <linux/videodev2.h> + +#include <media/v4l2-device.h> +#include <media/v4l2-fwnode.h> +#include <media/v4l2-subdev.h> +#include <media/videobuf2-dma-contig.h> + +/* Global configuration register */ +#define CSI2DC_GCFG 0x0 + +/* MIPI sensor pixel clock is free running */ +#define CSI2DC_GCFG_MIPIFRN BIT(0) +/* Output waveform inter-line minimum delay */ +#define CSI2DC_GCFG_HLC (v) ((v) << 4) +#define CSI2DC_GCFG_HLC_MASK GENMASK(7, 4) + +/* Global control register */ +#define CSI2DC_GCTLR 0x04 +#define CSI2DC_GCTLR_SWRST BIT(0) + +/* Global status register */ +#define CSI2DC_GS 0x08 + +/* SSP interrupt status register */ +#define CSI2DC_SSPIS 0x28 +/* Pipe update register */ +#define CSI2DC_PU 0xC0 +/* Video pipe attributes update */ +#define CSI2DC_PU_VP BIT(0) + +/* Pipe update status register */ +#define CSI2DC_PUS 0xC4 + +/* Video pipeline enable register */ +#define CSI2DC_VPE 0xF8 +#define CSI2DC_VPE_ENABLE BIT(0) + +/* Video pipeline configuration register */ +#define CSI2DC_VPCFG 0xFC +/* Data type */ +#define CSI2DC_VPCFG_DT (v) ((v) << 0) +#define CSI2DC_VPCFG_DT_MASK GENMASK(5, 0) +/* Virtual channel identifier */ +#define CSI2DC_VPCFG_VC (v) ((v) << 6) +#define CSI2DC_VPCFG_VC_MASK GENMASK(7, 6) +/* Decompression enable */ +#define CSI2DC_VPCFG_DE BIT(8) +/* Decoder mode */ +#define CSI2DC_VPCFG_DM (v) ((v) << 9) +#define CSI2DC_VPCFG_DM_DECODER8TO12 0 +/* Decoder predictor 2 selection */ +#define CSI2DC_VPCFG_DP2 BIT(12) +/* Recommended memory storage */ +#define CSI2DC_VPCFG_RMS BIT(13) +/* Post adjustment */ +#define CSI2DC_VPCFG_PA BIT(14) + +/* Video pipeline column register */ +#define CSI2DC_VPCOL 0x100 +/* Column number */ +#define CSI2DC_VPCOL_COL (v) ((v) << 0) +#define CSI2DC_VPCOL_COL_MASK GENMASK(15, 0) + +/* Video pipeline row register */ +#define CSI2DC_VPROW 0x104 +/* Row number */ +#define CSI2DC_VPROW_ROW (v) ((v) << 0) +#define CSI2DC_VPROW_ROW_MASK GENMASK(15, 0) + +/* Version register */ +#define CSI2DC_VERSION 0x1FC + +/* register read/write helpers */ +#define csi2dc_readl (st, reg) readl_relaxed((st)->base + (reg)) +#define csi2dc_writel (st, reg, val) writel_relaxed((val), (st)->base + (reg)) + +/* supported RAW data types */ +#define CSI2DC_DT_RAW6 0x28 +#define CSI2DC_DT_RAW7 0x29 +#define CSI2DC_DT_RAW8 0x2A
drivers/media/misc/microchip_csi2dc.c line 106
Quoted 10 lines
drivers/media/misc/microchip_csi2dc.c new file +10
-0+#define CSI2DC_DT_RAW10 0x2B +#define CSI2DC_DT_RAW12 0x2C +#define CSI2DC_DT_RAW14 0x2D + +struct csi2dc_format { +u32 mbus_code; +u32 dt; +}; + +static struct csi2dc_format csi2dc_formats_list[] = {
const
Quoted 50 lines
drivers/media/misc/microchip_csi2dc.c new file +50
-0+ { + .mbus_code = MEDIA_BUS_FMT_SRGGB10_1X10, + .dt = CSI2DC_DT_RAW10, + }, +}; + +enum mipi_csi_pads { +CSI2DC_PAD_SINK =0 , +CSI2DC_PAD_SOURCE =1 , +CSI2DC_PADS_NUM =2 , +}; + +struct csi2dc_device { +void __iomem *base; +struct v4l2_subdev csi2dc_sd; +struct device *dev; +struct v4l2_device v4l2_dev; +struct clk *pclk; +struct clk *scck; + +bool video_pipe; + +u32 num_fmts; +struct csi2dc_format **formats; + +struct csi2dc_format *cur_fmt; +struct csi2dc_format *try_fmt; + +struct media_pad pads[CSI2DC_PADS_NUM ]; + +bool clk_gated; +u32 inter_line_delay; +u32 vc; + +struct v4l2_async_subdev *asd; +struct v4l2_async_notifier notifier; + +struct v4l2_subdev *input_sd; +bool completed; +}; + +static void csi2dc_vp_update (struct csi2dc_device *csi2dc) +{ +u32 vp; + + vp =CSI2DC_VPCFG_DT (csi2dc->cur_fmt->dt) &CSI2DC_VPCFG_DT_MASK ; + vp |=CSI2DC_VPCFG_VC (csi2dc->vc) &CSI2DC_VPCFG_VC_MASK ; + vp &= ~CSI2DC_VPCFG_DE ; + vp |=CSI2DC_VPCFG_DM (CSI2DC_VPCFG_DM_DECODER8TO12 ); + vp &= ~CSI2DC_VPCFG_DP2 ;
drivers/media/misc/microchip_csi2dc.c line 166
Quoted 10 lines
drivers/media/misc/microchip_csi2dc.c new file +10
-0+ vp &= ~CSI2DC_VPCFG_RMS ; + vp |=CSI2DC_VPCFG_PA ; + +csi2dc_writel (csi2dc,CSI2DC_VPCFG , vp); +csi2dc_writel (csi2dc,CSI2DC_VPE ,CSI2DC_VPE_ENABLE ); +csi2dc_writel (csi2dc,CSI2DC_PU ,CSI2DC_PU_VP ); +} + +static inline struct csi2dc_device *csi2dc_sd_to_csi2dc_device + (struct v4l2_subdev *csi2dc_sd)
I'd suggest wrapping after the asterisk.
Quoted 16 lines
drivers/media/misc/microchip_csi2dc.c new file +16
-0+{ + return container_of(csi2dc_sd, struct csi2dc_device, csi2dc_sd); +} + +static int csi2dc_enum_mbus_code (struct v4l2_subdev *csi2dc_sd, +struct v4l2_subdev_pad_config *cfg, +struct v4l2_subdev_mbus_code_enum *code) +{ +struct csi2dc_device *csi2dc =csi2dc_sd_to_csi2dc_device (csi2dc_sd); + +if (code->index >= csi2dc->num_fmts) +return -EINVAL ; + + code->code = csi2dc->formats[code->index]->mbus_code; +return 0 ; +}
drivers/media/misc/microchip_csi2dc.c line 192
Quoted 10 lines
drivers/media/misc/microchip_csi2dc.c new file +10
-0+ +static int csi2dc_try_fmt (struct v4l2_subdev *csi2dc_sd, +struct v4l2_subdev_pad_config *cfg, +struct v4l2_subdev_format *req_fmt) +{ +struct csi2dc_device *csi2dc =csi2dc_sd_to_csi2dc_device (csi2dc_sd); +struct csi2dc_format *fmt; + +if (!csi2dc->completed) { +dev_dbg ((csi2dc)->dev,"subdev not registered yet\n" );
Uh... but can you end up here?
Quoted 5 lines
drivers/media/misc/microchip_csi2dc.c new file +5
-0+return 0 ; + } + +for (fmt = csi2dc->formats[0 ]; fmt; fmt++) +if (req_fmt->format.code == fmt->mbus_code)
drivers/media/misc/microchip_csi2dc.c line 207
Quoted 10 lines
drivers/media/misc/microchip_csi2dc.c new file +10
-0+ csi2dc->try_fmt = fmt; + +/* in case we could not find the desired format, default to something */ +if (!csi2dc->try_fmt || + req_fmt->format.code != csi2dc->try_fmt->mbus_code) { + csi2dc->try_fmt = csi2dc->formats[0 ]; + req_fmt->format.code = csi2dc->formats[0 ]->mbus_code; + } + +return v4l2_subdev_call (csi2dc->input_sd, pad, set_fmt, cfg, req_fmt);
For MC-enabled drivers (i.e. also those exposing sub-device nodes) the formats are set (and also enumerated) by the user and validated by the driver. See e.g. ipu3-cio2 driver for an example. It also includes DMA.
Quoted 43 lines
drivers/media/misc/microchip_csi2dc.c new file +43
-0+} + +static int csi2dc_set_fmt (struct v4l2_subdev *csi2dc_sd, +struct v4l2_subdev_pad_config *cfg, +struct v4l2_subdev_format *req_fmt) +{ +struct csi2dc_device *csi2dc =csi2dc_sd_to_csi2dc_device (csi2dc_sd); +int ret; + +if (!csi2dc->completed) { +dev_dbg ((csi2dc)->dev,"subdev not registered yet\n" ); +return 0 ; + } + +csi2dc_try_fmt (csi2dc_sd, cfg, req_fmt); + +if (csi2dc->try_fmt->mbus_code != req_fmt->format.code) { +dev_dbg (csi2dc->dev,"CSI2DC unsupported format 0x%x\n" , + req_fmt->format.code); +return -EINVAL ; + } + + ret =v4l2_subdev_call (csi2dc->input_sd, pad, set_fmt, cfg, req_fmt); +if (ret) { +dev_err (csi2dc->dev,"input subdev failed %d\n" , ret); +return ret; + } + + csi2dc->cur_fmt = csi2dc->try_fmt; +/* update video pipe */ +csi2dc_vp_update (csi2dc); + +dev_dbg (csi2dc->dev,"CSI2DC new format: 0x%x\n" , req_fmt->format.code); +return 0 ; +} + +static int csi2dc_formats_init (struct csi2dc_device *csi2dc) +{ +int i, j; +struct csi2dc_format *fmt = &csi2dc_formats_list[0 ]; + + csi2dc->num_fmts =1 ; +
drivers/media/misc/microchip_csi2dc.c line 260
Quoted 10 lines
drivers/media/misc/microchip_csi2dc.c new file +10
-0+ csi2dc->formats =devm_kcalloc (csi2dc->dev, csi2dc->num_fmts, +sizeof (*csi2dc->formats),GFP_KERNEL ); + +for (i =0 , j =0 ; i <ARRAY_SIZE (csi2dc_formats_list); i++, fmt++) +if (fmt->mbus_code ==MEDIA_BUS_FMT_SRGGB10_1X10 ) + csi2dc->formats[j++] = fmt; +return 0 ; +} + +static int csi2dc_s_power (struct v4l2_subdev *csi2dc_sd,int on)
Please use runtime PM instead.
Quoted 111 lines
drivers/media/misc/microchip_csi2dc.c new file +111
-0+{ +struct csi2dc_device *csi2dc =csi2dc_sd_to_csi2dc_device (csi2dc_sd); +int ret =0 ; + +if (!csi2dc->completed) { +dev_dbg ((csi2dc)->dev,"subdev not registered yet\n" ); +return 0 ; + } + +if (on) + ret =clk_prepare_enable (csi2dc->scck); +else +clk_disable_unprepare (csi2dc->scck); +if (ret) +dev_err (csi2dc->dev,"failed to enable scck: %d\n" , ret); + +/* if powering up, deassert reset line */ +if (on) +csi2dc_writel (csi2dc,CSI2DC_GCTLR ,CSI2DC_GCTLR_SWRST ); + + ret =v4l2_subdev_call (csi2dc->input_sd, core, s_power, on); + +/* if powering down, assert reset line */ +if (!on) +csi2dc_writel (csi2dc,CSI2DC_GCTLR , !CSI2DC_GCTLR_SWRST ); + +return ret; +} + +static int csi2dc_s_stream (struct v4l2_subdev *csi2dc_sd,int enable) +{ +struct csi2dc_device *csi2dc =csi2dc_sd_to_csi2dc_device (csi2dc_sd); + +if (!csi2dc->completed) { +dev_dbg ((csi2dc)->dev,"subdev not registered yet\n" ); +return 0 ; + } + +return v4l2_subdev_call (csi2dc->input_sd, video, s_stream, enable); +} + +static int csi2dc_g_frame_interval (struct v4l2_subdev *csi2dc_sd, +struct v4l2_subdev_frame_interval *interval) +{ +struct csi2dc_device *csi2dc =csi2dc_sd_to_csi2dc_device (csi2dc_sd); + +if (!csi2dc->completed) { +dev_dbg ((csi2dc)->dev,"subdev not registered yet\n" ); +return 0 ; + } + +return v4l2_subdev_call (csi2dc->input_sd, video, g_frame_interval, + interval); +} + +static int csi2dc_s_frame_interval (struct v4l2_subdev *csi2dc_sd, +struct v4l2_subdev_frame_interval *interval) +{ +struct csi2dc_device *csi2dc =csi2dc_sd_to_csi2dc_device (csi2dc_sd); + +if (!csi2dc->completed) { +dev_dbg ((csi2dc)->dev,"subdev not registered yet\n" ); +return 0 ; + } + +return v4l2_subdev_call (csi2dc->input_sd, video, s_frame_interval, + interval); +} + +static int csi2dc_enum_frame_size (struct v4l2_subdev *csi2dc_sd, +struct v4l2_subdev_pad_config *cfg, +struct v4l2_subdev_frame_size_enum *fse) +{ +struct csi2dc_device *csi2dc =csi2dc_sd_to_csi2dc_device (csi2dc_sd); + +if (!csi2dc->completed) { +dev_dbg ((csi2dc)->dev,"subdev not registered yet\n" ); +return 0 ; + } + +return v4l2_subdev_call (csi2dc->input_sd, pad, enum_frame_size, cfg, + fse); +} + +static int csi2dc_enum_frame_interval (struct v4l2_subdev *csi2dc_sd, +struct v4l2_subdev_pad_config *cfg, +struct v4l2_subdev_frame_interval_enum *fie) +{ +struct csi2dc_device *csi2dc =csi2dc_sd_to_csi2dc_device (csi2dc_sd); + +if (!csi2dc->completed) { +dev_dbg ((csi2dc)->dev,"subdev not registered yet\n" ); +return 0 ; + } + +return v4l2_subdev_call (csi2dc->input_sd, pad, enum_frame_interval, cfg, + fie); +} + +static struct v4l2_subdev_core_ops csi2dc_core_ops = { + .s_power = csi2dc_s_power, +}; + +static struct v4l2_subdev_pad_ops csi2dc_pad_ops = { + .enum_mbus_code = csi2dc_enum_mbus_code, + .set_fmt = csi2dc_set_fmt, + .enum_frame_size = csi2dc_enum_frame_size, + .enum_frame_interval = csi2dc_enum_frame_interval, +}; + +static struct v4l2_subdev_video_ops csi2dc_video_ops = {
drivers/media/misc/microchip_csi2dc.c line 381
Quoted 10 lines
drivers/media/misc/microchip_csi2dc.c new file +10
-0+ .s_stream = csi2dc_s_stream, + .g_frame_interval = csi2dc_g_frame_interval, + .s_frame_interval = csi2dc_s_frame_interval, +}; + +static struct v4l2_subdev_ops csi2dc_subdev_ops = { + .core = &csi2dc_core_ops, + .pad = &csi2dc_pad_ops, + .video = &csi2dc_video_ops, +};
const. Applies to all above.
Quoted 5 lines
drivers/media/misc/microchip_csi2dc.c new file +5
-0+ +static int csi2dc_async_bound (struct v4l2_async_notifier *notifier, +struct v4l2_subdev *subdev, +struct v4l2_async_subdev *asd) +{
drivers/media/misc/microchip_csi2dc.c line 396
Quoted 10 lines
drivers/media/misc/microchip_csi2dc.c new file +10
-0+struct csi2dc_device *csi2dc =container_of (notifier->v4l2_dev, + struct csi2dc_device, v4l2_dev); + csi2dc->input_sd = subdev; + +return 0 ; +} + +static int csi2dc_async_complete (struct v4l2_async_notifier *notifier) +{ + struct csi2dc_device *csi2dc = container_of(notifier->v4l2_dev,
It'd be cleaner to wrap after "=". Or align the lines below after "(".
Quoted 71 lines
drivers/media/misc/microchip_csi2dc.c new file +71
-0+ struct csi2dc_device, v4l2_dev); +int ret; + + ret =v4l2_device_register_subdev_nodes (&csi2dc->v4l2_dev); +if (ret <0 ) { +v4l2_err (&csi2dc->v4l2_dev,"failed to register subdev nodes\n" ); +return ret; + } + +csi2dc_writel (csi2dc,CSI2DC_GCFG , + (CSI2DC_GCFG_HLC (csi2dc->inter_line_delay) & +CSI2DC_GCFG_HLC_MASK ) | + (csi2dc->clk_gated ?0 :CSI2DC_GCFG_MIPIFRN )); + +csi2dc_writel (csi2dc,CSI2DC_VPCOL , +CSI2DC_VPCOL_COL (0xFFF ) &CSI2DC_VPCOL_COL_MASK ); +csi2dc_writel (csi2dc,CSI2DC_VPROW , +CSI2DC_VPROW_ROW (0xFFF ) &CSI2DC_VPROW_ROW_MASK ); + + csi2dc->completed = true; + +return ret; +} + +static const struct v4l2_async_notifier_operations csi2dc_async_ops = { + .bound = csi2dc_async_bound, + .complete = csi2dc_async_complete, +}; + +static void csi2dc_cleanup_notifier (struct csi2dc_device *csi2dc) +{ +v4l2_async_notifier_unregister (&csi2dc->notifier); +v4l2_async_notifier_cleanup (&csi2dc->notifier); +} + +static int csi2dc_prepare_notifier (struct csi2dc_device *csi2dc, +struct device_node *input_parent) +{ +int ret; + +v4l2_async_notifier_init (&csi2dc->notifier); + + csi2dc->asd =kzalloc (sizeof (*csi2dc->asd),GFP_KERNEL ); +if (!csi2dc->asd) +return -ENOMEM ; + + csi2dc->asd->match_type =V4L2_ASYNC_MATCH_FWNODE ; + csi2dc->asd->match.fwnode =of_fwnode_handle (input_parent); + + ret =v4l2_async_notifier_add_subdev (&csi2dc->notifier, csi2dc->asd); +if (ret) { +dev_err (csi2dc->dev,"failed to add async notifier.\n" ); +v4l2_async_notifier_cleanup (&csi2dc->notifier); + goto csi2dc_prepare_notifier_err; + } + + csi2dc->notifier.ops = &csi2dc_async_ops; + + ret =v4l2_async_notifier_register (&csi2dc->v4l2_dev, + &csi2dc->notifier); + +if (ret) { +dev_err (csi2dc->dev,"fail to register async notifier.\n" ); + goto csi2dc_prepare_notifier_err; + } + +csi2dc_prepare_notifier_err: +of_node_put (input_parent); + +return ret; +}
drivers/media/misc/microchip_csi2dc.c line 477
Quoted 10 lines
drivers/media/misc/microchip_csi2dc.c new file +10
-0+ +static int csi2dc_of_parse (struct csi2dc_device *csi2dc, +struct device_node *of_node) +{ +struct device_node *input_node, *sink_node, *input_parent; +struct v4l2_fwnode_endpoint input_endpoint, sink_endpoint; +int ret; + +memset (&input_endpoint,0 ,sizeof (input_endpoint)); +memset (&sink_endpoint,0 ,sizeof (sink_endpoint));
Could you assign a field to 0 in the declaration instead?
You should also set the bus type as I believe the driver supports a single one at both endpoints.
You could also use the fwnode property API instead so you could avoid of_fwnode_handle() --- up to you.
Quoted 15 lines
drivers/media/misc/microchip_csi2dc.c new file +15
-0+ + input_node =of_graph_get_next_endpoint (of_node,NULL ); + +if (!input_node) { +dev_err (csi2dc->dev,"missing port node at %s, input node is mandatory.\n" , + of_node->full_name); +return -EINVAL ; + } + + ret =v4l2_fwnode_endpoint_parse (of_fwnode_handle (input_node), + &input_endpoint); + +if (ret) { +dev_err (csi2dc->dev,"endpoint not defined at %s\n" , + of_node->full_name);
drivers/media/misc/microchip_csi2dc.c line 502
Quoted 10 lines
drivers/media/misc/microchip_csi2dc.c new file +10
-0+return ret; + } + + input_parent =of_graph_get_remote_port_parent (input_node); +if (!input_parent) { +dev_err (csi2dc->dev,"could not get input node's parent node.\n" ); +return -EINVAL ; + } + + sink_node =of_graph_get_next_endpoint (of_node, input_node);
You'll need to obtain the endpoints by port here (and above, too).
Quoted 13 lines
drivers/media/misc/microchip_csi2dc.c new file +13
-0+ +if (sink_node) + ret =v4l2_fwnode_endpoint_parse (of_fwnode_handle (sink_node), + &sink_endpoint); + +if (!sink_node || ret) { +dev_info (csi2dc->dev,"missing sink node at %s, data pipe available only.\n" , + of_node->full_name); + }else { + csi2dc->video_pipe = true; + csi2dc->vc = sink_endpoint.base.id; + + dev_dbg(csi2dc->dev, "block %s %d.%d->%d.%d video pipe VC %d\n",
drivers/media/misc/microchip_csi2dc.c line 525
Quoted 10 lines
drivers/media/misc/microchip_csi2dc.c new file +10
-0+ of_node->full_name, input_endpoint.base.port, + input_endpoint.base.id, sink_endpoint.base.port, + sink_endpoint.base.id, csi2dc->vc); + } + + csi2dc->clk_gated =of_property_read_bool (of_node, +"microchip,clk-gated" ); + +dev_dbg (csi2dc->dev,"%s clock\n" , + (csi2dc->clk_gated ?"Gated" :"Free running" ));
Extra parentheses.
drivers/media/misc/microchip_csi2dc.c line 536
Quoted 11 lines
drivers/media/misc/microchip_csi2dc.c new file +11
-0+ + ret =of_property_read_u32 (of_node,"microchip,inter-line-delay" , + &csi2dc->inter_line_delay); + +if (ret || csi2dc->inter_line_delay >16 ) { +dev_dbg (csi2dc->dev,"assuming inter line delay = 16 clocks" ); + csi2dc->inter_line_delay =16 ; + ret =0 ; + } +/* hardware automatically adds 1 */ + csi2dc->inter_line_delay--;
What happens if 0 was read from DT?
drivers/media/misc/microchip_csi2dc.c line 541
Quoted 5 lines
drivers/media/misc/microchip_csi2dc.c new file +5
-0+ +/* prepare async notifier for subdevice completion */ + +if (sink_node) +of_node_put (sink_node);
of_node_put() is NULL-safe.
Quoted 49 lines
drivers/media/misc/microchip_csi2dc.c new file +49
-0+of_node_put (input_node); + +return csi2dc_prepare_notifier (csi2dc, input_parent); +} + +static int csi2dc_probe (struct platform_device *pdev) +{ +struct device *dev = &pdev->dev; +struct csi2dc_device *csi2dc; +struct resource *res =NULL ; +int ret =0 ; + + csi2dc =devm_kzalloc (dev,sizeof (*csi2dc),GFP_KERNEL ); +if (!csi2dc) +return -ENOMEM ; + + csi2dc->dev = dev; + + res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); +if (!res) +return -EINVAL ; + + csi2dc->base =devm_ioremap_resource (dev, res); + +if (IS_ERR (csi2dc->base)) { +dev_err (dev,"base address not set\n" ); +return PTR_ERR (csi2dc->base); + } + + csi2dc->pclk =devm_clk_get (dev,"pclk" ); +if (IS_ERR (csi2dc->pclk)) { + ret =PTR_ERR (csi2dc->pclk); +dev_err (dev,"failed to get pclk: %d\n" , ret); +return ret; + } + + ret =clk_prepare_enable (csi2dc->pclk); +if (ret) { +dev_err (dev,"failed to enable pclk: %d\n" , ret); +return ret; + } + + csi2dc->scck =devm_clk_get (dev,"scck" ); +if (IS_ERR (csi2dc->scck)) { + ret =PTR_ERR (csi2dc->scck); +dev_err (dev,"failed to get scck: %d\n" , ret); + goto csi2dc_clk_fail; + } +
drivers/media/misc/microchip_csi2dc.c line 600
Quoted 10 lines
drivers/media/misc/microchip_csi2dc.c new file +10
-0+ ret =v4l2_device_register (dev, &csi2dc->v4l2_dev); +if (ret) { +dev_err (dev,"unable to register v4l2 device.\n" ); + goto csi2dc_clk_fail; + } + +v4l2_subdev_init (&csi2dc->csi2dc_sd, &csi2dc_subdev_ops); + + csi2dc->csi2dc_sd.owner =THIS_MODULE ; +
No need for a newline.
drivers/media/misc/microchip_csi2dc.c line 603
Quoted 3 lines
drivers/media/misc/microchip_csi2dc.c new file +3
-0+ csi2dc->csi2dc_sd.dev = dev; +snprintf (csi2dc->csi2dc_sd.name,sizeof (csi2dc->csi2dc_sd.name), +"%s.%d" ,"CSI2DC" ,0 );
The number is always zero.
Quoted 17 lines
drivers/media/misc/microchip_csi2dc.c new file +17
-0+ + csi2dc->csi2dc_sd.flags |=V4L2_SUBDEV_FL_HAS_DEVNODE ; + csi2dc->csi2dc_sd.entity.function =MEDIA_ENT_F_VID_IF_BRIDGE ; + csi2dc->pads[CSI2DC_PAD_SINK ].flags =MEDIA_PAD_FL_SINK ; + csi2dc->pads[CSI2DC_PAD_SOURCE ].flags =MEDIA_PAD_FL_SOURCE ; + + ret =media_entity_pads_init (&csi2dc->csi2dc_sd.entity,CSI2DC_PADS_NUM , + csi2dc->pads); +if (ret <0 ) { +dev_err (dev,"media entity init failed\n" ); + goto csi2dc_probe_entity_err; + } + +v4l2_set_subdevdata (&csi2dc->csi2dc_sd, pdev); + +platform_set_drvdata (pdev, &csi2dc->csi2dc_sd); +
drivers/media/misc/microchip_csi2dc.c line 630
Quoted 10 lines
drivers/media/misc/microchip_csi2dc.c new file +10
-0+ ret =csi2dc_of_parse (csi2dc, dev->of_node); +if (ret) + goto csi2dc_probe_entity_err; + + ret =csi2dc_formats_init (csi2dc); +if (ret) + goto csi2dc_probe_error; + + ret =v4l2_async_register_subdev (&csi2dc->csi2dc_sd); +if (ret) {// ret = -EPROBE_DEFER;
Oops.
drivers/media/misc/microchip_csi2dc.c line 639
Quoted 9 lines
drivers/media/misc/microchip_csi2dc.c new file +9
-0+ goto csi2dc_probe_error; + } + +pm_runtime_set_active (dev); +pm_runtime_enable (dev); +pm_request_idle (dev); + +pr_info ("Microchip CSI2DC version %x\n" , +csi2dc_readl (csi2dc,CSI2DC_VERSION ));
What happens if the device was powered down already?
Quoted 66 lines
drivers/media/misc/microchip_csi2dc.c new file +66
-0+ +return 0 ; + +csi2dc_probe_error: +v4l2_async_unregister_subdev (&csi2dc->csi2dc_sd); +csi2dc_cleanup_notifier (csi2dc); + +csi2dc_probe_entity_err: +media_entity_cleanup (&csi2dc->csi2dc_sd.entity); +v4l2_device_unregister (&csi2dc->v4l2_dev); +csi2dc_clk_fail: +clk_disable_unprepare (csi2dc->pclk); +return ret; +} + +static int csi2dc_remove (struct platform_device *pdev) +{ +struct v4l2_subdev *csi2dc_sd =platform_get_drvdata (pdev); +struct csi2dc_device *csi2dc =csi2dc_sd_to_csi2dc_device (csi2dc_sd); + +pm_runtime_disable (&pdev->dev); +csi2dc_cleanup_notifier (csi2dc); +media_entity_cleanup (&csi2dc->csi2dc_sd.entity); +v4l2_device_unregister (&csi2dc->v4l2_dev); +clk_disable_unprepare (csi2dc->pclk); + +return 0 ; +} + +static int __maybe_unused csi2dc_runtime_suspend (struct device *dev) +{ +return 0 ; +} + +static int __maybe_unused csi2dc_runtime_resume (struct device *dev) +{ +return 0 ; +} + +static const struct dev_pm_ops csi2dc_dev_pm_ops = { +SET_RUNTIME_PM_OPS (csi2dc_runtime_suspend, csi2dc_runtime_resume,NULL ) +}; + +static const struct of_device_id csi2dc_of_match[] = { + { .compatible ="microchip,sama7g5-csi2dc" }, + { } +}; + +MODULE_DEVICE_TABLE (of, csi2dc_of_match); + +static struct platform_driver csi2dc_driver = { + .probe = csi2dc_probe, + .remove = csi2dc_remove, + .driver = { + .name ="microchip-csi2dc" , + .pm = &csi2dc_dev_pm_ops, + .of_match_table =of_match_ptr (csi2dc_of_match), + }, +}; + +module_platform_driver (csi2dc_driver); + +MODULE_AUTHOR ("Eugen Hristev <[email protected]>" ); +MODULE_DESCRIPTION ("Microchip CSI2 Demux Controller driver" ); +MODULE_LICENSE ("GPL v2" ); +MODULE_SUPPORTED_DEVICE ("video" );
Signature · 3 lines
Kind regards, Sakari Ailus
Re: [PATCH v2 3/4] media: misc: introduce microchip_csi2dc driver
Quoted 3 lines · Sakari Ailus
Hi Eugen,
Thanks for the patch.
Hello Sakari,
Thanks for reviewing.
Quoted 239 lines · Eugen Hristev
Quoted 141 lines
Microchip CSI2DC (CSI2 Demultiplexer Controller) is a misc bridge device that converts a byte stream in IDI Synopsys format (coming from a CSI2HOST) to a pixel stream that can be captured by a sensor controller.
Signed-off-by Eugen Hristev <[email protected]>--- drivers/media/misc/Kconfig | 9 + drivers/media/misc/Makefile | 1 + drivers/media/misc/microchip_csi2dc.c | 705 ++++++++++++++++++++++++++ 3 files changed, 715 insertions(+)create mode 100644
drivers/media/misc/microchip_csi2dc.cdrivers/media/misc/Kconfig +9
-0@@ -8,6 +8,15 @@ menu "Miscellaneous helper chips" comment "Various helper chips" +config VIDEO_MICROCHIP_CSI2DC + tristate "Microchip CSI2 Demux Controller" + depends on VIDEO_V4L2 + help + CSI2 Demux Controller driver. CSI2DC is a helper chip + that converts IDI interface byte stream to a parallel pixel stream. + It supports various RAW formats as input. + Performs clock domain crossing between hardware blocks. + endmenu endifdrivers/media/misc/Makefile +1
-0@@ -1 +1,2 @@ # SPDX-License-Identifier: GPL-2.0 +obj-$(CONFIG_VIDEO_MICROCHIP_CSI2DC) += microchip_csi2dc.odrivers/media/misc/microchip_csi2dc.c new file +96
-0@@ -0,0 +1,705 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Microchip CSI2 Demux Controller (CSI2DC) driver +* +* Copyright (C) 2018-2020 Microchip Technology, Inc. +* +* Author: Eugen Hristev <[email protected]> +* +*/ + +#include <linux/clk.h> +#include <linux/module.h> +#include <linux/of.h> +#include <linux/of_graph.h> +#include <linux/platform_device.h> +#include <linux/pm_runtime.h> +#include <linux/videodev2.h> + +#include <media/v4l2-device.h> +#include <media/v4l2-fwnode.h> +#include <media/v4l2-subdev.h> +#include <media/videobuf2-dma-contig.h> + +/* Global configuration register */ +#define CSI2DC_GCFG 0x0 + +/* MIPI sensor pixel clock is free running */ +#define CSI2DC_GCFG_MIPIFRN BIT(0) +/* Output waveform inter-line minimum delay */ +#define CSI2DC_GCFG_HLC (v) ((v) << 4) +#define CSI2DC_GCFG_HLC_MASK GENMASK(7, 4) + +/* Global control register */ +#define CSI2DC_GCTLR 0x04 +#define CSI2DC_GCTLR_SWRST BIT(0) + +/* Global status register */ +#define CSI2DC_GS 0x08 + +/* SSP interrupt status register */ +#define CSI2DC_SSPIS 0x28 +/* Pipe update register */ +#define CSI2DC_PU 0xC0 +/* Video pipe attributes update */ +#define CSI2DC_PU_VP BIT(0) + +/* Pipe update status register */ +#define CSI2DC_PUS 0xC4 + +/* Video pipeline enable register */ +#define CSI2DC_VPE 0xF8 +#define CSI2DC_VPE_ENABLE BIT(0) + +/* Video pipeline configuration register */ +#define CSI2DC_VPCFG 0xFC +/* Data type */ +#define CSI2DC_VPCFG_DT (v) ((v) << 0) +#define CSI2DC_VPCFG_DT_MASK GENMASK(5, 0) +/* Virtual channel identifier */ +#define CSI2DC_VPCFG_VC (v) ((v) << 6) +#define CSI2DC_VPCFG_VC_MASK GENMASK(7, 6) +/* Decompression enable */ +#define CSI2DC_VPCFG_DE BIT(8) +/* Decoder mode */ +#define CSI2DC_VPCFG_DM (v) ((v) << 9) +#define CSI2DC_VPCFG_DM_DECODER8TO12 0 +/* Decoder predictor 2 selection */ +#define CSI2DC_VPCFG_DP2 BIT(12) +/* Recommended memory storage */ +#define CSI2DC_VPCFG_RMS BIT(13) +/* Post adjustment */ +#define CSI2DC_VPCFG_PA BIT(14) + +/* Video pipeline column register */ +#define CSI2DC_VPCOL 0x100 +/* Column number */ +#define CSI2DC_VPCOL_COL (v) ((v) << 0) +#define CSI2DC_VPCOL_COL_MASK GENMASK(15, 0) + +/* Video pipeline row register */ +#define CSI2DC_VPROW 0x104 +/* Row number */ +#define CSI2DC_VPROW_ROW (v) ((v) << 0) +#define CSI2DC_VPROW_ROW_MASK GENMASK(15, 0) + +/* Version register */ +#define CSI2DC_VERSION 0x1FC + +/* register read/write helpers */ +#define csi2dc_readl (st, reg) readl_relaxed((st)->base + (reg)) +#define csi2dc_writel (st, reg, val) writel_relaxed((val), (st)->base + (reg)) + +/* supported RAW data types */ +#define CSI2DC_DT_RAW6 0x28 +#define CSI2DC_DT_RAW7 0x29 +#define CSI2DC_DT_RAW8 0x2Adrivers/media/misc/microchip_csi2dc.c line 106
Quoted 10 lines
drivers/media/misc/microchip_csi2dc.c new file +10
-0+#define CSI2DC_DT_RAW10 0x2B +#define CSI2DC_DT_RAW12 0x2C +#define CSI2DC_DT_RAW14 0x2D + +struct csi2dc_format { +u32 mbus_code; +u32 dt; +}; + +static struct csi2dc_format csi2dc_formats_list[] = {const
Quoted 50 lines
drivers/media/misc/microchip_csi2dc.c new file +50
-0+ { + .mbus_code = MEDIA_BUS_FMT_SRGGB10_1X10, + .dt = CSI2DC_DT_RAW10, + }, +}; + +enum mipi_csi_pads { +CSI2DC_PAD_SINK =0 , +CSI2DC_PAD_SOURCE =1 , +CSI2DC_PADS_NUM =2 , +}; + +struct csi2dc_device { +void __iomem *base; +struct v4l2_subdev csi2dc_sd; +struct device *dev; +struct v4l2_device v4l2_dev; +struct clk *pclk; +struct clk *scck; + +bool video_pipe; + +u32 num_fmts; +struct csi2dc_format **formats; + +struct csi2dc_format *cur_fmt; +struct csi2dc_format *try_fmt; + +struct media_pad pads[CSI2DC_PADS_NUM ]; + +bool clk_gated; +u32 inter_line_delay; +u32 vc; + +struct v4l2_async_subdev *asd; +struct v4l2_async_notifier notifier; + +struct v4l2_subdev *input_sd; +bool completed; +}; + +static void csi2dc_vp_update (struct csi2dc_device *csi2dc) +{ +u32 vp; + + vp =CSI2DC_VPCFG_DT (csi2dc->cur_fmt->dt) &CSI2DC_VPCFG_DT_MASK ; + vp |=CSI2DC_VPCFG_VC (csi2dc->vc) &CSI2DC_VPCFG_VC_MASK ; + vp &= ~CSI2DC_VPCFG_DE ; + vp |=CSI2DC_VPCFG_DM (CSI2DC_VPCFG_DM_DECODER8TO12 ); + vp &= ~CSI2DC_VPCFG_DP2 ;drivers/media/misc/microchip_csi2dc.c line 166
Quoted 10 lines
drivers/media/misc/microchip_csi2dc.c new file +10
-0+ vp &= ~CSI2DC_VPCFG_RMS ; + vp |=CSI2DC_VPCFG_PA ; + +csi2dc_writel (csi2dc,CSI2DC_VPCFG , vp); +csi2dc_writel (csi2dc,CSI2DC_VPE ,CSI2DC_VPE_ENABLE ); +csi2dc_writel (csi2dc,CSI2DC_PU ,CSI2DC_PU_VP ); +} + +static inline struct csi2dc_device *csi2dc_sd_to_csi2dc_device + (struct v4l2_subdev *csi2dc_sd)I'd suggest wrapping after the asterisk.
Quoted 20 lines
drivers/media/misc/microchip_csi2dc.c new file +20
-0+{ + return container_of(csi2dc_sd, struct csi2dc_device, csi2dc_sd); +} + +static int csi2dc_enum_mbus_code (struct v4l2_subdev *csi2dc_sd, +struct v4l2_subdev_pad_config *cfg, +struct v4l2_subdev_mbus_code_enum *code) +{ +struct csi2dc_device *csi2dc =csi2dc_sd_to_csi2dc_device (csi2dc_sd); + +if (code->index >= csi2dc->num_fmts) +return -EINVAL ; + + code->code = csi2dc->formats[code->index]->mbus_code; +return 0 ; +} + +static int csi2dc_try_fmt (struct v4l2_subdev *csi2dc_sd, +struct v4l2_subdev_pad_config *cfg, +struct v4l2_subdev_format *req_fmt)
Quoted 8 lines
drivers/media/misc/microchip_csi2dc.c line 192
Quoted 6 lines
drivers/media/misc/microchip_csi2dc.c new file +6
-0+{ +struct csi2dc_device *csi2dc =csi2dc_sd_to_csi2dc_device (csi2dc_sd); +struct csi2dc_format *fmt; + +if (!csi2dc->completed) { +dev_dbg ((csi2dc)->dev,"subdev not registered yet\n" );Uh... but can you end up here?
Yes, if the subdevice has not yet registered.
The CSI2DC registers as a subdevice for the next element in pipeline regardless of it's own subdevice.
I encountered issues when trying to register the csi2dc at a later point than probe time (at the moment of it's own completion when the subdev is ready).
Do you think I need to change , and have csi2dc registers itself for the next element at a later point ?
Quoted 12 lines
Quoted 12 lines
drivers/media/misc/microchip_csi2dc.c new file +11
-0+return 0 ; + } + +for (fmt = csi2dc->formats[0 ]; fmt; fmt++) +if (req_fmt->format.code == fmt->mbus_code) + csi2dc->try_fmt = fmt; + +/* in case we could not find the desired format, default to something */ +if (!csi2dc->try_fmt || + req_fmt->format.code != csi2dc->try_fmt->mbus_code) { + csi2dc->try_fmt = csi2dc->formats[0 ];
Quoted 8 lines
drivers/media/misc/microchip_csi2dc.c line 207
Quoted 4 lines
drivers/media/misc/microchip_csi2dc.c new file +4
-0+ req_fmt->format.code = csi2dc->formats[0 ]->mbus_code; + } + +return v4l2_subdev_call (csi2dc->input_sd, pad, set_fmt, cfg, req_fmt);For MC-enabled drivers (i.e. also those exposing sub-device nodes) the formats are set (and also enumerated) by the user and validated by the driver. See e.g. ipu3-cio2 driver for an example. It also includes DMA.
To fully understand, I do not need to make a subdev call ? Just validate or invalidate the try format ?
Quoted 48 lines
Quoted 48 lines
drivers/media/misc/microchip_csi2dc.c new file +47
-0+} + +static int csi2dc_set_fmt (struct v4l2_subdev *csi2dc_sd, +struct v4l2_subdev_pad_config *cfg, +struct v4l2_subdev_format *req_fmt) +{ +struct csi2dc_device *csi2dc =csi2dc_sd_to_csi2dc_device (csi2dc_sd); +int ret; + +if (!csi2dc->completed) { +dev_dbg ((csi2dc)->dev,"subdev not registered yet\n" ); +return 0 ; + } + +csi2dc_try_fmt (csi2dc_sd, cfg, req_fmt); + +if (csi2dc->try_fmt->mbus_code != req_fmt->format.code) { +dev_dbg (csi2dc->dev,"CSI2DC unsupported format 0x%x\n" , + req_fmt->format.code); +return -EINVAL ; + } + + ret =v4l2_subdev_call (csi2dc->input_sd, pad, set_fmt, cfg, req_fmt); +if (ret) { +dev_err (csi2dc->dev,"input subdev failed %d\n" , ret); +return ret; + } + + csi2dc->cur_fmt = csi2dc->try_fmt; +/* update video pipe */ +csi2dc_vp_update (csi2dc); + +dev_dbg (csi2dc->dev,"CSI2DC new format: 0x%x\n" , req_fmt->format.code); +return 0 ; +} + +static int csi2dc_formats_init (struct csi2dc_device *csi2dc) +{ +int i, j; +struct csi2dc_format *fmt = &csi2dc_formats_list[0 ]; + + csi2dc->num_fmts =1 ; + + csi2dc->formats =devm_kcalloc (csi2dc->dev, csi2dc->num_fmts, +sizeof (*csi2dc->formats),GFP_KERNEL ); + +for (i =0 , j =0 ; i <ARRAY_SIZE (csi2dc_formats_list); i++, fmt++)
Quoted 8 lines
drivers/media/misc/microchip_csi2dc.c line 260
Quoted 6 lines
drivers/media/misc/microchip_csi2dc.c new file +6
-0+if (fmt->mbus_code ==MEDIA_BUS_FMT_SRGGB10_1X10 ) + csi2dc->formats[j++] = fmt; +return 0 ; +} + +static int csi2dc_s_power (struct v4l2_subdev *csi2dc_sd,int on)Please use runtime PM instead.
And in this case, s_power on/off will be unused?
The runtime PM will power on the pipeline when capture is required or it will have it powered on more than that ?
Currently in my experiments when stopping the streaming, s_power off is also called afterwards, and the CSI2DC can be reset, as the MIPI lanes must reach a stop state to reinitialize capture later.
Quoted 227 lines
Quoted 112 lines
drivers/media/misc/microchip_csi2dc.c new file +111
-0+{ +struct csi2dc_device *csi2dc =csi2dc_sd_to_csi2dc_device (csi2dc_sd); +int ret =0 ; + +if (!csi2dc->completed) { +dev_dbg ((csi2dc)->dev,"subdev not registered yet\n" ); +return 0 ; + } + +if (on) + ret =clk_prepare_enable (csi2dc->scck); +else +clk_disable_unprepare (csi2dc->scck); +if (ret) +dev_err (csi2dc->dev,"failed to enable scck: %d\n" , ret); + +/* if powering up, deassert reset line */ +if (on) +csi2dc_writel (csi2dc,CSI2DC_GCTLR ,CSI2DC_GCTLR_SWRST ); + + ret =v4l2_subdev_call (csi2dc->input_sd, core, s_power, on); + +/* if powering down, assert reset line */ +if (!on) +csi2dc_writel (csi2dc,CSI2DC_GCTLR , !CSI2DC_GCTLR_SWRST ); + +return ret; +} + +static int csi2dc_s_stream (struct v4l2_subdev *csi2dc_sd,int enable) +{ +struct csi2dc_device *csi2dc =csi2dc_sd_to_csi2dc_device (csi2dc_sd); + +if (!csi2dc->completed) { +dev_dbg ((csi2dc)->dev,"subdev not registered yet\n" ); +return 0 ; + } + +return v4l2_subdev_call (csi2dc->input_sd, video, s_stream, enable); +} + +static int csi2dc_g_frame_interval (struct v4l2_subdev *csi2dc_sd, +struct v4l2_subdev_frame_interval *interval) +{ +struct csi2dc_device *csi2dc =csi2dc_sd_to_csi2dc_device (csi2dc_sd); + +if (!csi2dc->completed) { +dev_dbg ((csi2dc)->dev,"subdev not registered yet\n" ); +return 0 ; + } + +return v4l2_subdev_call (csi2dc->input_sd, video, g_frame_interval, + interval); +} + +static int csi2dc_s_frame_interval (struct v4l2_subdev *csi2dc_sd, +struct v4l2_subdev_frame_interval *interval) +{ +struct csi2dc_device *csi2dc =csi2dc_sd_to_csi2dc_device (csi2dc_sd); + +if (!csi2dc->completed) { +dev_dbg ((csi2dc)->dev,"subdev not registered yet\n" ); +return 0 ; + } + +return v4l2_subdev_call (csi2dc->input_sd, video, s_frame_interval, + interval); +} + +static int csi2dc_enum_frame_size (struct v4l2_subdev *csi2dc_sd, +struct v4l2_subdev_pad_config *cfg, +struct v4l2_subdev_frame_size_enum *fse) +{ +struct csi2dc_device *csi2dc =csi2dc_sd_to_csi2dc_device (csi2dc_sd); + +if (!csi2dc->completed) { +dev_dbg ((csi2dc)->dev,"subdev not registered yet\n" ); +return 0 ; + } + +return v4l2_subdev_call (csi2dc->input_sd, pad, enum_frame_size, cfg, + fse); +} + +static int csi2dc_enum_frame_interval (struct v4l2_subdev *csi2dc_sd, +struct v4l2_subdev_pad_config *cfg, +struct v4l2_subdev_frame_interval_enum *fie) +{ +struct csi2dc_device *csi2dc =csi2dc_sd_to_csi2dc_device (csi2dc_sd); + +if (!csi2dc->completed) { +dev_dbg ((csi2dc)->dev,"subdev not registered yet\n" ); +return 0 ; + } + +return v4l2_subdev_call (csi2dc->input_sd, pad, enum_frame_interval, cfg, + fie); +} + +static struct v4l2_subdev_core_ops csi2dc_core_ops = { + .s_power = csi2dc_s_power, +}; + +static struct v4l2_subdev_pad_ops csi2dc_pad_ops = { + .enum_mbus_code = csi2dc_enum_mbus_code, + .set_fmt = csi2dc_set_fmt, + .enum_frame_size = csi2dc_enum_frame_size, + .enum_frame_interval = csi2dc_enum_frame_interval, +}; + +static struct v4l2_subdev_video_ops csi2dc_video_ops = {drivers/media/misc/microchip_csi2dc.c line 381
Quoted 10 lines
drivers/media/misc/microchip_csi2dc.c new file +10
-0+ .s_stream = csi2dc_s_stream, + .g_frame_interval = csi2dc_g_frame_interval, + .s_frame_interval = csi2dc_s_frame_interval, +}; + +static struct v4l2_subdev_ops csi2dc_subdev_ops = { + .core = &csi2dc_core_ops, + .pad = &csi2dc_pad_ops, + .video = &csi2dc_video_ops, +};const. Applies to all above.
Quoted 5 lines
drivers/media/misc/microchip_csi2dc.c new file +5
-0+ +static int csi2dc_async_bound (struct v4l2_async_notifier *notifier, +struct v4l2_subdev *subdev, +struct v4l2_async_subdev *asd) +{drivers/media/misc/microchip_csi2dc.c line 396
Quoted 10 lines
drivers/media/misc/microchip_csi2dc.c new file +10
-0+struct csi2dc_device *csi2dc =container_of (notifier->v4l2_dev, + struct csi2dc_device, v4l2_dev); + csi2dc->input_sd = subdev; + +return 0 ; +} + +static int csi2dc_async_complete (struct v4l2_async_notifier *notifier) +{ + struct csi2dc_device *csi2dc = container_of(notifier->v4l2_dev,It'd be cleaner to wrap after "=". Or align the lines below after "(".
Quoted 71 lines
drivers/media/misc/microchip_csi2dc.c new file +71
-0+ struct csi2dc_device, v4l2_dev); +int ret; + + ret =v4l2_device_register_subdev_nodes (&csi2dc->v4l2_dev); +if (ret <0 ) { +v4l2_err (&csi2dc->v4l2_dev,"failed to register subdev nodes\n" ); +return ret; + } + +csi2dc_writel (csi2dc,CSI2DC_GCFG , + (CSI2DC_GCFG_HLC (csi2dc->inter_line_delay) & +CSI2DC_GCFG_HLC_MASK ) | + (csi2dc->clk_gated ?0 :CSI2DC_GCFG_MIPIFRN )); + +csi2dc_writel (csi2dc,CSI2DC_VPCOL , +CSI2DC_VPCOL_COL (0xFFF ) &CSI2DC_VPCOL_COL_MASK ); +csi2dc_writel (csi2dc,CSI2DC_VPROW , +CSI2DC_VPROW_ROW (0xFFF ) &CSI2DC_VPROW_ROW_MASK ); + + csi2dc->completed = true; + +return ret; +} + +static const struct v4l2_async_notifier_operations csi2dc_async_ops = { + .bound = csi2dc_async_bound, + .complete = csi2dc_async_complete, +}; + +static void csi2dc_cleanup_notifier (struct csi2dc_device *csi2dc) +{ +v4l2_async_notifier_unregister (&csi2dc->notifier); +v4l2_async_notifier_cleanup (&csi2dc->notifier); +} + +static int csi2dc_prepare_notifier (struct csi2dc_device *csi2dc, +struct device_node *input_parent) +{ +int ret; + +v4l2_async_notifier_init (&csi2dc->notifier); + + csi2dc->asd =kzalloc (sizeof (*csi2dc->asd),GFP_KERNEL ); +if (!csi2dc->asd) +return -ENOMEM ; + + csi2dc->asd->match_type =V4L2_ASYNC_MATCH_FWNODE ; + csi2dc->asd->match.fwnode =of_fwnode_handle (input_parent); + + ret =v4l2_async_notifier_add_subdev (&csi2dc->notifier, csi2dc->asd); +if (ret) { +dev_err (csi2dc->dev,"failed to add async notifier.\n" ); +v4l2_async_notifier_cleanup (&csi2dc->notifier); + goto csi2dc_prepare_notifier_err; + } + + csi2dc->notifier.ops = &csi2dc_async_ops; + + ret =v4l2_async_notifier_register (&csi2dc->v4l2_dev, + &csi2dc->notifier); + +if (ret) { +dev_err (csi2dc->dev,"fail to register async notifier.\n" ); + goto csi2dc_prepare_notifier_err; + } + +csi2dc_prepare_notifier_err: +of_node_put (input_parent); + +return ret; +}drivers/media/misc/microchip_csi2dc.c line 477
Quoted 10 lines
drivers/media/misc/microchip_csi2dc.c new file +10
-0+ +static int csi2dc_of_parse (struct csi2dc_device *csi2dc, +struct device_node *of_node) +{ +struct device_node *input_node, *sink_node, *input_parent; +struct v4l2_fwnode_endpoint input_endpoint, sink_endpoint; +int ret; + +memset (&input_endpoint,0 ,sizeof (input_endpoint)); +memset (&sink_endpoint,0 ,sizeof (sink_endpoint));Could you assign a field to 0 in the declaration instead?
Quoted 2 lines
You should also set the bus type as I believe the driver supports a single one at both endpoints.
I thought about that, but on the input pad, what bus type I can use ? Synopsys IDI is not available in kernel.
Quoted 23 lines
You could also use the fwnode property API instead so you could avoid
of_fwnode_handle()--- up to you.Quoted 19 lines
drivers/media/misc/microchip_csi2dc.c new file +19
-0+ + input_node =of_graph_get_next_endpoint (of_node,NULL ); + +if (!input_node) { +dev_err (csi2dc->dev,"missing port node at %s, input node is mandatory.\n" , + of_node->full_name); +return -EINVAL ; + } + + ret =v4l2_fwnode_endpoint_parse (of_fwnode_handle (input_node), + &input_endpoint); + +if (ret) { +dev_err (csi2dc->dev,"endpoint not defined at %s\n" , + of_node->full_name); +return ret; + } + + input_parent =of_graph_get_remote_port_parent (input_node);
Quoted 8 lines
drivers/media/misc/microchip_csi2dc.c line 502
Quoted 6 lines
drivers/media/misc/microchip_csi2dc.c new file +6
-0+if (!input_parent) { +dev_err (csi2dc->dev,"could not get input node's parent node.\n" ); +return -EINVAL ; + } + + sink_node =of_graph_get_next_endpoint (of_node, input_node);You'll need to obtain the endpoints by port here (and above, too).
I obtain them in the order in the device tree, one by one. You suggest to use a different API such that they are obtained by port number ?
Quoted 147 lines
Quoted 14 lines
drivers/media/misc/microchip_csi2dc.c new file +13
-0+ +if (sink_node) + ret =v4l2_fwnode_endpoint_parse (of_fwnode_handle (sink_node), + &sink_endpoint); + +if (!sink_node || ret) { +dev_info (csi2dc->dev,"missing sink node at %s, data pipe available only.\n" , + of_node->full_name); + }else { + csi2dc->video_pipe = true; + csi2dc->vc = sink_endpoint.base.id; + + dev_dbg(csi2dc->dev, "block %s %d.%d->%d.%d video pipe VC %d\n",drivers/media/misc/microchip_csi2dc.c line 525
Quoted 10 lines
drivers/media/misc/microchip_csi2dc.c new file +10
-0+ of_node->full_name, input_endpoint.base.port, + input_endpoint.base.id, sink_endpoint.base.port, + sink_endpoint.base.id, csi2dc->vc); + } + + csi2dc->clk_gated =of_property_read_bool (of_node, +"microchip,clk-gated" ); + +dev_dbg (csi2dc->dev,"%s clock\n" , + (csi2dc->clk_gated ?"Gated" :"Free running" ));Extra parentheses.
drivers/media/misc/microchip_csi2dc.c line 536
Quoted 11 lines
drivers/media/misc/microchip_csi2dc.c new file +11
-0+ + ret =of_property_read_u32 (of_node,"microchip,inter-line-delay" , + &csi2dc->inter_line_delay); + +if (ret || csi2dc->inter_line_delay >16 ) { +dev_dbg (csi2dc->dev,"assuming inter line delay = 16 clocks" ); + csi2dc->inter_line_delay =16 ; + ret =0 ; + } +/* hardware automatically adds 1 */ + csi2dc->inter_line_delay--;What happens if 0 was read from DT?
drivers/media/misc/microchip_csi2dc.c line 541
Quoted 5 lines
drivers/media/misc/microchip_csi2dc.c new file +5
-0+ +/* prepare async notifier for subdevice completion */ + +if (sink_node) +of_node_put (sink_node);
of_node_put()is NULL-safe.Quoted 49 lines
drivers/media/misc/microchip_csi2dc.c new file +49
-0+of_node_put (input_node); + +return csi2dc_prepare_notifier (csi2dc, input_parent); +} + +static int csi2dc_probe (struct platform_device *pdev) +{ +struct device *dev = &pdev->dev; +struct csi2dc_device *csi2dc; +struct resource *res =NULL ; +int ret =0 ; + + csi2dc =devm_kzalloc (dev,sizeof (*csi2dc),GFP_KERNEL ); +if (!csi2dc) +return -ENOMEM ; + + csi2dc->dev = dev; + + res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); +if (!res) +return -EINVAL ; + + csi2dc->base =devm_ioremap_resource (dev, res); + +if (IS_ERR (csi2dc->base)) { +dev_err (dev,"base address not set\n" ); +return PTR_ERR (csi2dc->base); + } + + csi2dc->pclk =devm_clk_get (dev,"pclk" ); +if (IS_ERR (csi2dc->pclk)) { + ret =PTR_ERR (csi2dc->pclk); +dev_err (dev,"failed to get pclk: %d\n" , ret); +return ret; + } + + ret =clk_prepare_enable (csi2dc->pclk); +if (ret) { +dev_err (dev,"failed to enable pclk: %d\n" , ret); +return ret; + } + + csi2dc->scck =devm_clk_get (dev,"scck" ); +if (IS_ERR (csi2dc->scck)) { + ret =PTR_ERR (csi2dc->scck); +dev_err (dev,"failed to get scck: %d\n" , ret); + goto csi2dc_clk_fail; + } +drivers/media/misc/microchip_csi2dc.c line 600
Quoted 10 lines
drivers/media/misc/microchip_csi2dc.c new file +10
-0+ ret =v4l2_device_register (dev, &csi2dc->v4l2_dev); +if (ret) { +dev_err (dev,"unable to register v4l2 device.\n" ); + goto csi2dc_clk_fail; + } + +v4l2_subdev_init (&csi2dc->csi2dc_sd, &csi2dc_subdev_ops); + + csi2dc->csi2dc_sd.owner =THIS_MODULE ; +No need for a newline.
drivers/media/misc/microchip_csi2dc.c line 603
Quoted 3 lines
drivers/media/misc/microchip_csi2dc.c new file +3
-0+ csi2dc->csi2dc_sd.dev = dev; +snprintf (csi2dc->csi2dc_sd.name,sizeof (csi2dc->csi2dc_sd.name), +"%s.%d" ,"CSI2DC" ,0 );The number is always zero.
Quoted 17 lines
drivers/media/misc/microchip_csi2dc.c new file +17
-0+ + csi2dc->csi2dc_sd.flags |=V4L2_SUBDEV_FL_HAS_DEVNODE ; + csi2dc->csi2dc_sd.entity.function =MEDIA_ENT_F_VID_IF_BRIDGE ; + csi2dc->pads[CSI2DC_PAD_SINK ].flags =MEDIA_PAD_FL_SINK ; + csi2dc->pads[CSI2DC_PAD_SOURCE ].flags =MEDIA_PAD_FL_SOURCE ; + + ret =media_entity_pads_init (&csi2dc->csi2dc_sd.entity,CSI2DC_PADS_NUM , + csi2dc->pads); +if (ret <0 ) { +dev_err (dev,"media entity init failed\n" ); + goto csi2dc_probe_entity_err; + } + +v4l2_set_subdevdata (&csi2dc->csi2dc_sd, pdev); + +platform_set_drvdata (pdev, &csi2dc->csi2dc_sd); +drivers/media/misc/microchip_csi2dc.c line 630
Quoted 10 lines
drivers/media/misc/microchip_csi2dc.c new file +10
-0+ ret =csi2dc_of_parse (csi2dc, dev->of_node); +if (ret) + goto csi2dc_probe_entity_err; + + ret =csi2dc_formats_init (csi2dc); +if (ret) + goto csi2dc_probe_error; + + ret =v4l2_async_register_subdev (&csi2dc->csi2dc_sd); +if (ret) {// ret = -EPROBE_DEFER; Oops.
Quoted 11 lines
drivers/media/misc/microchip_csi2dc.c line 639
Quoted 9 lines
drivers/media/misc/microchip_csi2dc.c new file +9
-0+ goto csi2dc_probe_error; + } + +pm_runtime_set_active (dev); +pm_runtime_enable (dev); +pm_request_idle (dev); + +pr_info ("Microchip CSI2DC version %x\n" , +csi2dc_readl (csi2dc,CSI2DC_VERSION ));What happens if the device was powered down already?
I am moving the info line before pm_request_idle, if this was what you had in mind.
I am sending a v3 of the patch, with some of the comments addressed. Some others I do not fully understand yet how to change. Hopefully your replies will help me find the way.
Thanks again,
Eugen
Quoted 73 lines
Quoted 57 lines
drivers/media/misc/microchip_csi2dc.c new file +56
-0+ +return 0 ; + +csi2dc_probe_error: +v4l2_async_unregister_subdev (&csi2dc->csi2dc_sd); +csi2dc_cleanup_notifier (csi2dc); + +csi2dc_probe_entity_err: +media_entity_cleanup (&csi2dc->csi2dc_sd.entity); +v4l2_device_unregister (&csi2dc->v4l2_dev); +csi2dc_clk_fail: +clk_disable_unprepare (csi2dc->pclk); +return ret; +} + +static int csi2dc_remove (struct platform_device *pdev) +{ +struct v4l2_subdev *csi2dc_sd =platform_get_drvdata (pdev); +struct csi2dc_device *csi2dc =csi2dc_sd_to_csi2dc_device (csi2dc_sd); + +pm_runtime_disable (&pdev->dev); +csi2dc_cleanup_notifier (csi2dc); +media_entity_cleanup (&csi2dc->csi2dc_sd.entity); +v4l2_device_unregister (&csi2dc->v4l2_dev); +clk_disable_unprepare (csi2dc->pclk); + +return 0 ; +} + +static int __maybe_unused csi2dc_runtime_suspend (struct device *dev) +{ +return 0 ; +} + +static int __maybe_unused csi2dc_runtime_resume (struct device *dev) +{ +return 0 ; +} + +static const struct dev_pm_ops csi2dc_dev_pm_ops = { +SET_RUNTIME_PM_OPS (csi2dc_runtime_suspend, csi2dc_runtime_resume,NULL ) +}; + +static const struct of_device_id csi2dc_of_match[] = { + { .compatible ="microchip,sama7g5-csi2dc" }, + { } +}; + +MODULE_DEVICE_TABLE (of, csi2dc_of_match); + +static struct platform_driver csi2dc_driver = { + .probe = csi2dc_probe, + .remove = csi2dc_remove, + .driver = { + .name ="microchip-csi2dc" , + .pm = &csi2dc_dev_pm_ops,drivers/media/misc/microchip_csi2dc.c line 705
Quoted 10 lines
drivers/media/misc/microchip_csi2dc.c new file +10
-0+ .of_match_table = of_match_ptr(csi2dc_of_match), + }, +}; + +module_platform_driver (csi2dc_driver); + +MODULE_AUTHOR ("Eugen Hristev <[email protected]>" ); +MODULE_DESCRIPTION ("Microchip CSI2 Demux Controller driver" ); +MODULE_LICENSE ("GPL v2" ); +MODULE_SUPPORTED_DEVICE ("video" );--
Kind regards,Sakari Ailus
Re: [PATCH v2 3/4] media: misc: introduce microchip_csi2dc driver
Quoted 166 lines · On 25.08.2020 15:44, Eugen Hristev - M18282 wrote:
Quoted 3 lines · Sakari Ailus
Hi Eugen,
Thanks for the patch.
Hello Sakari,
Thanks for reviewing.
Quoted 156 lines · Eugen Hristev
Quoted 141 lines
Microchip CSI2DC (CSI2 Demultiplexer Controller) is a misc bridge device that converts a byte stream in IDI Synopsys format (coming from a CSI2HOST) to a pixel stream that can be captured by a sensor controller.
Signed-off-by Eugen Hristev <[email protected]>--- drivers/media/misc/Kconfig | 9 + drivers/media/misc/Makefile | 1 + drivers/media/misc/microchip_csi2dc.c | 705 ++++++++++++++++++++++++++ 3 files changed, 715 insertions(+)create mode 100644
drivers/media/misc/microchip_csi2dc.cdrivers/media/misc/Kconfig +9
-0@@ -8,6 +8,15 @@ menu "Miscellaneous helper chips" comment "Various helper chips" +config VIDEO_MICROCHIP_CSI2DC + tristate "Microchip CSI2 Demux Controller" + depends on VIDEO_V4L2 + help + CSI2 Demux Controller driver. CSI2DC is a helper chip + that converts IDI interface byte stream to a parallel pixel stream. + It supports various RAW formats as input. + Performs clock domain crossing between hardware blocks. + endmenu endifdrivers/media/misc/Makefile +1
-0@@ -1 +1,2 @@ # SPDX-License-Identifier: GPL-2.0 +obj-$(CONFIG_VIDEO_MICROCHIP_CSI2DC) += microchip_csi2dc.odrivers/media/misc/microchip_csi2dc.c new file +96
-0@@ -0,0 +1,705 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Microchip CSI2 Demux Controller (CSI2DC) driver +* +* Copyright (C) 2018-2020 Microchip Technology, Inc. +* +* Author: Eugen Hristev <[email protected]> +* +*/ + +#include <linux/clk.h> +#include <linux/module.h> +#include <linux/of.h> +#include <linux/of_graph.h> +#include <linux/platform_device.h> +#include <linux/pm_runtime.h> +#include <linux/videodev2.h> + +#include <media/v4l2-device.h> +#include <media/v4l2-fwnode.h> +#include <media/v4l2-subdev.h> +#include <media/videobuf2-dma-contig.h> + +/* Global configuration register */ +#define CSI2DC_GCFG 0x0 + +/* MIPI sensor pixel clock is free running */ +#define CSI2DC_GCFG_MIPIFRN BIT(0) +/* Output waveform inter-line minimum delay */ +#define CSI2DC_GCFG_HLC (v) ((v) << 4) +#define CSI2DC_GCFG_HLC_MASK GENMASK(7, 4) + +/* Global control register */ +#define CSI2DC_GCTLR 0x04 +#define CSI2DC_GCTLR_SWRST BIT(0) + +/* Global status register */ +#define CSI2DC_GS 0x08 + +/* SSP interrupt status register */ +#define CSI2DC_SSPIS 0x28 +/* Pipe update register */ +#define CSI2DC_PU 0xC0 +/* Video pipe attributes update */ +#define CSI2DC_PU_VP BIT(0) + +/* Pipe update status register */ +#define CSI2DC_PUS 0xC4 + +/* Video pipeline enable register */ +#define CSI2DC_VPE 0xF8 +#define CSI2DC_VPE_ENABLE BIT(0) + +/* Video pipeline configuration register */ +#define CSI2DC_VPCFG 0xFC +/* Data type */ +#define CSI2DC_VPCFG_DT (v) ((v) << 0) +#define CSI2DC_VPCFG_DT_MASK GENMASK(5, 0) +/* Virtual channel identifier */ +#define CSI2DC_VPCFG_VC (v) ((v) << 6) +#define CSI2DC_VPCFG_VC_MASK GENMASK(7, 6) +/* Decompression enable */ +#define CSI2DC_VPCFG_DE BIT(8) +/* Decoder mode */ +#define CSI2DC_VPCFG_DM (v) ((v) << 9) +#define CSI2DC_VPCFG_DM_DECODER8TO12 0 +/* Decoder predictor 2 selection */ +#define CSI2DC_VPCFG_DP2 BIT(12) +/* Recommended memory storage */ +#define CSI2DC_VPCFG_RMS BIT(13) +/* Post adjustment */ +#define CSI2DC_VPCFG_PA BIT(14) + +/* Video pipeline column register */ +#define CSI2DC_VPCOL 0x100 +/* Column number */ +#define CSI2DC_VPCOL_COL (v) ((v) << 0) +#define CSI2DC_VPCOL_COL_MASK GENMASK(15, 0) + +/* Video pipeline row register */ +#define CSI2DC_VPROW 0x104 +/* Row number */ +#define CSI2DC_VPROW_ROW (v) ((v) << 0) +#define CSI2DC_VPROW_ROW_MASK GENMASK(15, 0) + +/* Version register */ +#define CSI2DC_VERSION 0x1FC + +/* register read/write helpers */ +#define csi2dc_readl (st, reg) readl_relaxed((st)->base + (reg)) +#define csi2dc_writel (st, reg, val) writel_relaxed((val), (st)->base + (reg)) + +/* supported RAW data types */ +#define CSI2DC_DT_RAW6 0x28 +#define CSI2DC_DT_RAW7 0x29 +#define CSI2DC_DT_RAW8 0x2Adrivers/media/misc/microchip_csi2dc.c line 106
Quoted 10 lines
drivers/media/misc/microchip_csi2dc.c new file +10
-0+#define CSI2DC_DT_RAW10 0x2B +#define CSI2DC_DT_RAW12 0x2C +#define CSI2DC_DT_RAW14 0x2D + +struct csi2dc_format { +u32 mbus_code; +u32 dt; +}; + +static struct csi2dc_format csi2dc_formats_list[] = {const
Hi Sakari,
Elements from this table are being pointed to dynamically by all the other variables , like cur_fmt, try_fmt, and the dynamically built formats list. If I make this const, I either have to propagate const to all dynamic elements (which would not make sense, because they will keep changing), or at some point to avoid compiler warning, cast out to non const elements.
What do you think ?
Eugen
Quoted 699 lines
Quoted 83 lines
Quoted 50 lines
drivers/media/misc/microchip_csi2dc.c new file +50
-0+ { + .mbus_code = MEDIA_BUS_FMT_SRGGB10_1X10, + .dt = CSI2DC_DT_RAW10, + }, +}; + +enum mipi_csi_pads { +CSI2DC_PAD_SINK =0 , +CSI2DC_PAD_SOURCE =1 , +CSI2DC_PADS_NUM =2 , +}; + +struct csi2dc_device { +void __iomem *base; +struct v4l2_subdev csi2dc_sd; +struct device *dev; +struct v4l2_device v4l2_dev; +struct clk *pclk; +struct clk *scck; + +bool video_pipe; + +u32 num_fmts; +struct csi2dc_format **formats; + +struct csi2dc_format *cur_fmt; +struct csi2dc_format *try_fmt; + +struct media_pad pads[CSI2DC_PADS_NUM ]; + +bool clk_gated; +u32 inter_line_delay; +u32 vc; + +struct v4l2_async_subdev *asd; +struct v4l2_async_notifier notifier; + +struct v4l2_subdev *input_sd; +bool completed; +}; + +static void csi2dc_vp_update (struct csi2dc_device *csi2dc) +{ +u32 vp; + + vp =CSI2DC_VPCFG_DT (csi2dc->cur_fmt->dt) &CSI2DC_VPCFG_DT_MASK ; + vp |=CSI2DC_VPCFG_VC (csi2dc->vc) &CSI2DC_VPCFG_VC_MASK ; + vp &= ~CSI2DC_VPCFG_DE ; + vp |=CSI2DC_VPCFG_DM (CSI2DC_VPCFG_DM_DECODER8TO12 ); + vp &= ~CSI2DC_VPCFG_DP2 ;drivers/media/misc/microchip_csi2dc.c line 166
Quoted 10 lines
drivers/media/misc/microchip_csi2dc.c new file +10
-0+ vp &= ~CSI2DC_VPCFG_RMS ; + vp |=CSI2DC_VPCFG_PA ; + +csi2dc_writel (csi2dc,CSI2DC_VPCFG , vp); +csi2dc_writel (csi2dc,CSI2DC_VPE ,CSI2DC_VPE_ENABLE ); +csi2dc_writel (csi2dc,CSI2DC_PU ,CSI2DC_PU_VP ); +} + +static inline struct csi2dc_device *csi2dc_sd_to_csi2dc_device + (struct v4l2_subdev *csi2dc_sd)I'd suggest wrapping after the asterisk.
Quoted 20 lines
drivers/media/misc/microchip_csi2dc.c new file +20
-0+{ + return container_of(csi2dc_sd, struct csi2dc_device, csi2dc_sd); +} + +static int csi2dc_enum_mbus_code (struct v4l2_subdev *csi2dc_sd, +struct v4l2_subdev_pad_config *cfg, +struct v4l2_subdev_mbus_code_enum *code) +{ +struct csi2dc_device *csi2dc =csi2dc_sd_to_csi2dc_device (csi2dc_sd); + +if (code->index >= csi2dc->num_fmts) +return -EINVAL ; + + code->code = csi2dc->formats[code->index]->mbus_code; +return 0 ; +} + +static int csi2dc_try_fmt (struct v4l2_subdev *csi2dc_sd, +struct v4l2_subdev_pad_config *cfg, +struct v4l2_subdev_format *req_fmt)Quoted 8 lines
drivers/media/misc/microchip_csi2dc.c line 192
Quoted 6 lines
drivers/media/misc/microchip_csi2dc.c new file +6
-0+{ +struct csi2dc_device *csi2dc =csi2dc_sd_to_csi2dc_device (csi2dc_sd); +struct csi2dc_format *fmt; + +if (!csi2dc->completed) { +dev_dbg ((csi2dc)->dev,"subdev not registered yet\n" );Uh... but can you end up here?
Yes, if the subdevice has not yet registered.
The CSI2DC registers as a subdevice for the next element in pipeline regardless of it's own subdevice.
I encountered issues when trying to register the csi2dc at a later point than probe time (at the moment of it's own completion when the subdev is ready).
Do you think I need to change , and have csi2dc registers itself for the next element at a later point ?Quoted 12 lines
Quoted 12 lines
drivers/media/misc/microchip_csi2dc.c new file +11
-0+return 0 ; + } + +for (fmt = csi2dc->formats[0 ]; fmt; fmt++) +if (req_fmt->format.code == fmt->mbus_code) + csi2dc->try_fmt = fmt; + +/* in case we could not find the desired format, default to something */ +if (!csi2dc->try_fmt || + req_fmt->format.code != csi2dc->try_fmt->mbus_code) { + csi2dc->try_fmt = csi2dc->formats[0 ];Quoted 8 lines
drivers/media/misc/microchip_csi2dc.c line 207
Quoted 4 lines
drivers/media/misc/microchip_csi2dc.c new file +4
-0+ req_fmt->format.code = csi2dc->formats[0 ]->mbus_code; + } + +return v4l2_subdev_call (csi2dc->input_sd, pad, set_fmt, cfg, req_fmt);For MC-enabled drivers (i.e. also those exposing sub-device nodes) the formats are set (and also enumerated) by the user and validated by the driver. See e.g. ipu3-cio2 driver for an example. It also includes DMA.
To fully understand, I do not need to make a subdev call ? Just validate or invalidate the try format ?
Quoted 48 lines
Quoted 48 lines
drivers/media/misc/microchip_csi2dc.c new file +47
-0+} + +static int csi2dc_set_fmt (struct v4l2_subdev *csi2dc_sd, +struct v4l2_subdev_pad_config *cfg, +struct v4l2_subdev_format *req_fmt) +{ +struct csi2dc_device *csi2dc =csi2dc_sd_to_csi2dc_device (csi2dc_sd); +int ret; + +if (!csi2dc->completed) { +dev_dbg ((csi2dc)->dev,"subdev not registered yet\n" ); +return 0 ; + } + +csi2dc_try_fmt (csi2dc_sd, cfg, req_fmt); + +if (csi2dc->try_fmt->mbus_code != req_fmt->format.code) { +dev_dbg (csi2dc->dev,"CSI2DC unsupported format 0x%x\n" , + req_fmt->format.code); +return -EINVAL ; + } + + ret =v4l2_subdev_call (csi2dc->input_sd, pad, set_fmt, cfg, req_fmt); +if (ret) { +dev_err (csi2dc->dev,"input subdev failed %d\n" , ret); +return ret; + } + + csi2dc->cur_fmt = csi2dc->try_fmt; +/* update video pipe */ +csi2dc_vp_update (csi2dc); + +dev_dbg (csi2dc->dev,"CSI2DC new format: 0x%x\n" , req_fmt->format.code); +return 0 ; +} + +static int csi2dc_formats_init (struct csi2dc_device *csi2dc) +{ +int i, j; +struct csi2dc_format *fmt = &csi2dc_formats_list[0 ]; + + csi2dc->num_fmts =1 ; + + csi2dc->formats =devm_kcalloc (csi2dc->dev, csi2dc->num_fmts, +sizeof (*csi2dc->formats),GFP_KERNEL ); + +for (i =0 , j =0 ; i <ARRAY_SIZE (csi2dc_formats_list); i++, fmt++)Quoted 8 lines
drivers/media/misc/microchip_csi2dc.c line 260
Quoted 6 lines
drivers/media/misc/microchip_csi2dc.c new file +6
-0+if (fmt->mbus_code ==MEDIA_BUS_FMT_SRGGB10_1X10 ) + csi2dc->formats[j++] = fmt; +return 0 ; +} + +static int csi2dc_s_power (struct v4l2_subdev *csi2dc_sd,int on)Please use runtime PM instead.
And in this case,
s_poweron/off will be unused?
The runtime PM will power on the pipeline when capture is required or it will have it powered on more than that ?
Currently in my experiments when stopping the streaming,s_poweroff is also called afterwards, and the CSI2DC can be reset, as the MIPI lanes must reach a stop state to reinitialize capture later.Quoted 227 lines
Quoted 112 lines
drivers/media/misc/microchip_csi2dc.c new file +111
-0+{ +struct csi2dc_device *csi2dc =csi2dc_sd_to_csi2dc_device (csi2dc_sd); +int ret =0 ; + +if (!csi2dc->completed) { +dev_dbg ((csi2dc)->dev,"subdev not registered yet\n" ); +return 0 ; + } + +if (on) + ret =clk_prepare_enable (csi2dc->scck); +else +clk_disable_unprepare (csi2dc->scck); +if (ret) +dev_err (csi2dc->dev,"failed to enable scck: %d\n" , ret); + +/* if powering up, deassert reset line */ +if (on) +csi2dc_writel (csi2dc,CSI2DC_GCTLR ,CSI2DC_GCTLR_SWRST ); + + ret =v4l2_subdev_call (csi2dc->input_sd, core, s_power, on); + +/* if powering down, assert reset line */ +if (!on) +csi2dc_writel (csi2dc,CSI2DC_GCTLR , !CSI2DC_GCTLR_SWRST ); + +return ret; +} + +static int csi2dc_s_stream (struct v4l2_subdev *csi2dc_sd,int enable) +{ +struct csi2dc_device *csi2dc =csi2dc_sd_to_csi2dc_device (csi2dc_sd); + +if (!csi2dc->completed) { +dev_dbg ((csi2dc)->dev,"subdev not registered yet\n" ); +return 0 ; + } + +return v4l2_subdev_call (csi2dc->input_sd, video, s_stream, enable); +} + +static int csi2dc_g_frame_interval (struct v4l2_subdev *csi2dc_sd, +struct v4l2_subdev_frame_interval *interval) +{ +struct csi2dc_device *csi2dc =csi2dc_sd_to_csi2dc_device (csi2dc_sd); + +if (!csi2dc->completed) { +dev_dbg ((csi2dc)->dev,"subdev not registered yet\n" ); +return 0 ; + } + +return v4l2_subdev_call (csi2dc->input_sd, video, g_frame_interval, + interval); +} + +static int csi2dc_s_frame_interval (struct v4l2_subdev *csi2dc_sd, +struct v4l2_subdev_frame_interval *interval) +{ +struct csi2dc_device *csi2dc =csi2dc_sd_to_csi2dc_device (csi2dc_sd); + +if (!csi2dc->completed) { +dev_dbg ((csi2dc)->dev,"subdev not registered yet\n" ); +return 0 ; + } + +return v4l2_subdev_call (csi2dc->input_sd, video, s_frame_interval, + interval); +} + +static int csi2dc_enum_frame_size (struct v4l2_subdev *csi2dc_sd, +struct v4l2_subdev_pad_config *cfg, +struct v4l2_subdev_frame_size_enum *fse) +{ +struct csi2dc_device *csi2dc =csi2dc_sd_to_csi2dc_device (csi2dc_sd); + +if (!csi2dc->completed) { +dev_dbg ((csi2dc)->dev,"subdev not registered yet\n" ); +return 0 ; + } + +return v4l2_subdev_call (csi2dc->input_sd, pad, enum_frame_size, cfg, + fse); +} + +static int csi2dc_enum_frame_interval (struct v4l2_subdev *csi2dc_sd, +struct v4l2_subdev_pad_config *cfg, +struct v4l2_subdev_frame_interval_enum *fie) +{ +struct csi2dc_device *csi2dc =csi2dc_sd_to_csi2dc_device (csi2dc_sd); + +if (!csi2dc->completed) { +dev_dbg ((csi2dc)->dev,"subdev not registered yet\n" ); +return 0 ; + } + +return v4l2_subdev_call (csi2dc->input_sd, pad, enum_frame_interval, cfg, + fie); +} + +static struct v4l2_subdev_core_ops csi2dc_core_ops = { + .s_power = csi2dc_s_power, +}; + +static struct v4l2_subdev_pad_ops csi2dc_pad_ops = { + .enum_mbus_code = csi2dc_enum_mbus_code, + .set_fmt = csi2dc_set_fmt, + .enum_frame_size = csi2dc_enum_frame_size, + .enum_frame_interval = csi2dc_enum_frame_interval, +}; + +static struct v4l2_subdev_video_ops csi2dc_video_ops = {drivers/media/misc/microchip_csi2dc.c line 381
Quoted 10 lines
drivers/media/misc/microchip_csi2dc.c new file +10
-0+ .s_stream = csi2dc_s_stream, + .g_frame_interval = csi2dc_g_frame_interval, + .s_frame_interval = csi2dc_s_frame_interval, +}; + +static struct v4l2_subdev_ops csi2dc_subdev_ops = { + .core = &csi2dc_core_ops, + .pad = &csi2dc_pad_ops, + .video = &csi2dc_video_ops, +};const. Applies to all above.
Quoted 5 lines
drivers/media/misc/microchip_csi2dc.c new file +5
-0+ +static int csi2dc_async_bound (struct v4l2_async_notifier *notifier, +struct v4l2_subdev *subdev, +struct v4l2_async_subdev *asd) +{drivers/media/misc/microchip_csi2dc.c line 396
Quoted 10 lines
drivers/media/misc/microchip_csi2dc.c new file +10
-0+struct csi2dc_device *csi2dc =container_of (notifier->v4l2_dev, + struct csi2dc_device, v4l2_dev); + csi2dc->input_sd = subdev; + +return 0 ; +} + +static int csi2dc_async_complete (struct v4l2_async_notifier *notifier) +{ + struct csi2dc_device *csi2dc = container_of(notifier->v4l2_dev,It'd be cleaner to wrap after "=". Or align the lines below after "(".
Quoted 71 lines
drivers/media/misc/microchip_csi2dc.c new file +71
-0+ struct csi2dc_device, v4l2_dev); +int ret; + + ret =v4l2_device_register_subdev_nodes (&csi2dc->v4l2_dev); +if (ret <0 ) { +v4l2_err (&csi2dc->v4l2_dev,"failed to register subdev nodes\n" ); +return ret; + } + +csi2dc_writel (csi2dc,CSI2DC_GCFG , + (CSI2DC_GCFG_HLC (csi2dc->inter_line_delay) & +CSI2DC_GCFG_HLC_MASK ) | + (csi2dc->clk_gated ?0 :CSI2DC_GCFG_MIPIFRN )); + +csi2dc_writel (csi2dc,CSI2DC_VPCOL , +CSI2DC_VPCOL_COL (0xFFF ) &CSI2DC_VPCOL_COL_MASK ); +csi2dc_writel (csi2dc,CSI2DC_VPROW , +CSI2DC_VPROW_ROW (0xFFF ) &CSI2DC_VPROW_ROW_MASK ); + + csi2dc->completed = true; + +return ret; +} + +static const struct v4l2_async_notifier_operations csi2dc_async_ops = { + .bound = csi2dc_async_bound, + .complete = csi2dc_async_complete, +}; + +static void csi2dc_cleanup_notifier (struct csi2dc_device *csi2dc) +{ +v4l2_async_notifier_unregister (&csi2dc->notifier); +v4l2_async_notifier_cleanup (&csi2dc->notifier); +} + +static int csi2dc_prepare_notifier (struct csi2dc_device *csi2dc, +struct device_node *input_parent) +{ +int ret; + +v4l2_async_notifier_init (&csi2dc->notifier); + + csi2dc->asd =kzalloc (sizeof (*csi2dc->asd),GFP_KERNEL ); +if (!csi2dc->asd) +return -ENOMEM ; + + csi2dc->asd->match_type =V4L2_ASYNC_MATCH_FWNODE ; + csi2dc->asd->match.fwnode =of_fwnode_handle (input_parent); + + ret =v4l2_async_notifier_add_subdev (&csi2dc->notifier, csi2dc->asd); +if (ret) { +dev_err (csi2dc->dev,"failed to add async notifier.\n" ); +v4l2_async_notifier_cleanup (&csi2dc->notifier); + goto csi2dc_prepare_notifier_err; + } + + csi2dc->notifier.ops = &csi2dc_async_ops; + + ret =v4l2_async_notifier_register (&csi2dc->v4l2_dev, + &csi2dc->notifier); + +if (ret) { +dev_err (csi2dc->dev,"fail to register async notifier.\n" ); + goto csi2dc_prepare_notifier_err; + } + +csi2dc_prepare_notifier_err: +of_node_put (input_parent); + +return ret; +}drivers/media/misc/microchip_csi2dc.c line 477
Quoted 10 lines
drivers/media/misc/microchip_csi2dc.c new file +10
-0+ +static int csi2dc_of_parse (struct csi2dc_device *csi2dc, +struct device_node *of_node) +{ +struct device_node *input_node, *sink_node, *input_parent; +struct v4l2_fwnode_endpoint input_endpoint, sink_endpoint; +int ret; + +memset (&input_endpoint,0 ,sizeof (input_endpoint)); +memset (&sink_endpoint,0 ,sizeof (sink_endpoint));Could you assign a field to 0 in the declaration instead?
Quoted 2 lines
You should also set the bus type as I believe the driver supports a single one at both endpoints.
I thought about that, but on the input pad, what bus type I can use ? Synopsys IDI is not available in kernel.
Quoted 23 lines
You could also use the fwnode property API instead so you could avoid
of_fwnode_handle()--- up to you.Quoted 19 lines
drivers/media/misc/microchip_csi2dc.c new file +19
-0+ + input_node =of_graph_get_next_endpoint (of_node,NULL ); + +if (!input_node) { +dev_err (csi2dc->dev,"missing port node at %s, input node is mandatory.\n" , + of_node->full_name); +return -EINVAL ; + } + + ret =v4l2_fwnode_endpoint_parse (of_fwnode_handle (input_node), + &input_endpoint); + +if (ret) { +dev_err (csi2dc->dev,"endpoint not defined at %s\n" , + of_node->full_name); +return ret; + } + + input_parent =of_graph_get_remote_port_parent (input_node);Quoted 8 lines
drivers/media/misc/microchip_csi2dc.c line 502
Quoted 6 lines
drivers/media/misc/microchip_csi2dc.c new file +6
-0+if (!input_parent) { +dev_err (csi2dc->dev,"could not get input node's parent node.\n" ); +return -EINVAL ; + } + + sink_node =of_graph_get_next_endpoint (of_node, input_node);You'll need to obtain the endpoints by port here (and above, too).
I obtain them in the order in the device tree, one by one. You suggest to use a different API such that they are obtained by port number ?
Quoted 147 lines
Quoted 14 lines
drivers/media/misc/microchip_csi2dc.c new file +13
-0+ +if (sink_node) + ret =v4l2_fwnode_endpoint_parse (of_fwnode_handle (sink_node), + &sink_endpoint); + +if (!sink_node || ret) { +dev_info (csi2dc->dev,"missing sink node at %s, data pipe available only.\n" , + of_node->full_name); + }else { + csi2dc->video_pipe = true; + csi2dc->vc = sink_endpoint.base.id; + + dev_dbg(csi2dc->dev, "block %s %d.%d->%d.%d video pipe VC %d\n",drivers/media/misc/microchip_csi2dc.c line 525
Quoted 10 lines
drivers/media/misc/microchip_csi2dc.c new file +10
-0+ of_node->full_name, input_endpoint.base.port, + input_endpoint.base.id, sink_endpoint.base.port, + sink_endpoint.base.id, csi2dc->vc); + } + + csi2dc->clk_gated =of_property_read_bool (of_node, +"microchip,clk-gated" ); + +dev_dbg (csi2dc->dev,"%s clock\n" , + (csi2dc->clk_gated ?"Gated" :"Free running" ));Extra parentheses.
drivers/media/misc/microchip_csi2dc.c line 536
Quoted 11 lines
drivers/media/misc/microchip_csi2dc.c new file +11
-0+ + ret =of_property_read_u32 (of_node,"microchip,inter-line-delay" , + &csi2dc->inter_line_delay); + +if (ret || csi2dc->inter_line_delay >16 ) { +dev_dbg (csi2dc->dev,"assuming inter line delay = 16 clocks" ); + csi2dc->inter_line_delay =16 ; + ret =0 ; + } +/* hardware automatically adds 1 */ + csi2dc->inter_line_delay--;What happens if 0 was read from DT?
drivers/media/misc/microchip_csi2dc.c line 541
Quoted 5 lines
drivers/media/misc/microchip_csi2dc.c new file +5
-0+ +/* prepare async notifier for subdevice completion */ + +if (sink_node) +of_node_put (sink_node);
of_node_put()is NULL-safe.Quoted 49 lines
drivers/media/misc/microchip_csi2dc.c new file +49
-0+of_node_put (input_node); + +return csi2dc_prepare_notifier (csi2dc, input_parent); +} + +static int csi2dc_probe (struct platform_device *pdev) +{ +struct device *dev = &pdev->dev; +struct csi2dc_device *csi2dc; +struct resource *res =NULL ; +int ret =0 ; + + csi2dc =devm_kzalloc (dev,sizeof (*csi2dc),GFP_KERNEL ); +if (!csi2dc) +return -ENOMEM ; + + csi2dc->dev = dev; + + res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); +if (!res) +return -EINVAL ; + + csi2dc->base =devm_ioremap_resource (dev, res); + +if (IS_ERR (csi2dc->base)) { +dev_err (dev,"base address not set\n" ); +return PTR_ERR (csi2dc->base); + } + + csi2dc->pclk =devm_clk_get (dev,"pclk" ); +if (IS_ERR (csi2dc->pclk)) { + ret =PTR_ERR (csi2dc->pclk); +dev_err (dev,"failed to get pclk: %d\n" , ret); +return ret; + } + + ret =clk_prepare_enable (csi2dc->pclk); +if (ret) { +dev_err (dev,"failed to enable pclk: %d\n" , ret); +return ret; + } + + csi2dc->scck =devm_clk_get (dev,"scck" ); +if (IS_ERR (csi2dc->scck)) { + ret =PTR_ERR (csi2dc->scck); +dev_err (dev,"failed to get scck: %d\n" , ret); + goto csi2dc_clk_fail; + } +drivers/media/misc/microchip_csi2dc.c line 600
Quoted 10 lines
drivers/media/misc/microchip_csi2dc.c new file +10
-0+ ret =v4l2_device_register (dev, &csi2dc->v4l2_dev); +if (ret) { +dev_err (dev,"unable to register v4l2 device.\n" ); + goto csi2dc_clk_fail; + } + +v4l2_subdev_init (&csi2dc->csi2dc_sd, &csi2dc_subdev_ops); + + csi2dc->csi2dc_sd.owner =THIS_MODULE ; +No need for a newline.
drivers/media/misc/microchip_csi2dc.c line 603
Quoted 3 lines
drivers/media/misc/microchip_csi2dc.c new file +3
-0+ csi2dc->csi2dc_sd.dev = dev; +snprintf (csi2dc->csi2dc_sd.name,sizeof (csi2dc->csi2dc_sd.name), +"%s.%d" ,"CSI2DC" ,0 );The number is always zero.
Quoted 17 lines
drivers/media/misc/microchip_csi2dc.c new file +17
-0+ + csi2dc->csi2dc_sd.flags |=V4L2_SUBDEV_FL_HAS_DEVNODE ; + csi2dc->csi2dc_sd.entity.function =MEDIA_ENT_F_VID_IF_BRIDGE ; + csi2dc->pads[CSI2DC_PAD_SINK ].flags =MEDIA_PAD_FL_SINK ; + csi2dc->pads[CSI2DC_PAD_SOURCE ].flags =MEDIA_PAD_FL_SOURCE ; + + ret =media_entity_pads_init (&csi2dc->csi2dc_sd.entity,CSI2DC_PADS_NUM , + csi2dc->pads); +if (ret <0 ) { +dev_err (dev,"media entity init failed\n" ); + goto csi2dc_probe_entity_err; + } + +v4l2_set_subdevdata (&csi2dc->csi2dc_sd, pdev); + +platform_set_drvdata (pdev, &csi2dc->csi2dc_sd); +drivers/media/misc/microchip_csi2dc.c line 630
Quoted 10 lines
drivers/media/misc/microchip_csi2dc.c new file +10
-0+ ret =csi2dc_of_parse (csi2dc, dev->of_node); +if (ret) + goto csi2dc_probe_entity_err; + + ret =csi2dc_formats_init (csi2dc); +if (ret) + goto csi2dc_probe_error; + + ret =v4l2_async_register_subdev (&csi2dc->csi2dc_sd); +if (ret) {// ret = -EPROBE_DEFER; Oops.
Quoted 11 lines
drivers/media/misc/microchip_csi2dc.c line 639
Quoted 9 lines
drivers/media/misc/microchip_csi2dc.c new file +9
-0+ goto csi2dc_probe_error; + } + +pm_runtime_set_active (dev); +pm_runtime_enable (dev); +pm_request_idle (dev); + +pr_info ("Microchip CSI2DC version %x\n" , +csi2dc_readl (csi2dc,CSI2DC_VERSION ));What happens if the device was powered down already?
I am moving the info line before
pm_request_idle, if this was what you had in mind.I am sending a v3 of the patch, with some of the comments addressed. Some others I do not fully understand yet how to change. Hopefully your replies will help me find the way.
Thanks again,
EugenQuoted 73 lines
Quoted 57 lines
drivers/media/misc/microchip_csi2dc.c new file +56
-0+ +return 0 ; + +csi2dc_probe_error: +v4l2_async_unregister_subdev (&csi2dc->csi2dc_sd); +csi2dc_cleanup_notifier (csi2dc); + +csi2dc_probe_entity_err: +media_entity_cleanup (&csi2dc->csi2dc_sd.entity); +v4l2_device_unregister (&csi2dc->v4l2_dev); +csi2dc_clk_fail: +clk_disable_unprepare (csi2dc->pclk); +return ret; +} + +static int csi2dc_remove (struct platform_device *pdev) +{ +struct v4l2_subdev *csi2dc_sd =platform_get_drvdata (pdev); +struct csi2dc_device *csi2dc =csi2dc_sd_to_csi2dc_device (csi2dc_sd); + +pm_runtime_disable (&pdev->dev); +csi2dc_cleanup_notifier (csi2dc); +media_entity_cleanup (&csi2dc->csi2dc_sd.entity); +v4l2_device_unregister (&csi2dc->v4l2_dev); +clk_disable_unprepare (csi2dc->pclk); + +return 0 ; +} + +static int __maybe_unused csi2dc_runtime_suspend (struct device *dev) +{ +return 0 ; +} + +static int __maybe_unused csi2dc_runtime_resume (struct device *dev) +{ +return 0 ; +} + +static const struct dev_pm_ops csi2dc_dev_pm_ops = { +SET_RUNTIME_PM_OPS (csi2dc_runtime_suspend, csi2dc_runtime_resume,NULL ) +}; + +static const struct of_device_id csi2dc_of_match[] = { + { .compatible ="microchip,sama7g5-csi2dc" }, + { } +}; + +MODULE_DEVICE_TABLE (of, csi2dc_of_match); + +static struct platform_driver csi2dc_driver = { + .probe = csi2dc_probe, + .remove = csi2dc_remove, + .driver = { + .name ="microchip-csi2dc" , + .pm = &csi2dc_dev_pm_ops,drivers/media/misc/microchip_csi2dc.c line 705
Quoted 10 lines
drivers/media/misc/microchip_csi2dc.c new file +10
-0+ .of_match_table = of_match_ptr(csi2dc_of_match), + }, +}; + +module_platform_driver (csi2dc_driver); + +MODULE_AUTHOR ("Eugen Hristev <[email protected]>" ); +MODULE_DESCRIPTION ("Microchip CSI2 Demux Controller driver" ); +MODULE_LICENSE ("GPL v2" ); +MODULE_SUPPORTED_DEVICE ("video" );--
Kind regards,Sakari Ailus
PATCH v2 4/4 MAINTAINERS: add microchip csi2dc
In reply to Eugen HristevAdd Microchip CSI2DC driver in the list.
Signed-off-by Eugen Hristev <[email protected]>
--- MAINTAINERS | 7 +++++++ 1 file changed, 7 insertions(+)
MAINTAINERS +7 -0
@@ -11069,6 +11069,13 @@ L: [email protected] (moderated for non-subscribers) S: Supported F: sound/soc/atmel +MICROCHIP CSI2DC DRIVER +M: Eugen Hristev <[email protected]> +L: [email protected] +S: Supported +F: Documentation/devicetree/bindings/media/microchip,csi2dc.yaml +F: drivers/media/misc/microchip_csi2dc.c + MICROCHIP DMA DRIVER M: Ludovic Desroches <[email protected]> L: [email protected] (moderated for non-subscribers)
Signature · 1 line
2.25.1
Re: [PATCH v2 4/4] MAINTAINERS: add microchip csi2dc
Quoted 3 lines · Eugen Hristev
Add Microchip CSI2DC driver in the list.
Signed-off-by Eugen Hristev <[email protected]>
The MAINTAINERS change should be no later than the files. I guess it could be part of another patch as well.
Signature · 1 line
Sakari Ailus
Hi Eugen,
Quoted 6 lines · Eugen Hristev
Hi,
This series adds support for the Microchip csi2dc csi-2 demux controller.
I was not fully sure where is the best place for such a helper chip, thus I added the driver in a separate 'misc' menu under the media menu.
It goes under platform as the other platform drivers. There are some similar chips already supported I believe.
Feel free to CC me in the future.
Signature · 1 line
Sakari Ailus