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

Commit 3f04943d 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: Separate the SMEM and SMP2P entries for 8939/36"

parents 7012fd71 6214ea41

arch/arm/boot/dts/qcom/msm8936-smem.dtsi

0 → 100644
+68 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2014, 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

 * only version 2 as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



&soc {

	qcom,smem@86300000 {

		compatible = "qcom,smem";

		reg = <0x86300000 0x100000>,

			<0x0b011008 0x4>,

			<0x60000 0x8000>,

			<0x193D000 0x8>;

		reg-names = "smem", "irq-reg-base", "aux-mem1", "smem_targ_info_reg";

		qcom,mpu-enabled;



		qcom,smd-modem {

			compatible = "qcom,smd";

			qcom,smd-edge = <0>;

			qcom,smd-irq-offset = <0x0>;

			qcom,smd-irq-bitmask = <0x1000>;

			interrupts = <0 25 1>;

			label = "modem";

		};



		qcom,smsm-modem {

			compatible = "qcom,smsm";

			qcom,smsm-edge = <0>;

			qcom,smsm-irq-offset = <0x0>;

			qcom,smsm-irq-bitmask = <0x2000>;

			interrupts = <0 26 1>;

		};



		qcom,smd-wcnss {

			compatible = "qcom,smd";

			qcom,smd-edge = <6>;

			qcom,smd-irq-offset = <0x0>;

			qcom,smd-irq-bitmask = <0x20000>;

			interrupts = <0 142 1>;

			label = "wcnss";

		};



		qcom,smsm-wcnss {

			compatible = "qcom,smsm";

			qcom,smsm-edge = <6>;

			qcom,smsm-irq-offset = <0x0>;

			qcom,smsm-irq-bitmask = <0x80000>;

			interrupts = <0 144 1>;

		};



		qcom,smd-rpm {

			compatible = "qcom,smd";

			qcom,smd-edge = <15>;

			qcom,smd-irq-offset = <0x0>;

			qcom,smd-irq-bitmask = <0x1>;

			interrupts = <0 168 1>;

			label = "rpm";

			qcom,irq-no-suspend;

			qcom,not-loadable;

		};

	};

};

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

0 → 100644
+163 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2014, 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

 * only version 2 as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */

