Updated Add CAMSS and IMX577 sensor support for Shikra EVK

Documentation/devicetree/bindings/media/qcom,qcm2290-camss.yaml

@@ -8,16 +8,17 @@ title: Qualcomm QCM2290 Camera Subsystem (CAMSS)
 
 maintainers:
   - Loic Poulain <loic.poulain@oss.qualcomm.com>
-  - Nihal Kumar Gupta <nihal.gupta@oss.qualcomm.com>
 
 description:
   The CAMSS IP is a CSI decoder and ISP present on Qualcomm platforms.
 
 properties:
   compatible:
-    enum:
-      - qcom,qcm2290-camss
-      - qcom,shikra-camss
+    oneOf:
+      - items:
+          - const: qcom,shikra-camss
+          - const: qcom,qcm2290-camss
+      - const: qcom,qcm2290-camss
 
   reg:
     maxItems: 9
@@ -79,8 +80,14 @@ properties:
       - const: sf_mnoc
 
   iommus:
-    minItems: 1
-    maxItems: 4
+    oneOf:
+      - items:
+          - description: S1 HLOS VFE non-protected (VFE only)
+      - items:
+          - description: S1 HLOS VFE non-protected
+          - description: S1 HLOS CDM non-protected
+          - description: S1 HLOS OPE read non-protected
+          - description: S1 HLOS OPE write non-protected
 
   power-domains:
     items:

arch/arm64/boot/dts/qcom/Makefile

@@ -372,8 +372,8 @@ dtb-$(CONFIG_ARCH_QCOM)	+= shikra-cqm-evk.dtb
 dtb-$(CONFIG_ARCH_QCOM)	+= shikra-cqs-evk.dtb
 dtb-$(CONFIG_ARCH_QCOM)	+= shikra-iqs-evk.dtb
 
-shikra-cqm-evk-imx577-camera-dtbs	:= shikra-cqm-evk.dtb shikra-cqm-evk-imx577-camera.dtbo
-shikra-cqs-evk-imx577-camera-dtbs	:= shikra-cqs-evk.dtb shikra-cqm-evk-imx577-camera.dtbo
+shikra-cqm-evk-imx577-camera-dtbs	:= shikra-cqm-evk.dtb shikra-cqm-cqs-evk-imx577-camera.dtbo
+shikra-cqs-evk-imx577-camera-dtbs	:= shikra-cqs-evk.dtb shikra-cqm-cqs-evk-imx577-camera.dtbo
 shikra-iqs-evk-imx577-camera-dtbs	:= shikra-iqs-evk.dtb shikra-iqs-evk-imx577-camera.dtbo
 
 dtb-$(CONFIG_ARCH_QCOM)	+= shikra-cqm-evk-imx577-camera.dtb

arch/arm64/boot/dts/qcom/shikra-cqm-evk-imx577-camera.dtso → arch/arm64/boot/dts/qcom/shikra-cqm-cqs-evk-imx577-camera.dtso

@@ -43,21 +43,37 @@
 		reg = <0x1a>;
 
 		reset-gpios = <&tlmm 33 GPIO_ACTIVE_LOW>;
-		pinctrl-0 = <&mclk1_default>;
+		pinctrl-0 = <&cam_mclk1_default &cam1_reset_default>;
 		pinctrl-names = "default";
 
 		clocks = <&gcc GCC_CAMSS_MCLK1_CLK>;
 		assigned-clocks = <&gcc GCC_CAMSS_MCLK1_CLK>;
 		assigned-clock-rates = <24000000>;
 
+		/*
+		 * avdd and dvdd are supplied by on-board regulators on the
+		 * IMX577 module from the connector's 3.3 V rail; they are
+		 * not SoC-controlled. dovdd (1.8 V) powers the carrier board
+		 * level-shifter that translates CCI I2C and reset lines
+		 * between the SoC and the connector.
+		 */
 		dovdd-supply = <&pm4125_l15>;
 
 		port {
 			imx577_ep1: endpoint {
 				link-frequencies = /bits/ 64 <600000000>;
-				data-lanes = <0 1 2 3>;
+				data-lanes = <1 2 3 4>;
 				remote-endpoint = <&csiphy1_ep>;
 			};
 		};
 	};
 };
+
+&tlmm {
+	cam1_reset_default: cam1-reset-default-state {
+		pins = "gpio33";
+		function = "gpio";
+		drive-strength = <2>;
+		bias-disable;
+	};
+};

arch/arm64/boot/dts/qcom/shikra-iqs-evk-imx577-camera.dtso

@@ -43,21 +43,37 @@
 		reg = <0x1a>;
 
 		reset-gpios = <&tlmm 33 GPIO_ACTIVE_LOW>;
-		pinctrl-0 = <&mclk1_default>;
+		pinctrl-0 = <&cam_mclk1_default &cam1_reset_default>;
 		pinctrl-names = "default";
 
 		clocks = <&gcc GCC_CAMSS_MCLK1_CLK>;
 		assigned-clocks = <&gcc GCC_CAMSS_MCLK1_CLK>;
 		assigned-clock-rates = <24000000>;
 
+		/*
+		 * avdd and dvdd are supplied by on-board regulators on the
+		 * IMX577 module from the connector's 3.3 V rail; they are
+		 * not SoC-controlled. dovdd (1.8 V) powers the carrier board
+		 * level-shifter that translates CCI I2C and reset lines
+		 * between the SoC and the connector.
+		 */
 		dovdd-supply = <&pm8150_l15>;
 
 		port {
 			imx577_ep1: endpoint {
 				link-frequencies = /bits/ 64 <600000000>;
-				data-lanes = <0 1 2 3>;
+				data-lanes = <1 2 3 4>;
 				remote-endpoint = <&csiphy1_ep>;
 			};
 		};
 	};
 };
+
+&tlmm {
+	cam1_reset_default: cam1-reset-default-state {
+		pins = "gpio33";
+		function = "gpio";
+		drive-strength = <2>;
+		bias-disable;
+	};
+};