[PATCH v1 0/6] Qualcomm CCI for MSM8226 and fix CCI documentation for MSM8974

[PATCH v1 0/6] Qualcomm CCI for MSM8226 and fix CCI documentation for MSM8974

[Matti Lehtimäki]

This series adds support for Camera Control Interface found on MSM8226
and adds missing clock documentation for CCI found on MSM8974. In
addition the series adds CCI device tree nodes for both MSM8226 and
MSM8974.

Luca Weiss (1):
  ARM: dts: qcom: msm8974: Add CCI bus

Matti Lehtimäki (2):
  dt-bindings: i2c: qcom,i2c-cci: Document MSM8226 compatible
  dt-bindings: i2c: qcom,i2c-cci: Document clocks for MSM8974

Rayyan Ansari (3):
  ARM: dts: qcom: msm8226: Add MMCC node
  i2c: qcom-cci: Add MSM8226 compatible
  ARM: dts: qcom: msm8226: Add CCI bus

 .../devicetree/bindings/i2c/qcom,i2c-cci.yaml | 23 ++++++-
 arch/arm/boot/dts/qcom-msm8226.dtsi           | 52 +++++++++++++++
 arch/arm/boot/dts/qcom-msm8974.dtsi           | 66 +++++++++++++++++++
 drivers/i2c/busses/i2c-qcom-cci.c             |  1 +
 4 files changed, 140 insertions(+), 2 deletions(-)

-- 
2.34.1

[PATCH v1 2/6] dt-bindings: i2c: qcom,i2c-cci: Document MSM8226 compatible

[Matti Lehtimäki]

MSM8226's Camera Control Interface has one master and 3 clocks.

Signed-off-by: Matti Lehtimäki <matti.lehtimaki@gmail.com>
---
 .../devicetree/bindings/i2c/qcom,i2c-cci.yaml | 22 +++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/Documentation/devicetree/bindings/i2c/qcom,i2c-cci.yaml b/Documentation/devicetree/bindings/i2c/qcom,i2c-cci.yaml
index e51a85848d6e..c0f9537a4bb1 100644
--- a/Documentation/devicetree/bindings/i2c/qcom,i2c-cci.yaml
+++ b/Documentation/devicetree/bindings/i2c/qcom,i2c-cci.yaml
@@ -13,6 +13,7 @@ maintainers:
 properties:
   compatible:
     enum:
+      - qcom,msm8226-cci
       - qcom,msm8916-cci
       - qcom,msm8974-cci
       - qcom,msm8996-cci
@@ -27,11 +28,11 @@ properties:
     const: 0
 
   clocks:
-    minItems: 4
+    minItems: 3
     maxItems: 6
 
   clock-names:
-    minItems: 4
+    minItems: 3
     maxItems: 6
 
   interrupts:
@@ -78,11 +79,28 @@ allOf:
         compatible:
           contains:
             enum:
+              - qcom,msm8226-cci
               - qcom,msm8916-cci
     then:
       properties:
         i2c-bus@1: false
 
+  - if:
+      properties:
+        compatible:
+          contains:
+            enum:
+              - qcom,msm8226-cci
+    then:
+      properties:
+        clocks:
+          maxItems: 3
+        clock-names:
+          items:
+            - const: camss_top_ahb
+            - const: cci_ahb
+            - const: cci
+
   - if:
       properties:
         compatible:
-- 
2.34.1

[PATCH v1 3/6] dt-bindings: i2c: qcom,i2c-cci: Document clocks for MSM8974

[Matti Lehtimäki]

Uses same clocks as MSM8226.

Signed-off-by: Matti Lehtimäki <matti.lehtimaki@gmail.com>
---
 Documentation/devicetree/bindings/i2c/qcom,i2c-cci.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Documentation/devicetree/bindings/i2c/qcom,i2c-cci.yaml b/Documentation/devicetree/bindings/i2c/qcom,i2c-cci.yaml
index c0f9537a4bb1..cf9f8fda595f 100644
--- a/Documentation/devicetree/bindings/i2c/qcom,i2c-cci.yaml
+++ b/Documentation/devicetree/bindings/i2c/qcom,i2c-cci.yaml
@@ -91,6 +91,7 @@ allOf:
           contains:
             enum:
               - qcom,msm8226-cci
+              - qcom,msm8974-cci
     then:
       properties:
         clocks:
-- 
2.34.1

[PATCH v1 4/6] i2c: qcom-cci: Add MSM8226 compatible

[Matti Lehtimäki]

From: Rayyan Ansari <rayyan@ansari.sh>

Add a compatible for MSM8226's Camera Control Interface, which is
similar to the one used on MSM8916.

Signed-off-by: Rayyan Ansari <rayyan@ansari.sh>
Signed-off-by: Matti Lehtimäki <matti.lehtimaki@gmail.com>
---
 drivers/i2c/busses/i2c-qcom-cci.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/i2c/busses/i2c-qcom-cci.c b/drivers/i2c/busses/i2c-qcom-cci.c
