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

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

Merge "mhi: core: add support for priority based event processing"

parents 15f7f0c2 d5982d07

Documentation/devicetree/bindings/mhi/msm_mhi.txt

+4 −3
Original line number Diff line number Diff line
@@ -88,12 +88,13 @@ Main node properties: 
  Usage: required

  Value type: Array of <u32>

  Definition: mhi event ring configuration parameters for platform

	defined as below <A B C D E>:

	defined as below <A B C D E F>:

		A = maximum event descriptors

		B = MSI associated with event

		C = interrupt moderation (see MHI specification)

		D = Associated channel

		E = flags defined by mhi_macros.h GET_EV_PROPS

		E = priority of the event ring. 0 being the highest.

		F = flags defined by mhi_macros.h GET_EV_PROPS



- qcom,mhi-address-window

  Usage: required
@@ -147,5 +148,5 @@ mhi: qcom,mhi { 
			<100 512 1200000000 1200000000>;

	mhi-event-rings = <1>;

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

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

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

};

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

+7 −7
Original line number Diff line number Diff line 
/* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.

/* Copyright (c) 2015-2017, 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
@@ -91,12 +91,12 @@ 
	mhi-chan-cfg-101 = <0x65 0x80 0x4 0x762>;

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

	mhi-event-rings = <6>;

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

	mhi-event-cfg-1 = <0x80 0x1 0x1 0 0x11>;

	mhi-event-cfg-2 = <0x80 0x2 0x5 0 0x11>;

	mhi-event-cfg-3 = <0x100 0x3 0x1 100 0x69>;

	mhi-event-cfg-4 = <0x100 0x4 0x1 101 0x68>;

	mhi-event-cfg-5 = <0x100 0x5 0x1 102 0x48>;

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

	mhi-event-cfg-1 = <0x80 0x1 0x1 0 1 0x11>;

	mhi-event-cfg-2 = <0x80 0x2 0x5 0 2 0x11>;

	mhi-event-cfg-3 = <0x100 0x3 0x1 100 1 0x69>;

	mhi-event-cfg-4 = <0x100 0x4 0x1 101 1 0x68>;

	mhi-event-cfg-5 = <0x100 0x5 0x1 102 1 0x48>;

};



&mhi_rmnet_0 {

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

+7 −7
Original line number Diff line number Diff line 
/* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.

/* Copyright (c) 2015-2017, 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
@@ -90,12 +90,12 @@ 
	mhi-chan-cfg-101 = <0x65 0x80 0x4 0x762>;

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

	mhi-event-rings = <6>;

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

	mhi-event-cfg-1 = <0x80 0x1 0x1 0 0x11>;

	mhi-event-cfg-2 = <0x80 0x2 0x5 0 0x11>;

	mhi-event-cfg-3 = <0x100 0x3 0x1 100 0x69>;

	mhi-event-cfg-4 = <0x100 0x4 0x1 101 0x68>;

	mhi-event-cfg-5 = <0x100 0x5 0x1 102 0x48>;

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

	mhi-event-cfg-1 = <0x80 0x1 0x1 0 1 0x11>;

	mhi-event-cfg-2 = <0x80 0x2 0x5 0 2 0x11>;

	mhi-event-cfg-3 = <0x100 0x3 0x1 100 1 0x69>;

	mhi-event-cfg-4 = <0x100 0x4 0x1 101 1 0x68>;

	mhi-event-cfg-5 = <0x100 0x5 0x1 102 1 0x48>;

};



&mhi_rmnet_0 {

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

+7 −7
Original line number Diff line number Diff line 
/* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.

/* Copyright (c) 2015-2017, 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
@@ -91,12 +91,12 @@ 
	mhi-chan-cfg-101 = <0x65 0x80 0x4 0x762>;

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

	mhi-event-rings = <6>;

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

	mhi-event-cfg-1 = <0x80 0x1 0x1 0 0x11>;

	mhi-event-cfg-2 = <0x80 0x2 0x5 0 0x11>;

	mhi-event-cfg-3 = <0x100 0x3 0x1 100 0x69>;

	mhi-event-cfg-4 = <0x100 0x4 0x1 101 0x68>;

	mhi-event-cfg-5 = <0x100 0x5 0x1 102 0x48>;

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

	mhi-event-cfg-1 = <0x80 0x1 0x1 0 1 0x11>;

	mhi-event-cfg-2 = <0x80 0x2 0x5 0 2 0x11>;

	mhi-event-cfg-3 = <0x100 0x3 0x1 100 1 0x69>;

	mhi-event-cfg-4 = <0x100 0x4 0x1 101 1 0x68>;

	mhi-event-cfg-5 = <0x100 0x5 0x1 102 1 0x48>;

};



&mhi_rmnet_0 {

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

+7 −7
Original line number Diff line number Diff line 
/* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.

/* Copyright (c) 2015-2017, 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
@@ -91,12 +91,12 @@ 
	mhi-chan-cfg-101 = <0x65 0x80 0x4 0x762>;

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

	mhi-event-rings = <6>;

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

	mhi-event-cfg-1 = <0x80 0x1 0x1 0 0x11>;

	mhi-event-cfg-2 = <0x80 0x2 0x5 0 0x11>;

	mhi-event-cfg-3 = <0x100 0x3 0x1 100 0x69>;

	mhi-event-cfg-4 = <0x100 0x4 0x1 101 0x68>;

	mhi-event-cfg-5 = <0x100 0x5 0x1 102 0x48>;

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

	mhi-event-cfg-1 = <0x80 0x1 0x1 0 1 0x11>;

	mhi-event-cfg-2 = <0x80 0x2 0x5 0 2 0x11>;

	mhi-event-cfg-3 = <0x100 0x3 0x1 100 1 0x69>;

	mhi-event-cfg-4 = <0x100 0x4 0x1 101 1 0x68>;

	mhi-event-cfg-5 = <0x100 0x5 0x1 102 1 0x48>;

};



&mhi_rmnet_0 {