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

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

Merge changes... 

Merge changes Ic8594bbe,If93ab28f,I41a319d2,Ie4fd12d7,I84810ba8,I6d5043ff,I5d7b44ec,I70547a6c,Icb0f8f7d,I8e2519b0,I42c5e68d,I5ed5206e,I74ce62b5,I493d8592 into msm-next

* changes:
  rpmsg: glink: Do a mbox_free_channel in remove
  rpmsg: glink: Return -EAGAIN when there is no FIFO space
  rpmsg: glink: Allow unaligned data access
  rpmsg: glink: Move the common glink protocol implementation to glink_native.c
  rpmsg: glink: Split rpm_probe to reuse the common code
  rpmsg: glink: Associate indirections for pipe fifo accessor's
  rpmsg: glink: Rename glink_rpm_xx functions to qcom_glink_xx
  ARM: dts: msm: Add SMP2P entries for sdm855
  defconfig: arm64: sdm855: Enable SMP2P
  soc: qcom: smem: Increase the number of hosts
  soc: qcom: smem: Support dynamic item limit
  soc: qcom: smem: Support global partition
  soc: qcom: smem: Read version by using the smem header
  soc: qcom: smem: Use le32_to_cpu for partition size comparison
parents 7088c180 d7383e22

arch/arm64/boot/dts/qcom/sdm855-smp2p.dtsi

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

 * 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.

 */



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



&soc {



	qcom,smp2p-modem@1799000c {

		compatible = "qcom,smp2p";

		qcom,smem = <435>, <428>;

		interrupts = <GIC_SPI 451 IRQ_TYPE_EDGE_RISING>;

		qcom,ipc = <&apcs 0 14>;

		qcom,local-pid = <0>;

		qcom,remote-pid = <1>;



		modem_smp2p_out: master-kernel {

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

			#qcom,smem-state-cells = <1>;

		};



		modem_smp2p_in: slave-kernel {

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

			interrupt-controller;

			#interrupt-cells = <2>;

		};

	};



	qcom,smp2p-adsp@1799000c {

		compatible = "qcom,smp2p";

		qcom,smem = <443>, <429>;

		interrupts = <GIC_SPI 158 IRQ_TYPE_EDGE_RISING>;

		qcom,ipc = <&apcs 0 10>;

		qcom,local-pid = <0>;

		qcom,remote-pid = <2>;



		adsp_smp2p_out: master-kernel {

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

			#qcom,smem-state-cells = <1>;

		};



		adsp_smp2p_in: slave-kernel {

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

			interrupt-controller;

			#interrupt-cells = <2>;

		};

	};



	qcom,smp2p-dsps@1799000c {

		compatible = "qcom,smp2p";

		qcom,smem = <481>, <430>;

		interrupts = <GIC_SPI 172 IRQ_TYPE_EDGE_RISING>;

		qcom,ipc = <&apcs 0 26>;

		qcom,local-pid = <0>;

		qcom,remote-pid = <3>;



		dsps_smp2p_out: master-kernel {

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

			#qcom,smem-state-cells = <1>;

		};



		dsps_smp2p_in: slave-kernel {

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

			interrupt-controller;

			#interrupt-cells = <2>;

		};

	};



	qcom,smp2p-cdsp@1799000c {

		compatible = "qcom,smp2p";

		qcom,smem = <94>, <432>;

		interrupts = <GIC_SPI 576 IRQ_TYPE_EDGE_RISING>;

		qcom,ipc = <&apcs 0 6>;

		qcom,local-pid = <0>;

		qcom,remote-pid = <5>;



		cdsp_smp2p_out: master-kernel {

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

			#qcom,smem-state-cells = <1>;

		};



		cdsp_smp2p_in: slave-kernel {

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

			interrupt-controller;

			#interrupt-cells = <2>;

		};

	};

};

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

+6 −0
Original line number Diff line number Diff line
@@ -623,6 +623,11 @@ 
		hwlocks = <&tcsr_mutex 3>;

	};



	apcs: syscon@17c0000c {

		compatible = "syscon";

		reg = <0x17c0000c 0x4>;

	};



	ufsphy_mem: ufsphy_mem@1d87000 {

		reg = <0x1d87000 0xda8>; /* PHY regs */

		reg-names = "phy_mem";
@@ -935,3 +940,4 @@ 
#include "sdm855-pinctrl.dtsi"

#include "sdm855-regulator.dtsi"

#include "sdm855-ion.dtsi"

#include "sdm855-smp2p.dtsi"

arch/arm64/configs/sdm855-perf_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -318,6 +318,7 @@ CONFIG_QCOM_LLCC=y 
CONFIG_QCOM_SDM855_LLCC=y

CONFIG_QCOM_SMEM=y

CONFIG_QCOM_SCM=y

CONFIG_QCOM_SMP2P=y

CONFIG_IIO=y

CONFIG_PWM=y

CONFIG_RAS=y

arch/arm64/configs/sdm855_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -328,6 +328,7 @@ CONFIG_QCOM_LLCC=y 
CONFIG_QCOM_SDM855_LLCC=y

CONFIG_QCOM_SMEM=y

CONFIG_QCOM_SCM=y

CONFIG_QCOM_SMP2P=y

CONFIG_IIO=y

CONFIG_PWM=y

CONFIG_PHY_XGENE=y

drivers/rpmsg/Kconfig

+5 −1
Original line number Diff line number Diff line
@@ -13,9 +13,13 @@ config RPMSG_CHAR 
	  in /dev. They make it possible for user-space programs to send and

	  receive rpmsg packets.



config RPMSG_QCOM_GLINK_NATIVE

	tristate

	select RPMSG



config RPMSG_QCOM_GLINK_RPM

	tristate "Qualcomm RPM Glink driver"

	select RPMSG

        select RPMSG_QCOM_GLINK_NATIVE

	depends on HAS_IOMEM

	depends on MAILBOX

	help