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

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

Merge "msm: cpp: Use the micro reset binding to decide if micro can be reset"

parents 70e6c2b9 92d5d6f2

Documentation/devicetree/bindings/media/video/msm-cpp.txt

+3 −0
Original line number Diff line number Diff line
@@ -68,6 +68,8 @@ Optional properties: 
  platforms that support such feature.

- qcom,vbif-setting: The offset and value for vbif core qos registers.

  The first entry is register offset and second entry is register value.

- qcom,micro-reset: Boolean flag indicating if micro reset need to be enabled.

  This needs to present on platforms that support this feature.



Example:
@@ -111,6 +113,7 @@ Example: 
			<0x2C 0x10000000>;

		qcom,src-clock-rates = <100000000 200000000 384000000 404000000

			480000000 576000000 600000000>;

		qcom,micro-reset;

		qcom,cpp-fw-payload-info {

			qcom,stripe-base = <553>;

			qcom,plane-base = <481>;

drivers/media/platform/msm/camera_v2/pproc/cpp/msm_cpp_soc.c

+5 −0
Original line number Diff line number Diff line
@@ -53,6 +53,11 @@ void msm_cpp_fetch_dt_params(struct cpp_device *cpp_dev) 
			&cpp_dev->bus_master_flag);

	if (rc)

		cpp_dev->bus_master_flag = 0;



	if (of_property_read_bool(of_node, "qcom,micro-reset"))

		cpp_dev->micro_reset = 1;

	else

		cpp_dev->micro_reset = 0;

}



int msm_cpp_get_clock_index(struct cpp_device *cpp_dev, const char *clk_name)