diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-12-20 23:45:13 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-12-20 23:45:13 -0800 |
| commit | 70e6c2b9134f1d06aab7ac5e519d86321b59b2c2 (patch) | |
| tree | 2ffe3181e2cd13ed53ebdf45c748f62e26a3863f | |
| parent | 4a3a2bdbcdbd6d0b1a0384472e017be01e7da766 (diff) | |
| parent | 1051be44eb2415c7ab20383b5b17ba15f2bfedcd (diff) | |
Merge "ARM: dts: msm: Add cpp micro reset flag for 8998 and 8996"
| -rw-r--r-- | arch/arm/boot/dts/qcom/msm8996-camera.dtsi | 1 | ||||
| -rw-r--r-- | arch/arm/boot/dts/qcom/msm8998-camera.dtsi | 1 | ||||
| -rw-r--r-- | arch/arm/boot/dts/qcom/msm8998-v2-camera.dtsi | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/qcom/msm8996-camera.dtsi b/arch/arm/boot/dts/qcom/msm8996-camera.dtsi index ec07030092ca..ec713e1b11fd 100644 --- a/arch/arm/boot/dts/qcom/msm8996-camera.dtsi +++ b/arch/arm/boot/dts/qcom/msm8996-camera.dtsi @@ -644,6 +644,7 @@ qcom,msm-bus-vector-dyn-vote; qcom,src-clock-rates = <100000000 200000000 320000000 480000000 640000000>; + qcom,micro-reset; qcom,cpp-fw-payload-info { qcom,stripe-base = <553>; qcom,plane-base = <481>; diff --git a/arch/arm/boot/dts/qcom/msm8998-camera.dtsi b/arch/arm/boot/dts/qcom/msm8998-camera.dtsi index d0fa9921da3f..976750d6a26f 100644 --- a/arch/arm/boot/dts/qcom/msm8998-camera.dtsi +++ b/arch/arm/boot/dts/qcom/msm8998-camera.dtsi @@ -424,6 +424,7 @@ reset-names = "micro_iface_reset"; qcom,src-clock-rates = <100000000 200000000 576000000 600000000>; + qcom,micro-reset; qcom,cpp-fw-payload-info { qcom,stripe-base = <790>; qcom,plane-base = <715>; diff --git a/arch/arm/boot/dts/qcom/msm8998-v2-camera.dtsi b/arch/arm/boot/dts/qcom/msm8998-v2-camera.dtsi index a81287c36266..fdc452a47a46 100644 --- a/arch/arm/boot/dts/qcom/msm8998-v2-camera.dtsi +++ b/arch/arm/boot/dts/qcom/msm8998-v2-camera.dtsi @@ -168,6 +168,7 @@ reset-names = "micro_iface_reset"; qcom,src-clock-rates = <100000000 200000000 384000000 404000000 480000000 576000000 600000000>; + qcom,micro-reset; qcom,cpp-fw-payload-info { qcom,stripe-base = <790>; qcom,plane-base = <715>; |