From cfd091a9bb4fe086c88034edc55c80a62d320eba Mon Sep 17 00:00:00 2001 From: Sujeev Dias Date: Tue, 2 Aug 2016 19:44:37 -0700 Subject: [PATCH] ARM: dts: msm: mhi_uci: Enable MHI TF Channels Enable MHI TF channels 22, and 23 for unit testing. CRs-Fixed: 1024980 Change-Id: I38a01b25fdd3b4b330e0925cb762ec9747b31fa4 Signed-off-by: Sujeev Dias --- arch/arm/boot/dts/qcom/apq8096-v3-pmi8994-mdm9x55-i2s-cdp.dts | 4 ++-- arch/arm/boot/dts/qcom/apq8096-v3-pmi8994-mdm9x55-i2s-mtp.dts | 4 ++-- .../boot/dts/qcom/apq8096-v3-pmi8994-mdm9x55-slimbus-mtp.dts | 4 ++-- .../dts/qcom/apq8096-v3-pmi8994-pm8004-mdm9x55-i2s-cdp.dts | 4 ++-- .../dts/qcom/apq8096-v3-pmi8994-pmk8001-mdm9x55-i2s-cdp.dts | 4 ++-- arch/arm/boot/dts/qcom/apq8096-v3-pmi8996-mdm9x55-i2s-cdp.dts | 4 ++-- arch/arm/boot/dts/qcom/apq8096-v3-pmi8996-mdm9x55-i2s-mtp.dts | 4 ++-- .../boot/dts/qcom/apq8096-v3-pmi8996-mdm9x55-slimbus-mtp.dts | 4 ++-- drivers/platform/msm/mhi_uci/mhi_uci.c | 2 ++ 9 files changed, 18 insertions(+), 16 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 b434140dc88d..5e2886f7e615 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 @@ -79,8 +79,8 @@ 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-22 = <0x16 0x40 0x2 0x92>; + mhi-chan-cfg-23 = <0x17 0x40 0x2 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>; 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 d017949248a5..2ff517a2521b 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 @@ -78,8 +78,8 @@ 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-22 = <0x16 0x40 0x2 0x92>; + mhi-chan-cfg-23 = <0x17 0x40 0x2 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>; 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 2fbb98c26e2c..0b74b1b2ca6c 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 @@ -79,8 +79,8 @@ 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-22 = <0x16 0x40 0x2 0x92>; + mhi-chan-cfg-23 = <0x17 0x40 0x2 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>; 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 eae754dbd3c5..1c9d4ea56d47 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 @@ -79,8 +79,8 @@ 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-22 = <0x16 0x40 0x2 0x92>; + mhi-chan-cfg-23 = <0x17 0x40 0x2 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>; 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 17d7717587f2..7c58c05f5c61 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 @@ -79,8 +79,8 @@ 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-22 = <0x16 0x40 0x2 0x92>; + mhi-chan-cfg-23 = <0x17 0x40 0x2 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>; 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 ab51e673bc7d..71ef7617b47f 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 @@ -80,8 +80,8 @@ 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-22 = <0x16 0x40 0x2 0x92>; + mhi-chan-cfg-23 = <0x17 0x40 0x2 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>; 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 3e4d11122e01..4d136091806a 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 @@ -80,8 +80,8 @@ 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-22 = <0x16 0x40 0x2 0x92>; + mhi-chan-cfg-23 = <0x17 0x40 0x2 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>; 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 c5c1fe0115f7..8fda04fbfe92 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 @@ -80,8 +80,8 @@ 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-22 = <0x16 0x40 0x2 0x92>; + mhi-chan-cfg-23 = <0x17 0x40 0x2 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>; diff --git a/drivers/platform/msm/mhi_uci/mhi_uci.c b/drivers/platform/msm/mhi_uci/mhi_uci.c index d6eb96a3e89e..88a213b1b241 100644 --- a/drivers/platform/msm/mhi_uci/mhi_uci.c +++ b/drivers/platform/msm/mhi_uci/mhi_uci.c @@ -895,6 +895,8 @@ static int uci_init_client_attributes(struct mhi_uci_ctxt_t case MHI_CLIENT_BL_IN: case MHI_CLIENT_DUN_OUT: case MHI_CLIENT_DUN_IN: + case MHI_CLIENT_TF_OUT: + case MHI_CLIENT_TF_IN: chan_attrib->uci_ownership = 1; break; default: