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

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

Merge "Merge tmp-30f491c9 into msm-3.10"

parents 66193db9 4acd1efd
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -407,6 +407,8 @@ Fudge Factors: Fudge factors are used to boost demand for
				values when the overlap bandwidth is the
				predominant value compared to prefill bandwidth
				value.
- qcom,mdss-ib-factor-cmd:	This fudge factor is applied to calculated ib
				values in case of command mode.
- qcom,mdss-clk-factor:		This fudge factor is applied to calculated mdp
				clk rate in default conditions.

+2 −0
Original line number Diff line number Diff line
@@ -68,7 +68,9 @@ Required properties:
    - "shinetech,hi256"
    - "shinetech,s5k4e1"
    - "ovti,ov5645"
    - "ovti,ov7695"
    - "qcom,mt9m114"
    - "shinetech,gc0310"
- reg : should contain i2c slave address of the device
- qcom,csiphy-sd-index : should contain csiphy instance that will used to
    receive sensor data
+2 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ Required properties:
- qcom,clock-rates: clock rate in Hz.
- qcom,min-clock-rate: minimum clock rate in Hz, to be set to CPP hardware in
  case dynamic clock scaling based on prevalent streams need lower clock rate.
- bus_master: Flag for presence of CPP bus master

Example:

@@ -45,4 +46,5 @@ Example:
			"camss_vfe_cpp_clk","micro_iface_clk", "camss_ahb_clk";
		qcom,clock-rates = <0 465000000 0 0 465000000 0 0>;
		qcom,min-clock-rate = <465000000>;
		bus_master = <0>;
	};
+5 −0
Original line number Diff line number Diff line
@@ -20,6 +20,9 @@ Optional properties:
- qcom,reg-presets : list of offset-value pairs for registers to be written.
  The offsets are from the base offset specified in 'reg'. This is mainly
  used for QoS, VBIF, etc. presets for video.
- qcom,qdss-presets : list of physical address and memory allocation size pairs.
  when fw_debug_mode is set as HFI_DEBUG_MODE_QDSS, all firmware messages will be
  written to QDSS memory.
- qcom,msm-bus-clients : list of bus clients/consumer each listed as a node.
  The format of the node should follow the layout specified by the bus provider
  for bus consumers at Documentation/devicetree/bindings/arm/msm/msm_bus.txt.
@@ -133,6 +136,8 @@ Example:
		qcom,hfi = "venus";
		qcom,reg-presets = <0x80004 0x1>,
			<0x80178 0x00001FFF>;
		qcom,qdss-presets = <0xFC307000 0x1000>,
			<0xFC322000 0x1000>;
		qcom,max-hw-load = <1224450>; /* 4k @ 30 + 1080p @ 30*/
		clock-names = "foo_clk", "bar_clk", "baz_clk";
		qcom,clock-configs = <0x3 0x1 0x0>;
+1 −3
Original line number Diff line number Diff line
@@ -33,13 +33,11 @@
		qcom,mdss-dsi-v-top-border = <0>;
		qcom,mdss-dsi-v-bottom-border = <0>;
		qcom,mdss-dsi-bpp = <24>;
		qcom,mdss-dsi-color-order = "rgb_swap_bgr";
		qcom,mdss-dsi-underflow-color = <0xff>;
		qcom,mdss-dsi-border-color = <0>;
		qcom,mdss-dsi-on-command = [05 01 00 00 32 00 02 01 00
					05 01 00 00 0a 00 02 11 00
					15 01 00 00 0a 00 02 53 2c
					15 01 00 00 0a 00 02 51 ff
					15 01 00 00 0a 00 02 53 0c
					05 01 00 00 0a 00 02 29 00
					15 01 00 00 0a 00 02 ae 03
					15 01 00 00 0a 00 02 3a 77];
Loading