Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 86e3974b authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "mhi: Enable logging based on defconfig option"

parents f6d7a6d8 f01ea865

Documentation/devicetree/bindings/mhi/msm_mhi.txt

+2 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ Required properties: 
  - mhi-chan-cfg-#: mhi channel configuration parameters for platform

  - mhi-event-cfg-#: mhi event ring configuration parameters for platform

  - mhi-event-rings: number of event rings supported by platform

  - mhi-dev-address-win-size: size of the MHI device addressing window



Example:
@@ -36,4 +37,5 @@ Example: 
		mhi-event-rings = <6>;

		mhi-chan-cfg-102 = <0x66 0x80 0x5 0x62>;

		mhi-event-cfg-0 = <0x80 0x0 0x0 0x11>;

		mhi-dev-address-win-size= <0x10 0x00000000>;

	};

arch/arm/boot/dts/qcom/apq8096-v3-pmi8994-mdm9x55-i2s-cdp.dts

+47 −1
Original line number Diff line number Diff line 
/* 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,52 @@ 
	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>;

	mhi-dev-address-win-size = <0x10 0x00000000>;

};



&pm8994_mpps {

	mpp@a100 { /* MPP 2*/

		/* MDM PON conrol*/

arch/arm/boot/dts/qcom/apq8096-v3-pmi8994-mdm9x55-i2s-mtp.dts

+47 −1
Original line number Diff line number Diff line 
/* 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,52 @@ 
	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>;

	mhi-dev-address-win-size = <0x10 0x00000000>;

};



&pm8994_mpps {

	mpp@a100 { /* MPP 2*/

		/* MDM PON conrol*/

arch/arm/boot/dts/qcom/apq8096-v3-pmi8994-mdm9x55-slimbus-mtp.dts

+47 −1
Original line number Diff line number Diff line 
/* 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,52 @@ 
	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>;

	mhi-dev-address-win-size = <0x10 0x00000000>;

};



&pm8994_mpps {

	mpp@a100 { /* MPP 2*/

		/* MDM PON conrol*/

arch/arm/boot/dts/qcom/apq8096-v3-pmi8994-pm8004-mdm9x55-i2s-cdp.dts

+47 −1
Original line number Diff line number Diff line 
/* 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,52 @@ 
	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>;

	mhi-dev-address-win-size = <0x10 0x00000000>;

};



&pm8994_mpps {

	mpp@a100 { /* MPP 2*/

		/* MDM PON conrol*/