media: dt-bindings: nokia,smia: Amend SMIA bindings with MIPI CCS support

Amend the existing SMIA bindings by adding MIPI CCS support, with separate
compatible strings for CCS 1.0 and CCS 1.1. Rename the old bindings
accordingly as CCS is the current standard.

Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Reviewed-by: Rob Herring <robh@kernel.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/Documentation/devicetree/bindings/media/i2c/mipi-ccs.yaml b/Documentation/devicetree/bindings/media/i2c/mipi-ccs.yaml
new file mode 100644 (file)
index 0000000..a386ee2
--- /dev/null
+++ b/Documentation/devicetree/bindings/media/i2c/mipi-ccs.yaml
@@ -0,0 +1,119 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+# Copyright (C) 2014--2020 Intel Corporation
+
+$id: http://devicetree.org/schemas/media/i2c/mipi-ccs.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: MIPI CCS, SMIA++ and SMIA compliant camera sensors
+
+maintainers:
+  - Sakari Ailus <sakari.ailus@linux.intel.com>
+
+description:
+
+  CCS (Camera Command Set) is a raw Bayer camera sensor standard defined by the
+  MIPI Alliance; see
+  <URL:https://www.mipi.org/specifications/camera-command-set>.
+
+  SMIA (Standard Mobile Imaging Architecture) is an image sensor standard
+  defined jointly by Nokia and ST. SMIA++, defined by Nokia, is an extension of
+  that.
+
+  More detailed documentation can be found in
+  Documentation/devicetree/bindings/media/video-interfaces.txt .
+
+properties:
+  compatible:
+    oneOf:
+      - items:
+        - const: mipi-ccs-1.1
+        - const: mipi-ccs
+      - items:
+        - const: mipi-ccs-1.0
+        - const: mipi-ccs
+      - const: nokia,smia
+
+  reg:
+    maxItems: 1
+
+  vana-supply:
+    description: Analogue voltage supply (VANA), typically 2,8 volts (sensor
+      dependent).
+    maxItems: 1
+
+  clocks:
+    description: External clock to the sensor.
+    maxItems: 1
+
+  clock-frequency:
+    description: Frequency of the external clock to the sensor in Hz.
+
+  reset-gpios:
+    description: Reset GPIO. Also commonly called XSHUTDOWN in hardware
+      documentation.
+    maxItems: 1
+
+  flash-leds:
+    description: Flash LED phandles. See ../video-interfaces.txt for details.
+
+  lens-focus:
+    description: Lens focus controller phandles. See ../video-interfaces.txt
+      for details.
+
+  rotation:
+    description: Rotation of the sensor.  See ../video-interfaces.txt for
+      details.
+    enum: [ 0, 180 ]
+
+  port:
+    type: object
+    properties:
+      endpoint:
+        type: object
+        properties:
+          link-frequencies:
+            $ref: /schemas/types.yaml#/definitions/uint64-array
+            description: List of allowed data link frequencies.
+          data-lanes:
+            minItems: 1
+            maxItems: 8
+        required:
+          - link-frequencies
+          - data-lanes
+
+required:
+  - compatible
+  - reg
+  - clock-frequency
+  - clocks
+
+additionalProperties: false
+
+examples:
+  - |
+    #include <dt-bindings/gpio/gpio.h>
+
+    i2c2 {
+        #address-cells = <1>;
+        #size-cells = <0>;
+
+        clock-frequency = <400000>;
+
+        camera-sensor@10 {
+            compatible = "mipi-ccs-1.0", "mipi-ccs";
+            reg = <0x10>;
+            reset-gpios = <&gpio3 20 GPIO_ACTIVE_LOW>;
+            vana-supply = <&vaux3>;
+            clocks = <&omap3_isp 0>;
+            clock-frequency = <9600000>;
+            port {
+                ccs_ep: endpoint {
+                    data-lanes = <1 2>;
+                    remote-endpoint = <&csi2a_ep>;
+                    link-frequencies = /bits/ 64 <199200000 210000000
+                                                  499200000>;
+                };
+            };
+        };
+    };
+...

