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

Commit 357700f1 authored by Sridhar Gujje's avatar Sridhar Gujje
Browse files

Merge commit 'b469676f' into msm-4.9 - PC212 



* commit 'b469676f':
  Revert "msm: camera: isp: improve flush logic to prevent race condition"
  msm: camera: cpas: Modify error check
  msm: camera: Remove sysfs bind/unbind files
  msm: camera: isp: Fix race condition in tasklet stop
  msm: camera: sync: resolve race condition between merge and signal
  msm: camera: Check for valid per frame i2c data.
  msm: camera: jpeg: Fix flush with request id
  msm: camera: flash: Remove wrong bubble condition check
  msm: camera: eeprom: Memory allocation using vzalloc
  msm: camera: fix double free in jpeg mgr
  msm: camera: cpas: Update logic for reading hw version at runtime
  msm: camera: icp: icp log modification
  msm: camera: isp: Fix the return value for CDM timeout error
  msm: camera: cdm: Add log utility for CDM cmd buffers
  msm: camera: cci: Fix error check
  msm: camera: icp: Add release call
  msm: camera: Improve logging capability in kmd drivers
  msm: camera: Check for valid per frame i2c data.
  msm: camera: debugfs to update clk rates dynamically
  ARM: dts: msm: Add src clk name in csiphy node
  ARM: dts: msm: Add field to determine clock control
  msm: camera: Return IRQ_NONE from irq handlers
  msm: camera: Dynamically enable CSID SOF irq
  Revert "msm: camera: icp: removes reference input depedency"
  msm: camera: cpas: Add protection for concurrent execution
  msm: camera: sensor: Allocate buffer to be of DMA memory type
  msm: camera: Fix power related issues across sensor modules
  msm: camera: isp: acquire tasklet cmd before processing top half
  msm: camera: Fix for actuator manual move lens not working
  msm: camera: icp: removes reference input depedency
  msm: camera: isp: improve flush logic to prevent race condition
  msm: camera: sensor: Add support to vote for PWM mode
  msm: camera: icp: Handle Watchdog/subsystem failures
  msm: camera: reqmgr: Change state check in callbacks
  msm: camera: Correct check for rdi res_id

Change-Id: Ifd92e6d8e8d1915c6fae5a2f6717c18b96f425cd
Signed-off-by: default avatarSridhar Gujje <sgujje@codeaurora.org>
parents cbfc0b35 b469676f

Documentation/devicetree/bindings/media/video/msm-cam-cci.txt

+739 −335

File changed.

Preview size limit exceeded, changes collapsed.

Documentation/devicetree/bindings/media/video/msm-cam-fd.txt

+5 −0
Original line number Diff line number Diff line
@@ -108,6 +108,11 @@ about the device register map, interrupt map, clocks, regulators. 
  Value type: <string>

  Definition: Source clock name.



- clock-control-debugfs

  Usage: optional

  Value type: <string>

  Definition: Enable/Disable clk rate control.



- clock-cntl-level

  Usage: required

  Value type: <string>

Documentation/devicetree/bindings/media/video/msm-cam-icp.txt

+5 −0
Original line number Diff line number Diff line
@@ -110,6 +110,11 @@ and name of firmware image. 
  Value type: <string>

  Definition: Source clock name.



- clock-control-debugfs

  Usage: optional

  Value type: <string>

  Definition: Enable/Disable clk rate control.



- clocks

  Usage: required

  Value type: <phandle>

Documentation/devicetree/bindings/media/video/msm-cam-ife-csid.txt

+4 −1
Original line number Diff line number Diff line
@@ -73,7 +73,10 @@ First Level Node - CAM IFE CSID device 
  Value type: <string>

  Definition: Source clock name.





- clock-control-debugfs

  Usage: optional

  Value type: <string>

  Definition: Enable/Disable clk rate control.



Example:

Documentation/devicetree/bindings/media/video/msm-cam-vfe.txt

+5 −0
Original line number Diff line number Diff line
@@ -91,6 +91,11 @@ Optional properties: 
  Value type: <u32>

  Definition: List of clocks rates for optional clocks.



- clock-control-debugfs

  Usage: optional

  Value type: <string>

  Definition: Enable/Disable clk rate control.



Example:

	qcom,vfe0@acaf000 {

		cell-index = <0>;