* [PATCH 1/4] dt-bindings: media: Binding document for Qualcomm Camera Control Interface driver [not found] <1506953613-23875-1-git-send-email-todor.tomov@linaro.org> @ 2017-10-02 14:13 ` Todor Tomov 2017-10-06 5:29 ` Bjorn Andersson 2017-10-02 14:13 ` [PATCH 4/4] arm64: dts: qcom: Add Camera Control Interface support Todor Tomov 1 sibling, 1 reply; 4+ messages in thread From: Todor Tomov @ 2017-10-02 14:13 UTC (permalink / raw) To: wsa, linux-i2c Cc: linux-arm-msm, linux-kernel, Todor Tomov, Rob Herring, Mark Rutland, devicetree Add DT binding document for Qualcomm Camera Control Interface driver CC: Rob Herring <robh+dt@kernel.org> CC: Mark Rutland <mark.rutland@arm.com> CC: devicetree@vger.kernel.org Signed-off-by: Todor Tomov <todor.tomov@linaro.org> --- .../devicetree/bindings/i2c/i2c-qcom-cci.txt | 55 ++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 Documentation/devicetree/bindings/i2c/i2c-qcom-cci.txt diff --git a/Documentation/devicetree/bindings/i2c/i2c-qcom-cci.txt b/Documentation/devicetree/bindings/i2c/i2c-qcom-cci.txt new file mode 100644 index 0000000..f4c5338 --- /dev/null +++ b/Documentation/devicetree/bindings/i2c/i2c-qcom-cci.txt @@ -0,0 +1,55 @@ +Qualcomm Camera Control Interface I2C controller + +Required properties: + - compatible: Should be one of: + - "qcom,cci-v1.0.8" for 8916; + - "qcom,cci-v1.4.0" for 8996. + - #address-cells: Should be <1>. + - #size-cells: Should be <0>. + - reg: Base address of the controller and length of memory mapped region. + - reg-names: Should be "cci". + - interrupts: Specifier for CCI interrupt. + - interrupt-names: Should be "cci". + - clocks: List of clock specifiers, one for each entry in clock-names. + - clock-names: Should contain: + - "mmss_mmagic_ahb" - on 8996 only; + - "camss_top_ahb"; + - "cci_ahb"; + - "cci"; + - "camss_ahb". + - pinctrl-names: Should contain only one value - "default". + - pinctrl-0: Pin control group to be used for this controller. + + +Required properties on 8996: + - power-domains: Power domain specifier. + +Optional: + - clock-frequency: Desired I2C bus clock frequency in Hz, defaults to 100 kHz + if omitted. + +Example: + + cci: qcom,cci@a0c000 { + compatible = "qcom,cci-v1.4.0"; + #address-cells = <1>; + #size-cells = <0>; + reg = <0xa0c000 0x1000>; + reg-names = "cci"; + interrupts = <GIC_SPI 295 IRQ_TYPE_EDGE_RISING>; + interrupt-names = "cci"; + power-domains = <&mmcc CAMSS_GDSC>; + clocks = <&mmcc MMSS_MMAGIC_AHB_CLK>, + <&mmcc CAMSS_TOP_AHB_CLK>, + <&mmcc CAMSS_CCI_AHB_CLK>, + <&mmcc CAMSS_CCI_CLK>, + <&mmcc CAMSS_AHB_CLK>; + clock-names = "mmss_mmagic_ahb", + "camss_top_ahb", + "cci_ahb", + "cci", + "camss_ahb"; + pinctrl-names = "default"; + pinctrl-0 = <&cci0_default>; + clock-frequency = <400000>; + }; -- 2.7.4 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 1/4] dt-bindings: media: Binding document for Qualcomm Camera Control Interface driver 2017-10-02 14:13 ` [PATCH 1/4] dt-bindings: media: Binding document for Qualcomm Camera Control Interface driver Todor Tomov @ 2017-10-06 5:29 ` Bjorn Andersson 2017-10-12 14:50 ` Todor Tomov 0 siblings, 1 reply; 4+ messages in thread From: Bjorn Andersson @ 2017-10-06 5:29 UTC (permalink / raw) To: Todor Tomov Cc: wsa, linux-i2c, linux-arm-msm, linux-kernel, Rob Herring, Mark Rutland, devicetree On Mon 02 Oct 07:13 PDT 2017, Todor Tomov wrote: > diff --git a/Documentation/devicetree/bindings/i2c/i2c-qcom-cci.txt b/Documentation/devicetree/bindings/i2c/i2c-qcom-cci.txt > new file mode 100644 > index 0000000..f4c5338 > --- /dev/null > +++ b/Documentation/devicetree/bindings/i2c/i2c-qcom-cci.txt > @@ -0,0 +1,55 @@ > +Qualcomm Camera Control Interface I2C controller Well, it's not a I2C controller, it is a MIPI CCI controller. > + > +Required properties: > + - compatible: Should be one of: > + - "qcom,cci-v1.0.8" for 8916; > + - "qcom,cci-v1.4.0" for 8996. > + - #address-cells: Should be <1>. > + - #size-cells: Should be <0>. > + - reg: Base address of the controller and length of memory mapped region. > + - reg-names: Should be "cci". No need for reg-names, as we only have one. > + - interrupts: Specifier for CCI interrupt. > + - interrupt-names: Should be "cci". No need for interrupt-names, as we only have one. > + - clocks: List of clock specifiers, one for each entry in clock-names. > + - clock-names: Should contain: > + - "mmss_mmagic_ahb" - on 8996 only; > + - "camss_top_ahb"; > + - "cci_ahb"; > + - "cci"; > + - "camss_ahb". > + - pinctrl-names: Should contain only one value - "default". > + - pinctrl-0: Pin control group to be used for this controller. No need to document that the node can have the default pinctrl properties. > + > + > +Required properties on 8996: > + - power-domains: Power domain specifier. > + > +Optional: > + - clock-frequency: Desired I2C bus clock frequency in Hz, defaults to 100 kHz > + if omitted. > + > +Example: > + > + cci: qcom,cci@a0c000 { Don't do qcom, in the node name, and there's probably no reason to have a label for this node either. So just make it cci@a0c000 { > + compatible = "qcom,cci-v1.4.0"; > + #address-cells = <1>; > + #size-cells = <0>; > + reg = <0xa0c000 0x1000>; > + reg-names = "cci"; > + interrupts = <GIC_SPI 295 IRQ_TYPE_EDGE_RISING>; > + interrupt-names = "cci"; > + power-domains = <&mmcc CAMSS_GDSC>; > + clocks = <&mmcc MMSS_MMAGIC_AHB_CLK>, > + <&mmcc CAMSS_TOP_AHB_CLK>, > + <&mmcc CAMSS_CCI_AHB_CLK>, > + <&mmcc CAMSS_CCI_CLK>, > + <&mmcc CAMSS_AHB_CLK>; > + clock-names = "mmss_mmagic_ahb", > + "camss_top_ahb", > + "cci_ahb", > + "cci", > + "camss_ahb"; > + pinctrl-names = "default"; > + pinctrl-0 = <&cci0_default>; > + clock-frequency = <400000>; > + }; In the case of this single cci block having two masters we need a way to describe the two sets of clients. I think the two options we have are: cci { client { reg = <0 0x2c>; }; }; The reg here being <master address> or: cci { master0 { client { reg = <0x2c>; }; }; }; The name "master0" could be made significant and picked up by name, and in the case of single-master this level could be omitted. I like the first one, but it looks really hard to get implemented in Linux, based on the i2c core's expectation that #address-cells is 1. So I think the latter is the favourable option. Regards, Bjorn ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 1/4] dt-bindings: media: Binding document for Qualcomm Camera Control Interface driver 2017-10-06 5:29 ` Bjorn Andersson @ 2017-10-12 14:50 ` Todor Tomov 0 siblings, 0 replies; 4+ messages in thread From: Todor Tomov @ 2017-10-12 14:50 UTC (permalink / raw) To: Bjorn Andersson Cc: wsa, linux-i2c, linux-arm-msm, linux-kernel, Rob Herring, Mark Rutland, devicetree Hi Bjorn, Thank you for the review. On 6.10.2017 08:29, Bjorn Andersson wrote: > On Mon 02 Oct 07:13 PDT 2017, Todor Tomov wrote: >> diff --git a/Documentation/devicetree/bindings/i2c/i2c-qcom-cci.txt b/Documentation/devicetree/bindings/i2c/i2c-qcom-cci.txt >> new file mode 100644 >> index 0000000..f4c5338 >> --- /dev/null >> +++ b/Documentation/devicetree/bindings/i2c/i2c-qcom-cci.txt >> @@ -0,0 +1,55 @@ >> +Qualcomm Camera Control Interface I2C controller > > Well, it's not a I2C controller, it is a MIPI CCI controller. > >> + >> +Required properties: >> + - compatible: Should be one of: >> + - "qcom,cci-v1.0.8" for 8916; >> + - "qcom,cci-v1.4.0" for 8996. >> + - #address-cells: Should be <1>. >> + - #size-cells: Should be <0>. >> + - reg: Base address of the controller and length of memory mapped region. >> + - reg-names: Should be "cci". > > No need for reg-names, as we only have one. > >> + - interrupts: Specifier for CCI interrupt. >> + - interrupt-names: Should be "cci". > > No need for interrupt-names, as we only have one. > >> + - clocks: List of clock specifiers, one for each entry in clock-names. >> + - clock-names: Should contain: >> + - "mmss_mmagic_ahb" - on 8996 only; >> + - "camss_top_ahb"; >> + - "cci_ahb"; >> + - "cci"; >> + - "camss_ahb". >> + - pinctrl-names: Should contain only one value - "default". >> + - pinctrl-0: Pin control group to be used for this controller. > > No need to document that the node can have the default pinctrl > properties. > >> + >> + >> +Required properties on 8996: >> + - power-domains: Power domain specifier. >> + >> +Optional: >> + - clock-frequency: Desired I2C bus clock frequency in Hz, defaults to 100 kHz >> + if omitted. >> + >> +Example: >> + >> + cci: qcom,cci@a0c000 { > > Don't do qcom, in the node name, and there's probably no reason to have > a label for this node either. So just make it > > cci@a0c000 { > >> + compatible = "qcom,cci-v1.4.0"; >> + #address-cells = <1>; >> + #size-cells = <0>; >> + reg = <0xa0c000 0x1000>; >> + reg-names = "cci"; >> + interrupts = <GIC_SPI 295 IRQ_TYPE_EDGE_RISING>; >> + interrupt-names = "cci"; >> + power-domains = <&mmcc CAMSS_GDSC>; >> + clocks = <&mmcc MMSS_MMAGIC_AHB_CLK>, >> + <&mmcc CAMSS_TOP_AHB_CLK>, >> + <&mmcc CAMSS_CCI_AHB_CLK>, >> + <&mmcc CAMSS_CCI_CLK>, >> + <&mmcc CAMSS_AHB_CLK>; >> + clock-names = "mmss_mmagic_ahb", >> + "camss_top_ahb", >> + "cci_ahb", >> + "cci", >> + "camss_ahb"; >> + pinctrl-names = "default"; >> + pinctrl-0 = <&cci0_default>; >> + clock-frequency = <400000>; >> + }; > > In the case of this single cci block having two masters we need a way to > describe the two sets of clients. I think the two options we have are: > > cci { > client { > reg = <0 0x2c>; > }; > }; > > The reg here being <master address> > > or: > > cci { > master0 { > client { > reg = <0x2c>; > }; > }; > }; > > The name "master0" could be made significant and picked up by name, and > in the case of single-master this level could be omitted. > > > I like the first one, but it looks really hard to get implemented in > Linux, based on the i2c core's expectation that #address-cells is 1. So > I think the latter is the favourable option. Yes, I'll try this for the version which supports the second bus. Thank you for this suggestion. The rest of the points I'll fix now and send a v2. > > Regards, > Bjorn > -- Best regards, Todor Tomov ^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 4/4] arm64: dts: qcom: Add Camera Control Interface support [not found] <1506953613-23875-1-git-send-email-todor.tomov@linaro.org> 2017-10-02 14:13 ` [PATCH 1/4] dt-bindings: media: Binding document for Qualcomm Camera Control Interface driver Todor Tomov @ 2017-10-02 14:13 ` Todor Tomov 1 sibling, 0 replies; 4+ messages in thread From: Todor Tomov @ 2017-10-02 14:13 UTC (permalink / raw) To: wsa, linux-i2c Cc: linux-arm-msm, linux-kernel, Todor Tomov, Andy Gross, Rob Herring, Mark Rutland, devicetree, linux-soc, linux-arm-kernel This commit adds the CCI node for the CCI controller that resides on the Qualcomm MSM8916 and MSM8996 platforms. CC: Andy Gross <andy.gross@linaro.org> CC: Rob Herring <robh+dt@kernel.org> CC: Mark Rutland <mark.rutland@arm.com> CC: devicetree@vger.kernel.org CC: linux-soc@vger.kernel.org CC: linux-arm-kernel@lists.infradead.org Signed-off-by: Todor Tomov <todor.tomov@linaro.org> --- arch/arm64/boot/dts/qcom/msm8916-pins.dtsi | 14 ++++++++++++++ arch/arm64/boot/dts/qcom/msm8916.dtsi | 21 +++++++++++++++++++++ arch/arm64/boot/dts/qcom/msm8996-pins.dtsi | 14 ++++++++++++++ arch/arm64/boot/dts/qcom/msm8996.dtsi | 24 ++++++++++++++++++++++++ 4 files changed, 73 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/msm8916-pins.dtsi b/arch/arm64/boot/dts/qcom/msm8916-pins.dtsi index 4cb0b58..4fa6a72 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-pins.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8916-pins.dtsi @@ -733,4 +733,18 @@ bias-pull-up; }; }; + + cci_lines { + cci0_default: cci0_default { + pinmux { + function = "cci_i2c"; + pins = "gpio29", "gpio30"; + }; + pinconf { + pins = "gpio29", "gpio30"; + drive-strength = <16>; + bias-disable; + }; + }; + }; }; diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916.dtsi index dc38175..4885360 100644 --- a/arch/arm64/boot/dts/qcom/msm8916.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi @@ -1325,6 +1325,27 @@ compatible = "venus-encoder"; }; }; + + cci: qcom,cci@1b0c000 { + compatible = "qcom,cci-v1.0.8"; + #address-cells = <1>; + #size-cells = <0>; + reg = <0x1b0c000 0x1000>; + reg-names = "cci"; + interrupts = <GIC_SPI 50 IRQ_TYPE_EDGE_RISING>; + interrupt-names = "cci"; + clocks = <&gcc GCC_CAMSS_TOP_AHB_CLK>, + <&gcc GCC_CAMSS_CCI_AHB_CLK>, + <&gcc GCC_CAMSS_CCI_CLK>, + <&gcc GCC_CAMSS_AHB_CLK>; + clock-names = "camss_top_ahb", + "cci_ahb", + "cci", + "camss_ahb"; + pinctrl-names = "default"; + pinctrl-0 = <&cci0_default>; + status = "disabled"; + }; }; smd { diff --git a/arch/arm64/boot/dts/qcom/msm8996-pins.dtsi b/arch/arm64/boot/dts/qcom/msm8996-pins.dtsi index 6599404..3faaa4c 100644 --- a/arch/arm64/boot/dts/qcom/msm8996-pins.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8996-pins.dtsi @@ -300,4 +300,18 @@ drive-strength = <2>; /* 2 MA */ }; }; + + cci_lines { + cci0_default: cci0_default { + pinmux { + function = "cci_i2c"; + pins = "gpio17", "gpio18"; + }; + pinconf { + pins = "gpio17", "gpio18"; + drive-strength = <16>; + bias-disable; + }; + }; + }; }; diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi index 887b61c..118722f 100644 --- a/arch/arm64/boot/dts/qcom/msm8996.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi @@ -819,6 +819,30 @@ phy-names = "usb2-phy", "usb3-phy"; }; }; + + cci: qcom,cci@a0c000 { + compatible = "qcom,cci-v1.4.0"; + #address-cells = <1>; + #size-cells = <0>; + reg = <0xa0c000 0x1000>; + reg-names = "cci"; + interrupts = <GIC_SPI 295 IRQ_TYPE_EDGE_RISING>; + interrupt-names = "cci"; + power-domains = <&mmcc CAMSS_GDSC>; + clocks = <&mmcc MMSS_MMAGIC_AHB_CLK>, + <&mmcc CAMSS_TOP_AHB_CLK>, + <&mmcc CAMSS_CCI_AHB_CLK>, + <&mmcc CAMSS_CCI_CLK>, + <&mmcc CAMSS_AHB_CLK>; + clock-names = "mmss_mmagic_ahb", + "camss_top_ahb", + "cci_ahb", + "cci", + "camss_ahb"; + pinctrl-names = "default"; + pinctrl-0 = <&cci0_default>; + status = "disabled"; + }; }; adsp-pil { -- 2.7.4 ^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-10-12 14:50 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <1506953613-23875-1-git-send-email-todor.tomov@linaro.org>
2017-10-02 14:13 ` [PATCH 1/4] dt-bindings: media: Binding document for Qualcomm Camera Control Interface driver Todor Tomov
2017-10-06 5:29 ` Bjorn Andersson
2017-10-12 14:50 ` Todor Tomov
2017-10-02 14:13 ` [PATCH 4/4] arm64: dts: qcom: Add Camera Control Interface support Todor Tomov
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).