diff --git a/Documentation/devicetree/bindings/media/i2c/nokia,smia.yaml b/Documentation/devicetree/bindings/media/i2c/nokia,smia.yaml
deleted file mode 100644 (file)
index 47df083..0000000
--- a/Documentation/devicetree/bindings/media/i2c/nokia,smia.yaml
+++ /dev/null
@@ -1,108 +0,0 @@
-# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
-# Copyright (C) 2014--2020 Intel Corporation
-
-$id: http://devicetree.org/schemas/media/i2c/nokia,smia.yaml#
-$schema: http://devicetree.org/meta-schemas/core.yaml#
-
-title: SMIA/SMIA++ sensor
-
-maintainers:
-  - Sakari Ailus <sakari.ailus@linux.intel.com>
-
-description:
-
-  SMIA (Standard Mobile Imaging Architecture) is an image sensor standard
-  defined jointly by Nokia and ST. SMIA++, defined by Nokia, is an extension of
-  that. These definitions are valid for both types of sensors.
-
-  More detailed documentation can be found in
-  Documentation/devicetree/bindings/media/video-interfaces.txt .
-
-properties:
-  compatible:
-    const: nokia,smia
-
-  reg:
-    maxItems: 1
-
-  vana-supply:
-    description: Analogue voltage supply (VANA), typically 2,8 volts (sensor
-      dependent).
-    maxItems: 1
-
-  clocks:
-    description: External clock to the sensor.
-    maxItems: 1
-
-  clock-frequency:
-    description: Frequency of the external clock to the sensor in Hz.
-
-  reset-gpios:
-    description: Reset GPIO. Also commonly called XSHUTDOWN in hardware
-      documentation.
-    maxItems: 1
-
-  flash-leds:
-    description: Flash LED phandles. See ../video-interfaces.txt for details.
-
-  lens-focus:
-    description: Lens focus controller phandles. See ../video-interfaces.txt
-      for details.
-
-  rotation:
-    description: Rotation of the sensor.  See ../video-interfaces.txt for
-      details.
-    enum: [ 0, 180 ]
-
-  port:
-    type: object
-    properties:
-      endpoint:
-        type: object
-        properties:
-          link-frequencies:
-            $ref: /schemas/types.yaml#/definitions/uint64-array
-            description: List of allowed data link frequencies.
-          data-lanes:
-            minItems: 1
-            maxItems: 8
-        required:
-          - link-frequencies
-          - data-lanes
-
-required:
-  - compatible
-  - reg
-  - clock-frequency
-  - clocks
-
-additionalProperties: false
-
-examples:
-  - |
-    #include <dt-bindings/gpio/gpio.h>
-
-    i2c2 {
-        #address-cells = <1>;
-        #size-cells = <0>;
-
-        clock-frequency = <400000>;
-
-        camera-sensor@10 {
-            compatible = "nokia,smia";
-            reg = <0x10>;
-            reset-gpios = <&gpio3 20 GPIO_ACTIVE_LOW>;
-            vana-supply = <&vaux3>;
-            clocks = <&omap3_isp 0>;
-            clock-frequency = <9600000>;
-            port {
-                smiapp_ep: endpoint {
-                    data-lanes = <1 2>;
-                    remote-endpoint = <&csi2a_ep>;
-                    link-frequencies = /bits/ 64 <199200000 210000000
-                                                  499200000>;
-                };
-            };
-        };
-    };
-...

diff --git a/MAINTAINERS b/MAINTAINERS
index 38faf82ef7665b165c51ef4c8c36083d8bf6aada..5c05e7bf7ffde126b0cb389c1ec4f54a4870baec 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -11634,7 +11634,7 @@ MIPI CCS, SMIA AND SMIA++ IMAGE SENSOR DRIVER
 M:     Sakari Ailus <sakari.ailus@linux.intel.com>
 L:     linux-media@vger.kernel.org
 S:     Maintained
-F:     Documentation/devicetree/bindings/media/i2c/nokia,smia.yaml
+F:     Documentation/devicetree/bindings/media/i2c/mipi-ccs.yaml
 F:     Documentation/driver-api/media/drivers/ccs/
 F:     drivers/media/i2c/ccs/
 F:     drivers/media/i2c/smiapp-pll.c