diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-03-03 17:39:22 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-03-03 17:39:21 -0800 |
| commit | f13bb40b09f583d4e55efc1e8ed21d053f59e619 (patch) | |
| tree | 6a230c2aed9f88f739c411050105783c151056ad | |
| parent | 92751c23bd9e92dd3a2d2fd16d5054b3aa905716 (diff) | |
| parent | adad17d072d79ac826f377221a0a8f3c56aef8c1 (diff) | |
Merge "ARM: dts: msm: Update SDCC bus voting for SDM660"
| -rw-r--r-- | arch/arm/boot/dts/qcom/sdm660-common.dtsi | 72 | ||||
| -rw-r--r-- | arch/arm/boot/dts/qcom/sdm660.dtsi | 72 |
2 files changed, 106 insertions, 38 deletions
diff --git a/arch/arm/boot/dts/qcom/sdm660-common.dtsi b/arch/arm/boot/dts/qcom/sdm660-common.dtsi index d4461395891a..a9de658a064d 100644 --- a/arch/arm/boot/dts/qcom/sdm660-common.dtsi +++ b/arch/arm/boot/dts/qcom/sdm660-common.dtsi @@ -474,16 +474,34 @@ qcom,msm-bus,name = "sdhc1"; qcom,msm-bus,num-cases = <9>; - qcom,msm-bus,num-paths = <1>; - qcom,msm-bus,vectors-KBps = <78 512 0 0>, /* No vote */ - <78 512 1046 3200>, /* 400 KB/s*/ - <78 512 52286 160000>, /* 20 MB/s */ - <78 512 65360 200000>, /* 25 MB/s */ - <78 512 130718 400000>, /* 50 MB/s */ - <78 512 130718 400000>, /* 100 MB/s */ - <78 512 261438 800000>, /* 200 MB/s */ - <78 512 261438 800000>, /* 400 MB/s */ - <78 512 1338562 4096000>; /* Max. bandwidth */ + qcom,msm-bus,num-paths = <2>; + qcom,msm-bus,vectors-KBps = + /* No vote */ + <78 512 0 0>, <1 606 0 0>, + /* 400 KB/s*/ + <78 512 1046 3200>, + <1 606 1046 3200>, + /* 20 MB/s */ + <78 512 52286 160000>, + <1 606 52286 160000>, + /* 25 MB/s */ + <78 512 65360 200000>, + <1 606 65360 200000>, + /* 50 MB/s */ + <78 512 130718 400000>, + <1 606 130718 400000>, + /* 100 MB/s */ + <78 512 130718 400000>, + <1 606 130718 400000>, + /* 200 MB/s */ + <78 512 261438 800000>, + <1 606 261438 800000>, + /* 400 MB/s */ + <78 512 261438 800000>, + <1 606 261438 800000>, + /* Max. bandwidth */ + <78 512 1338562 4096000>, + <1 606 1338562 4096000>; qcom,bus-bw-vectors-bps = <0 400000 20000000 25000000 50000000 100000000 200000000 400000000 4294967295>; @@ -516,15 +534,31 @@ qcom,msm-bus,name = "sdhc2"; qcom,msm-bus,num-cases = <8>; - qcom,msm-bus,num-paths = <1>; - qcom,msm-bus,vectors-KBps = <81 512 0 0>, /* No vote */ - <81 512 1046 3200>, /* 400 KB/s */ - <81 512 52286 160000>, /* 20 MB/s */ - <81 512 65360 200000>, /* 25 MB/s */ - <81 512 130718 400000>, /* 50 MB/s */ - <81 512 261438 800000>, /* 100 MB/s */ - <81 512 261438 800000>, /* 200 MB/s */ - <81 512 1338562 4096000>; /* Max. bandwidth */ + qcom,msm-bus,num-paths = <2>; + qcom,msm-bus,vectors-KBps = + /* No vote */ + <81 512 0 0>, <1 608 0 0>, + /* 400 KB/s */ + <81 512 1046 3200>, + <1 608 1046 3200>, + /* 20 MB/s */ + <81 512 52286 160000>, + <1 608 52286 160000>, + /* 25 MB/s */ + <81 512 65360 200000>, + <1 608 65360 200000>, + /* 50 MB/s */ + <81 512 130718 400000>, + <1 608 130718 400000>, + /* 100 MB/s */ + <81 512 261438 800000>, + <1 608 261438 800000>, + /* 200 MB/s */ + <81 512 261438 800000>, + <1 608 261438 800000>, + /* Max. bandwidth */ + <81 512 1338562 4096000>, + <1 608 1338562 4096000>; qcom,bus-bw-vectors-bps = <0 400000 20000000 25000000 50000000 100000000 200000000 4294967295>; diff --git a/arch/arm/boot/dts/qcom/sdm660.dtsi b/arch/arm/boot/dts/qcom/sdm660.dtsi index 2d44c69ea827..c14449289594 100644 --- a/arch/arm/boot/dts/qcom/sdm660.dtsi +++ b/arch/arm/boot/dts/qcom/sdm660.dtsi @@ -1329,16 +1329,34 @@ qcom,msm-bus,name = "sdhc1"; qcom,msm-bus,num-cases = <9>; - qcom,msm-bus,num-paths = <1>; - qcom,msm-bus,vectors-KBps = <78 512 0 0>, /* No vote */ - <78 512 1046 3200>, /* 400 KB/s*/ - <78 512 52286 160000>, /* 20 MB/s */ - <78 512 65360 200000>, /* 25 MB/s */ - <78 512 130718 400000>, /* 50 MB/s */ - <78 512 130718 400000>, /* 100 MB/s */ - <78 512 261438 800000>, /* 200 MB/s */ - <78 512 261438 800000>, /* 400 MB/s */ - <78 512 1338562 4096000>; /* Max. bandwidth */ + qcom,msm-bus,num-paths = <2>; + qcom,msm-bus,vectors-KBps = + /* No vote */ + <78 512 0 0>, <1 606 0 0>, + /* 400 KB/s*/ + <78 512 1046 3200>, + <1 606 1046 3200>, + /* 20 MB/s */ + <78 512 52286 160000>, + <1 606 52286 160000>, + /* 25 MB/s */ + <78 512 65360 200000>, + <1 606 65360 200000>, + /* 50 MB/s */ + <78 512 130718 400000>, + <1 606 130718 400000>, + /* 100 MB/s */ + <78 512 130718 400000>, + <1 606 130718 400000>, + /* 200 MB/s */ + <78 512 261438 800000>, + <1 606 261438 800000>, + /* 400 MB/s */ + <78 512 261438 800000>, + <1 606 261438 800000>, + /* Max. bandwidth */ + <78 512 1338562 4096000>, + <1 606 1338562 4096000>; qcom,bus-bw-vectors-bps = <0 400000 20000000 25000000 50000000 100000000 200000000 400000000 4294967295>; @@ -1364,15 +1382,31 @@ qcom,msm-bus,name = "sdhc2"; qcom,msm-bus,num-cases = <8>; - qcom,msm-bus,num-paths = <1>; - qcom,msm-bus,vectors-KBps = <81 512 0 0>, /* No vote */ - <81 512 1046 3200>, /* 400 KB/s */ - <81 512 52286 160000>, /* 20 MB/s */ - <81 512 65360 200000>, /* 25 MB/s */ - <81 512 130718 400000>, /* 50 MB/s */ - <81 512 261438 800000>, /* 100 MB/s */ - <81 512 261438 800000>, /* 200 MB/s */ - <81 512 1338562 4096000>; /* Max. bandwidth */ + qcom,msm-bus,num-paths = <2>; + qcom,msm-bus,vectors-KBps = + /* No vote */ + <81 512 0 0>, <1 608 0 0>, + /* 400 KB/s */ + <81 512 1046 3200>, + <1 608 1046 3200>, + /* 20 MB/s */ + <81 512 52286 160000>, + <1 608 52286 160000>, + /* 25 MB/s */ + <81 512 65360 200000>, + <1 608 65360 200000>, + /* 50 MB/s */ + <81 512 130718 400000>, + <1 608 130718 400000>, + /* 100 MB/s */ + <81 512 261438 800000>, + <1 608 261438 800000>, + /* 200 MB/s */ + <81 512 261438 800000>, + <1 608 261438 800000>, + /* Max. bandwidth */ + <81 512 1338562 4096000>, + <1 608 1338562 4096000>; qcom,bus-bw-vectors-bps = <0 400000 20000000 25000000 50000000 100000000 200000000 4294967295>; |