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

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

Merge "ARM: dts: msm: Refactor cam_hw_fuse entry" into camera-kernel.lnx.4.0

parents 0693537f 4d51dd69

bindings/msm-cam-cpas.txt

+9 −3
Original line number Diff line number Diff line
@@ -67,9 +67,15 @@ 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:fuse_address> <u32:fuse_mask> <u32:fuse_type> <u32:hw_map>

  Definition: List of fuse based features and respective fuse info.

  fuse_id: fuse id for each features

  fuse_address: fuse register io address

  fuse_mask: fuse mask for the fuse registers

  fuse_type: fuse feature is enable, disable or value type

  hw_map: Hw map of the feature, set bit positions which HWs are

	supported for that feature. Use 0xFF if all HWs supported





- interrupt-names

  Usage: optional

lito-camera.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -1039,8 +1039,8 @@ 
		reg = <0xac40000 0x1000>,

			<0xac42000 0x6000>;

		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 0x20000000 CAM_CPAS_FEATURE_TYPE_ENABLE 0xFF>,

			<CAM_CPAS_SECURE_CAMERA_ENABLE 0x00780210 0x40000 CAM_CPAS_FEATURE_TYPE_ENABLE 0xFF>;

		interrupt-names = "cpas_camnoc";

		interrupts = <GIC_SPI 459 IRQ_TYPE_EDGE_RISING>;

		camnoc-axi-min-ib-bw = <3000000000>;

shima-camera.dtsi

+2 −1
Original line number Diff line number Diff line
@@ -1317,7 +1317,8 @@ 
		reg = <0xac40000 0x1000>,

			<0xac42000 0x8000>;

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

		cam_hw_fuse = <CAM_CPAS_MF_HDR_ENABLE 0x007801E0 22>;

		cam_hw_fuse = <CAM_CPAS_MF_HDR_ENABLE 0x007801E0 0x400000 CAM_CPAS_FEATURE_TYPE_ENABLE 0xFF>,

			<CAM_CPAS_MP_LIMIT_FUSE 0x7801EC 0x18000000 CAM_CPAS_FEATURE_TYPE_VALUE 0xFF>;

		interrupt-names = "cpas_camnoc";

		interrupts = <GIC_SPI 459 IRQ_TYPE_EDGE_RISING>;

		camnoc-axi-min-ib-bw = <3000000000>;