ARM: dts: msm: Enable MHI channels for MSM8996/APQ8096

Enable MHI channel and event configuration for MSM8996
and APQ8096 fused platforms so they can communicate with
MDM devices. Host will be able to bring up the MDM and
initiate data traffic between the two.

Change-Id: Id9b676051547e91aa7f7e047e7d7a0e38051fba4
Signed-off-by: Andrei Danaila <adanaila@codeaurora.org>
Signed-off-by: Tony Truong <truong@codeaurora.org>

10 files changed, 453 insertions, 10 deletions

diff --git a/arch/arm/boot/dts/qcom/apq8096-v3-pmi8994-mdm9x55-i2s-cdp.dts b/arch/arm/boot/dts/qcom/apq8096-v3-pmi8994-mdm9x55-i2s-cdp.dts
index ce46b0224731..b8e53068e86b 100644
--- a/arch/arm/boot/dts/qcom/apq8096-v3-pmi8994-mdm9x55-i2s-cdp.dts
+++ b/arch/arm/boot/dts/qcom/apq8096-v3-pmi8994-mdm9x55-i2s-cdp.dts
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
@@ -52,6 +52,51 @@
 	status = "ok";
 };
 
+&mhi {
+	esoc-names = "mdm";
+	esoc-0 = <&mdm3>;
+	qcom,msm-bus,name = "mhi";
+	qcom,msm-bus,num-cases = <2>;
+	qcom,msm-bus,num-paths = <1>;
+	qcom,msm-bus,vectors-KBps =
+		<100 512 0 0>,
+		<100 512 1200000000 650000000>;
+	mhi-chan-cfg-0 = <0x0 0x80 0x2 0x92>;
+	mhi-chan-cfg-1 = <0x1 0x80 0x2 0xa2>;
+	mhi-chan-cfg-2 = <0x2 0x80 0x1 0x91>;
+	mhi-chan-cfg-3 = <0x3 0x80 0x1 0xa1>;
+	mhi-chan-cfg-4 = <0x4 0x80 0x2 0x92>;
+	mhi-chan-cfg-5 = <0x5 0x80 0x2 0xa2>;
+	mhi-chan-cfg-6 = <0x6 0xa 0x0 0x92>;
+	mhi-chan-cfg-7 = <0x7 0xa 0x0 0xa2>;
+	mhi-chan-cfg-10 = <0xa 0x80 0x1 0x92>;
+	mhi-chan-cfg-11 = <0xb 0x80 0x1 0xa2>;
+	mhi-chan-cfg-14 = <0xe 0x40 0x1 0x92>;
+	mhi-chan-cfg-15 = <0xf 0x40 0x1 0xa2>;
+	mhi-chan-cfg-16 = <0x10 0x40 0x1 0x92>;
+	mhi-chan-cfg-17 = <0x11 0x40 0x1 0xa2>;
+	mhi-chan-cfg-18 = <0x12 0x40 0x1 0x92>;
+	mhi-chan-cfg-19 = <0x13 0x40 0x1 0xa2>;
+	mhi-chan-cfg-20 = <0x14 0xa 0x0 0x92>;
+	mhi-chan-cfg-21 = <0x15 0xa 0x0 0xa2>;
+	mhi-chan-cfg-22 = <0x16 0xa 0x0 0x92>;
+	mhi-chan-cfg-23 = <0x17 0xa 0x0 0xa2>;
+	mhi-chan-cfg-24 = <0x18 0xa 0x0 0x91>;
+	mhi-chan-cfg-25 = <0x19 0xa 0x0 0xa1>;
+	mhi-chan-cfg-32 = <0x20 0x80 0x2 0x92>;
+	mhi-chan-cfg-33 = <0x21 0x80 0x2 0xa2>;
+	mhi-chan-cfg-34 = <0x22 0x80 0x2 0x92>;
+	mhi-chan-cfg-35 = <0x23 0x80 0x2 0xa2>;
+	mhi-chan-cfg-100 = <0x64 0x80 0x3 0x52>;
+	mhi-chan-cfg-101 = <0x65 0x80 0x4 0x62>;
+	mhi-event-rings = <5>;
+	mhi-event-cfg-0 = <0x80 0x0 0x1 0x11>;
+	mhi-event-cfg-1 = <0x80 0x1 0x1 0x11>;
+	mhi-event-cfg-2 = <0x80 0x2 0x5 0x11>;
+	mhi-event-cfg-3 = <0x100 0x3 0x1 0x9>;
+	mhi-event-cfg-4 = <0x100 0x4 0x1 0x8>;
+};
+
 &pm8994_mpps {
 	mpp@a100 { /* MPP 2*/
 		/* MDM PON conrol*/
diff --git a/arch/arm/boot/dts/qcom/apq8096-v3-pmi8994-mdm9x55-i2s-mtp.dts b/arch/arm/boot/dts/qcom/apq8096-v3-pmi8994-mdm9x55-i2s-mtp.dts
index 56d72694d5d1..101a28ec4058 100644
--- a/arch/arm/boot/dts/qcom/apq8096-v3-pmi8994-mdm9x55-i2s-mtp.dts
+++ b/arch/arm/boot/dts/qcom/apq8096-v3-pmi8994-mdm9x55-i2s-mtp.dts
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
@@ -51,6 +51,51 @@
 	status = "ok";
 };
 
+&mhi {
+	esoc-names = "mdm";
+	esoc-0 = <&mdm3>;
+	qcom,msm-bus,name = "mhi";
+	qcom,msm-bus,num-cases = <2>;
+	qcom,msm-bus,num-paths = <1>;
+	qcom,msm-bus,vectors-KBps =
+		<100 512 0 0>,
+		<100 512 1200000000 650000000>;
+	mhi-chan-cfg-0 = <0x0 0x80 0x2 0x92>;
+	mhi-chan-cfg-1 = <0x1 0x80 0x2 0xa2>;
+	mhi-chan-cfg-2 = <0x2 0x80 0x1 0x91>;
+	mhi-chan-cfg-3 = <0x3 0x80 0x1 0xa1>;
+	mhi-chan-cfg-4 = <0x4 0x80 0x2 0x92>;
+	mhi-chan-cfg-5 = <0x5 0x80 0x2 0xa2>;
+	mhi-chan-cfg-6 = <0x6 0xa 0x0 0x92>;
+	mhi-chan-cfg-7 = <0x7 0xa 0x0 0xa2>;
+	mhi-chan-cfg-10 = <0xa 0x80 0x1 0x92>;
+	mhi-chan-cfg-11 = <0xb 0x80 0x1 0xa2>;
+	mhi-chan-cfg-14 = <0xe 0x40 0x1 0x92>;
+	mhi-chan-cfg-15 = <0xf 0x40 0x1 0xa2>;
+	mhi-chan-cfg-16 = <0x10 0x40 0x1 0x92>;
+	mhi-chan-cfg-17 = <0x11 0x40 0x1 0xa2>;
+	mhi-chan-cfg-18 = <0x12 0x40 0x1 0x92>;
+	mhi-chan-cfg-19 = <0x13 0x40 0x1 0xa2>;
+	mhi-chan-cfg-20 = <0x14 0xa 0x0 0x92>;
+	mhi-chan-cfg-21 = <0x15 0xa 0x0 0xa2>;
+	mhi-chan-cfg-22 = <0x16 0xa 0x0 0x92>;
+	mhi-chan-cfg-23 = <0x17 0xa 0x0 0xa2>;
+	mhi-chan-cfg-24 = <0x18 0xa 0x0 0x91>;
+	mhi-chan-cfg-25 = <0x19 0xa 0x0 0xa1>;
+	mhi-chan-cfg-32 = <0x20 0x80 0x2 0x92>;
+	mhi-chan-cfg-33 = <0x21 0x80 0x2 0xa2>;
+	mhi-chan-cfg-34 = <0x22 0x80 0x2 0x92>;
+	mhi-chan-cfg-35 = <0x23 0x80 0x2 0xa2>;
+	mhi-chan-cfg-100 = <0x64 0x80 0x3 0x52>;
+	mhi-chan-cfg-101 = <0x65 0x80 0x4 0x62>;
+	mhi-event-rings = <5>;
+	mhi-event-cfg-0 = <0x80 0x0 0x1 0x11>;
+	mhi-event-cfg-1 = <0x80 0x1 0x1 0x11>;
+	mhi-event-cfg-2 = <0x80 0x2 0x5 0x11>;
+	mhi-event-cfg-3 = <0x100 0x3 0x1 0x9>;
+	mhi-event-cfg-4 = <0x100 0x4 0x1 0x8>;
+};
+
 &pm8994_mpps {
 	mpp@a100 { /* MPP 2*/
 		/* MDM PON conrol*/
diff --git a/arch/arm/boot/dts/qcom/apq8096-v3-pmi8994-mdm9x55-slimbus-mtp.dts b/arch/arm/boot/dts/qcom/apq8096-v3-pmi8994-mdm9x55-slimbus-mtp.dts
index 2ab8030004ef..6f939813feb5 100644
--- a/arch/arm/boot/dts/qcom/apq8096-v3-pmi8994-mdm9x55-slimbus-mtp.dts
+++ b/arch/arm/boot/dts/qcom/apq8096-v3-pmi8994-mdm9x55-slimbus-mtp.dts
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
@@ -52,6 +52,51 @@
 	status = "ok";
 };
 
+&mhi {
+	esoc-names = "mdm";
+	esoc-0 = <&mdm3>;
+	qcom,msm-bus,name = "mhi";
+	qcom,msm-bus,num-cases = <2>;
+	qcom,msm-bus,num-paths = <1>;
+	qcom,msm-bus,vectors-KBps =
+		<100 512 0 0>,
+		<100 512 1200000000 650000000>;
+	mhi-chan-cfg-0 = <0x0 0x80 0x2 0x92>;
+	mhi-chan-cfg-1 = <0x1 0x80 0x2 0xa2>;
+	mhi-chan-cfg-2 = <0x2 0x80 0x1 0x91>;
+	mhi-chan-cfg-3 = <0x3 0x80 0x1 0xa1>;
+	mhi-chan-cfg-4 = <0x4 0x80 0x2 0x92>;
+	mhi-chan-cfg-5 = <0x5 0x80 0x2 0xa2>;
+	mhi-chan-cfg-6 = <0x6 0xa 0x0 0x92>;
+	mhi-chan-cfg-7 = <0x7 0xa 0x0 0xa2>;
+	mhi-chan-cfg-10 = <0xa 0x80 0x1 0x92>;
+	mhi-chan-cfg-11 = <0xb 0x80 0x1 0xa2>;
+	mhi-chan-cfg-14 = <0xe 0x40 0x1 0x92>;
+	mhi-chan-cfg-15 = <0xf 0x40 0x1 0xa2>;
+	mhi-chan-cfg-16 = <0x10 0x40 0x1 0x92>;
+	mhi-chan-cfg-17 = <0x11 0x40 0x1 0xa2>;
+	mhi-chan-cfg-18 = <0x12 0x40 0x1 0x92>;
+	mhi-chan-cfg-19 = <0x13 0x40 0x1 0xa2>;
+	mhi-chan-cfg-20 = <0x14 0xa 0x0 0x92>;
+	mhi-chan-cfg-21 = <0x15 0xa 0x0 0xa2>;
+	mhi-chan-cfg-22 = <0x16 0xa 0x0 0x92>;
+	mhi-chan-cfg-23 = <0x17 0xa 0x0 0xa2>;
+	mhi-chan-cfg-24 = <0x18 0xa 0x0 0x91>;
+	mhi-chan-cfg-25 = <0x19 0xa 0x0 0xa1>;
+	mhi-chan-cfg-32 = <0x20 0x80 0x2 0x92>;
+	mhi-chan-cfg-33 = <0x21 0x80 0x2 0xa2>;
+	mhi-chan-cfg-34 = <0x22 0x80 0x2 0x92>;
+	mhi-chan-cfg-35 = <0x23 0x80 0x2 0xa2>;
+	mhi-chan-cfg-100 = <0x64 0x80 0x3 0x52>;
+	mhi-chan-cfg-101 = <0x65 0x80 0x4 0x62>;
+	mhi-event-rings = <5>;
+	mhi-event-cfg-0 = <0x80 0x0 0x1 0x11>;
+	mhi-event-cfg-1 = <0x80 0x1 0x1 0x11>;
+	mhi-event-cfg-2 = <0x80 0x2 0x5 0x11>;
+	mhi-event-cfg-3 = <0x100 0x3 0x1 0x9>;
+	mhi-event-cfg-4 = <0x100 0x4 0x1 0x8>;
+};
+
 &pm8994_mpps {
 	mpp@a100 { /* MPP 2*/
 		/* MDM PON conrol*/
diff --git a/arch/arm/boot/dts/qcom/apq8096-v3-pmi8994-pm8004-mdm9x55-i2s-cdp.dts b/arch/arm/boot/dts/qcom/apq8096-v3-pmi8994-pm8004-mdm9x55-i2s-cdp.dts
index 696e37361983..64b6f14d501a 100644
--- a/arch/arm/boot/dts/qcom/apq8096-v3-pmi8994-pm8004-mdm9x55-i2s-cdp.dts
+++ b/arch/arm/boot/dts/qcom/apq8096-v3-pmi8994-pm8004-mdm9x55-i2s-cdp.dts
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
@@ -52,6 +52,51 @@
 	status = "ok";
 };
 
+&mhi {
+	esoc-names = "mdm";
+	esoc-0 = <&mdm3>;
+	qcom,msm-bus,name = "mhi";
+	qcom,msm-bus,num-cases = <2>;
+	qcom,msm-bus,num-paths = <1>;
+	qcom,msm-bus,vectors-KBps =
+		<100 512 0 0>,
+		<100 512 1200000000 650000000>;
+	mhi-chan-cfg-0 = <0x0 0x80 0x2 0x92>;
+	mhi-chan-cfg-1 = <0x1 0x80 0x2 0xa2>;
+	mhi-chan-cfg-2 = <0x2 0x80 0x1 0x91>;
+	mhi-chan-cfg-3 = <0x3 0x80 0x1 0xa1>;
+	mhi-chan-cfg-4 = <0x4 0x80 0x2 0x92>;
+	mhi-chan-cfg-5 = <0x5 0x80 0x2 0xa2>;
+	mhi-chan-cfg-6 = <0x6 0xa 0x0 0x92>;
+	mhi-chan-cfg-7 = <0x7 0xa 0x0 0xa2>;
+	mhi-chan-cfg-10 = <0xa 0x80 0x1 0x92>;
+	mhi-chan-cfg-11 = <0xb 0x80 0x1 0xa2>;
+	mhi-chan-cfg-14 = <0xe 0x40 0x1 0x92>;
+	mhi-chan-cfg-15 = <0xf 0x40 0x1 0xa2>;
+	mhi-chan-cfg-16 = <0x10 0x40 0x1 0x92>;
+	mhi-chan-cfg-17 = <0x11 0x40 0x1 0xa2>;
+	mhi-chan-cfg-18 = <0x12 0x40 0x1 0x92>;
+	mhi-chan-cfg-19 = <0x13 0x40 0x1 0xa2>;
+	mhi-chan-cfg-20 = <0x14 0xa 0x0 0x92>;
+	mhi-chan-cfg-21 = <0x15 0xa 0x0 0xa2>;
+	mhi-chan-cfg-22 = <0x16 0xa 0x0 0x92>;
+	mhi-chan-cfg-23 = <0x17 0xa 0x0 0xa2>;
+	mhi-chan-cfg-24 = <0x18 0xa 0x0 0x91>;
+	mhi-chan-cfg-25 = <0x19 0xa 0x0 0xa1>;
+	mhi-chan-cfg-32 = <0x20 0x80 0x2 0x92>;
+	mhi-chan-cfg-33 = <0x21 0x80 0x2 0xa2>;
+	mhi-chan-cfg-34 = <0x22 0x80 0x2 0x92>;
+	mhi-chan-cfg-35 = <0x23 0x80 0x2 0xa2>;
+	mhi-chan-cfg-100 = <0x64 0x80 0x3 0x52>;
+	mhi-chan-cfg-101 = <0x65 0x80 0x4 0x62>;
+	mhi-event-rings = <5>;
+	mhi-event-cfg-0 = <0x80 0x0 0x1 0x11>;
+	mhi-event-cfg-1 = <0x80 0x1 0x1 0x11>;
+	mhi-event-cfg-2 = <0x80 0x2 0x5 0x11>;
+	mhi-event-cfg-3 = <0x100 0x3 0x1 0x9>;
+	mhi-event-cfg-4 = <0x100 0x4 0x1 0x8>;
+};
+
 &pm8994_mpps {
 	mpp@a100 { /* MPP 2*/
 		/* MDM PON conrol*/
diff --git a/arch/arm/boot/dts/qcom/apq8096-v3-pmi8994-pm8004-pmk8001-mdm9x55-i2s-cdp.dts b/arch/arm/boot/dts/qcom/apq8096-v3-pmi8994-pm8004-pmk8001-mdm9x55-i2s-cdp.dts
index 4afe4d4f19f5..8ebad296de6a 100644
--- a/arch/arm/boot/dts/qcom/apq8096-v3-pmi8994-pm8004-pmk8001-mdm9x55-i2s-cdp.dts
+++ b/arch/arm/boot/dts/qcom/apq8096-v3-pmi8994-pm8004-pmk8001-mdm9x55-i2s-cdp.dts
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
@@ -52,6 +52,51 @@
 	status = "ok";
 };
 
+&mhi {
+	esoc-names = "mdm";
+	esoc-0 = <&mdm3>;
+	qcom,msm-bus,name = "mhi";
+	qcom,msm-bus,num-cases = <2>;
+	qcom,msm-bus,num-paths = <1>;
+	qcom,msm-bus,vectors-KBps =
+		<100 512 0 0>,
+		<100 512 1200000000 650000000>;
+	mhi-chan-cfg-0 = <0x0 0x80 0x2 0x92>;
+	mhi-chan-cfg-1 = <0x1 0x80 0x2 0xa2>;
+	mhi-chan-cfg-2 = <0x2 0x80 0x1 0x91>;
+	mhi-chan-cfg-3 = <0x3 0x80 0x1 0xa1>;
+	mhi-chan-cfg-4 = <0x4 0x80 0x2 0x92>;
+	mhi-chan-cfg-5 = <0x5 0x80 0x2 0xa2>;
+	mhi-chan-cfg-6 = <0x6 0xa 0x0 0x92>;
+	mhi-chan-cfg-7 = <0x7 0xa 0x0 0xa2>;
+	mhi-chan-cfg-10 = <0xa 0x80 0x1 0x92>;
+	mhi-chan-cfg-11 = <0xb 0x80 0x1 0xa2>;
+	mhi-chan-cfg-14 = <0xe 0x40 0x1 0x92>;
+	mhi-chan-cfg-15 = <0xf 0x40 0x1 0xa2>;
+	mhi-chan-cfg-16 = <0x10 0x40 0x1 0x92>;
+	mhi-chan-cfg-17 = <0x11 0x40 0x1 0xa2>;
+	mhi-chan-cfg-18 = <0x12 0x40 0x1 0x92>;
+	mhi-chan-cfg-19 = <0x13 0x40 0x1 0xa2>;
+	mhi-chan-cfg-20 = <0x14 0xa 0x0 0x92>;
+	mhi-chan-cfg-21 = <0x15 0xa 0x0 0xa2>;
+	mhi-chan-cfg-22 = <0x16 0xa 0x0 0x92>;
+	mhi-chan-cfg-23 = <0x17 0xa 0x0 0xa2>;
+	mhi-chan-cfg-24 = <0x18 0xa 0x0 0x91>;
+	mhi-chan-cfg-25 = <0x19 0xa 0x0 0xa1>;
+	mhi-chan-cfg-32 = <0x20 0x80 0x2 0x92>;
+	mhi-chan-cfg-33 = <0x21 0x80 0x2 0xa2>;
+	mhi-chan-cfg-34 = <0x22 0x80 0x2 0x92>;
+	mhi-chan-cfg-35 = <0x23 0x80 0x2 0xa2>;
+	mhi-chan-cfg-100 = <0x64 0x80 0x3 0x52>;
+	mhi-chan-cfg-101 = <0x65 0x80 0x4 0x62>;
+	mhi-event-rings = <5>;
+	mhi-event-cfg-0 = <0x80 0x0 0x1 0x11>;
+	mhi-event-cfg-1 = <0x80 0x1 0x1 0x11>;
+	mhi-event-cfg-2 = <0x80 0x2 0x5 0x11>;
+	mhi-event-cfg-3 = <0x100 0x3 0x1 0x9>;
+	mhi-event-cfg-4 = <0x100 0x4 0x1 0x8>;
+};
+
 &pm8994_mpps {
 	mpp@a100 { /* MPP 2*/
 		/* MDM PON conrol*/
diff --git a/arch/arm/boot/dts/qcom/apq8096-v3-pmi8994-pmk8001-mdm9x55-i2s-cdp.dts b/arch/arm/boot/dts/qcom/apq8096-v3-pmi8994-pmk8001-mdm9x55-i2s-cdp.dts
index f3916b70524a..0b1f44292517 100644
--- a/arch/arm/boot/dts/qcom/apq8096-v3-pmi8994-pmk8001-mdm9x55-i2s-cdp.dts
+++ b/arch/arm/boot/dts/qcom/apq8096-v3-pmi8994-pmk8001-mdm9x55-i2s-cdp.dts
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License version 2 and
@@ -52,6 +52,51 @@
 	status = "ok";
 };
 
+&mhi {
+	esoc-names = "mdm";
+	esoc-0 = <&mdm3>;
+	qcom,msm-bus,name = "mhi";
+	qcom,msm-bus,num-cases = <2>;
+	qcom,msm-bus,num-paths = <1>;
+	qcom,msm-bus,vectors-KBps =
+		<100 512 0 0>,
+		<100 512 1200000000 650000000>;
+	mhi-chan-cfg-0 = <0x0 0x80 0x2 0x92>;
+	mhi-chan-cfg-1 = <0x1 0x80 0x2 0xa2>;
+	mhi-chan-cfg-2 = <0x2 0x80 0x1 0x91>;
+	mhi-chan-cfg-3 = <0x3 0x80 0x1 0xa1>;
+	mhi-chan-cfg-4 = <0x4 0x80 0x2 0x92>;
+	mhi-chan-cfg-5 = <0x5 0x80 0x2 0xa2>;
+	mhi-chan-cfg-6 = <0x6 0xa 0x0 0x92>;
+	mhi-chan-cfg-7 = <0x7 0xa 0x0 0xa2>;
+	mhi-chan-cfg-10 = <0xa 0x80 0x1 0x92>;
+	mhi-chan-cfg-11 = <0xb 0x80 0x1 0xa2>;
+	mhi-chan-cfg-14 = <0xe 0x40 0x1 0x92>;
+	mhi-chan-cfg-15 = <0xf 0x40 0x1 0xa2>;
+	mhi-chan-cfg-16 = <0x10 0x40 0x1 0x92>;
+	mhi-chan-cfg-17 = <0x11 0x40 0x1 0xa2>;
+	mhi-chan-cfg-18 = <0x12 0x40 0x1 0x92>;
+	mhi-chan-cfg-19 = <0x13 0x40 0x1 0xa2>;
+	mhi-chan-cfg-20 = <0x14 0xa 0x0 0x92>;
+	mhi-chan-cfg-21 = <0x15 0xa 0x0 0xa2>;
+	mhi-chan-cfg-22 = <0x16 0xa 0x0 0x92>;
+	mhi-chan-cfg-23 = <0x17 0xa 0x0 0xa2>;
+	mhi-chan-cfg-24 = <0x18 0xa 0x0 0x91>;
+	mhi-chan-cfg-25 = <0x19 0xa 0x0 0xa1>;
+	mhi-chan-cfg-32 = <0x20 0x80 0x2 0x92>;
+	mhi-chan-cfg-33 = <0x21 0x80 0x2 0xa2>;
+	mhi-chan-cfg-34 = <0x22 0x80 0x2 0x92>;
+	mhi-chan-cfg-35 = <0x23 0x80 0x2 0xa2>;
+	mhi-chan-cfg-100 = <0x64 0x80 0x3 0x52>;
+	mhi-chan-cfg-101 = <0x65 0x80 0x4 0x62>;
+	mhi-event-rings = <5>;
+	mhi-event-cfg-0 = <0x80 0x0 0x1 0x11>;
+	mhi-event-cfg-1 = <0x80 0x1 0x1 0x11>;
+	mhi-event-cfg-2 = <0x80 0x2 0x5 0x11>;
+	mhi-event-cfg-3 = <0x100 0x3 0x1 0x9>;
+	mhi-event-cfg-4 = <0x100 0x4 0x1 0x8>;
+};
+
 &pm8994_mpps {
 	mpp@a100 { /* MPP 2*/
 		/* MDM PON conrol*/
diff --git a/arch/arm/boot/dts/qcom/apq8096-v3-pmi8996-mdm9x55-i2s-cdp.dts b/arch/arm/boot/dts/qcom/apq8096-v3-pmi8996-mdm9x55-i2s-cdp.dts
index d6c927625b66..263de076fa1f 100644
--- a/arch/arm/boot/dts/qcom/apq8096-v3-pmi8996-mdm9x55-i2s-cdp.dts
+++ b/arch/arm/boot/dts/qcom/apq8096-v3-pmi8996-mdm9x55-i2s-cdp.dts
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
@@ -53,6 +53,51 @@
 	status = "ok";
 };
 
+&mhi {
+	esoc-names = "mdm";
+	esoc-0 = <&mdm3>;
+	qcom,msm-bus,name = "mhi";
+	qcom,msm-bus,num-cases = <2>;
+	qcom,msm-bus,num-paths = <1>;
+	qcom,msm-bus,vectors-KBps =
+		<100 512 0 0>,
+		<100 512 1200000000 650000000>;
+	mhi-chan-cfg-0 = <0x0 0x80 0x2 0x92>;
+	mhi-chan-cfg-1 = <0x1 0x80 0x2 0xa2>;
+	mhi-chan-cfg-2 = <0x2 0x80 0x1 0x91>;
+	mhi-chan-cfg-3 = <0x3 0x80 0x1 0xa1>;
+	mhi-chan-cfg-4 = <0x4 0x80 0x2 0x92>;
+	mhi-chan-cfg-5 = <0x5 0x80 0x2 0xa2>;
+	mhi-chan-cfg-6 = <0x6 0xa 0x0 0x92>;
+	mhi-chan-cfg-7 = <0x7 0xa 0x0 0xa2>;
+	mhi-chan-cfg-10 = <0xa 0x80 0x1 0x92>;
+	mhi-chan-cfg-11 = <0xb 0x80 0x1 0xa2>;
+	mhi-chan-cfg-14 = <0xe 0x40 0x1 0x92>;
+	mhi-chan-cfg-15 = <0xf 0x40 0x1 0xa2>;
+	mhi-chan-cfg-16 = <0x10 0x40 0x1 0x92>;
+	mhi-chan-cfg-17 = <0x11 0x40 0x1 0xa2>;
+	mhi-chan-cfg-18 = <0x12 0x40 0x1 0x92>;
+	mhi-chan-cfg-19 = <0x13 0x40 0x1 0xa2>;
+	mhi-chan-cfg-20 = <0x14 0xa 0x0 0x92>;
+	mhi-chan-cfg-21 = <0x15 0xa 0x0 0xa2>;
+	mhi-chan-cfg-22 = <0x16 0xa 0x0 0x92>;
+	mhi-chan-cfg-23 = <0x17 0xa 0x0 0xa2>;
+	mhi-chan-cfg-24 = <0x18 0xa 0x0 0x91>;
+	mhi-chan-cfg-25 = <0x19 0xa 0x0 0xa1>;
+	mhi-chan-cfg-32 = <0x20 0x80 0x2 0x92>;
+	mhi-chan-cfg-33 = <0x21 0x80 0x2 0xa2>;
+	mhi-chan-cfg-34 = <0x22 0x80 0x2 0x92>;
+	mhi-chan-cfg-35 = <0x23 0x80 0x2 0xa2>;
+	mhi-chan-cfg-100 = <0x64 0x80 0x3 0x52>;
+	mhi-chan-cfg-101 = <0x65 0x80 0x4 0x62>;
+	mhi-event-rings = <5>;
+	mhi-event-cfg-0 = <0x80 0x0 0x1 0x11>;
+	mhi-event-cfg-1 = <0x80 0x1 0x1 0x11>;
+	mhi-event-cfg-2 = <0x80 0x2 0x5 0x11>;
+	mhi-event-cfg-3 = <0x100 0x3 0x1 0x9>;
+	mhi-event-cfg-4 = <0x100 0x4 0x1 0x8>;
+};
+
 &pm8994_mpps {
 	mpp@a100 { /* MPP 2*/
 		/* MDM PON conrol*/
diff --git a/arch/arm/boot/dts/qcom/apq8096-v3-pmi8996-mdm9x55-i2s-mtp.dts b/arch/arm/boot/dts/qcom/apq8096-v3-pmi8996-mdm9x55-i2s-mtp.dts
index 6869b19876a8..b47ba8f0cef6 100644
--- a/arch/arm/boot/dts/qcom/apq8096-v3-pmi8996-mdm9x55-i2s-mtp.dts
+++ b/arch/arm/boot/dts/qcom/apq8096-v3-pmi8996-mdm9x55-i2s-mtp.dts
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
@@ -53,6 +53,51 @@
 	status = "ok";
 };
 
+&mhi {
+	esoc-names = "mdm";
+	esoc-0 = <&mdm3>;
+	qcom,msm-bus,name = "mhi";
+	qcom,msm-bus,num-cases = <2>;
+	qcom,msm-bus,num-paths = <1>;
+	qcom,msm-bus,vectors-KBps =
+		<100 512 0 0>,
+		<100 512 1200000000 650000000>;
+	mhi-chan-cfg-0 = <0x0 0x80 0x2 0x92>;
+	mhi-chan-cfg-1 = <0x1 0x80 0x2 0xa2>;
+	mhi-chan-cfg-2 = <0x2 0x80 0x1 0x91>;
+	mhi-chan-cfg-3 = <0x3 0x80 0x1 0xa1>;
+	mhi-chan-cfg-4 = <0x4 0x80 0x2 0x92>;
+	mhi-chan-cfg-5 = <0x5 0x80 0x2 0xa2>;
+	mhi-chan-cfg-6 = <0x6 0xa 0x0 0x92>;
+	mhi-chan-cfg-7 = <0x7 0xa 0x0 0xa2>;
+	mhi-chan-cfg-10 = <0xa 0x80 0x1 0x92>;
+	mhi-chan-cfg-11 = <0xb 0x80 0x1 0xa2>;
+	mhi-chan-cfg-14 = <0xe 0x40 0x1 0x92>;
+	mhi-chan-cfg-15 = <0xf 0x40 0x1 0xa2>;
+	mhi-chan-cfg-16 = <0x10 0x40 0x1 0x92>;
+	mhi-chan-cfg-17 = <0x11 0x40 0x1 0xa2>;
+	mhi-chan-cfg-18 = <0x12 0x40 0x1 0x92>;
+	mhi-chan-cfg-19 = <0x13 0x40 0x1 0xa2>;
+	mhi-chan-cfg-20 = <0x14 0xa 0x0 0x92>;
+	mhi-chan-cfg-21 = <0x15 0xa 0x0 0xa2>;
+	mhi-chan-cfg-22 = <0x16 0xa 0x0 0x92>;
+	mhi-chan-cfg-23 = <0x17 0xa 0x0 0xa2>;
+	mhi-chan-cfg-24 = <0x18 0xa 0x0 0x91>;
+	mhi-chan-cfg-25 = <0x19 0xa 0x0 0xa1>;
+	mhi-chan-cfg-32 = <0x20 0x80 0x2 0x92>;
+	mhi-chan-cfg-33 = <0x21 0x80 0x2 0xa2>;
+	mhi-chan-cfg-34 = <0x22 0x80 0x2 0x92>;
+	mhi-chan-cfg-35 = <0x23 0x80 0x2 0xa2>;
+	mhi-chan-cfg-100 = <0x64 0x80 0x3 0x52>;
+	mhi-chan-cfg-101 = <0x65 0x80 0x4 0x62>;
+	mhi-event-rings = <5>;
+	mhi-event-cfg-0 = <0x80 0x0 0x1 0x11>;
+	mhi-event-cfg-1 = <0x80 0x1 0x1 0x11>;
+	mhi-event-cfg-2 = <0x80 0x2 0x5 0x11>;
+	mhi-event-cfg-3 = <0x100 0x3 0x1 0x9>;
+	mhi-event-cfg-4 = <0x100 0x4 0x1 0x8>;
+};
+
 &pm8994_mpps {
 	mpp@a100 { /* MPP 2*/
 		/* MDM PON conrol*/
diff --git a/arch/arm/boot/dts/qcom/apq8096-v3-pmi8996-mdm9x55-slimbus-mtp.dts b/arch/arm/boot/dts/qcom/apq8096-v3-pmi8996-mdm9x55-slimbus-mtp.dts
index b0c1b1a50467..a566d1a4b3fa 100644
--- a/arch/arm/boot/dts/qcom/apq8096-v3-pmi8996-mdm9x55-slimbus-mtp.dts
+++ b/arch/arm/boot/dts/qcom/apq8096-v3-pmi8996-mdm9x55-slimbus-mtp.dts
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
@@ -53,6 +53,51 @@
 	status = "ok";
 };
 
+&mhi {
+	esoc-names = "mdm";
+	esoc-0 = <&mdm3>;
+	qcom,msm-bus,name = "mhi";
+	qcom,msm-bus,num-cases = <2>;
+	qcom,msm-bus,num-paths = <1>;
+	qcom,msm-bus,vectors-KBps =
+		<100 512 0 0>,
+		<100 512 1200000000 650000000>;
+	mhi-chan-cfg-0 = <0x0 0x80 0x2 0x92>;
+	mhi-chan-cfg-1 = <0x1 0x80 0x2 0xa2>;
+	mhi-chan-cfg-2 = <0x2 0x80 0x1 0x91>;
+	mhi-chan-cfg-3 = <0x3 0x80 0x1 0xa1>;
+	mhi-chan-cfg-4 = <0x4 0x80 0x2 0x92>;
+	mhi-chan-cfg-5 = <0x5 0x80 0x2 0xa2>;
+	mhi-chan-cfg-6 = <0x6 0xa 0x0 0x92>;
+	mhi-chan-cfg-7 = <0x7 0xa 0x0 0xa2>;
+	mhi-chan-cfg-10 = <0xa 0x80 0x1 0x92>;
+	mhi-chan-cfg-11 = <0xb 0x80 0x1 0xa2>;
+	mhi-chan-cfg-14 = <0xe 0x40 0x1 0x92>;
+	mhi-chan-cfg-15 = <0xf 0x40 0x1 0xa2>;
+	mhi-chan-cfg-16 = <0x10 0x40 0x1 0x92>;
+	mhi-chan-cfg-17 = <0x11 0x40 0x1 0xa2>;
+	mhi-chan-cfg-18 = <0x12 0x40 0x1 0x92>;
+	mhi-chan-cfg-19 = <0x13 0x40 0x1 0xa2>;
+	mhi-chan-cfg-20 = <0x14 0xa 0x0 0x92>;
+	mhi-chan-cfg-21 = <0x15 0xa 0x0 0xa2>;
+	mhi-chan-cfg-22 = <0x16 0xa 0x0 0x92>;
+	mhi-chan-cfg-23 = <0x17 0xa 0x0 0xa2>;
+	mhi-chan-cfg-24 = <0x18 0xa 0x0 0x91>;
+	mhi-chan-cfg-25 = <0x19 0xa 0x0 0xa1>;
+	mhi-chan-cfg-32 = <0x20 0x80 0x2 0x92>;
+	mhi-chan-cfg-33 = <0x21 0x80 0x2 0xa2>;
+	mhi-chan-cfg-34 = <0x22 0x80 0x2 0x92>;
+	mhi-chan-cfg-35 = <0x23 0x80 0x2 0xa2>;
+	mhi-chan-cfg-100 = <0x64 0x80 0x3 0x52>;
+	mhi-chan-cfg-101 = <0x65 0x80 0x4 0x62>;
+	mhi-event-rings = <5>;
+	mhi-event-cfg-0 = <0x80 0x0 0x1 0x11>;
+	mhi-event-cfg-1 = <0x80 0x1 0x1 0x11>;
+	mhi-event-cfg-2 = <0x80 0x2 0x5 0x11>;
+	mhi-event-cfg-3 = <0x100 0x3 0x1 0x9>;
+	mhi-event-cfg-4 = <0x100 0x4 0x1 0x8>;
+};
+
 &pm8994_mpps {
 	mpp@a100 { /* MPP 2*/
 		/* MDM PON conrol*/
diff --git a/arch/arm/boot/dts/qcom/msm8996-v2-pmi8994-mtp.dts b/arch/arm/boot/dts/qcom/msm8996-v2-pmi8994-mtp.dts
index e28a3eeaccb6..164e89c0631c 100644
--- a/arch/arm/boot/dts/qcom/msm8996-v2-pmi8994-mtp.dts
+++ b/arch/arm/boot/dts/qcom/msm8996-v2-pmi8994-mtp.dts
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
@@ -21,3 +21,41 @@
 	compatible = "qcom,msm8996-mtp", "qcom,msm8996", "qcom,mtp";
 	qcom,board-id = <8 0>;
 };
+
+&mhi {
+	esoc-names = "mdm";
+	qcom,msm-bus,name = "mhi";
+	qcom,msm-bus,num-cases = <2>;
+	qcom,msm-bus,num-paths = <1>;
+	qcom,msm-bus,vectors-KBps =
+			<100 512 0 0>,
+			<100 512 1200000000 650000000>;
+	mhi-chan-cfg-0 = <0x0 0x80 0x2 0x92>;
+	mhi-chan-cfg-1 = <0x1 0x80 0x2 0xa2>;
+	mhi-chan-cfg-2 = <0x2 0x80 0x1 0x91>;
+	mhi-chan-cfg-3 = <0x3 0x80 0x1 0xa1>;
+	mhi-chan-cfg-4 = <0x4 0x80 0x2 0x92>;
+	mhi-chan-cfg-5 = <0x5 0x80 0x2 0xa2>;
+	mhi-chan-cfg-6 = <0x6 0xa 0x0 0x92>;
+	mhi-chan-cfg-7 = <0x7 0xa 0x0 0xa2>;
+	mhi-chan-cfg-10 = <0xa 0x80 0x1 0x92>;
+	mhi-chan-cfg-11 = <0xb 0x80 0x1 0xa2>;
+	mhi-chan-cfg-14 = <0xe 0x40 0x1 0x92>;
+	mhi-chan-cfg-15 = <0xf 0x40 0x1 0xa2>;
+	mhi-chan-cfg-16 = <0x10 0x40 0x1 0x92>;
+	mhi-chan-cfg-17 = <0x11 0x40 0x1 0xa2>;
+	mhi-chan-cfg-18 = <0x12 0x40 0x1 0x92>;
+	mhi-chan-cfg-19 = <0x13 0x40 0x1 0xa2>;
+	mhi-chan-cfg-20 = <0x14 0xa 0x0 0x92>;
+	mhi-chan-cfg-21 = <0x15 0xa 0x0 0xa2>;
+	mhi-chan-cfg-32 = <0x20 0x80 0x2 0x92>;
+	mhi-chan-cfg-33 = <0x21 0x80 0x2 0xa2>;
+	mhi-chan-cfg-100 = <0x64 0x80 0x3 0x52>;
+	mhi-chan-cfg-101 = <0x65 0x80 0x4 0x62>;
+	mhi-event-rings = <5>;
+	mhi-event-cfg-0 = <0x80 0x0 0x1 0x11>;
+	mhi-event-cfg-1 = <0x80 0x1 0x1 0x11>;
+	mhi-event-cfg-2 = <0x80 0x2 0x5 0x11>;
+	mhi-event-cfg-3 = <0x100 0x3 0x1 0x9>;
+	mhi-event-cfg-4 = <0x100 0x4 0x1 0x8>;
+};