Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e2564c3e authored by Camera Software Integration's avatar Camera Software Integration Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: camera: Add tfe2 fuse info to cpas node" into camera-kernel.lnx.3.1

parents d8378cd5 dfacd101

bengal-camera.dtsi

+2 −0
Original line number Diff line number Diff line
@@ -272,6 +272,8 @@ 
		reg = <0x5c11000 0x1000>,

			<0x5c13000 0x4000>;

		reg-cam-base = <0x11000 0x13000>;

		cam_hw_fuse = <CAM_CPAS_ISP_FUSE_ID   0x01B401D0 5 CAM_CPAS_FEATURE_TYPE_DISABLE  2>,

			<CAM_CPAS_ISP_PIX_FUSE_ID 0x01B401D0 6 CAM_CPAS_FEATURE_TYPE_DISABLE  2>;

		interrupt-names = "cpas_camnoc";

		interrupts = <GIC_SPI 159 IRQ_TYPE_EDGE_RISING>;

		camnoc-axi-min-ib-bw = <3000000000>;  /*Need to be verified*/

bindings/msm-cam-cpas.txt

+8 −5
Original line number Diff line number Diff line
@@ -67,9 +67,12 @@ First Level Node - CAM CPAS device 


- cam_hw_fuse

  Usage: optional

  Value type: <u32>

  Definition: List of fuse based features and respective

	fuse info.

  Value type: <u32:fuse_id> <u32:address> <u32:fuse_bit> <u32:fuse_type> <u32:hw_id>

   fuse_id: fuse id for each features

   address: fuse register io address

   fuse_bit: fuse bit number in the fuse registers

   fuse_type: fuse feature is enable type or disable type

   hw_id: Hw id of the feature



- interrupt-names

  Usage: optional
@@ -299,8 +302,8 @@ Example: 
		reg = <0xac40000 0x1000>,

			<0xac42000 0x5000>;

		reg-cam-base = <0x40000 0x42000>;

		cam_hw_fuse = <CAM_CPAS_QCFA_BINNING_ENABLE 0x00780210 29>,

			<CAM_CPAS_SECURE_CAMERA_ENABLE 0x00780210 18>;

		cam_hw_fuse = <CAM_CPAS_QCFA_BINNING_ENABLE 0x00780210 29  CAM_CPAS_FEATURE_TYPE_ENABLE 0>,

			<CAM_CPAS_SECURE_CAMERA_ENABLE 0x00780210 18 CAM_CPAS_FEATURE_TYPE_ENABLE 0>;

		interrupt-names = "cpas_camnoc";

		interrupts = <0 459 0>;

		qcom,cpas-hw-ver = <0x170100>; /* Titan v170 v1.0.0 */