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

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

Merge changes Ib6eef05d,Ic0185c46 into msm-4.14 

* changes:
  defconfig: enable RPMH communication for sdmshrike
  ARM: dts: msm: add RSC device bindings for sdmshrike
parents 756c9562 606f9282

arch/arm64/boot/dts/qcom/sdmshrike.dtsi

+33 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 


#include "skeleton64.dtsi"

#include <dt-bindings/interrupt-controller/arm-gic.h>

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



/ {

	model = "Qualcomm Technologies, Inc. SDMSHRIKE";
@@ -310,6 +311,38 @@ 
			compatible = "qcom,llcc-amon";

		};

	};



	cmd_db: qcom,cmd-db@c3f000c {

		compatible = "qcom,cmd-db";

		reg = <0xc3f000c 8>;

	};



	apps_rsc: mailbox@18220000 {

		compatible = "qcom,tcs-drv";

		label = "apps_rsc";

		reg = <0x18220000 0x100>, <0x18220d00 0x3000>;

		interrupts = <GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>;

		#mbox-cells = <1>;

		qcom,drv-id = <2>;

		qcom,tcs-config = <ACTIVE_TCS  2>,

				  <SLEEP_TCS   3>,

				  <WAKE_TCS    3>,

				  <CONTROL_TCS 1>;

	};



	disp_rsc: mailbox@af20000 {

		status = "disabled";

		compatible = "qcom,tcs-drv";

		label = "display_rsc";

		reg = <0xaf20000 0x100>, <0xaf21c00 0x3000>;

		interrupts = <GIC_SPI 129 IRQ_TYPE_LEVEL_HIGH>;

		#mbox-cells = <1>;

		qcom,drv-id = <0>;

		qcom,tcs-config = <ACTIVE_TCS  2>,

				  <SLEEP_TCS   1>,

				  <WAKE_TCS    1>,

				  <CONTROL_TCS 0>;

	};

};



#include "sdmshrike-pinctrl.dtsi"

arch/arm64/configs/sdmshrike-perf_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -297,6 +297,8 @@ CONFIG_HWSPINLOCK_QCOM=y 
CONFIG_ARM_SMMU=y

CONFIG_QCOM_LAZY_MAPPING=y

CONFIG_QCOM_SMEM=y

CONFIG_QCOM_COMMAND_DB=y

CONFIG_QTI_RPMH_API=y

CONFIG_IIO=y

CONFIG_PWM=y

CONFIG_ANDROID=y

arch/arm64/configs/sdmshrike_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -304,6 +304,8 @@ CONFIG_HWSPINLOCK_QCOM=y 
CONFIG_ARM_SMMU=y

CONFIG_QCOM_LAZY_MAPPING=y

CONFIG_QCOM_SMEM=y

CONFIG_QCOM_COMMAND_DB=y

CONFIG_QTI_RPMH_API=y

CONFIG_IIO=y

CONFIG_PWM=y

CONFIG_PHY_XGENE=y