* [PATCH 00/17] CAMSS: SM8250 support (and some fixes)
@ 2021-06-08 22:34 Jonathan Marek
2021-06-08 22:35 ` [PATCH 17/17] media: dt-bindings: media: camss: Add qcom,sm8250-camss binding Jonathan Marek
2021-06-16 18:16 ` [PATCH 00/17] CAMSS: SM8250 support (and some fixes) Andrey Konovalov
0 siblings, 2 replies; 7+ messages in thread
From: Jonathan Marek @ 2021-06-08 22:34 UTC (permalink / raw)
To: linux-arm-msm
Cc: robert.foss, andrey.konovalov, Andy Gross, Bjorn Andersson,
open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS,
Hans Verkuil, open list,
open list:QUALCOMM CAMERA SUBSYSTEM DRIVER, Mauro Carvalho Chehab,
Rob Herring, Todor Tomov
This adds initial support for SM8250 and its 4 VFEs and 6 CSIPHYs.
The only big change is the added camss-vfe-480.c to support the
Titan 480 VFE.
v2:
- Fixed some typos in commit messages (patches 02 and 08)
- patch 03 ("media: camss: csiphy-3ph: add support for SM8250 CSI DPHY"):
- moved definition of CAMSS_8250 to this patch,
- removed unused lane_enable variable
- added a default unreachable case to avoid a warning
- added a is_gen2 variable (minor rework)
- Undo DECODE_FORMAT_PAYLOAD_ONLY change, add comment instead (patch 04)
- "ops" reworks in addition to removing dead code (patch 12)
- renamed csid-170 to csid-gen2, added defines for offsets, add missing
camnoc_axi clock to sm8250 vfe resources (patch 16/17)
Jonathan Marek (17):
media: camss: csiphy-3ph: don't print HW version as an error
media: camss: csiphy-3ph: disable interrupts
media: camss: csiphy-3ph: add support for SM8250 CSI DPHY
media: camss: csid-170: fix non-10bit formats
media: camss: csid-170: don't enable unused irqs
media: camss: csid-170: remove stray comment
media: camss: csid-170: support more than one lite vfe
media: camss: csid-170: set the right HALT_CMD when disabled
media: camss: csid: allow csid to work without a regulator
media: camss: remove vdda-csiN from sdm845 resources
media: camss: fix VFE irq name
media: camss: remove some vfe ops and clean up dead vfe-170 code
media: camss: vfe-170: fix "VFE halt timeout" error
media: camss: Add initial support for VFE hardware version Titan 480
media: camss: add support for V4L2_PIX_FMT_GREY for sdm845 HW
media: camss: add support for SM8250 camss
media: dt-bindings: media: camss: Add qcom,sm8250-camss binding
.../bindings/media/qcom,sm8250-camss.yaml | 399 +++++++++++++
drivers/media/platform/qcom/camss/Makefile | 3 +-
.../{camss-csid-170.c => camss-csid-gen2.c} | 32 +-
.../media/platform/qcom/camss/camss-csid.c | 45 +-
.../media/platform/qcom/camss/camss-csid.h | 2 +-
.../qcom/camss/camss-csiphy-3ph-1-0.c | 184 ++++--
.../media/platform/qcom/camss/camss-csiphy.c | 9 +-
.../media/platform/qcom/camss/camss-vfe-170.c | 101 +---
.../media/platform/qcom/camss/camss-vfe-4-1.c | 25 +-
.../media/platform/qcom/camss/camss-vfe-4-7.c | 63 +-
.../media/platform/qcom/camss/camss-vfe-4-8.c | 65 +--
.../media/platform/qcom/camss/camss-vfe-480.c | 545 ++++++++++++++++++
.../platform/qcom/camss/camss-vfe-gen1.c | 94 +--
.../platform/qcom/camss/camss-vfe-gen1.h | 39 +-
drivers/media/platform/qcom/camss/camss-vfe.c | 29 +-
drivers/media/platform/qcom/camss/camss-vfe.h | 17 +-
.../media/platform/qcom/camss/camss-video.c | 5 +-
drivers/media/platform/qcom/camss/camss.c | 205 ++++++-
drivers/media/platform/qcom/camss/camss.h | 1 +
19 files changed, 1523 insertions(+), 340 deletions(-)
create mode 100644 Documentation/devicetree/bindings/media/qcom,sm8250-camss.yaml
rename drivers/media/platform/qcom/camss/{camss-csid-170.c => camss-csid-gen2.c} (95%)
create mode 100644 drivers/media/platform/qcom/camss/camss-vfe-480.c
--
2.26.1
^ permalink raw reply [flat|nested] 7+ messages in thread* [PATCH 17/17] media: dt-bindings: media: camss: Add qcom,sm8250-camss binding 2021-06-08 22:34 [PATCH 00/17] CAMSS: SM8250 support (and some fixes) Jonathan Marek @ 2021-06-08 22:35 ` Jonathan Marek 2021-06-09 16:16 ` Rob Herring 2021-06-09 22:10 ` Rob Herring 2021-06-16 18:16 ` [PATCH 00/17] CAMSS: SM8250 support (and some fixes) Andrey Konovalov 1 sibling, 2 replies; 7+ messages in thread From: Jonathan Marek @ 2021-06-08 22:35 UTC (permalink / raw) To: linux-arm-msm Cc: robert.foss, andrey.konovalov, Andy Gross, Bjorn Andersson, Todor Tomov, Mauro Carvalho Chehab, Rob Herring, open list:QUALCOMM CAMERA SUBSYSTEM DRIVER, open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS, open list Add bindings for qcom,sm8250-camss in order to support the camera subsystem for SM8250. Signed-off-by: Jonathan Marek <jonathan@marek.ca> --- .../bindings/media/qcom,sm8250-camss.yaml | 399 ++++++++++++++++++ 1 file changed, 399 insertions(+) create mode 100644 Documentation/devicetree/bindings/media/qcom,sm8250-camss.yaml diff --git a/Documentation/devicetree/bindings/media/qcom,sm8250-camss.yaml b/Documentation/devicetree/bindings/media/qcom,sm8250-camss.yaml new file mode 100644 index 0000000000000..7180e52ee59a8 --- /dev/null +++ b/Documentation/devicetree/bindings/media/qcom,sm8250-camss.yaml @@ -0,0 +1,399 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) + +%YAML 1.2 +--- +$id: "http://devicetree.org/schemas/media/qcom,sm8250-camss.yaml#" +$schema: "http://devicetree.org/meta-schemas/core.yaml#" + +title: Qualcomm CAMSS ISP + +maintainers: + - Robert Foss <robert.foss@linaro.org> + +description: | + The CAMSS IP is a CSI decoder and ISP present on Qualcomm platforms + +properties: + compatible: + const: qcom,sm8250-camss + + clocks: + minItems: 31 + maxItems: 31 + + clock-names: + items: + - const: cam_hf_axi + - const: camnoc_axi + - const: csiphy0 + - const: csiphy0_timer + - const: csiphy1 + - const: csiphy1_timer + - const: csiphy2 + - const: csiphy2_timer + - const: csiphy3 + - const: csiphy3_timer + - const: csiphy4 + - const: csiphy4_timer + - const: csiphy5 + - const: csiphy5_timer + - const: vfe0_ahb + - const: vfe0_axi + - const: vfe0 + - const: vfe0_cphy_rx + - const: vfe0_csid + - const: vfe0_areg + - const: vfe1_ahb + - const: vfe1_axi + - const: vfe1 + - const: vfe1_cphy_rx + - const: vfe1_csid + - const: vfe1_areg + - const: vfe_lite_ahb + - const: vfe_lite_axi + - const: vfe_lite + - const: vfe_lite_cphy_rx + - const: vfe_lite_csid + + interrupts: + minItems: 14 + maxItems: 14 + + interrupt-names: + items: + - const: csid0 + - const: csid1 + - const: csid2 + - const: csid3 + - const: csiphy0 + - const: csiphy1 + - const: csiphy2 + - const: csiphy3 + - const: csiphy4 + - const: csiphy5 + - const: vfe0 + - const: vfe1 + - const: vfe_lite0 + - const: vfe_lite1 + + iommus: + maxItems: 1 + + power-domains: + items: + - description: IFE0 GDSC - Image Front End, Global Distributed Switch Controller. + - description: IFE1 GDSC - Image Front End, Global Distributed Switch Controller. + - description: Titan GDSC - Titan ISP Block, Global Distributed Switch Controller. + + ports: + $ref: /schemas/graph.yaml#/properties/ports + + description: + CSI input ports. + + properties: + port@0: + $ref: /schemas/graph.yaml#/$defs/port-base + unevaluatedProperties: false + description: + Input port for receiving CSI data. + + properties: + endpoint: + $ref: video-interfaces.yaml# + unevaluatedProperties: false + + properties: + clock-lanes: + maxItems: 1 + + data-lanes: + minItems: 1 + maxItems: 4 + + required: + - clock-lanes + - data-lanes + + port@1: + $ref: /schemas/graph.yaml#/$defs/port-base + unevaluatedProperties: false + description: + Input port for receiving CSI data. + + properties: + endpoint: + $ref: video-interfaces.yaml# + unevaluatedProperties: false + + properties: + clock-lanes: + maxItems: 1 + + data-lanes: + minItems: 1 + maxItems: 4 + + required: + - clock-lanes + - data-lanes + + port@2: + $ref: /schemas/graph.yaml#/$defs/port-base + unevaluatedProperties: false + description: + Input port for receiving CSI data. + + properties: + endpoint: + $ref: video-interfaces.yaml# + unevaluatedProperties: false + + properties: + clock-lanes: + maxItems: 1 + + data-lanes: + minItems: 1 + maxItems: 4 + + required: + - clock-lanes + - data-lanes + + port@3: + $ref: /schemas/graph.yaml#/$defs/port-base + unevaluatedProperties: false + description: + Input port for receiving CSI data. + + properties: + endpoint: + $ref: video-interfaces.yaml# + unevaluatedProperties: false + + properties: + clock-lanes: + maxItems: 1 + + data-lanes: + minItems: 1 + maxItems: 4 + + required: + - clock-lanes + - data-lanes + + port@4: + $ref: /schemas/graph.yaml#/$defs/port-base + unevaluatedProperties: false + description: + Input port for receiving CSI data. + + properties: + endpoint: + $ref: video-interfaces.yaml# + unevaluatedProperties: false + + properties: + clock-lanes: + maxItems: 1 + + data-lanes: + minItems: 1 + maxItems: 4 + + required: + - clock-lanes + - data-lanes + + port@5: + $ref: /schemas/graph.yaml#/$defs/port-base + unevaluatedProperties: false + description: + Input port for receiving CSI data. + + properties: + endpoint: + $ref: video-interfaces.yaml# + unevaluatedProperties: false + + properties: + clock-lanes: + maxItems: 1 + + data-lanes: + minItems: 1 + maxItems: 4 + + required: + - clock-lanes + - data-lanes + + reg: + minItems: 10 + maxItems: 10 + + reg-names: + items: + - const: csiphy0 + - const: csiphy1 + - const: csiphy2 + - const: csiphy3 + - const: csiphy4 + - const: csiphy5 + - const: vfe0 + - const: vfe1 + - const: vfe_lite0 + - const: vfe_lite1 + +required: + - clock-names + - clocks + - compatible + - interrupt-names + - interrupts + - iommus + - power-domains + - reg + - reg-names + +additionalProperties: false + +examples: + - | + #include <dt-bindings/interrupt-controller/arm-gic.h> + #include <dt-bindings/clock/qcom,camcc-sm8250.h> + #include <dt-bindings/clock/qcom,gcc-sm8250.h> + + soc { + #address-cells = <2>; + #size-cells = <2>; + + camss: camss@ac6a000 { + compatible = "qcom,sm8250-camss"; + + reg = <0 0xac6a000 0 0x2000>, + <0 0xac6c000 0 0x2000>, + <0 0xac6e000 0 0x1000>, + <0 0xac70000 0 0x1000>, + <0 0xac72000 0 0x1000>, + <0 0xac74000 0 0x1000>, + <0 0xacb4000 0 0xd000>, + <0 0xacc3000 0 0xd000>, + <0 0xacd9000 0 0x2200>, + <0 0xacdb200 0 0x2200>; + reg-names = "csiphy0", + "csiphy1", + "csiphy2", + "csiphy3", + "csiphy4", + "csiphy5", + "vfe0", + "vfe1", + "vfe_lite0", + "vfe_lite1"; + + interrupts = <GIC_SPI 477 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 478 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 479 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 448 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 89 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 464 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 466 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 468 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 359 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 465 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 467 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 469 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 360 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "csiphy0", + "csiphy1", + "csiphy2", + "csiphy3", + "csiphy4", + "csiphy5", + "csid0", + "csid1", + "csid2", + "csid3", + "vfe0", + "vfe1", + "vfe_lite0", + "vfe_lite1"; + + power-domains = <&camcc IFE_0_GDSC>, + <&camcc IFE_1_GDSC>, + <&camcc TITAN_TOP_GDSC>; + + clocks = <&gcc GCC_CAMERA_HF_AXI_CLK>, + <&camcc CAM_CC_CSIPHY0_CLK>, + <&camcc CAM_CC_CSI0PHYTIMER_CLK>, + <&camcc CAM_CC_CSIPHY1_CLK>, + <&camcc CAM_CC_CSI1PHYTIMER_CLK>, + <&camcc CAM_CC_CSIPHY2_CLK>, + <&camcc CAM_CC_CSI2PHYTIMER_CLK>, + <&camcc CAM_CC_CSIPHY3_CLK>, + <&camcc CAM_CC_CSI3PHYTIMER_CLK>, + <&camcc CAM_CC_CSIPHY4_CLK>, + <&camcc CAM_CC_CSI4PHYTIMER_CLK>, + <&camcc CAM_CC_CSIPHY5_CLK>, + <&camcc CAM_CC_CSI5PHYTIMER_CLK>, + <&camcc CAM_CC_IFE_0_AHB_CLK>, + <&camcc CAM_CC_IFE_0_AXI_CLK>, + <&camcc CAM_CC_IFE_0_CLK>, + <&camcc CAM_CC_IFE_0_CPHY_RX_CLK>, + <&camcc CAM_CC_IFE_0_CSID_CLK>, + <&camcc CAM_CC_IFE_0_AREG_CLK>, + <&camcc CAM_CC_IFE_1_AHB_CLK>, + <&camcc CAM_CC_IFE_1_AXI_CLK>, + <&camcc CAM_CC_IFE_1_CLK>, + <&camcc CAM_CC_IFE_1_CPHY_RX_CLK>, + <&camcc CAM_CC_IFE_1_CSID_CLK>, + <&camcc CAM_CC_IFE_1_AREG_CLK>, + <&camcc CAM_CC_IFE_LITE_AHB_CLK>, + <&camcc CAM_CC_IFE_LITE_AXI_CLK>, + <&camcc CAM_CC_IFE_LITE_CLK>, + <&camcc CAM_CC_IFE_LITE_CPHY_RX_CLK>, + <&camcc CAM_CC_IFE_LITE_CSID_CLK>; + + clock-names = "cam_hf_axi", + "csiphy0", + "csiphy0_timer", + "csiphy1", + "csiphy1_timer", + "csiphy2", + "csiphy2_timer", + "csiphy3", + "csiphy3_timer", + "csiphy4", + "csiphy4_timer", + "csiphy5", + "csiphy5_timer", + "vfe0_ahb", + "vfe0_axi", + "vfe0", + "vfe0_cphy_rx", + "vfe0_csid", + "vfe0_areg", + "vfe1_ahb", + "vfe1_axi", + "vfe1", + "vfe1_cphy_rx", + "vfe1_csid", + "vfe1_areg", + "vfe_lite_ahb", + "vfe_lite_axi", + "vfe_lite", + "vfe_lite_cphy_rx", + "vfe_lite_csid"; + + iommus = <&apps_smmu 0x800 0x400>; + + ports { + #address-cells = <1>; + #size-cells = <0>; + }; + }; + }; -- 2.26.1 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 17/17] media: dt-bindings: media: camss: Add qcom,sm8250-camss binding 2021-06-08 22:35 ` [PATCH 17/17] media: dt-bindings: media: camss: Add qcom,sm8250-camss binding Jonathan Marek @ 2021-06-09 16:16 ` Rob Herring 2021-06-09 22:10 ` Rob Herring 1 sibling, 0 replies; 7+ messages in thread From: Rob Herring @ 2021-06-09 16:16 UTC (permalink / raw) To: Jonathan Marek Cc: Bjorn Andersson, andrey.konovalov, linux-media, linux-arm-msm, linux-kernel, devicetree, Todor Tomov, Rob Herring, Andy Gross, robert.foss, Mauro Carvalho Chehab On Tue, 08 Jun 2021 18:35:06 -0400, Jonathan Marek wrote: > Add bindings for qcom,sm8250-camss in order to support the camera > subsystem for SM8250. > > Signed-off-by: Jonathan Marek <jonathan@marek.ca> > --- > .../bindings/media/qcom,sm8250-camss.yaml | 399 ++++++++++++++++++ > 1 file changed, 399 insertions(+) > create mode 100644 Documentation/devicetree/bindings/media/qcom,sm8250-camss.yaml > My bot found errors running 'make DT_CHECKER_FLAGS=-m dt_binding_check' on your patch (DT_CHECKER_FLAGS is new in v5.13): yamllint warnings/errors: dtschema/dtc warnings/errors: Documentation/devicetree/bindings/media/qcom,sm8250-camss.example.dts:20:18: fatal error: dt-bindings/clock/qcom,camcc-sm8250.h: No such file or directory 20 | #include <dt-bindings/clock/qcom,camcc-sm8250.h> | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ compilation terminated. make[1]: *** [scripts/Makefile.lib:380: Documentation/devicetree/bindings/media/qcom,sm8250-camss.example.dt.yaml] Error 1 make[1]: *** Waiting for unfinished jobs.... make: *** [Makefile:1416: dt_binding_check] Error 2 \ndoc reference errors (make refcheckdocs): See https://patchwork.ozlabs.org/patch/1489658 This check can fail if there are any dependencies. The base for a patch series is generally the most recent rc1. If you already ran 'make dt_binding_check' and didn't see the above error(s), then make sure 'yamllint' is installed and dt-schema is up to date: pip3 install dtschema --upgrade Please check and re-submit. ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 17/17] media: dt-bindings: media: camss: Add qcom,sm8250-camss binding 2021-06-08 22:35 ` [PATCH 17/17] media: dt-bindings: media: camss: Add qcom,sm8250-camss binding Jonathan Marek 2021-06-09 16:16 ` Rob Herring @ 2021-06-09 22:10 ` Rob Herring 2021-06-09 22:32 ` Jonathan Marek 1 sibling, 1 reply; 7+ messages in thread From: Rob Herring @ 2021-06-09 22:10 UTC (permalink / raw) To: Jonathan Marek Cc: linux-arm-msm, robert.foss, andrey.konovalov, Andy Gross, Bjorn Andersson, Todor Tomov, Mauro Carvalho Chehab, open list:QUALCOMM CAMERA SUBSYSTEM DRIVER, open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS, open list On Tue, Jun 08, 2021 at 06:35:06PM -0400, Jonathan Marek wrote: > Add bindings for qcom,sm8250-camss in order to support the camera > subsystem for SM8250. > > Signed-off-by: Jonathan Marek <jonathan@marek.ca> > --- > .../bindings/media/qcom,sm8250-camss.yaml | 399 ++++++++++++++++++ > 1 file changed, 399 insertions(+) > create mode 100644 Documentation/devicetree/bindings/media/qcom,sm8250-camss.yaml > > diff --git a/Documentation/devicetree/bindings/media/qcom,sm8250-camss.yaml b/Documentation/devicetree/bindings/media/qcom,sm8250-camss.yaml > new file mode 100644 > index 0000000000000..7180e52ee59a8 > --- /dev/null > +++ b/Documentation/devicetree/bindings/media/qcom,sm8250-camss.yaml > @@ -0,0 +1,399 @@ > +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) > + > +%YAML 1.2 > +--- > +$id: "http://devicetree.org/schemas/media/qcom,sm8250-camss.yaml#" > +$schema: "http://devicetree.org/meta-schemas/core.yaml#" > + > +title: Qualcomm CAMSS ISP > + > +maintainers: > + - Robert Foss <robert.foss@linaro.org> > + > +description: | > + The CAMSS IP is a CSI decoder and ISP present on Qualcomm platforms > + > +properties: > + compatible: > + const: qcom,sm8250-camss > + > + clocks: > + minItems: 31 > + maxItems: 31 > + > + clock-names: > + items: > + - const: cam_hf_axi > + - const: camnoc_axi > + - const: csiphy0 > + - const: csiphy0_timer > + - const: csiphy1 > + - const: csiphy1_timer > + - const: csiphy2 > + - const: csiphy2_timer > + - const: csiphy3 > + - const: csiphy3_timer > + - const: csiphy4 > + - const: csiphy4_timer > + - const: csiphy5 > + - const: csiphy5_timer > + - const: vfe0_ahb > + - const: vfe0_axi > + - const: vfe0 > + - const: vfe0_cphy_rx > + - const: vfe0_csid > + - const: vfe0_areg > + - const: vfe1_ahb > + - const: vfe1_axi > + - const: vfe1 > + - const: vfe1_cphy_rx > + - const: vfe1_csid > + - const: vfe1_areg > + - const: vfe_lite_ahb > + - const: vfe_lite_axi > + - const: vfe_lite > + - const: vfe_lite_cphy_rx > + - const: vfe_lite_csid > + > + interrupts: > + minItems: 14 > + maxItems: 14 > + > + interrupt-names: > + items: > + - const: csid0 > + - const: csid1 > + - const: csid2 > + - const: csid3 > + - const: csiphy0 > + - const: csiphy1 > + - const: csiphy2 > + - const: csiphy3 > + - const: csiphy4 > + - const: csiphy5 > + - const: vfe0 > + - const: vfe1 > + - const: vfe_lite0 > + - const: vfe_lite1 > + > + iommus: > + maxItems: 1 > + > + power-domains: > + items: > + - description: IFE0 GDSC - Image Front End, Global Distributed Switch Controller. > + - description: IFE1 GDSC - Image Front End, Global Distributed Switch Controller. > + - description: Titan GDSC - Titan ISP Block, Global Distributed Switch Controller. > + > + ports: > + $ref: /schemas/graph.yaml#/properties/ports > + > + description: > + CSI input ports. > + > + properties: > + port@0: > + $ref: /schemas/graph.yaml#/$defs/port-base > + unevaluatedProperties: false > + description: > + Input port for receiving CSI data. > + > + properties: > + endpoint: > + $ref: video-interfaces.yaml# > + unevaluatedProperties: false > + > + properties: > + clock-lanes: > + maxItems: 1 > + > + data-lanes: > + minItems: 1 > + maxItems: 4 > + > + required: > + - clock-lanes > + - data-lanes > + > + port@1: > + $ref: /schemas/graph.yaml#/$defs/port-base > + unevaluatedProperties: false > + description: > + Input port for receiving CSI data. > + > + properties: > + endpoint: > + $ref: video-interfaces.yaml# > + unevaluatedProperties: false > + > + properties: > + clock-lanes: > + maxItems: 1 > + > + data-lanes: > + minItems: 1 > + maxItems: 4 > + > + required: > + - clock-lanes > + - data-lanes > + > + port@2: > + $ref: /schemas/graph.yaml#/$defs/port-base > + unevaluatedProperties: false > + description: > + Input port for receiving CSI data. > + > + properties: > + endpoint: > + $ref: video-interfaces.yaml# > + unevaluatedProperties: false > + > + properties: > + clock-lanes: > + maxItems: 1 > + > + data-lanes: > + minItems: 1 > + maxItems: 4 > + > + required: > + - clock-lanes > + - data-lanes > + > + port@3: > + $ref: /schemas/graph.yaml#/$defs/port-base > + unevaluatedProperties: false > + description: > + Input port for receiving CSI data. > + > + properties: > + endpoint: > + $ref: video-interfaces.yaml# > + unevaluatedProperties: false > + > + properties: > + clock-lanes: > + maxItems: 1 > + > + data-lanes: > + minItems: 1 > + maxItems: 4 > + > + required: > + - clock-lanes > + - data-lanes > + > + port@4: > + $ref: /schemas/graph.yaml#/$defs/port-base > + unevaluatedProperties: false > + description: > + Input port for receiving CSI data. > + > + properties: > + endpoint: > + $ref: video-interfaces.yaml# > + unevaluatedProperties: false > + > + properties: > + clock-lanes: > + maxItems: 1 > + > + data-lanes: > + minItems: 1 > + maxItems: 4 > + > + required: > + - clock-lanes > + - data-lanes > + > + port@5: > + $ref: /schemas/graph.yaml#/$defs/port-base > + unevaluatedProperties: false > + description: > + Input port for receiving CSI data. > + > + properties: > + endpoint: > + $ref: video-interfaces.yaml# > + unevaluatedProperties: false > + > + properties: > + clock-lanes: > + maxItems: 1 > + > + data-lanes: > + minItems: 1 > + maxItems: 4 > + > + required: > + - clock-lanes > + - data-lanes > + > + reg: > + minItems: 10 > + maxItems: 10 > + > + reg-names: Move these before ports. (DT) properties first then nodes. > + items: > + - const: csiphy0 > + - const: csiphy1 > + - const: csiphy2 > + - const: csiphy3 > + - const: csiphy4 > + - const: csiphy5 Should be separate phy nodes? Same/similar DPHY or CPHY as QCom DSI PHY? > + - const: vfe0 > + - const: vfe1 > + - const: vfe_lite0 > + - const: vfe_lite1 > + > +required: > + - clock-names > + - clocks > + - compatible > + - interrupt-names > + - interrupts > + - iommus > + - power-domains > + - reg > + - reg-names > + > +additionalProperties: false > + > +examples: > + - | > + #include <dt-bindings/interrupt-controller/arm-gic.h> > + #include <dt-bindings/clock/qcom,camcc-sm8250.h> > + #include <dt-bindings/clock/qcom,gcc-sm8250.h> > + > + soc { > + #address-cells = <2>; > + #size-cells = <2>; > + > + camss: camss@ac6a000 { > + compatible = "qcom,sm8250-camss"; > + > + reg = <0 0xac6a000 0 0x2000>, > + <0 0xac6c000 0 0x2000>, > + <0 0xac6e000 0 0x1000>, > + <0 0xac70000 0 0x1000>, > + <0 0xac72000 0 0x1000>, > + <0 0xac74000 0 0x1000>, > + <0 0xacb4000 0 0xd000>, > + <0 0xacc3000 0 0xd000>, > + <0 0xacd9000 0 0x2200>, > + <0 0xacdb200 0 0x2200>; > + reg-names = "csiphy0", > + "csiphy1", > + "csiphy2", > + "csiphy3", > + "csiphy4", > + "csiphy5", > + "vfe0", > + "vfe1", > + "vfe_lite0", > + "vfe_lite1"; > + > + interrupts = <GIC_SPI 477 IRQ_TYPE_LEVEL_HIGH>, > + <GIC_SPI 478 IRQ_TYPE_LEVEL_HIGH>, > + <GIC_SPI 479 IRQ_TYPE_LEVEL_HIGH>, > + <GIC_SPI 448 IRQ_TYPE_LEVEL_HIGH>, > + <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>, > + <GIC_SPI 89 IRQ_TYPE_LEVEL_HIGH>, > + <GIC_SPI 464 IRQ_TYPE_LEVEL_HIGH>, > + <GIC_SPI 466 IRQ_TYPE_LEVEL_HIGH>, > + <GIC_SPI 468 IRQ_TYPE_LEVEL_HIGH>, > + <GIC_SPI 359 IRQ_TYPE_LEVEL_HIGH>, > + <GIC_SPI 465 IRQ_TYPE_LEVEL_HIGH>, > + <GIC_SPI 467 IRQ_TYPE_LEVEL_HIGH>, > + <GIC_SPI 469 IRQ_TYPE_LEVEL_HIGH>, > + <GIC_SPI 360 IRQ_TYPE_LEVEL_HIGH>; > + interrupt-names = "csiphy0", > + "csiphy1", > + "csiphy2", > + "csiphy3", > + "csiphy4", > + "csiphy5", > + "csid0", > + "csid1", > + "csid2", > + "csid3", > + "vfe0", > + "vfe1", > + "vfe_lite0", > + "vfe_lite1"; > + > + power-domains = <&camcc IFE_0_GDSC>, > + <&camcc IFE_1_GDSC>, > + <&camcc TITAN_TOP_GDSC>; > + > + clocks = <&gcc GCC_CAMERA_HF_AXI_CLK>, > + <&camcc CAM_CC_CSIPHY0_CLK>, > + <&camcc CAM_CC_CSI0PHYTIMER_CLK>, > + <&camcc CAM_CC_CSIPHY1_CLK>, > + <&camcc CAM_CC_CSI1PHYTIMER_CLK>, > + <&camcc CAM_CC_CSIPHY2_CLK>, > + <&camcc CAM_CC_CSI2PHYTIMER_CLK>, > + <&camcc CAM_CC_CSIPHY3_CLK>, > + <&camcc CAM_CC_CSI3PHYTIMER_CLK>, > + <&camcc CAM_CC_CSIPHY4_CLK>, > + <&camcc CAM_CC_CSI4PHYTIMER_CLK>, > + <&camcc CAM_CC_CSIPHY5_CLK>, > + <&camcc CAM_CC_CSI5PHYTIMER_CLK>, > + <&camcc CAM_CC_IFE_0_AHB_CLK>, > + <&camcc CAM_CC_IFE_0_AXI_CLK>, > + <&camcc CAM_CC_IFE_0_CLK>, > + <&camcc CAM_CC_IFE_0_CPHY_RX_CLK>, > + <&camcc CAM_CC_IFE_0_CSID_CLK>, > + <&camcc CAM_CC_IFE_0_AREG_CLK>, > + <&camcc CAM_CC_IFE_1_AHB_CLK>, > + <&camcc CAM_CC_IFE_1_AXI_CLK>, > + <&camcc CAM_CC_IFE_1_CLK>, > + <&camcc CAM_CC_IFE_1_CPHY_RX_CLK>, > + <&camcc CAM_CC_IFE_1_CSID_CLK>, > + <&camcc CAM_CC_IFE_1_AREG_CLK>, > + <&camcc CAM_CC_IFE_LITE_AHB_CLK>, > + <&camcc CAM_CC_IFE_LITE_AXI_CLK>, > + <&camcc CAM_CC_IFE_LITE_CLK>, > + <&camcc CAM_CC_IFE_LITE_CPHY_RX_CLK>, > + <&camcc CAM_CC_IFE_LITE_CSID_CLK>; > + > + clock-names = "cam_hf_axi", > + "csiphy0", > + "csiphy0_timer", > + "csiphy1", > + "csiphy1_timer", > + "csiphy2", > + "csiphy2_timer", > + "csiphy3", > + "csiphy3_timer", > + "csiphy4", > + "csiphy4_timer", > + "csiphy5", > + "csiphy5_timer", > + "vfe0_ahb", > + "vfe0_axi", > + "vfe0", > + "vfe0_cphy_rx", > + "vfe0_csid", > + "vfe0_areg", > + "vfe1_ahb", > + "vfe1_axi", > + "vfe1", > + "vfe1_cphy_rx", > + "vfe1_csid", > + "vfe1_areg", > + "vfe_lite_ahb", > + "vfe_lite_axi", > + "vfe_lite", > + "vfe_lite_cphy_rx", > + "vfe_lite_csid"; > + > + iommus = <&apps_smmu 0x800 0x400>; > + > + ports { > + #address-cells = <1>; > + #size-cells = <0>; > + }; > + }; > + }; > -- > 2.26.1 ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 17/17] media: dt-bindings: media: camss: Add qcom,sm8250-camss binding 2021-06-09 22:10 ` Rob Herring @ 2021-06-09 22:32 ` Jonathan Marek 0 siblings, 0 replies; 7+ messages in thread From: Jonathan Marek @ 2021-06-09 22:32 UTC (permalink / raw) To: Rob Herring Cc: linux-arm-msm, robert.foss, andrey.konovalov, Andy Gross, Bjorn Andersson, Todor Tomov, Mauro Carvalho Chehab, open list:QUALCOMM CAMERA SUBSYSTEM DRIVER, open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS, open list On 6/9/21 6:10 PM, Rob Herring wrote: > On Tue, Jun 08, 2021 at 06:35:06PM -0400, Jonathan Marek wrote: >> Add bindings for qcom,sm8250-camss in order to support the camera >> subsystem for SM8250. ... >> + items: >> + - const: csiphy0 >> + - const: csiphy1 >> + - const: csiphy2 >> + - const: csiphy3 >> + - const: csiphy4 >> + - const: csiphy5 > > Should be separate phy nodes? Same/similar DPHY or CPHY as QCom DSI PHY? > This is not a new driver, this series only adds support for a new SoC - the design has already been decided (and this binding is similar to qcom,sdm845-camss.yaml). The hardware supports D-PHY and C-PHY, but the driver isn't aware of this and assumes D-PHY. sdm845 and msm8996 hardware also support C-PHY, so it isn't a problem specific to this series. >> + - const: vfe0 >> + - const: vfe1 >> + - const: vfe_lite0 >> + - const: vfe_lite1 >> + ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 00/17] CAMSS: SM8250 support (and some fixes) 2021-06-08 22:34 [PATCH 00/17] CAMSS: SM8250 support (and some fixes) Jonathan Marek 2021-06-08 22:35 ` [PATCH 17/17] media: dt-bindings: media: camss: Add qcom,sm8250-camss binding Jonathan Marek @ 2021-06-16 18:16 ` Andrey Konovalov 1 sibling, 0 replies; 7+ messages in thread From: Andrey Konovalov @ 2021-06-16 18:16 UTC (permalink / raw) To: Jonathan Marek, linux-arm-msm Cc: robert.foss, Andy Gross, Bjorn Andersson, open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS, Hans Verkuil, open list, open list:QUALCOMM CAMERA SUBSYSTEM DRIVER, Mauro Carvalho Chehab, Rob Herring, Todor Tomov Hi Jonathan, I've given this patchset a try on RB3 board (SDM845) with ov8856 camera sensor - works OK, no regressions. Thanks, Andrey On 09.06.2021 01:34, Jonathan Marek wrote: > This adds initial support for SM8250 and its 4 VFEs and 6 CSIPHYs. > The only big change is the added camss-vfe-480.c to support the > Titan 480 VFE. > > v2: > - Fixed some typos in commit messages (patches 02 and 08) > - patch 03 ("media: camss: csiphy-3ph: add support for SM8250 CSI DPHY"): > - moved definition of CAMSS_8250 to this patch, > - removed unused lane_enable variable > - added a default unreachable case to avoid a warning > - added a is_gen2 variable (minor rework) > - Undo DECODE_FORMAT_PAYLOAD_ONLY change, add comment instead (patch 04) > - "ops" reworks in addition to removing dead code (patch 12) > - renamed csid-170 to csid-gen2, added defines for offsets, add missing > camnoc_axi clock to sm8250 vfe resources (patch 16/17) > > Jonathan Marek (17): > media: camss: csiphy-3ph: don't print HW version as an error > media: camss: csiphy-3ph: disable interrupts > media: camss: csiphy-3ph: add support for SM8250 CSI DPHY > media: camss: csid-170: fix non-10bit formats > media: camss: csid-170: don't enable unused irqs > media: camss: csid-170: remove stray comment > media: camss: csid-170: support more than one lite vfe > media: camss: csid-170: set the right HALT_CMD when disabled > media: camss: csid: allow csid to work without a regulator > media: camss: remove vdda-csiN from sdm845 resources > media: camss: fix VFE irq name > media: camss: remove some vfe ops and clean up dead vfe-170 code > media: camss: vfe-170: fix "VFE halt timeout" error > media: camss: Add initial support for VFE hardware version Titan 480 > media: camss: add support for V4L2_PIX_FMT_GREY for sdm845 HW > media: camss: add support for SM8250 camss > media: dt-bindings: media: camss: Add qcom,sm8250-camss binding > > .../bindings/media/qcom,sm8250-camss.yaml | 399 +++++++++++++ > drivers/media/platform/qcom/camss/Makefile | 3 +- > .../{camss-csid-170.c => camss-csid-gen2.c} | 32 +- > .../media/platform/qcom/camss/camss-csid.c | 45 +- > .../media/platform/qcom/camss/camss-csid.h | 2 +- > .../qcom/camss/camss-csiphy-3ph-1-0.c | 184 ++++-- > .../media/platform/qcom/camss/camss-csiphy.c | 9 +- > .../media/platform/qcom/camss/camss-vfe-170.c | 101 +--- > .../media/platform/qcom/camss/camss-vfe-4-1.c | 25 +- > .../media/platform/qcom/camss/camss-vfe-4-7.c | 63 +- > .../media/platform/qcom/camss/camss-vfe-4-8.c | 65 +-- > .../media/platform/qcom/camss/camss-vfe-480.c | 545 ++++++++++++++++++ > .../platform/qcom/camss/camss-vfe-gen1.c | 94 +-- > .../platform/qcom/camss/camss-vfe-gen1.h | 39 +- > drivers/media/platform/qcom/camss/camss-vfe.c | 29 +- > drivers/media/platform/qcom/camss/camss-vfe.h | 17 +- > .../media/platform/qcom/camss/camss-video.c | 5 +- > drivers/media/platform/qcom/camss/camss.c | 205 ++++++- > drivers/media/platform/qcom/camss/camss.h | 1 + > 19 files changed, 1523 insertions(+), 340 deletions(-) > create mode 100644 Documentation/devicetree/bindings/media/qcom,sm8250-camss.yaml > rename drivers/media/platform/qcom/camss/{camss-csid-170.c => camss-csid-gen2.c} (95%) > create mode 100644 drivers/media/platform/qcom/camss/camss-vfe-480.c > ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 00/17] CAMSS: SM8250 support (and some fixes) @ 2021-05-11 18:07 Jonathan Marek 0 siblings, 0 replies; 7+ messages in thread From: Jonathan Marek @ 2021-05-11 18:07 UTC (permalink / raw) To: linux-arm-msm Cc: robert.foss, andrey.konovalov, Andy Gross, Bjorn Andersson, open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS, Hans Verkuil, open list, open list:QUALCOMM CAMERA SUBSYSTEM DRIVER, Mauro Carvalho Chehab, Rob Herring, Todor Tomov This adds initial support for SM8250 and its 4 VFEs and 6 CSIPHYs. The only big change is the added camss-vfe-480.c to support the Titan 480 VFE. Jonathan Marek (17): media: camss: csiphy-3ph: don't print HW version as an error media: camss: csiphy-3ph: disable interrupts media: camss: csiphy-3ph: add support for SM8250 CSI DPHY media: camss: csid-170: fix non-10bit formats media: camss: csid-170: don't enable unused irqs media: camss: csid-170: remove stray comment media: camss: csid-170: support more than one lite vfe media: camss: csid-170: set the right HALF_CMD when disabled media: camss: csid: allow csid to work without a regulator media: camss: remove vdda-csiN from sdm845 resources media: camss: fix VFE irq name media: camss: vfe-170: clean up some dead code media: camss: vfe-170: fix "VFE halt timeout" error media: camss: Add initial support for VFE hardware version Titan 480 media: camss: add support for V4L2_PIX_FMT_GREY for sdm845 HW media: camss: add support for SM8250 camss media: dt-bindings: media: camss: Add qcom,sm8250-camss binding .../bindings/media/qcom,sm8250-camss.yaml | 398 +++++++++++++ drivers/media/platform/qcom/camss/Makefile | 1 + .../platform/qcom/camss/camss-csid-170.c | 31 +- .../media/platform/qcom/camss/camss-csid.c | 39 +- .../qcom/camss/camss-csiphy-3ph-1-0.c | 181 ++++-- .../media/platform/qcom/camss/camss-csiphy.c | 9 +- .../media/platform/qcom/camss/camss-vfe-170.c | 65 +- .../media/platform/qcom/camss/camss-vfe-480.c | 554 ++++++++++++++++++ drivers/media/platform/qcom/camss/camss-vfe.c | 13 +- drivers/media/platform/qcom/camss/camss-vfe.h | 1 + .../media/platform/qcom/camss/camss-video.c | 5 +- drivers/media/platform/qcom/camss/camss.c | 202 ++++++- drivers/media/platform/qcom/camss/camss.h | 1 + 13 files changed, 1352 insertions(+), 148 deletions(-) create mode 100644 Documentation/devicetree/bindings/media/qcom,sm8250-camss.yaml create mode 100644 drivers/media/platform/qcom/camss/camss-vfe-480.c -- 2.26.1 ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2021-06-16 18:16 UTC | newest] Thread overview: 7+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2021-06-08 22:34 [PATCH 00/17] CAMSS: SM8250 support (and some fixes) Jonathan Marek 2021-06-08 22:35 ` [PATCH 17/17] media: dt-bindings: media: camss: Add qcom,sm8250-camss binding Jonathan Marek 2021-06-09 16:16 ` Rob Herring 2021-06-09 22:10 ` Rob Herring 2021-06-09 22:32 ` Jonathan Marek 2021-06-16 18:16 ` [PATCH 00/17] CAMSS: SM8250 support (and some fixes) Andrey Konovalov -- strict thread matches above, loose matches on Subject: below -- 2021-05-11 18:07 Jonathan Marek
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).