Add SDM670 camera subsystem
Subsystems (8)
v3 cover Add SDM670 camera subsystem
This adds support for the camera subsystem on the Snapdragon 670.
Changes since v2 ([email protected]):
- drop unnecessary assigned AXI clock frequency (5/5)
- drop src clocks from cci (5/5)
- add unit name, remove mmio properties from port in example dts (2/5)
- correct the reg-names order (2/5)
- add parent_dev_ops to csid (3/5)
- remove CSID clocks from VFE (3/5)
- remove AXI clock from CSIPHY (3/5)
- change subsystem part of the commit message summary (3/5)
- add reviewed-by (4/5)
Changes since v1 ([email protected]):
- define dedicated resource structs/arrays for sdm670 (3/5)
- separate camcc device tree node into its own patch (4/5)
- specify correct dual license (2/5)
- add include directives in dt-bindings camss example (2/5)
- remove src clocks from dt-bindings (2/5)
- remove src clocks from dtsi (5/5)
- add power-domain-names to camss (5/5)
- specify power domain names (3/5)
- restrict cci-i2c clocks (1/5)
- populate a commit message with hw info (2/5)
- reword commit message (3/5)
Richard Acayan (5):
dt-bindings: i2c: qcom-cci: Document SDM670 compatible
dt-bindings: media: camss: Add qcom,sdm670-camss
media: qcom: camss: add support for SDM670 camss
arm64: dts: qcom: sdm670: add camcc
arm64: dts: qcom: sdm670: add camss and cci
.../devicetree/bindings/i2c/qcom,i2c-cci.yaml | 18 + .../bindings/media/qcom,sdm670-camss.yaml | 319 ++++++++++++++++++ arch/arm64/boot/dts/qcom/sdm670.dtsi | 198 +++++++++++ drivers/media/platform/qcom/camss/camss.c | 191 +++++++++++ 4 files changed, 726 insertions(+) create mode 100644 Documentation/devicetree/bindings/media/qcom,sdm670-camss.yaml
Signature · 1 line
2.46.0
PATCH v3 1/5 dt-bindings: i2c: qcom-cci: Document SDM670 compatible
The CCI on the Snapdragon 670 is the interface for controlling camera hardware over I2C. Add the compatible so it can be added to the SDM670 device tree.
--- .../devicetree/bindings/i2c/qcom,i2c-cci.yaml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)
Documentation/devicetree/bindings/i2c/qcom,i2c-cci.yaml +18 -0
@@ -27,6 +27,7 @@ properties: - enum: - qcom,sc7280-cci - qcom,sc8280xp-cci + - qcom,sdm670-cci - qcom,sdm845-cci - qcom,sm6350-cci - qcom,sm8250-cci
@@ -138,6 +139,23 @@ allOf: - const: cci - const: camss_ahb + - if: + properties: + compatible: + contains: + enum: + - qcom,sdm670-cci + then: + properties: + clocks: + minItems: 4 + clock-names: + items: + - const: camnoc_axi + - const: soc_ahb + - const: cpas_ahb + - const: cci + - if: properties: compatible:
Signature · 1 line
2.46.0
Re: [PATCH v3 1/5] dt-bindings: i2c: qcom-cci: Document SDM670 compatible
Quoted 8 lines · Richard Acayan
The CCI on the Snapdragon 670 is the interface for controlling camera hardware over I2C. Add the compatible so it can be added to the SDM670 device tree.
Documentation/devicetree/bindings/i2c/qcom,i2c-cci.yaml +0
-0@@ -138,6 +139,23 @@ allOf: - const: cci - const: camss_ahb
Documentation/devicetree/bindings/i2c/qcom,i2c-cci.yaml allOf: · line 151
Quoted 10 lines
Documentation/devicetree/bindings/i2c/qcom,i2c-cci.yaml +10
-0+ - if: + properties: + compatible: + contains: + enum: + - qcom,sdm670-cci + then: + properties: + clocks: + minItems: 4
maxItems: 4
Documentation/devicetree/bindings/i2c/qcom,i2c-cci.yaml allOf: · line 152
Quoted 1 line
Documentation/devicetree/bindings/i2c/qcom,i2c-cci.yaml +1
-0+ clock-names:
Best regards,
Krzysztof
Re: [PATCH v3 1/5] dt-bindings: i2c: qcom-cci: Document SDM670 compatible
In reply to Richard AcayanQuoted 35 lines · Richard Acayan
The CCI on the Snapdragon 670 is the interface for controlling camera hardware over I2C. Add the compatible so it can be added to the SDM670 device tree.
Signed-off-by Richard Acayan <[email protected]>--- .../devicetree/bindings/i2c/qcom,i2c-cci.yaml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)Documentation/devicetree/bindings/i2c/qcom,i2c-cci.yaml +11
-0@@ -27,6 +27,7 @@ properties: - enum: - qcom,sc7280-cci - qcom,sc8280xp-cci + - qcom,sdm670-cci - qcom,sdm845-cci - qcom,sm6350-cci - qcom,sm8250-cci@@ -138,6 +139,23 @@ allOf: - const: cci - const: camss_ahb + - if: + properties: + compatible: + contains: + enum: + - qcom,sdm670-cci + then: + properties: + clocks: + minItems: 4
Documentation/devicetree/bindings/i2c/qcom,i2c-cci.yaml allOf: · line 161
Quoted 10 lines
Documentation/devicetree/bindings/i2c/qcom,i2c-cci.yaml +7
-0+ clock-names: + items: + - const: camnoc_axi + - const: soc_ahb + - const: cpas_ahb + - const: cci + - if: properties: compatible:
After fixing a review comment by Krzysztof,
--
Best wishes,
Vladimir
PATCH v3 2/5 dt-bindings: media: camss: Add qcom,sdm670-camss
In reply to Richard AcayanAs found in the Pixel 3a, the Snapdragon 670 has a camera subsystem with 3 CSIDs and 3 VFEs (including 1 VFE lite). Add this camera subsystem to the bindings.
Adapted from SC8280XP camera subsystem.
--- .../bindings/media/qcom,sdm670-camss.yaml | 319 ++++++++++++++++++ 1 file changed, 319 insertions(+) create mode 100644 Documentation/devicetree/bindings/media/qcom,sdm670-camss.yaml
Documentation/devicetree/bindings/media/qcom,sdm670-camss.yaml new file +319 -0
@@ -0,0 +1,319 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) + +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/media/qcom,sdm670-camss.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Qualcomm SDM670 Camera Subsystem (CAMSS) + +maintainers: + - Richard Acayan <[email protected]> + +description: + The CAMSS IP is a CSI decoder and ISP present on Qualcomm platforms. + +properties: + compatible: + const: qcom,sdm670-camss + + clocks: + maxItems: 22 + + clock-names: + items: + - const: camnoc_axi + - const: cpas_ahb + - const: csi0 + - const: csi1 + - const: csi2 + - const: csiphy0 + - const: csiphy0_timer + - const: csiphy1 + - const: csiphy1_timer + - const: csiphy2 + - const: csiphy2_timer + - const: gcc_camera_ahb + - const: gcc_camera_axi + - const: soc_ahb + - const: vfe0_axi + - const: vfe0 + - const: vfe0_cphy_rx + - const: vfe1_axi + - const: vfe1 + - const: vfe1_cphy_rx + - const: vfe_lite + - const: vfe_lite_cphy_rx + + interrupts: + maxItems: 9 + + interrupt-names: + items: + - const: csid0 + - const: csid1 + - const: csid2 + - const: csiphy0 + - const: csiphy1 + - const: csiphy2 + - const: vfe0 + - const: vfe1 + - const: vfe_lite + + iommus: + maxItems: 4 + + 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 Top GDSC - Titan ISP Block, Global Distributed Switch Controller. + + power-domain-names: + items: + - const: ife0 + - const: ife1 + - const: top + + 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 from CSIPHY0. + + 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 from CSIPHY1. + + 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 from CSIPHY2. + + 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: + maxItems: 9 + + reg-names: + items: + - const: csiphy0 + - const: csiphy1 + - const: csiphy2 + - const: vfe0 + - const: csid0 + - const: vfe1 + - const: csid1 + - const: vfe_lite + - const: csid2 + + vdda-phy-supply: + description: + Phandle to a regulator supply to PHY core block. + + vdda-pll-supply: + description: + Phandle to 1.8V regulator supply to PHY refclk pll block. + +required: + - clock-names + - clocks + - compatible + - interrupts + - interrupt-names + - iommus + - power-domains + - power-domain-names + - reg + - reg-names + - vdda-phy-supply + - vdda-pll-supply + +additionalProperties: false + +examples: + - | + #include <dt-bindings/clock/qcom,camcc-sdm845.h> + #include <dt-bindings/clock/qcom,gcc-sdm845.h> + #include <dt-bindings/interrupt-controller/arm-gic.h> + + soc { + #address-cells = <2>; + #size-cells = <2>; + + camss@ac65000 { + compatible = "qcom,sdm670-camss"; + + reg = <0 0x0ac65000 0 0x1000>, + <0 0x0ac66000 0 0x1000>, + <0 0x0ac67000 0 0x1000>, + <0 0x0acaf000 0 0x4000>, + <0 0x0acb3000 0 0x1000>, + <0 0x0acb6000 0 0x4000>, + <0 0x0acba000 0 0x1000>, + <0 0x0acc4000 0 0x4000>, + <0 0x0acc8000 0 0x1000>; + reg-names = "csiphy0", + "csiphy1", + "csiphy2", + "vfe0", + "csid0", + "vfe1", + "csid1", + "vfe_lite", + "csid2"; + + interrupts = <GIC_SPI 464 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 466 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 468 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 477 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 478 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 479 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>; + interrupt-names = "csid0", + "csid1", + "csid2", + "csiphy0", + "csiphy1", + "csiphy2", + "vfe0", + "vfe1", + "vfe_lite"; + + clocks = <&camcc CAM_CC_CAMNOC_AXI_CLK>, + <&camcc CAM_CC_CPAS_AHB_CLK>, + <&camcc CAM_CC_IFE_0_CSID_CLK>, + <&camcc CAM_CC_IFE_1_CSID_CLK>, + <&camcc CAM_CC_IFE_LITE_CSID_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>, + <&gcc GCC_CAMERA_AHB_CLK>, + <&gcc GCC_CAMERA_AXI_CLK>, + <&camcc CAM_CC_SOC_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_1_AXI_CLK>, + <&camcc CAM_CC_IFE_1_CLK>, + <&camcc CAM_CC_IFE_1_CPHY_RX_CLK>, + <&camcc CAM_CC_IFE_LITE_CLK>, + <&camcc CAM_CC_IFE_LITE_CPHY_RX_CLK>; + clock-names = "camnoc_axi", + "cpas_ahb", + "csi0", + "csi1", + "csi2", + "csiphy0", + "csiphy0_timer", + "csiphy1", + "csiphy1_timer", + "csiphy2", + "csiphy2_timer", + "gcc_camera_ahb", + "gcc_camera_axi", + "soc_ahb", + "vfe0_axi", + "vfe0", + "vfe0_cphy_rx", + "vfe1_axi", + "vfe1", + "vfe1_cphy_rx", + "vfe_lite", + "vfe_lite_cphy_rx"; + + iommus = <&apps_smmu 0x808 0x0>, + <&apps_smmu 0x810 0x8>, + <&apps_smmu 0xc08 0x0>, + <&apps_smmu 0xc10 0x8>; + + power-domains = <&camcc IFE_0_GDSC>, + <&camcc IFE_1_GDSC>, + <&camcc TITAN_TOP_GDSC>; + power-domain-names = "ife0", + "ife1", + "top"; + + vdda-phy-supply = <&vreg_l1a_1p225>; + vdda-pll-supply = <&vreg_l8a_1p8>; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + + csiphy_ep0: endpoint { + clock-lanes = <7>; + data-lanes = <0 1 2 3>; + remote-endpoint = <&front_sensor_ep>; + }; + }; + }; + }; + };
Signature · 1 line
2.46.0
Re: [PATCH v3 2/5] dt-bindings: media: camss: Add qcom,sdm670-camss
Quoted 18 lines · Richard Acayan
As found in the Pixel 3a, the Snapdragon 670 has a camera subsystem with 3 CSIDs and 3 VFEs (including 1 VFE lite). Add this camera subsystem to the bindings.
Adapted from SC8280XP camera subsystem.
Signed-off-by Richard Acayan <[email protected]>--- .../bindings/media/qcom,sdm670-camss.yaml | 319 ++++++++++++++++++ 1 file changed, 319 insertions(+) create mode 100644 Documentation/devicetree/bindings/media/qcom,sdm670-camss.yamlDocumentation/devicetree/bindings/media/qcom,sdm670-camss.yaml new file +0
-0
Documentation/devicetree/bindings/media/qcom,sdm670-camss.yaml line 2
Quoted 2 lines
Documentation/devicetree/bindings/media/qcom,sdm670-camss.yaml new file +2
-0@@ -0,0 +1,319 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +
No blank line here.
Documentation/devicetree/bindings/media/qcom,sdm670-camss.yaml line 3
Quoted 1 line
Documentation/devicetree/bindings/media/qcom,sdm670-camss.yaml new file +1
-0+%YAML 1.2
With above:
Best regards,
Krzysztof
Vladimir Zapolskiy
reviewerRe: [PATCH v3 2/5] dt-bindings: media: camss: Add qcom,sdm670-camss
In reply to Richard AcayanHi Richard,
Quoted 28 lines · Richard Acayan
As found in the Pixel 3a, the Snapdragon 670 has a camera subsystem with 3 CSIDs and 3 VFEs (including 1 VFE lite). Add this camera subsystem to the bindings.
Adapted from SC8280XP camera subsystem.
Signed-off-by Richard Acayan <[email protected]>--- .../bindings/media/qcom,sdm670-camss.yaml | 319 ++++++++++++++++++ 1 file changed, 319 insertions(+)create mode 100644
Documentation/devicetree/bindings/media/qcom,sdm670-camss.yamlDocumentation/devicetree/bindings/media/qcom,sdm670-camss.yaml new file +10
-0@@ -0,0 +1,319 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) + +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/media/qcom,sdm670-camss.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Qualcomm SDM670 Camera Subsystem (CAMSS) + +maintainers:
Documentation/devicetree/bindings/media/qcom,sdm670-camss.yaml line 20
Quoted 10 lines
Documentation/devicetree/bindings/media/qcom,sdm670-camss.yaml new file +10
-0+ - Richard Acayan <[email protected]> + +description: + The CAMSS IP is a CSI decoder and ISP present on Qualcomm platforms. + +properties: + compatible: + const: qcom,sdm670-camss + + clocks:
Please add
minItems: 22
Quoted 17 lines
Documentation/devicetree/bindings/media/qcom,sdm670-camss.yaml new file +17
-0+ maxItems: 22> + + clock-names: + items: + - const: camnoc_axi + - const: cpas_ahb + - const: csi0 + - const: csi1 + - const: csi2 + - const: csiphy0 + - const: csiphy0_timer + - const: csiphy1 + - const: csiphy1_timer + - const: csiphy2 + - const: csiphy2_timer + - const: gcc_camera_ahb + - const: gcc_camera_axi + - const: soc_ahb
Documentation/devicetree/bindings/media/qcom,sdm670-camss.yaml line 48
Quoted 10 lines
Documentation/devicetree/bindings/media/qcom,sdm670-camss.yaml new file +10
-0+ - const: vfe0_axi + - const: vfe0 + - const: vfe0_cphy_rx + - const: vfe1_axi + - const: vfe1 + - const: vfe1_cphy_rx + - const: vfe_lite + - const: vfe_lite_cphy_rx + + interrupts:
Please add
minItems: 9
Quoted 5 lines
Documentation/devicetree/bindings/media/qcom,sdm670-camss.yaml new file +5
-0+ maxItems: 9 + + interrupt-names: + items: + - const: csid0
Documentation/devicetree/bindings/media/qcom,sdm670-camss.yaml line 63
Quoted 10 lines
Documentation/devicetree/bindings/media/qcom,sdm670-camss.yaml new file +10
-0+ - const: csid1 + - const: csid2 + - const: csiphy0 + - const: csiphy1 + - const: csiphy2 + - const: vfe0 + - const: vfe1 + - const: vfe_lite + + iommus:
Please add
minItems: 4
Quoted 81 lines
Documentation/devicetree/bindings/media/qcom,sdm670-camss.yaml new file +81
-0+ maxItems: 4 + + 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 Top GDSC - Titan ISP Block, Global Distributed Switch Controller. + + power-domain-names: + items: + - const: ife0 + - const: ife1 + - const: top + + 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 from CSIPHY0. + + 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 from CSIPHY1. + + 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 from CSIPHY2. + + properties: + endpoint: + $ref: video-interfaces.yaml# + unevaluatedProperties: false + + properties: + clock-lanes: + maxItems: 1
Documentation/devicetree/bindings/media/qcom,sdm670-camss.yaml line 154
Quoted 10 lines
Documentation/devicetree/bindings/media/qcom,sdm670-camss.yaml new file +10
-0+ + data-lanes: + minItems: 1 + maxItems: 4 + + required: + - clock-lanes + - data-lanes + + reg:
Please add
minItems: 9
Documentation/devicetree/bindings/media/qcom,sdm670-camss.yaml line 167
Quoted 13 lines
Documentation/devicetree/bindings/media/qcom,sdm670-camss.yaml new file +13
-0+ maxItems: 9 + + reg-names: + items: + - const: csiphy0 + - const: csiphy1 + - const: csiphy2 + - const: vfe0 + - const: csid0 + - const: vfe1 + - const: csid1 + - const: vfe_lite + - const: csid2
Additionally I would suggest to put descriptions of 'reg' and 'reg-names' properties right after 'compatible' one, this is in accordance to DTS Coding Style.
Quoted 18 lines
Documentation/devicetree/bindings/media/qcom,sdm670-camss.yaml new file +18
-0+ vdda-phy-supply: + description: + Phandle to a regulator supply to PHY core block. + + vdda-pll-supply: + description: + Phandle to 1.8V regulator supply to PHY refclk pll block. + +required: + - clock-names + - clocks + - compatible + - interrupts + - interrupt-names + - iommus + - power-domains + - power-domain-names + - reg
Documentation/devicetree/bindings/media/qcom,sdm670-camss.yaml line 196
Quoted 10 lines
Documentation/devicetree/bindings/media/qcom,sdm670-camss.yaml new file +10
-0+ - reg-names + - vdda-phy-supply + - vdda-pll-supply + +additionalProperties: false + +examples: + - | + #include <dt-bindings/clock/qcom,camcc-sdm845.h> + #include <dt-bindings/clock/qcom,gcc-sdm845.h>
Okay.
Quoted 113 lines
Documentation/devicetree/bindings/media/qcom,sdm670-camss.yaml new file +113
-0+ #include <dt-bindings/interrupt-controller/arm-gic.h> + + soc { + #address-cells = <2>; + #size-cells = <2>; + + camss@ac65000 { + compatible = "qcom,sdm670-camss"; + + reg = <0 0x0ac65000 0 0x1000>, + <0 0x0ac66000 0 0x1000>, + <0 0x0ac67000 0 0x1000>, + <0 0x0acaf000 0 0x4000>, + <0 0x0acb3000 0 0x1000>, + <0 0x0acb6000 0 0x4000>, + <0 0x0acba000 0 0x1000>, + <0 0x0acc4000 0 0x4000>, + <0 0x0acc8000 0 0x1000>; + reg-names = "csiphy0", + "csiphy1", + "csiphy2", + "vfe0", + "csid0", + "vfe1", + "csid1", + "vfe_lite", + "csid2"; + + interrupts = <GIC_SPI 464 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 466 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 468 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 477 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 478 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 479 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>; + interrupt-names = "csid0", + "csid1", + "csid2", + "csiphy0", + "csiphy1", + "csiphy2", + "vfe0", + "vfe1", + "vfe_lite"; + + clocks = <&camcc CAM_CC_CAMNOC_AXI_CLK>, + <&camcc CAM_CC_CPAS_AHB_CLK>, + <&camcc CAM_CC_IFE_0_CSID_CLK>, + <&camcc CAM_CC_IFE_1_CSID_CLK>, + <&camcc CAM_CC_IFE_LITE_CSID_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>, + <&gcc GCC_CAMERA_AHB_CLK>, + <&gcc GCC_CAMERA_AXI_CLK>, + <&camcc CAM_CC_SOC_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_1_AXI_CLK>, + <&camcc CAM_CC_IFE_1_CLK>, + <&camcc CAM_CC_IFE_1_CPHY_RX_CLK>, + <&camcc CAM_CC_IFE_LITE_CLK>, + <&camcc CAM_CC_IFE_LITE_CPHY_RX_CLK>; + clock-names = "camnoc_axi", + "cpas_ahb", + "csi0", + "csi1", + "csi2", + "csiphy0", + "csiphy0_timer", + "csiphy1", + "csiphy1_timer", + "csiphy2", + "csiphy2_timer", + "gcc_camera_ahb", + "gcc_camera_axi", + "soc_ahb", + "vfe0_axi", + "vfe0", + "vfe0_cphy_rx", + "vfe1_axi", + "vfe1", + "vfe1_cphy_rx", + "vfe_lite", + "vfe_lite_cphy_rx"; + + iommus = <&apps_smmu 0x808 0x0>, + <&apps_smmu 0x810 0x8>, + <&apps_smmu 0xc08 0x0>, + <&apps_smmu 0xc10 0x8>; + + power-domains = <&camcc IFE_0_GDSC>, + <&camcc IFE_1_GDSC>, + <&camcc TITAN_TOP_GDSC>; + power-domain-names = "ife0", + "ife1", + "top"; + + vdda-phy-supply = <&vreg_l1a_1p225>; + vdda-pll-supply = <&vreg_l8a_1p8>; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>;
Documentation/devicetree/bindings/media/qcom,sdm670-camss.yaml line 319
Quoted 10 lines
Documentation/devicetree/bindings/media/qcom,sdm670-camss.yaml new file +10
-0+ + csiphy_ep0: endpoint { + clock-lanes = <7>; + data-lanes = <0 1 2 3>; + remote-endpoint = <&front_sensor_ep>; + }; + }; + }; + }; + };
--
Best wishes,
Vladimir
Re: [PATCH v3 2/5] dt-bindings: media: camss: Add qcom,sdm670-camss
Quoted 2 lines · Vladimir Zapolskiy
Hi Richard,
...
Quoted 152 lines
Review
Quoted 2 lines
(quoted diff) +2
-0+ + clocks:Please add
minItems: 22
Quoted 17 lines
Documentation/devicetree/bindings/media/qcom,sdm670-camss.yaml new file +17
-0+ maxItems: 22> + + clock-names: + items: + - const: camnoc_axi + - const: cpas_ahb + - const: csi0 + - const: csi1 + - const: csi2 + - const: csiphy0 + - const: csiphy0_timer + - const: csiphy1 + - const: csiphy1_timer + - const: csiphy2 + - const: csiphy2_timer + - const: gcc_camera_ahb + - const: gcc_camera_axi + - const: soc_ahbDocumentation/devicetree/bindings/media/qcom,sdm670-camss.yaml line 48
Quoted 10 lines
Documentation/devicetree/bindings/media/qcom,sdm670-camss.yaml new file +10
-0+ - const: vfe0_axi + - const: vfe0 + - const: vfe0_cphy_rx + - const: vfe1_axi + - const: vfe1 + - const: vfe1_cphy_rx + - const: vfe_lite + - const: vfe_lite_cphy_rx + + interrupts:Please add
minItems: 9
Quoted 5 lines
Documentation/devicetree/bindings/media/qcom,sdm670-camss.yaml new file +5
-0+ maxItems: 9 + + interrupt-names: + items: + - const: csid0Documentation/devicetree/bindings/media/qcom,sdm670-camss.yaml line 63
Quoted 10 lines
Documentation/devicetree/bindings/media/qcom,sdm670-camss.yaml new file +10
-0+ - const: csid1 + - const: csid2 + - const: csiphy0 + - const: csiphy1 + - const: csiphy2 + - const: vfe0 + - const: vfe1 + - const: vfe_lite + + iommus:Please add
minItems: 4>
Quoted 81 lines
Documentation/devicetree/bindings/media/qcom,sdm670-camss.yaml new file +81
-0+ maxItems: 4 + + 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 Top GDSC - Titan ISP Block, Global Distributed Switch Controller. + + power-domain-names: + items: + - const: ife0 + - const: ife1 + - const: top + + 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 from CSIPHY0. + + 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 from CSIPHY1. + + 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 from CSIPHY2. + + properties: + endpoint: + $ref: video-interfaces.yaml# + unevaluatedProperties: false + + properties: + clock-lanes: + maxItems: 1Documentation/devicetree/bindings/media/qcom,sdm670-camss.yaml line 154
Quoted 10 lines
Documentation/devicetree/bindings/media/qcom,sdm670-camss.yaml new file +10
-0+ + data-lanes: + minItems: 1 + maxItems: 4 + + required: + - clock-lanes + - data-lanes + + reg:Please add
Quoted 1 line
minItems: 9
None of above are necessary and this contradicts review we give to drop these...
Best regards,
Krzysztof
Vladimir Zapolskiy
reviewerRe: [PATCH v3 2/5] dt-bindings: media: camss: Add qcom,sdm670-camss
Hi Krzysztof,
Quoted 158 lines · Krzysztof Kozlowski
Quoted 2 lines · Vladimir Zapolskiy
Hi Richard,
...
Quoted 152 lines
Review
Quoted 2 lines
(quoted diff) +2
-0+ + clocks:Please add
minItems: 22
Quoted 17 lines
Documentation/devicetree/bindings/media/qcom,sdm670-camss.yaml new file +17
-0+ maxItems: 22> + + clock-names: + items: + - const: camnoc_axi + - const: cpas_ahb + - const: csi0 + - const: csi1 + - const: csi2 + - const: csiphy0 + - const: csiphy0_timer + - const: csiphy1 + - const: csiphy1_timer + - const: csiphy2 + - const: csiphy2_timer + - const: gcc_camera_ahb + - const: gcc_camera_axi + - const: soc_ahbDocumentation/devicetree/bindings/media/qcom,sdm670-camss.yaml line 48
Quoted 10 lines
Documentation/devicetree/bindings/media/qcom,sdm670-camss.yaml new file +10
-0+ - const: vfe0_axi + - const: vfe0 + - const: vfe0_cphy_rx + - const: vfe1_axi + - const: vfe1 + - const: vfe1_cphy_rx + - const: vfe_lite + - const: vfe_lite_cphy_rx + + interrupts:Please add
minItems: 9
Quoted 5 lines
Documentation/devicetree/bindings/media/qcom,sdm670-camss.yaml new file +5
-0+ maxItems: 9 + + interrupt-names: + items: + - const: csid0Documentation/devicetree/bindings/media/qcom,sdm670-camss.yaml line 63
Quoted 10 lines
Documentation/devicetree/bindings/media/qcom,sdm670-camss.yaml new file +10
-0+ - const: csid1 + - const: csid2 + - const: csiphy0 + - const: csiphy1 + - const: csiphy2 + - const: vfe0 + - const: vfe1 + - const: vfe_lite + + iommus:Please add
minItems: 4>
Quoted 81 lines
Documentation/devicetree/bindings/media/qcom,sdm670-camss.yaml new file +81
-0+ maxItems: 4 + + 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 Top GDSC - Titan ISP Block, Global Distributed Switch Controller. + + power-domain-names: + items: + - const: ife0 + - const: ife1 + - const: top + + 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 from CSIPHY0. + + 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 from CSIPHY1. + + 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 from CSIPHY2. + + properties: + endpoint: + $ref: video-interfaces.yaml# + unevaluatedProperties: false + + properties: + clock-lanes: + maxItems: 1Documentation/devicetree/bindings/media/qcom,sdm670-camss.yaml line 154
Quoted 10 lines
Documentation/devicetree/bindings/media/qcom,sdm670-camss.yaml new file +10
-0+ + data-lanes: + minItems: 1 + maxItems: 4 + + required: + - clock-lanes + - data-lanes + + reg:Please add
Quoted 5 lines
Quoted 1 line
minItems: 9
None of above are necessary and this contradicts review we give to drop these...
Thank you for the correction, I will memorize it.
--
Best wishes,
Vladimir
PATCH v3 3/5 media: qcom: camss: add support for SDM670 camss
In reply to Richard AcayanThe camera subsystem for the SDM670 the same as on SDM845 except with 3 CSIPHY ports instead of 4. Add support for the SDM670 camera subsystem.
--- drivers/media/platform/qcom/camss/camss.c | 191 ++++++++++++++++++++++ 1 file changed, 191 insertions(+)
drivers/media/platform/qcom/camss/camss.c +191 -0
@@ -584,6 +584,185 @@ static const struct camss_subdev_resources vfe_res_660[] = { } }; +static const struct camss_subdev_resources csiphy_res_670[] = { +/* CSIPHY0 */ + { + .regulators = {}, + .clock = {"soc_ahb" ,"cpas_ahb" , +"csiphy0" ,"csiphy0_timer" }, + .clock_rate = { {0 }, + {0 }, + {0 }, + {19200000 ,240000000 ,269333333 } }, + .reg = {"csiphy0" }, + .interrupt = {"csiphy0" }, + .csiphy = { + .hw_ops = &csiphy_ops_3ph_1_0, + .formats = &csiphy_formats_sdm845 + } + }, + +/* CSIPHY1 */ + { + .regulators = {}, + .clock = {"soc_ahb" ,"cpas_ahb" , +"csiphy1" ,"csiphy1_timer" }, + .clock_rate = { {0 }, + {0 }, + {0 }, + {19200000 ,240000000 ,269333333 } }, + .reg = {"csiphy1" }, + .interrupt = {"csiphy1" }, + .csiphy = { + .hw_ops = &csiphy_ops_3ph_1_0, + .formats = &csiphy_formats_sdm845 + } + }, + +/* CSIPHY2 */ + { + .regulators = {}, + .clock = {"soc_ahb" ,"cpas_ahb" , +"csiphy2" ,"csiphy2_timer" }, + .clock_rate = { {0 }, + {0 }, + {0 }, + {19200000 ,240000000 ,269333333 } }, + .reg = {"csiphy2" }, + .interrupt = {"csiphy2" }, + .csiphy = { + .hw_ops = &csiphy_ops_3ph_1_0, + .formats = &csiphy_formats_sdm845 + } + } +}; + +static const struct camss_subdev_resources csid_res_670[] = { +/* CSID0 */ + { + .regulators = {"vdda-phy" ,"vdda-pll" }, + .clock = {"cpas_ahb" ,"soc_ahb" ,"vfe0" , +"vfe0_cphy_rx" ,"csi0" }, + .clock_rate = { {0 }, + {0 }, + {100000000 ,320000000 ,404000000 ,480000000 ,600000000 }, + {384000000 }, + {19200000 ,75000000 ,384000000 ,538666667 } }, + .reg = {"csid0" }, + .interrupt = {"csid0" }, + .csid = { + .hw_ops = &csid_ops_gen2, + .parent_dev_ops = &vfe_parent_dev_ops, + .formats = &csid_formats_gen2 + } + }, + +/* CSID1 */ + { + .regulators = {"vdda-phy" ,"vdda-pll" }, + .clock = {"cpas_ahb" ,"soc_ahb" ,"vfe1" , +"vfe1_cphy_rx" ,"csi1" }, + .clock_rate = { {0 }, + {0 }, + {100000000 ,320000000 ,404000000 ,480000000 ,600000000 }, + {384000000 }, + {19200000 ,75000000 ,384000000 ,538666667 } }, + .reg = {"csid1" }, + .interrupt = {"csid1" }, + .csid = { + .hw_ops = &csid_ops_gen2, + .parent_dev_ops = &vfe_parent_dev_ops, + .formats = &csid_formats_gen2 + } + }, + +/* CSID2 */ + { + .regulators = {"vdda-phy" ,"vdda-pll" }, + .clock = {"cpas_ahb" ,"soc_ahb" ,"vfe_lite" , +"vfe_lite_cphy_rx" ,"csi2" }, + .clock_rate = { {0 }, + {0 }, + {100000000 ,320000000 ,404000000 ,480000000 ,600000000 }, + {384000000 }, + {19200000 ,75000000 ,384000000 ,538666667 } }, + .reg = {"csid2" }, + .interrupt = {"csid2" }, + .csid = { + .is_lite = true, + .hw_ops = &csid_ops_gen2, + .parent_dev_ops = &vfe_parent_dev_ops, + .formats = &csid_formats_gen2 + } + } +}; + +static const struct camss_subdev_resources vfe_res_670[] = { +/* VFE0 */ + { + .regulators = {}, + .clock = {"camnoc_axi" ,"cpas_ahb" ,"soc_ahb" , +"vfe0" ,"vfe0_axi" }, + .clock_rate = { {0 }, + {0 }, + {0 }, + {100000000 ,320000000 ,404000000 ,480000000 ,600000000 }, + {0 } }, + .reg = {"vfe0" }, + .interrupt = {"vfe0" }, + .vfe = { + .line_num =4 , + .has_pd = true, + .pd_name ="ife0" , + .hw_ops = &vfe_ops_170, + .formats_rdi = &vfe_formats_rdi_845, + .formats_pix = &vfe_formats_pix_845 + } + }, + +/* VFE1 */ + { + .regulators = {}, + .clock = {"camnoc_axi" ,"cpas_ahb" ,"soc_ahb" , +"vfe1" ,"vfe1_axi" }, + .clock_rate = { {0 }, + {0 }, + {0 }, + {100000000 ,320000000 ,404000000 ,480000000 ,600000000 }, + {0 } }, + .reg = {"vfe1" }, + .interrupt = {"vfe1" }, + .vfe = { + .line_num =4 , + .has_pd = true, + .pd_name ="ife1" , + .hw_ops = &vfe_ops_170, + .formats_rdi = &vfe_formats_rdi_845, + .formats_pix = &vfe_formats_pix_845 + } + }, + +/* VFE-lite */ + { + .regulators = {}, + .clock = {"camnoc_axi" ,"cpas_ahb" ,"soc_ahb" , +"vfe_lite" }, + .clock_rate = { {0 }, + {0 }, + {0 }, + {100000000 ,320000000 ,404000000 ,480000000 ,600000000 } }, + .reg = {"vfe_lite" }, + .interrupt = {"vfe_lite" }, + .vfe = { + .is_lite = true, + .line_num =4 , + .hw_ops = &vfe_ops_170, + .formats_rdi = &vfe_formats_rdi_845, + .formats_pix = &vfe_formats_pix_845 + } + } +}; +static const struct camss_subdev_resources csiphy_res_845[] = {/* CSIPHY0 */ {
@@ -2403,6 +2582,17 @@ static const struct camss_resources sdm660_resources = { .link_entities = camss_link_entities }; +static const struct camss_resources sdm670_resources = { + .version =CAMSS_845 , + .csiphy_res = csiphy_res_670, + .csid_res = csid_res_670, + .vfe_res = vfe_res_670, + .csiphy_num =ARRAY_SIZE (csiphy_res_670), + .csid_num =ARRAY_SIZE (csid_res_670), + .vfe_num =ARRAY_SIZE (vfe_res_670), + .link_entities = camss_link_entities +}; +static const struct camss_resources sdm845_resources = { .version =CAMSS_845 , .csiphy_res = csiphy_res_845,
@@ -2447,6 +2637,7 @@ static const struct of_device_id camss_dt_match[] = { { .compatible = "qcom,msm8916-camss", .data = &msm8916_resources }, { .compatible = "qcom,msm8996-camss", .data = &msm8996_resources }, { .compatible = "qcom,sdm660-camss", .data = &sdm660_resources }, + { .compatible = "qcom,sdm670-camss", .data = &sdm670_resources }, { .compatible = "qcom,sdm845-camss", .data = &sdm845_resources }, { .compatible = "qcom,sm8250-camss", .data = &sm8250_resources }, { .compatible = "qcom,sc8280xp-camss", .data = &sc8280xp_resources },
Signature · 1 line
2.46.0
Re: [PATCH v3 3/5] media: qcom: camss: add support for SDM670 camss
drivers/media/platform/qcom/camss/camss.c
Quoted 13 lines · Richard Acayan
The camera subsystem for the SDM670 the same as on SDM845 except with 3 CSIPHY ports instead of 4. Add support for the SDM670 camera subsystem.
Signed-off-by Richard Acayan <[email protected]>--- drivers/media/platform/qcom/camss/camss.c | 191 ++++++++++++++++++++++ 1 file changed, 191 insertions(+)drivers/media/platform/qcom/camss/camss.c +0
-0
Re: [PATCH v3 3/5] media: qcom: camss: add support for SDM670 camss
In reply to Richard AcayanQuoted 5 lines · Richard Acayan
The camera subsystem for the SDM670 the same as on SDM845 except with 3 CSIPHY ports instead of 4. Add support for the SDM670 camera subsystem.
Signed-off-by Richard Acayan <[email protected]>
--
Best wishes,
Vladimir
PATCH v3 4/5 arm64: dts: qcom: sdm670: add camcc
In reply to Richard AcayanThe camera clock controller on SDM670 controls the clocks that drive the camera subsystem. The clocks are the same as on SDM845. Add the camera clock controller for SDM670.
--- arch/arm64/boot/dts/qcom/sdm670.dtsi | 10 ++++++++++ 1 file changed, 10 insertions(+)
arch/arm64/boot/dts/qcom/sdm670.dtsi +10 -0
@@ -1400,6 +1400,16 @@ spmi_bus: spmi@c440000 { #interrupt-cells = <4>; }; + camcc: clock-controller@ad00000 { + compatible = "qcom,sdm845-camcc"; + reg = <0 0x0ad00000 0 0x10000>; + clocks = <&rpmhcc RPMH_CXO_CLK>; + clock-names = "bi_tcxo"; + #clock-cells = <1>; + #reset-cells = <1>; + #power-domain-cells = <1>; + }; + mdss: display-subsystem@ae00000 { compatible = "qcom,sdm670-mdss"; reg = <0 0x0ae00000 0 0x1000>;
Signature · 1 line
2.46.0
Vladimir Zapolskiy
reviewerRe: [PATCH v3 4/5] arm64: dts: qcom: sdm670: add camcc
Quoted 15 lines · Richard Acayan
The camera clock controller on SDM670 controls the clocks that drive the camera subsystem. The clocks are the same as on SDM845. Add the camera clock controller for SDM670.
Reviewed-by Bryan O'Donoghue <[email protected]>Signed-off-by Richard Acayan <[email protected]>--- arch/arm64/boot/dts/qcom/sdm670.dtsi | 10 ++++++++++ 1 file changed, 10 insertions(+)arch/arm64/boot/dts/qcom/sdm670.dtsi +0
-0
arch/arm64/boot/dts/qcom/sdm670.dtsi spmi_bus: spmi@c440000 { · line 1404
Quoted 5 lines
arch/arm64/boot/dts/qcom/sdm670.dtsi +2
-0@@ -1400,6 +1400,16 @@ spmi_bus: spmi@c440000 { #interrupt-cells = <4>; }; + camcc: clock-controller@ad00000 { + compatible = "qcom,sdm845-camcc";
Here it's wrong, and the compatible property value shall contain "qcom,sdm670-camcc", probably it could contain both values though.
It may require to add a new compatible to dt documentation and, if needed, to the corresponding clock driver.
arch/arm64/boot/dts/qcom/sdm670.dtsi spmi_bus: spmi@c440000 { · line 1415
Quoted 11 lines
arch/arm64/boot/dts/qcom/sdm670.dtsi +8
-0+ reg = <0 0x0ad00000 0 0x10000>; + clocks = <&rpmhcc RPMH_CXO_CLK>; + clock-names = "bi_tcxo"; + #clock-cells = <1>; + #reset-cells = <1>; + #power-domain-cells = <1>; + }; + mdss: display-subsystem@ae00000 { compatible = "qcom,sdm670-mdss"; reg = <0 0x0ae00000 0 0x1000>;
--
Best wishes,
Vladimir
Konrad Dybcio
maintainerRe: [PATCH v3 4/5] arm64: dts: qcom: sdm670: add camcc
Quoted 24 lines · Vladimir Zapolskiy
Quoted 15 lines · Richard Acayan
The camera clock controller on SDM670 controls the clocks that drive the camera subsystem. The clocks are the same as on SDM845. Add the camera clock controller for SDM670.
Reviewed-by Bryan O'Donoghue <[email protected]>Signed-off-by Richard Acayan <[email protected]>---
arch/arm64/boot/dts/qcom/sdm670.dtsi| 10 ++++++++++1 file changed, 10 insertions(+)arch/arm64/boot/dts/qcom/sdm670.dtsi +0
-0arch/arm64/boot/dts/qcom/sdm670.dtsi spmi_bus: spmi@c440000 { · line 1403
Quoted 4 lines
arch/arm64/boot/dts/qcom/sdm670.dtsi +1
-0@@ -1400,6 +1400,16 @@ spmi_bus: spmi@c440000 { #interrupt-cells = <4>; }; + camcc: clock-controller@ad00000 { + compatible = "qcom,sdm845-camcc";Here it's wrong, and the compatible property value shall contain "qcom,sdm670-camcc", probably it could contain both values though.
Quoted 2 lines
It may require to add a new compatible to dt documentation and, if needed, to the corresponding clock driver.
+1, even if the blocks are physically the same, please add a SoC-specific compatible (with a fallback to 845 if that's the case) just in case there are some implementation problems only concerning this instance
Konrad
PATCH v3 5/5 arm64: dts: qcom: sdm670: add camss and cci
In reply to Richard AcayanAdd the camera subsystem and CCI used to interface with cameras on the Snapdragon 670.
--- arch/arm64/boot/dts/qcom/sdm670.dtsi | 188 +++++++++++++++++++++++++++ 1 file changed, 188 insertions(+)
arch/arm64/boot/dts/qcom/sdm670.dtsi +188 -0
@@ -6,6 +6,7 @@ * Copyright (c) 2022, Richard Acayan. All rights reserved. */ +#include <dt-bindings/clock/qcom,camcc-sdm845.h> #include <dt-bindings/clock/qcom,dispcc-sdm845.h> #include <dt-bindings/clock/qcom,gcc-sdm845.h> #include <dt-bindings/clock/qcom,rpmh.h>
@@ -1168,6 +1169,34 @@ tlmm: pinctrl@3400000 { gpio-ranges = <&tlmm 0 0 151>; wakeup-parent = <&pdc>; + cci0_default: cci0-default-state { + pins = "gpio17", "gpio18"; + function = "cci_i2c"; + drive-strength = <2>; + bias-pull-up; + }; + + cci0_sleep: cci0-sleep-state { + pins = "gpio17", "gpio18"; + function = "cci_i2c"; + drive-strength = <2>; + bias-pull-down; + }; + + cci1_default: cci1-default-state { + pins = "gpio19", "gpio20"; + function = "cci_i2c"; + drive-strength = <2>; + bias-pull-up; + }; + + cci1_sleep: cci1-sleep-state { + pins = "gpio19", "gpio20"; + function = "cci_i2c"; + drive-strength = <2>; + bias-pull-down; + }; + qup_i2c0_default: qup-i2c0-default-state { pins = "gpio0", "gpio1"; function = "qup0";
@@ -1400,6 +1429,165 @@ spmi_bus: spmi@c440000 { #interrupt-cells = <4>; }; + cci: cci@ac4a000 { + compatible = "qcom,sdm670-cci", "qcom,msm8996-cci"; + #address-cells = <1>; + #size-cells = <0>; + + reg = <0 0x0ac4a000 0 0x4000>; + interrupts = <GIC_SPI 460 IRQ_TYPE_EDGE_RISING>; + power-domains = <&camcc TITAN_TOP_GDSC>; + + clocks = <&camcc CAM_CC_CAMNOC_AXI_CLK>, + <&camcc CAM_CC_SOC_AHB_CLK>, + <&camcc CAM_CC_CPAS_AHB_CLK>, + <&camcc CAM_CC_CCI_CLK>; + clock-names = "camnoc_axi", + "soc_ahb", + "cpas_ahb", + "cci"; + + assigned-clocks = <&camcc CAM_CC_CCI_CLK>; + assigned-clock-rates = <37500000>; + + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&cci0_default &cci1_default>; + pinctrl-1 = <&cci0_sleep &cci1_sleep>; + + status = "disabled"; + + cci_i2c0: i2c-bus@0 { + reg = <0>; + clock-frequency = <1000000>; + #address-cells = <1>; + #size-cells = <0>; + }; + + cci_i2c1: i2c-bus@1 { + reg = <1>; + clock-frequency = <1000000>; + #address-cells = <1>; + #size-cells = <0>; + }; + }; + + camss: camera-controller@ac65000 { + compatible = "qcom,sdm670-camss"; + reg = <0 0x0ac65000 0 0x1000>, + <0 0x0ac66000 0 0x1000>, + <0 0x0ac67000 0 0x1000>, + <0 0x0acaf000 0 0x4000>, + <0 0x0acb3000 0 0x1000>, + <0 0x0acb6000 0 0x4000>, + <0 0x0acba000 0 0x1000>, + <0 0x0acc4000 0 0x4000>, + <0 0x0acc8000 0 0x1000>; + reg-names = "csiphy0", + "csiphy1", + "csiphy2", + "vfe0", + "csid0", + "vfe1", + "csid1", + "vfe_lite", + "csid2"; + + interrupts = <GIC_SPI 464 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 466 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 468 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 477 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 478 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 479 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>; + interrupt-names = "csid0", + "csid1", + "csid2", + "csiphy0", + "csiphy1", + "csiphy2", + "vfe0", + "vfe1", + "vfe_lite"; + + clocks = <&camcc CAM_CC_CAMNOC_AXI_CLK>, + <&camcc CAM_CC_CPAS_AHB_CLK>, + <&camcc CAM_CC_IFE_0_CSID_CLK>, + <&camcc CAM_CC_IFE_1_CSID_CLK>, + <&camcc CAM_CC_IFE_LITE_CSID_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>, + <&gcc GCC_CAMERA_AHB_CLK>, + <&gcc GCC_CAMERA_AXI_CLK>, + <&camcc CAM_CC_SOC_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_1_AXI_CLK>, + <&camcc CAM_CC_IFE_1_CLK>, + <&camcc CAM_CC_IFE_1_CPHY_RX_CLK>, + <&camcc CAM_CC_IFE_LITE_CLK>, + <&camcc CAM_CC_IFE_LITE_CPHY_RX_CLK>; + clock-names = "camnoc_axi", + "cpas_ahb", + "csi0", + "csi1", + "csi2", + "csiphy0", + "csiphy0_timer", + "csiphy1", + "csiphy1_timer", + "csiphy2", + "csiphy2_timer", + "gcc_camera_ahb", + "gcc_camera_axi", + "soc_ahb", + "vfe0_axi", + "vfe0", + "vfe0_cphy_rx", + "vfe1_axi", + "vfe1", + "vfe1_cphy_rx", + "vfe_lite", + "vfe_lite_cphy_rx"; + + iommus = <&apps_smmu 0x808 0x0>, + <&apps_smmu 0x810 0x8>, + <&apps_smmu 0xc08 0x0>, + <&apps_smmu 0xc10 0x8>; + + power-domains = <&camcc IFE_0_GDSC>, + <&camcc IFE_1_GDSC>, + <&camcc TITAN_TOP_GDSC>; + power-domain-names = "ife0", + "ife1", + "top"; + + status = "disabled"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + camss_port0: port@0 { + reg = <0>; + }; + + camss_port1: port@1 { + reg = <1>; + }; + + camss_port2: port@2 { + reg = <2>; + }; + }; + }; + camcc: clock-controller@ad00000 { compatible = "qcom,sdm845-camcc"; reg = <0 0x0ad00000 0 0x10000>;
Signature · 1 line
2.46.0
Re: [PATCH v3 5/5] arm64: dts: qcom: sdm670: add camss and cci
arch/arm64/boot/dts/qcom/sdm670.dtsi
Quoted 12 lines · Richard Acayan
Add the camera subsystem and CCI used to interface with cameras on the Snapdragon 670.
Signed-off-by Richard Acayan <[email protected]>--- arch/arm64/boot/dts/qcom/sdm670.dtsi | 188 +++++++++++++++++++++++++++ 1 file changed, 188 insertions(+)arch/arm64/boot/dts/qcom/sdm670.dtsi +0
-0
This looks neater - better indentation for example than what we have for 845 upstream.
Vladimir Zapolskiy
reviewerRe: [PATCH v3 5/5] arm64: dts: qcom: sdm670: add camss and cci
In reply to Richard AcayanQuoted 69 lines · Richard Acayan
Add the camera subsystem and CCI used to interface with cameras on the Snapdragon 670.
Signed-off-by Richard Acayan <[email protected]>--- arch/arm64/boot/dts/qcom/sdm670.dtsi | 188 +++++++++++++++++++++++++++ 1 file changed, 188 insertions(+)arch/arm64/boot/dts/qcom/sdm670.dtsi +39
-0@@ -6,6 +6,7 @@ * Copyright (c) 2022, Richard Acayan. All rights reserved. */ +#include <dt-bindings/clock/qcom,camcc-sdm845.h> #include <dt-bindings/clock/qcom,dispcc-sdm845.h> #include <dt-bindings/clock/qcom,gcc-sdm845.h> #include <dt-bindings/clock/qcom,rpmh.h>@@ -1168,6 +1169,34 @@ tlmm: pinctrl@3400000 { gpio-ranges = <&tlmm 0 0 151>; wakeup-parent = <&pdc>; + cci0_default: cci0-default-state { + pins = "gpio17", "gpio18"; + function = "cci_i2c"; + drive-strength = <2>; + bias-pull-up; + }; + + cci0_sleep: cci0-sleep-state { + pins = "gpio17", "gpio18"; + function = "cci_i2c"; + drive-strength = <2>; + bias-pull-down; + }; + + cci1_default: cci1-default-state { + pins = "gpio19", "gpio20"; + function = "cci_i2c"; + drive-strength = <2>; + bias-pull-up; + }; + + cci1_sleep: cci1-sleep-state { + pins = "gpio19", "gpio20"; + function = "cci_i2c"; + drive-strength = <2>; + bias-pull-down; + }; + qup_i2c0_default: qup-i2c0-default-state { pins = "gpio0", "gpio1"; function = "qup0";@@ -1400,6 +1429,165 @@ spmi_bus: spmi@c440000 { #interrupt-cells = <4>; }; + cci: cci@ac4a000 { + compatible = "qcom,sdm670-cci", "qcom,msm8996-cci"; + #address-cells = <1>; + #size-cells = <0>; + + reg = <0 0x0ac4a000 0 0x4000>; + interrupts = <GIC_SPI 460 IRQ_TYPE_EDGE_RISING>; + power-domains = <&camcc TITAN_TOP_GDSC>; + + clocks = <&camcc CAM_CC_CAMNOC_AXI_CLK>,
arch/arm64/boot/dts/qcom/sdm670.dtsi spmi_bus: spmi@c440000 { · line 1451
Quoted 10 lines
arch/arm64/boot/dts/qcom/sdm670.dtsi +10
-0+ <&camcc CAM_CC_SOC_AHB_CLK>, + <&camcc CAM_CC_CPAS_AHB_CLK>, + <&camcc CAM_CC_CCI_CLK>; + clock-names = "camnoc_axi", + "soc_ahb", + "cpas_ahb", + "cci"; + + assigned-clocks = <&camcc CAM_CC_CCI_CLK>; + assigned-clock-rates = <37500000>;
Please remove assigned-clocks and assigned-clock-rates properties.
Quoted 66 lines
arch/arm64/boot/dts/qcom/sdm670.dtsi +66
-0+ + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&cci0_default &cci1_default>; + pinctrl-1 = <&cci0_sleep &cci1_sleep>; + + status = "disabled"; + + cci_i2c0: i2c-bus@0 { + reg = <0>; + clock-frequency = <1000000>; + #address-cells = <1>; + #size-cells = <0>; + }; + + cci_i2c1: i2c-bus@1 { + reg = <1>; + clock-frequency = <1000000>; + #address-cells = <1>; + #size-cells = <0>; + }; + }; + + camss: camera-controller@ac65000 { + compatible = "qcom,sdm670-camss"; + reg = <0 0x0ac65000 0 0x1000>, + <0 0x0ac66000 0 0x1000>, + <0 0x0ac67000 0 0x1000>, + <0 0x0acaf000 0 0x4000>, + <0 0x0acb3000 0 0x1000>, + <0 0x0acb6000 0 0x4000>, + <0 0x0acba000 0 0x1000>, + <0 0x0acc4000 0 0x4000>, + <0 0x0acc8000 0 0x1000>; + reg-names = "csiphy0", + "csiphy1", + "csiphy2", + "vfe0", + "csid0", + "vfe1", + "csid1", + "vfe_lite", + "csid2"; + + interrupts = <GIC_SPI 464 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 466 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 468 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 477 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 478 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 479 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>; + interrupt-names = "csid0", + "csid1", + "csid2", + "csiphy0", + "csiphy1", + "csiphy2", + "vfe0", + "vfe1", + "vfe_lite"; + + clocks = <&camcc CAM_CC_CAMNOC_AXI_CLK>, + <&camcc CAM_CC_CPAS_AHB_CLK>, + <&camcc CAM_CC_IFE_0_CSID_CLK>, + <&camcc CAM_CC_IFE_1_CSID_CLK>,
arch/arm64/boot/dts/qcom/sdm670.dtsi spmi_bus: spmi@c440000 { · line 1527
Quoted 10 lines
arch/arm64/boot/dts/qcom/sdm670.dtsi +10
-0+ <&camcc CAM_CC_IFE_LITE_CSID_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>, + <&gcc GCC_CAMERA_AHB_CLK>, + <&gcc GCC_CAMERA_AXI_CLK>, + <&camcc CAM_CC_SOC_AHB_CLK>,
Please put two &gcc and "soc_ahb" clock sources on top, it will require a change in dt bindings documentation also.
Quoted 56 lines
arch/arm64/boot/dts/qcom/sdm670.dtsi +56
-0+ <&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_1_AXI_CLK>, + <&camcc CAM_CC_IFE_1_CLK>, + <&camcc CAM_CC_IFE_1_CPHY_RX_CLK>, + <&camcc CAM_CC_IFE_LITE_CLK>, + <&camcc CAM_CC_IFE_LITE_CPHY_RX_CLK>; + clock-names = "camnoc_axi", + "cpas_ahb", + "csi0", + "csi1", + "csi2", + "csiphy0", + "csiphy0_timer", + "csiphy1", + "csiphy1_timer", + "csiphy2", + "csiphy2_timer", + "gcc_camera_ahb", + "gcc_camera_axi", + "soc_ahb", + "vfe0_axi", + "vfe0", + "vfe0_cphy_rx", + "vfe1_axi", + "vfe1", + "vfe1_cphy_rx", + "vfe_lite", + "vfe_lite_cphy_rx"; + + iommus = <&apps_smmu 0x808 0x0>, + <&apps_smmu 0x810 0x8>, + <&apps_smmu 0xc08 0x0>, + <&apps_smmu 0xc10 0x8>; + + power-domains = <&camcc IFE_0_GDSC>, + <&camcc IFE_1_GDSC>, + <&camcc TITAN_TOP_GDSC>; + power-domain-names = "ife0", + "ife1", + "top"; + + status = "disabled"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + camss_port0: port@0 { + reg = <0>; + }; + + camss_port1: port@1 { + reg = <1>; + };
arch/arm64/boot/dts/qcom/sdm670.dtsi spmi_bus: spmi@c440000 { · line 1593
Quoted 10 lines
arch/arm64/boot/dts/qcom/sdm670.dtsi +7
-0+ + camss_port2: port@2 { + reg = <2>; + }; + }; + }; + camcc: clock-controller@ad00000 { compatible = "qcom,sdm845-camcc"; reg = <0 0x0ad00000 0 0x10000>;
--
Best wishes,
Vladimir
Re: [PATCH v3 5/5] arm64: dts: qcom: sdm670: add camss and cci
Quoted 71 lines · Vladimir Zapolskiy
Quoted 70 lines · Richard Acayan
Add the camera subsystem and CCI used to interface with cameras on the Snapdragon 670.
Signed-off-by Richard Acayan <[email protected]>--- arch/arm64/boot/dts/qcom/sdm670.dtsi | 188 +++++++++++++++++++++++++++ 1 file changed, 188 insertions(+)arch/arm64/boot/dts/qcom/sdm670.dtsi +43
-0@@ -6,6 +6,7 @@ * Copyright (c) 2022, Richard Acayan. All rights reserved. */ +#include <dt-bindings/clock/qcom,camcc-sdm845.h> #include <dt-bindings/clock/qcom,dispcc-sdm845.h> #include <dt-bindings/clock/qcom,gcc-sdm845.h> #include <dt-bindings/clock/qcom,rpmh.h>@@ -1168,6 +1169,34 @@ tlmm: pinctrl@3400000 { gpio-ranges = <&tlmm 0 0 151>; wakeup-parent = <&pdc>; + cci0_default: cci0-default-state { + pins = "gpio17", "gpio18"; + function = "cci_i2c"; + drive-strength = <2>; + bias-pull-up; + }; + + cci0_sleep: cci0-sleep-state { + pins = "gpio17", "gpio18"; + function = "cci_i2c"; + drive-strength = <2>; + bias-pull-down; + }; + + cci1_default: cci1-default-state { + pins = "gpio19", "gpio20"; + function = "cci_i2c"; + drive-strength = <2>; + bias-pull-up; + }; + + cci1_sleep: cci1-sleep-state { + pins = "gpio19", "gpio20"; + function = "cci_i2c"; + drive-strength = <2>; + bias-pull-down; + }; + qup_i2c0_default: qup-i2c0-default-state { pins = "gpio0", "gpio1"; function = "qup0";@@ -1400,6 +1429,165 @@ spmi_bus: spmi@c440000 { #interrupt-cells = <4>; }; + cci: cci@ac4a000 { + compatible = "qcom,sdm670-cci", "qcom,msm8996-cci"; + #address-cells = <1>; + #size-cells = <0>; + + reg = <0 0x0ac4a000 0 0x4000>; + interrupts = <GIC_SPI 460 IRQ_TYPE_EDGE_RISING>; + power-domains = <&camcc TITAN_TOP_GDSC>; + + clocks = <&camcc CAM_CC_CAMNOC_AXI_CLK>, + <&camcc CAM_CC_SOC_AHB_CLK>, + <&camcc CAM_CC_CPAS_AHB_CLK>, + <&camcc CAM_CC_CCI_CLK>; + clock-names = "camnoc_axi",
Quoted 8 lines
arch/arm64/boot/dts/qcom/sdm670.dtsi spmi_bus: spmi@c440000 { · line 1451
Quoted 6 lines
arch/arm64/boot/dts/qcom/sdm670.dtsi +6
-0+ "soc_ahb", + "cpas_ahb", + "cci"; + + assigned-clocks = <&camcc CAM_CC_CCI_CLK>; + assigned-clock-rates = <37500000>;Please remove assigned-clocks and assigned-clock-rates properties.
Doing this adds a warning to dmesg, where the clock rate is set to 19.2 MHz by default.
Quoted 71 lines
Quoted 71 lines
arch/arm64/boot/dts/qcom/sdm670.dtsi +71
-0+ + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&cci0_default &cci1_default>; + pinctrl-1 = <&cci0_sleep &cci1_sleep>; + + status = "disabled"; + + cci_i2c0: i2c-bus@0 { + reg = <0>; + clock-frequency = <1000000>; + #address-cells = <1>; + #size-cells = <0>; + }; + + cci_i2c1: i2c-bus@1 { + reg = <1>; + clock-frequency = <1000000>; + #address-cells = <1>; + #size-cells = <0>; + }; + }; + + camss: camera-controller@ac65000 { + compatible = "qcom,sdm670-camss"; + reg = <0 0x0ac65000 0 0x1000>, + <0 0x0ac66000 0 0x1000>, + <0 0x0ac67000 0 0x1000>, + <0 0x0acaf000 0 0x4000>, + <0 0x0acb3000 0 0x1000>, + <0 0x0acb6000 0 0x4000>, + <0 0x0acba000 0 0x1000>, + <0 0x0acc4000 0 0x4000>, + <0 0x0acc8000 0 0x1000>; + reg-names = "csiphy0", + "csiphy1", + "csiphy2", + "vfe0", + "csid0", + "vfe1", + "csid1", + "vfe_lite", + "csid2"; + + interrupts = <GIC_SPI 464 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 466 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 468 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 477 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 478 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 479 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>; + interrupt-names = "csid0", + "csid1", + "csid2", + "csiphy0", + "csiphy1", + "csiphy2", + "vfe0", + "vfe1", + "vfe_lite"; + + clocks = <&camcc CAM_CC_CAMNOC_AXI_CLK>, + <&camcc CAM_CC_CPAS_AHB_CLK>, + <&camcc CAM_CC_IFE_0_CSID_CLK>, + <&camcc CAM_CC_IFE_1_CSID_CLK>, + <&camcc CAM_CC_IFE_LITE_CSID_CLK>, + <&camcc CAM_CC_CSIPHY0_CLK>, + <&camcc CAM_CC_CSI0PHYTIMER_CLK>, + <&camcc CAM_CC_CSIPHY1_CLK>, + <&camcc CAM_CC_CSI1PHYTIMER_CLK>,
Quoted 8 lines
arch/arm64/boot/dts/qcom/sdm670.dtsi spmi_bus: spmi@c440000 { · line 1527
Quoted 5 lines
arch/arm64/boot/dts/qcom/sdm670.dtsi +5
-0+ <&camcc CAM_CC_CSIPHY2_CLK>, + <&camcc CAM_CC_CSI2PHYTIMER_CLK>, + <&gcc GCC_CAMERA_AHB_CLK>, + <&gcc GCC_CAMERA_AXI_CLK>, + <&camcc CAM_CC_SOC_AHB_CLK>,Please put two &gcc and "
soc_ahb" clock sources on top, it will require a change in dt bindings documentation also.
I'll do this for the clocks themselves because they have no parents (so no obvious clock sources).
Bryan O'Donoghue
maintainerRe: [PATCH v3 5/5] arm64: dts: qcom: sdm670: add camss and cci
Quoted 6 lines · Richard Acayan
Quoted 4 lines
arch/arm64/boot/dts/qcom/sdm670.dtsi spmi_bus: spmi@c440000 { · line 1451
Quoted 3 lines
arch/arm64/boot/dts/qcom/sdm670.dtsi +3
-0+ + assigned-clocks = <&camcc CAM_CC_CCI_CLK>; + assigned-clock-rates = <37500000>;Please remove assigned-clocks and assigned-clock-rates properties.
Doing this adds a warning to dmesg, where the clock rate is set to 19.2 MHz by default.
I have a patch for this.
Feel free to take into your series and then update the dts here.
---
bod
Bryan O'Donoghue
maintainerPATCH 1/1 i2c: qcom-cci: Stop complaining about DT set clock rate
In reply to Richard AcayanIt is common practice in the downstream and upstream CCI dt to set CCI clock rates to 19.2 MHz. It appears to be fairly common for initial code to set the CCI clock rate to 37.5 MHz.
Applying the widely used CCI clock rates from downstream ought not to cause warning messages in the upstream kernel where our general policy is to usually copy downstream hardware clock rates across the range of Qualcomm drivers.
Drop the warning it is pervasive across CAMSS users but doesn't add any information or warrant any changes to the DT to align the DT clock rate to the bootloader clock rate.
--- drivers/i2c/busses/i2c-qcom-cci.c | 8 -------- 1 file changed, 8 deletions(-)
drivers/i2c/busses/i2c-qcom-cci.c +0 -8
@@ -602,14 +602,6 @@ static int cci_probe(struct platform_device *pdev) } } -if (cci_clk_rate != cci->data->cci_clk_rate) { -/* cci clock set by the bootloader or via assigned clock rate -* in DT. -*/ -dev_warn (dev,"Found %lu cci clk rate while %lu was expected\n" , - cci_clk_rate, cci->data->cci_clk_rate); - } - ret =cci_enable_clocks (cci);if (ret <0 )return ret;
Signature · 1 line
2.45.2
Re: [PATCH] i2c: qcom-cci: Stop complaining about DT set clock rate
Quoted 9 lines · Bryan O'Donoghue
It is common practice in the downstream and upstream CCI dt to set CCI clock rates to 19.2 MHz. It appears to be fairly common for initial code to set the CCI clock rate to 37.5 MHz.
Applying the widely used CCI clock rates from downstream ought not to cause warning messages in the upstream kernel where our general policy is to usually copy downstream hardware clock rates across the range of Qualcomm drivers.
Quoted 5 lines
Drop the warning it is pervasive across CAMSS users but doesn't add any information or warrant any changes to the DT to align the DT clock rate to the bootloader clock rate.
Signed-off-by Bryan O'Donoghue <[email protected]>
--
Best wishes,
Vladimir