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

Commit 16824962 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Merge commit 'AU296' into dev/msm-4.14-display" into dev/msm-4.14-display

parents 26c3cd9b 6edab06f

AndroidKernel.mk

+2 −0
Original line number Diff line number Diff line
@@ -120,6 +120,8 @@ KERNEL_MODULES_OUT ?= $(PRODUCT_OUT)/$(KERNEL_MODULES_INSTALL)/lib/modules 


TARGET_PREBUILT_KERNEL := $(TARGET_PREBUILT_INT_KERNEL)



BOARD_VENDOR_KERNEL_MODULES += $(shell ls $(KERNEL_MODULES_OUT)/*.ko)



define mv-modules

mdpath=`find $(KERNEL_MODULES_OUT) -type f -name modules.dep`;\

if [ "$$mdpath" != "" ];then\

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
@@ -79,7 +79,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>;