&soc {

	qcom,smp2p-modem {

		compatible = "qcom,smp2p";

		reg = <0x0b011008 0x4>;

		qcom,remote-pid = <1>;

		qcom,irq-bitmask = <0x4000>;

		interrupts = <0 27 1>;

	};



	qcom,smp2p-wcnss {

		compatible = "qcom,smp2p";

		reg = <0x0b011008 0x4>;

		qcom,remote-pid = <4>;

		qcom,irq-bitmask = <0x40000>;

		interrupts = <0 143 1>;

	};



	smp2pgpio_smp2p_7_in: qcom,smp2pgpio-smp2p-7-in {

		compatible = "qcom,smp2pgpio";

		qcom,entry-name = "smp2p";

		qcom,remote-pid = <7>;

		qcom,is-inbound;

		gpio-controller;

		#gpio-cells = <2>;

		interrupt-controller;

		#interrupt-cells = <2>;

	};



	qcom,smp2pgpio_test_smp2p_7_in {

		compatible = "qcom,smp2pgpio_test_smp2p_7_in";

		gpios = <&smp2pgpio_smp2p_7_in 0 0>;

	};



	smp2pgpio_smp2p_7_out: qcom,smp2pgpio-smp2p-7-out {

		compatible = "qcom,smp2pgpio";

		qcom,entry-name = "smp2p";

		qcom,remote-pid = <7>;

		gpio-controller;

		#gpio-cells = <2>;

		interrupt-controller;

		#interrupt-cells = <2>;

	};



	qcom,smp2pgpio_test_smp2p_7_out {

		compatible = "qcom,smp2pgpio_test_smp2p_7_out";

		gpios = <&smp2pgpio_smp2p_7_out 0 0>;

	};



	smp2pgpio_smp2p_1_in: qcom,smp2pgpio-smp2p-1-in {

		compatible = "qcom,smp2pgpio";

		qcom,entry-name = "smp2p";

		qcom,remote-pid = <1>;

		qcom,is-inbound;

		gpio-controller;

		#gpio-cells = <2>;

		interrupt-controller;

		#interrupt-cells = <2>;

	};



	qcom,smp2pgpio_test_smp2p_1_in {

		compatible = "qcom,smp2pgpio_test_smp2p_1_in";

		gpios = <&smp2pgpio_smp2p_1_in 0 0>;

	};



	smp2pgpio_smp2p_1_out: qcom,smp2pgpio-smp2p-1-out {

		compatible = "qcom,smp2pgpio";

		qcom,entry-name = "smp2p";

		qcom,remote-pid = <1>;

		gpio-controller;

		#gpio-cells = <2>;

		interrupt-controller;

		#interrupt-cells = <2>;

	};



	qcom,smp2pgpio_test_smp2p_1_out {

		compatible = "qcom,smp2pgpio_test_smp2p_1_out";

		gpios = <&smp2pgpio_smp2p_1_out 0 0>;

	};



	smp2pgpio_ssr_smp2p_1_in: qcom,smp2pgpio-ssr-smp2p-1-in {

		compatible = "qcom,smp2pgpio";

		qcom,entry-name = "slave-kernel";

		qcom,remote-pid = <1>;

		qcom,is-inbound;

		gpio-controller;

		#gpio-cells = <2>;

		interrupt-controller;

		#interrupt-cells = <2>;

	};



	smp2pgpio_ssr_smp2p_1_out: qcom,smp2pgpio-ssr-smp2p-1-out {

		compatible = "qcom,smp2pgpio";

		qcom,entry-name = "master-kernel";

		qcom,remote-pid = <1>;

		gpio-controller;

		#gpio-cells = <2>;

		interrupt-controller;

		#interrupt-cells = <2>;

	};



	smp2pgpio_smp2p_4_in: qcom,smp2pgpio-smp2p-4-in {

		compatible = "qcom,smp2pgpio";

		qcom,entry-name = "smp2p";

		qcom,remote-pid = <4>;

		qcom,is-inbound;

		gpio-controller;

		#gpio-cells = <2>;

		interrupt-controller;

		#interrupt-cells = <2>;

	};



	qcom,smp2pgpio_test_smp2p_4_in {

		compatible = "qcom,smp2pgpio_test_smp2p_4_in";

		gpios = <&smp2pgpio_smp2p_4_in 0 0>;

	};



	smp2pgpio_smp2p_4_out: qcom,smp2pgpio-smp2p-4-out {

		compatible = "qcom,smp2pgpio";

		qcom,entry-name = "smp2p";

		qcom,remote-pid = <4>;

		gpio-controller;

		#gpio-cells = <2>;

		interrupt-controller;

		#interrupt-cells = <2>;

	};



	qcom,smp2pgpio_test_smp2p_4_out {

		compatible = "qcom,smp2pgpio_test_smp2p_4_out";

		gpios = <&smp2pgpio_smp2p_4_out 0 0>;

	};



	smp2pgpio_ssr_smp2p_4_in: qcom,smp2pgpio-ssr-smp2p-4-in {

               compatible = "qcom,smp2pgpio";

               qcom,entry-name = "slave-kernel";

               qcom,remote-pid = <4>;

               qcom,is-inbound;

               gpio-controller;

               #gpio-cells = <2>;

               interrupt-controller;

               #interrupt-cells = <2>;

	};



	smp2pgpio_ssr_smp2p_4_out: qcom,smp2pgpio-ssr-smp2p-4-out {

               compatible = "qcom,smp2pgpio";

               qcom,entry-name = "master-kernel";

               qcom,remote-pid = <4>;

               gpio-controller;

               #gpio-cells = <2>;

               interrupt-controller;

               #interrupt-cells = <2>;

	};

};

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

+2 −0
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ 
#include <dt-bindings/clock/msm-cpu-clocks-8939.h>

#include "msm8939-common.dtsi"

#include "msm8936-cpu.dtsi"

#include "msm8936-smem.dtsi"

#include "msm8936-smp2p.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. MSM8936";

arch/arm/boot/dts/qcom/msm8939-common.dtsi

+0 −56
Original line number Diff line number Diff line
@@ -85,7 +85,6 @@ 
	soc: soc { };

};



#include "msm8939-smp2p.dtsi"

