diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-12-30 06:27:16 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-12-30 06:27:16 -0800 |
| commit | d3b2123d2c3cf01f853606cfdc343d0f0c6aa491 (patch) | |
| tree | d970e5b6d5032a0d8019318dd93c6d74d615aa28 | |
| parent | fd194c107b8d68d68b4b8ac9269a6b5c2bc2a113 (diff) | |
| parent | b17b5d80dab4b90dc7897cadb2a830ec4ec5c83e (diff) | |
Merge "ARM: dts: msm: Remove unrequired vbif settings"
| -rw-r--r-- | arch/arm/boot/dts/qcom/msm8998-camera.dtsi | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/boot/dts/qcom/msm8998-camera.dtsi b/arch/arm/boot/dts/qcom/msm8998-camera.dtsi index 976750d6a26f..799455a0de2e 100644 --- a/arch/arm/boot/dts/qcom/msm8998-camera.dtsi +++ b/arch/arm/boot/dts/qcom/msm8998-camera.dtsi @@ -574,9 +574,9 @@ 0xaaa9aaa9 0xaaa9aaa9 0xaaa9aaa9>; - vbif-entries = <3>; - vbif-regs = <0x124 0xac 0xd0>; - vbif-settings = <0x3 0x40 0x1010>; + vbif-entries = <1>; + vbif-regs = <0x124>; + vbif-settings = <0x3>; ds-entries = <17>; ds-regs = <0x424 0x428 0x42c 0x430 0x434 0x438 0x43c 0x440 0x444 0x448 0x44c @@ -654,9 +654,9 @@ 0xaaa9aaa9 0xaaa9aaa9 0xaaa9aaa9>; - vbif-entries = <3>; - vbif-regs = <0x124 0xac 0xd0>; - vbif-settings = <0x3 0x40 0x1010>; + vbif-entries = <1>; + vbif-regs = <0x124>; + vbif-settings = <0x3>; ds-entries = <17>; ds-regs = <0x424 0x428 0x42c 0x430 0x434 0x438 0x43c 0x440 0x444 0x448 0x44c |