diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-12-20 23:45:14 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-12-20 23:45:13 -0800 |
| commit | cc4405e27b638878a7aacc4bdc8fbe3b8c2b425e (patch) | |
| tree | d28d5f6db8e149f1ecd0ef4ee51b39f5b7c34df8 | |
| parent | 70e6c2b9134f1d06aab7ac5e519d86321b59b2c2 (diff) | |
| parent | 92d5d6f27e1f18ab55dab1fa478ddf9228a5a1d8 (diff) | |
Merge "msm: cpp: Use the micro reset binding to decide if micro can be reset"
| -rw-r--r-- | Documentation/devicetree/bindings/media/video/msm-cpp.txt | 3 | ||||
| -rw-r--r-- | drivers/media/platform/msm/camera_v2/pproc/cpp/msm_cpp_soc.c | 5 |
2 files changed, 8 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/media/video/msm-cpp.txt b/Documentation/devicetree/bindings/media/video/msm-cpp.txt index ade5fbe8cbd7..2bd9fb840830 100644 --- a/Documentation/devicetree/bindings/media/video/msm-cpp.txt +++ b/Documentation/devicetree/bindings/media/video/msm-cpp.txt @@ -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>; diff --git a/drivers/media/platform/msm/camera_v2/pproc/cpp/msm_cpp_soc.c b/drivers/media/platform/msm/camera_v2/pproc/cpp/msm_cpp_soc.c index 8213f736205a..6911e8fc5f2f 100644 --- a/drivers/media/platform/msm/camera_v2/pproc/cpp/msm_cpp_soc.c +++ b/drivers/media/platform/msm/camera_v2/pproc/cpp/msm_cpp_soc.c @@ -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) |