Re: [PATCH v3 5/5] arm64: dts: qcom: sdm670: add camss and cci

Richard Acayan
2024-08-23T23:44:29Z

On Wed, Aug 21, 2024 at 01:40:14PM +0300, Vladimir Zapolskiy wrote:
> On 8/20/24 01:10, Richard Acayan wrote:
> > Add the camera subsystem and CCI used to interface with cameras on the
> > Snapdragon 670.
> >
> > Signed-off-by: Richard Acayan <mailingradian@gmail.com>
> > ---
> > arch/arm64/boot/dts/qcom/sdm670.dtsi | 188 +++++++++++++++++++++++++++
> > 1 file changed, 188 insertions(+)
> >
> > diff --git a/arch/arm64/boot/dts/qcom/sdm670.dtsi b/arch/arm64/boot/dts/qcom/sdm670.dtsi
> > index ba93cef33dbb..37bc4fa04286 100644
> > --- a/arch/arm64/boot/dts/qcom/sdm670.dtsi
> > +++ b/arch/arm64/boot/dts/qcom/sdm670.dtsi
> > @@ -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>;
>
> 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.

> > +
> > + 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>,
>
> 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).