index ea48e6a9cfca..87739fb4388b 100644
--- a/drivers/i2c/busses/i2c-qcom-cci.c
+++ b/drivers/i2c/busses/i2c-qcom-cci.c
@@ -807,6 +807,7 @@ static const struct cci_data cci_v2_data = {
 };
 
 static const struct of_device_id cci_dt_match[] = {
+	{ .compatible = "qcom,msm8226-cci", .data = &cci_v1_data},
 	{ .compatible = "qcom,msm8916-cci", .data = &cci_v1_data},
 	{ .compatible = "qcom,msm8974-cci", .data = &cci_v1_5_data},
 	{ .compatible = "qcom,msm8996-cci", .data = &cci_v2_data},
-- 
2.34.1

Re: [PATCH v1 4/6] i2c: qcom-cci: Add MSM8226 compatible

[Loic Poulain]

On Sun, 2 Oct 2022 at 14:29, Matti Lehtimäki <matti.lehtimaki@gmail.com> wrote:
>
> From: Rayyan Ansari <rayyan@ansari.sh>
>
> Add a compatible for MSM8226's Camera Control Interface, which is
> similar to the one used on MSM8916.
>
> Signed-off-by: Rayyan Ansari <rayyan@ansari.sh>
> Signed-off-by: Matti Lehtimäki <matti.lehtimaki@gmail.com>

Reviewed-by: Loic Poulain <loic.poulain@linaro.org>

> ---
>  drivers/i2c/busses/i2c-qcom-cci.c | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/drivers/i2c/busses/i2c-qcom-cci.c b/drivers/i2c/busses/i2c-qcom-cci.c
> index ea48e6a9cfca..87739fb4388b 100644
> --- a/drivers/i2c/busses/i2c-qcom-cci.c
> +++ b/drivers/i2c/busses/i2c-qcom-cci.c
> @@ -807,6 +807,7 @@ static const struct cci_data cci_v2_data = {
>  };
>
>  static const struct of_device_id cci_dt_match[] = {
> +       { .compatible = "qcom,msm8226-cci", .data = &cci_v1_data},
>         { .compatible = "qcom,msm8916-cci", .data = &cci_v1_data},
>         { .compatible = "qcom,msm8974-cci", .data = &cci_v1_5_data},
>         { .compatible = "qcom,msm8996-cci", .data = &cci_v2_data},
> --
> 2.34.1
>

Re: [PATCH v1 2/6] dt-bindings: i2c: qcom,i2c-cci: Document MSM8226 compatible

[Krzysztof Kozlowski]

On 02/10/2022 14:28, Matti Lehtimäki wrote:
> MSM8226's Camera Control Interface has one master and 3 clocks.
> 
> Signed-off-by: Matti Lehtimäki <matti.lehtimaki@gmail.com>
> ---
>  .../devicetree/bindings/i2c/qcom,i2c-cci.yaml | 22 +++++++++++++++++--
>  1 file changed, 20 insertions(+), 2 deletions(-)
> 

Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>

Best regards,
Krzysztof

Re: [PATCH v1 3/6] dt-bindings: i2c: qcom,i2c-cci: Document clocks for MSM8974

[Krzysztof Kozlowski]

On 02/10/2022 14:28, Matti Lehtimäki wrote:
> Uses same clocks as MSM8226.
> 
> Signed-off-by: Matti Lehtimäki <matti.lehtimaki@gmail.com>


Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>

Best regards,
Krzysztof

Re: [PATCH v1 2/6] dt-bindings: i2c: qcom,i2c-cci: Document MSM8226 compatible

[Wolfram Sang]

[-- Attachment #1: Type: text/plain, Size: 238 bytes --]

On Sun, Oct 02, 2022 at 03:28:54PM +0300, Matti Lehtimäki wrote:
> MSM8226's Camera Control Interface has one master and 3 clocks.
> 
> Signed-off-by: Matti Lehtimäki <matti.lehtimaki@gmail.com>

Applied to for-current, thanks!


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [PATCH v1 3/6] dt-bindings: i2c: qcom,i2c-cci: Document clocks for MSM8974

[Wolfram Sang]

[-- Attachment #1: Type: text/plain, Size: 203 bytes --]

On Sun, Oct 02, 2022 at 03:28:55PM +0300, Matti Lehtimäki wrote:
> Uses same clocks as MSM8226.
> 
> Signed-off-by: Matti Lehtimäki <matti.lehtimaki@gmail.com>

Applied to for-current, thanks!


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [PATCH v1 4/6] i2c: qcom-cci: Add MSM8226 compatible

[Wolfram Sang]

[-- Attachment #1: Type: text/plain, Size: 376 bytes --]

On Sun, Oct 02, 2022 at 03:28:56PM +0300, Matti Lehtimäki wrote:
> From: Rayyan Ansari <rayyan@ansari.sh>
> 
> Add a compatible for MSM8226's Camera Control Interface, which is
> similar to the one used on MSM8916.
> 
> Signed-off-by: Rayyan Ansari <rayyan@ansari.sh>
> Signed-off-by: Matti Lehtimäki <matti.lehtimaki@gmail.com>

Applied to for-current, thanks!


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: (subset) [PATCH v1 0/6] Qualcomm CCI for MSM8226 and fix CCI documentation for MSM8974

[Bjorn Andersson]

On Sun, 2 Oct 2022 15:28:52 +0300, Matti Lehtimäki wrote:
> This series adds support for Camera Control Interface found on MSM8226
> and adds missing clock documentation for CCI found on MSM8974. In
> addition the series adds CCI device tree nodes for both MSM8226 and
> MSM8974.
> 
> Luca Weiss (1):
>   ARM: dts: qcom: msm8974: Add CCI bus
> 
> [...]

Applied, thanks!

[5/6] ARM: dts: qcom: msm8226: Add CCI bus
      commit: 4ab2f41b0850768716c446461653178372bcd35c
[6/6] ARM: dts: qcom: msm8974: Add CCI bus
      commit: 4dd3949d17b66144fe7c39cf68ff4bedb4154f61

Best regards,
-- 
Bjorn Andersson <andersson@kernel.org>