#include "msm8939-ipcrouter.dtsi"

#include "msm8939-ion.dtsi"

#include "msm-gdsc-8916.dtsi"
@@ -211,61 +210,6 @@ 
		qcom,rtb-size = <0x100000>;

	};



	qcom,smem@86300000 {

		compatible = "qcom,smem";

		reg = <0x86300000 0x100000>,

			<0x0b111008 0x4>,

			<0x60000 0x8000>,

			<0x193D000 0x8>;

		reg-names = "smem", "irq-reg-base", "aux-mem1", "smem_targ_info_reg";

		qcom,mpu-enabled;



		qcom,smd-modem {

			compatible = "qcom,smd";

			qcom,smd-edge = <0>;

			qcom,smd-irq-offset = <0x0>;

			qcom,smd-irq-bitmask = <0x1000>;

			interrupts = <0 25 1>;

			label = "modem";

		};



		qcom,smsm-modem {

			compatible = "qcom,smsm";

			qcom,smsm-edge = <0>;

			qcom,smsm-irq-offset = <0x0>;

			qcom,smsm-irq-bitmask = <0x2000>;

			interrupts = <0 26 1>;

		};



		qcom,smd-wcnss {

			compatible = "qcom,smd";

			qcom,smd-edge = <6>;

			qcom,smd-irq-offset = <0x0>;

			qcom,smd-irq-bitmask = <0x20000>;

			interrupts = <0 142 1>;

			label = "wcnss";

		};



		qcom,smsm-wcnss {

			compatible = "qcom,smsm";

			qcom,smsm-edge = <6>;

			qcom,smsm-irq-offset = <0x0>;

			qcom,smsm-irq-bitmask = <0x80000>;

			interrupts = <0 144 1>;

		};



		qcom,smd-rpm {

			compatible = "qcom,smd";

			qcom,smd-edge = <15>;

			qcom,smd-irq-offset = <0x0>;

			qcom,smd-irq-bitmask = <0x1>;

			interrupts = <0 168 1>;

			label = "rpm";

			qcom,irq-no-suspend;

			qcom,not-loadable;

		};

	};



        rpm_bus: qcom,rpm-smd {

                compatible = "qcom,rpm-smd";

                rpm-channel-name = "rpm_requests";

arch/arm/boot/dts/qcom/msm8939-smem.dtsi

0 → 100644
+68 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2014, 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

 * only version 2 as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



&soc {

	qcom,smem@86300000 {

		compatible = "qcom,smem";

		reg = <0x86300000 0x100000>,

			<0x0b111008 0x4>,

			<0x60000 0x8000>,

			<0x193D000 0x8>;

		reg-names = "smem", "irq-reg-base", "aux-mem1", "smem_targ_info_reg";

		qcom,mpu-enabled;



		qcom,smd-modem {

			compatible = "qcom,smd";

			qcom,smd-edge = <0>;

			qcom,smd-irq-offset = <0x0>;

			qcom,smd-irq-bitmask = <0x1000>;

			interrupts = <0 25 1>;

			label = "modem";

		};



		qcom,smsm-modem {

			compatible = "qcom,smsm";

			qcom,smsm-edge = <0>;

			qcom,smsm-irq-offset = <0x0>;

			qcom,smsm-irq-bitmask = <0x2000>;

			interrupts = <0 26 1>;

		};



		qcom,smd-wcnss {

			compatible = "qcom,smd";

			qcom,smd-edge = <6>;

			qcom,smd-irq-offset = <0x0>;

			qcom,smd-irq-bitmask = <0x20000>;

			interrupts = <0 142 1>;

			label = "wcnss";

		};



		qcom,smsm-wcnss {

			compatible = "qcom,smsm";

			qcom,smsm-edge = <6>;

			qcom,smsm-irq-offset = <0x0>;

			qcom,smsm-irq-bitmask = <0x80000>;

			interrupts = <0 144 1>;

		};



		qcom,smd-rpm {

			compatible = "qcom,smd";

			qcom,smd-edge = <15>;

			qcom,smd-irq-offset = <0x0>;

			qcom,smd-irq-bitmask = <0x1>;

			interrupts = <0 168 1>;

			label = "rpm";

			qcom,irq-no-suspend;

			qcom,not-loadable;

		};

	};

};