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

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

Merge "ARM: dts: msm: Fix IPC interrupt configuration for msmcobalt"

parents cc76859f a0a14b46

arch/arm/boot/dts/qcom/msmcobalt-smp2p.dtsi

+6 −6
Original line number Diff line number Diff line
@@ -10,25 +10,25 @@ 
 * GNU General Public License for more details.

 */

&soc {

	qcom,smp2p-modem@17820010 {

	qcom,smp2p-modem@17911008 {

		compatible = "qcom,smp2p";

		reg = <0x17820010 0x4>;

		reg = <0x17911008 0x4>;

		qcom,remote-pid = <1>;

		qcom,irq-bitmask = <0x4000>;

		interrupts = <0 451 1>;

	};



	qcom,smp2p-adsp@17820010 {

	qcom,smp2p-adsp@17911008 {

		compatible = "qcom,smp2p";

		reg = <0x17820010 0x4>;

		reg = <0x17911008 0x4>;

		qcom,remote-pid = <2>;

		qcom,irq-bitmask = <0x400>;

		interrupts = <0 158 1>;

	};



	qcom,smp2p-dsps@17820010 {

	qcom,smp2p-dsps@17911008 {

		compatible = "qcom,smp2p";

		reg = <0x17820010 0x4>;

		reg = <0x17911008 0x4>;

		qcom,remote-pid = <3>;

		qcom,irq-bitmask = <0x4000000>;

		interrupts = <0 178 1>;

arch/arm/boot/dts/qcom/msmcobalt.dtsi

+5 −5
Original line number Diff line number Diff line
@@ -341,7 +341,7 @@ 
	qcom,smem@86000000 {

		compatible = "qcom,smem";

		reg = <0x86000000 0x200000>,

			<0x17820010 0x4>,

			<0x17911008 0x4>,

			<0x778000 0x7000>,

			<0x1fd4000 0x8>;

		reg-names = "smem", "irq-reg-base", "aux-mem1",
@@ -448,7 +448,7 @@ 
	qcom,glink-smem-native-xprt-modem@86000000 {

		compatible = "qcom,glink-smem-native-xprt";

		reg = <0x86000000 0x200000>,

			<0x17820010 0x4>;

			<0x17911008 0x4>;

		reg-names = "smem", "irq-reg-base";

		qcom,irq-mask = <0x8000>;

		interrupts = <0 452 1>;
@@ -458,7 +458,7 @@ 
	qcom,glink-smem-native-xprt-adsp@86000000 {

		compatible = "qcom,glink-smem-native-xprt";

		reg = <0x86000000 0x200000>,

			<0x17820010 0x4>;

			<0x17911008 0x4>;

		reg-names = "smem", "irq-reg-base";

		qcom,irq-mask = <0x200>;

		interrupts = <0 157 1>;
@@ -468,7 +468,7 @@ 
	qcom,glink-smem-native-xprt-dsps@86000000 {

		compatible = "qcom,glink-smem-native-xprt";

		reg = <0x86000000 0x200000>,

			<0x17820010 0x4>;

			<0x17911008 0x4>;

		reg-names = "smem", "irq-reg-base";

		qcom,irq-mask = <0x8000000>;

		interrupts = <0 179 1>;
@@ -478,7 +478,7 @@ 
	qcom,glink-smem-native-xprt-rpm@778000 {

		compatible = "qcom,glink-rpm-native-xprt";

		reg = <0x778000 0x7000>,

			<0x17820010 0x4>;

			<0x17911008 0x4>;

		reg-names = "msgram", "irq-reg-base";

		qcom,irq-mask = <0x1>;

		interrupts = <0 168 1>;