| Message ID | 20250602-camss-8x39-vbif-v4-0-32c277d8f9bf@mailoo.org |
|---|---|
| Headers | show |
| Series | CAMSS support for MSM8939 | expand |
Hello Vincent. On 6/2/25 20:27, Vincent Knecht via B4 Relay wrote: > From: Vincent Knecht <vincent.knecht@mailoo.org> > > Add bindings for qcom,msm8939-camss in order to support the camera > subsystem for MSM8939. > > Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> > Signed-off-by: Vincent Knecht <vincent.knecht@mailoo.org> > --- > .../bindings/media/qcom,msm8939-camss.yaml | 254 +++++++++++++++++++++ > 1 file changed, 254 insertions(+) > > diff --git a/Documentation/devicetree/bindings/media/qcom,msm8939-camss.yaml b/Documentation/devicetree/bindings/media/qcom,msm8939-camss.yaml > new file mode 100644 > index 0000000000000000000000000000000000000000..59bf16888a8235495a2080e512ce179583bcd25d > --- /dev/null > +++ b/Documentation/devicetree/bindings/media/qcom,msm8939-camss.yaml > @@ -0,0 +1,254 @@ > +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) > +%YAML 1.2 > +--- > +$id: http://devicetree.org/schemas/media/qcom,msm8939-camss.yaml# > +$schema: http://devicetree.org/meta-schemas/core.yaml# > + > +title: Qualcomm MSM8939 Camera Subsystem (CAMSS) > + > +maintainers: > + - Vincent Knecht <vincent.knecht@mailoo.org> > + > +description: > + The CAMSS IP is a CSI decoder and ISP present on Qualcomm platforms > + > +properties: > + compatible: > + const: qcom,msm8939-camss > + > + reg: > + maxItems: 11 > + > + reg-names: > + items: > + - const: csid0 > + - const: csid1 > + - const: csid2 > + - const: csiphy0 > + - const: csiphy0_clk_mux > + - const: csiphy1 > + - const: csiphy1_clk_mux > + - const: csi_clk_mux > + - const: ispif > + - const: vfe0 > + - const: vfe0_vbif Please sort the list alphanumerically, accorting to the ASCII character set the underscore symbol precedes lower case letters. > + > + clocks: > + maxItems: 24 > + > + clock-names: > + items: > + - const: ahb > + - const: csi0 > + - const: csi0_ahb > + - const: csi0_phy > + - const: csi0_pix > + - const: csi0_rdi > + - const: csi1 > + - const: csi1_ahb > + - const: csi1_phy > + - const: csi1_pix > + - const: csi1_rdi > + - const: csi2 > + - const: csi2_ahb > + - const: csi2_phy > + - const: csi2_pix > + - const: csi2_rdi > + - const: csiphy0_timer > + - const: csiphy1_timer > + - const: csi_vfe0 > + - const: ispif_ahb > + - const: top_ahb > + - const: vfe0 > + - const: vfe_ahb > + - const: vfe_axi Same comment as above. > + > + interrupts: > + maxItems: 7 > + > + interrupt-names: > + items: > + - const: csid0 > + - const: csid1 > + - const: csid2 > + - const: csiphy0 > + - const: csiphy1 > + - const: ispif > + - const: vfe0 > + > + iommus: > + maxItems: 1 > + > + power-domains: > + items: > + - description: VFE GDSC - Video Front End, Global Distributed Switch > + Controller. > + > + vdda-supply: > + description: > + Definition of the regulator used as analog power supply. Please specify the wanted voltage level in the description, due to the example below I would expect it's 2.8V. > + > + ports: > + $ref: /schemas/graph.yaml#/properties/ports > + > + description: > + CSI input ports. > + > + patternProperties: > + "^port@[0-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: > + data-lanes: > + minItems: 1 > + maxItems: 4 > + > + bus-type: > + enum: > + - 4 # MEDIA_BUS_TYPE_CSI2_DPHY > + > + required: > + - data-lanes > + > +required: > + - compatible > + - reg > + - reg-names > + - clocks > + - clock-names > + - interrupts > + - interrupt-names > + - iommus > + - power-domains > + - vdda-supply > + - ports > + > +additionalProperties: false > + > +examples: > + - | > + #include <dt-bindings/interrupt-controller/arm-gic.h> > + #include <dt-bindings/clock/qcom,gcc-msm8939.h> > + > + isp@1b08000 { > + compatible = "qcom,msm8939-camss"; > + > + reg = <0x01b08000 0x100>, > + <0x01b08400 0x100>, > + <0x01b08800 0x100>, > + <0x01b0ac00 0x200>, > + <0x01b00030 0x4>, > + <0x01b0b000 0x200>, > + <0x01b00038 0x4>, > + <0x01b00020 0x10>, > + <0x01b0a000 0x500>, > + <0x01b10000 0x1000>, > + <0x01b40000 0x200>; > + > + reg-names = "csid0", > + "csid1", > + "csid2", > + "csiphy0", > + "csiphy0_clk_mux", > + "csiphy1", > + "csiphy1_clk_mux", > + "csi_clk_mux", > + "ispif", > + "vfe0", > + "vfe0_vbif"; > + > + clocks = <&gcc GCC_CAMSS_AHB_CLK>, > + <&gcc GCC_CAMSS_CSI0_CLK>, > + <&gcc GCC_CAMSS_CSI0_AHB_CLK>, > + <&gcc GCC_CAMSS_CSI0PHY_CLK>, > + <&gcc GCC_CAMSS_CSI0PIX_CLK>, > + <&gcc GCC_CAMSS_CSI0RDI_CLK>, > + <&gcc GCC_CAMSS_CSI1_CLK>, > + <&gcc GCC_CAMSS_CSI1_AHB_CLK>, > + <&gcc GCC_CAMSS_CSI1PHY_CLK>, > + <&gcc GCC_CAMSS_CSI1PIX_CLK>, > + <&gcc GCC_CAMSS_CSI1RDI_CLK>, > + <&gcc GCC_CAMSS_CSI2_CLK>, > + <&gcc GCC_CAMSS_CSI2_AHB_CLK>, > + <&gcc GCC_CAMSS_CSI2PHY_CLK>, > + <&gcc GCC_CAMSS_CSI2PIX_CLK>, > + <&gcc GCC_CAMSS_CSI2RDI_CLK>, > + <&gcc GCC_CAMSS_CSI0PHYTIMER_CLK>, > + <&gcc GCC_CAMSS_CSI1PHYTIMER_CLK>, > + <&gcc GCC_CAMSS_CSI_VFE0_CLK>, > + <&gcc GCC_CAMSS_ISPIF_AHB_CLK>, > + <&gcc GCC_CAMSS_TOP_AHB_CLK>, > + <&gcc GCC_CAMSS_VFE0_CLK>, > + <&gcc GCC_CAMSS_VFE_AHB_CLK>, > + <&gcc GCC_CAMSS_VFE_AXI_CLK>; > + > + clock-names = "ahb", > + "csi0", > + "csi0_ahb", > + "csi0_phy", > + "csi0_pix", > + "csi0_rdi", > + "csi1", > + "csi1_ahb", > + "csi1_phy", > + "csi1_pix", > + "csi1_rdi", > + "csi2", > + "csi2_ahb", > + "csi2_phy", > + "csi2_pix", > + "csi2_rdi", > + "csiphy0_timer", > + "csiphy1_timer", > + "csi_vfe0", > + "ispif_ahb", > + "top_ahb", > + "vfe0", > + "vfe_ahb", > + "vfe_axi"; > + > + interrupts = <GIC_SPI 51 IRQ_TYPE_EDGE_RISING>, > + <GIC_SPI 52 IRQ_TYPE_EDGE_RISING>, > + <GIC_SPI 153 IRQ_TYPE_EDGE_RISING>, > + <GIC_SPI 78 IRQ_TYPE_EDGE_RISING>, > + <GIC_SPI 79 IRQ_TYPE_EDGE_RISING>, > + <GIC_SPI 55 IRQ_TYPE_EDGE_RISING>, > + <GIC_SPI 57 IRQ_TYPE_EDGE_RISING>; > + > + interrupt-names = "csid0", > + "csid1", > + "csid2", > + "csiphy0", > + "csiphy1", > + "ispif", > + "vfe0"; > + > + iommus = <&apps_iommu 3>; > + > + power-domains = <&gcc VFE_GDSC>; > + > + vdda-supply = <®_2v8>; > + > + ports { > + #address-cells = <1>; > + #size-cells = <0>; > + > + port@1 { > + reg = <1>; > + csiphy1_ep: endpoint { There should be an empty line between the end of the list of properties and the beginning of the list of children device tree nodes. > + clock-lanes = <1>; Please remove 'clock-lanes' propoerty from here. > + data-lanes = <0 2>; > + remote-endpoint = <&sensor_ep>; > + }; > + }; > + }; > + }; > -- Best wishes, Vladimir
This series adds CAMSS support for MSM8939. It's mostly identical to MSM8916, except for some clocks and an additional CSI. To fix black stripes across sensor output, and garbage in CSID TPG output, 2 VFE VBIF register settings are needed. So the 1st patch adds helper functions to do just that. Patch 1: adds helper for VFE VBIF settings Patch 2: adds CAMSS_8x39 version in CAMSS driver Patch 3: documents qcom,msm8939-camss DT bindings Patch 4: adds camss and cci in msm8939.dtsi Signed-off-by: Vincent Knecht <vincent.knecht@mailoo.org> --- Changes in v4: - Picked up tags - Patch 1: - Fix alignment to match opening parenthesis (Bryan) - Patch 2: no change - Patch 3: - Wrap line at 80 chars (Krzysztof) - Patch 4: no change - Link to v3: https://lore.kernel.org/r/20250530-camss-8x39-vbif-v3-0-fc91d15bb5d6@mailoo.org Changes in v3: - Patch 1: - Use braces around multiline (Bryan) - Rename vfe_vbif_reg_write to vfe_vbif_write_reg (Bryan) - Get rid of switch block on CAMSS version (Bryan) - Patch 2: - Get rid of switch block on CAMSS version (Bryan) - Patch 3: no change - Patch 4: no change - Tried to get rid of CCI camss_ahb but this resulted in device freeze+reboot (Konrad) - Link to v2: https://lore.kernel.org/r/20250525-camss-8x39-vbif-v2-0-6d3d5c5af456@mailoo.org Changes in v2: - Patch 1: - Fix devm_platform_ioremap_resource_byname line to not end with opening parenthesis (media-ci/1-checkpatch) - Move camss-vfe-4-1.c handling of VBIF previously in patch 2 here (Dmitry) - Patch 2: - Declare regulators in PHY entries, not CSID ones (Bryan) - Patch 3: (bindings) - Fix bindings checks for new errors (Rob) - Fix properties ordering, code-style and example (Krzysztof) - Sort reg-names, clock-names and interrupt-names alphanumerically (Bryan) - Patch 4: (dtsi) - Move #address/#size cells before status (Konrad) - Aligned CCI with msm8916, thus removing ispif_ahb mention (Konrad) If "camss_ahb should be unnecessary", it's still required by qcom,i2c-cci.yaml - Link to v1: https://lore.kernel.org/r/20250520-camss-8x39-vbif-v1-0-a12cd6006af9@mailoo.org --- Vincent Knecht (4): media: qcom: camss: vfe: Add VBIF setting support media: qcom: camss: Add support for MSM8939 media: dt-bindings: Add qcom,msm8939-camss arm64: dts: qcom: msm8939: Add camss and cci .../bindings/media/qcom,msm8939-camss.yaml | 254 +++++++++++++++++++++ arch/arm64/boot/dts/qcom/msm8939-pm8916.dtsi | 4 + arch/arm64/boot/dts/qcom/msm8939.dtsi | 146 ++++++++++++ drivers/media/platform/qcom/camss/Makefile | 1 + drivers/media/platform/qcom/camss/camss-csiphy.c | 1 + drivers/media/platform/qcom/camss/camss-ispif.c | 8 +- drivers/media/platform/qcom/camss/camss-vfe-4-1.c | 12 + drivers/media/platform/qcom/camss/camss-vfe-vbif.c | 31 +++ drivers/media/platform/qcom/camss/camss-vfe-vbif.h | 19 ++ drivers/media/platform/qcom/camss/camss-vfe.c | 10 + drivers/media/platform/qcom/camss/camss-vfe.h | 3 + drivers/media/platform/qcom/camss/camss.c | 157 +++++++++++++ drivers/media/platform/qcom/camss/camss.h | 1 + 13 files changed, 645 insertions(+), 2 deletions(-) --- base-commit: 8566fc3b96539e3235909d6bdda198e1282beaed change-id: 20250517-camss-8x39-vbif-975ff5819198 Best regards,