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

Commit 9a3b96da 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 node for sdx ipc driver to communicate with AP"

parents 8fefb8de 1032fc69

arch/arm/boot/dts/qcom/sa415m-ccard-pcie-ep.dts

+5 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2019, The Linux Foundation. All rights reserved.

/* Copyright (c) 2020, 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
@@ -58,3 +58,7 @@ 
&mhi_net_device {

	status = "okay";

};



&sdx_ext_ipc {

	status = "okay";

};

arch/arm/boot/dts/qcom/sa415m-ccard.dtsi

+9 −0
Original line number Diff line number Diff line
@@ -146,6 +146,15 @@ 
		gpio = <&tlmm 23 GPIO_ACTIVE_HIGH>;

		enable-active-high;

	};



	sdx_ext_ipc: qcom,sdx_ext_ipc {

		compatible = "qcom,sdx-ext-ipc";

		qcom,ap2mdm-status-gpio = <&tlmm 95 0x00>;

		qcom,mdm2ap-status-gpio = <&tlmm 36 0x00>;

		qcom,mdm2ap-status2-gpio = <&tlmm 88 0x00>;

		status = "disabled";

	};



};



&emac_hw {

arch/arm/configs/sa415m-perf_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -374,6 +374,7 @@ CONFIG_SSR_SYSMON_NOTIF_TIMEOUT=20000 
CONFIG_SSR_SUBSYS_NOTIF_TIMEOUT=20000

CONFIG_MSM_BOOT_STATS=y

CONFIG_MSM_BOOT_TIME_MARKER=y

CONFIG_SDX_EXT_IPC=y

CONFIG_QCOM_WATCHDOG_V2=y

CONFIG_QCOM_MEMORY_DUMP_V2=y

CONFIG_QCOM_BUS_SCALING=y

arch/arm/configs/sa415m_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -391,6 +391,7 @@ CONFIG_SSR_SYSMON_NOTIF_TIMEOUT=20000 
CONFIG_SSR_SUBSYS_NOTIF_TIMEOUT=20000

CONFIG_MSM_BOOT_STATS=y

CONFIG_MSM_BOOT_TIME_MARKER=y

CONFIG_SDX_EXT_IPC=y

CONFIG_QCOM_WATCHDOG_V2=y

CONFIG_QCOM_MEMORY_DUMP_V2=y

CONFIG_QCOM_BUS_SCALING=y

drivers/soc/qcom/sdx_ext_ipc.c

+2 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2019, The Linux Foundation. All rights reserved.

/* Copyright (c) 2019-2020, 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
@@ -240,6 +240,7 @@ static int sdx_ext_ipc_remove(struct platform_device *pdev) 


static const struct of_device_id sdx_ext_ipc_of_match[] = {

	{ .compatible = "qcom,sdx-ext-ipc"},

	{ .compatible = "qcom,sa415m-ccard"},

	{},

};