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

Commit 366b24d4 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: Add RPMH nodes for sdxpoorwills target"

parents 8725a0c5 3e365aa5

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

+24 −2
Original line number Diff line number Diff line
@@ -10,9 +10,8 @@ 
 * GNU General Public License for more details.

 */





#include <dt-bindings/soc/qcom,tcs-mbox.h>

#include "skeleton.dtsi"



#include <dt-bindings/clock/qcom,rpmh.h>

#include <dt-bindings/clock/qcom,gcc-sdxpoorwills.h>

#include <dt-bindings/interrupt-controller/arm-gic.h>
@@ -415,6 +414,29 @@ 
		/* GPIO output to mss */

		qcom,gpio-force-stop = <&smp2pgpio_ssr_smp2p_1_out 0 0>;

	};



	apps_rsc: mailbox@17840000 {

		compatible = "qcom,tcs-drv";

		label = "apps_rsc";

		reg = <0x17840000 0x100>, <0x17840d00 0x3000>;

		interrupts = <0 17 0>;

		#mbox-cells = <1>;

		qcom,drv-id = <1>;

		qcom,tcs-config = <ACTIVE_TCS  2>,

				<SLEEP_TCS     2>,

				<WAKE_TCS      2>,

				<CONTROL_TCS   1>;

	};



	cmd_db: qcom,cmd-db@ca0000c {

		compatible = "qcom,cmd-db";

		reg = <0xca0000c 8>;

	};



	system_pm {

		compatible = "qcom,system-pm";

		mboxes = <&apps_rsc 0>;

	};

};



#include "pmxpoorwills.dtsi"

drivers/mailbox/qcom-rpmh-mailbox.c

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
#include <linux/of_irq.h>

#include <linux/platform_device.h>

#include <linux/spinlock.h>



#include <asm/arch_timer.h>

#include <asm-generic/io.h>



#include <soc/qcom/tcs.h>

drivers/soc/qcom/system_pm.c

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 


#include <linux/kernel.h>

#include <linux/platform_device.h>

#include <asm/arch_timer.h>



#include <soc/qcom/rpmh.h>

#include <soc/qcom/system_pm.h>