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

Commit 99168cae authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Add support for SA515M CCARD boards"

parents 07b8393e 7782f2ce

Documentation/devicetree/bindings/arm/msm/msm.txt

+1 −0
Original line number Diff line number Diff line
@@ -209,6 +209,7 @@ compatible = "qcom,sa8155p-adp-alcor" 
compatible = "qcom,sdxprairie-rumi"

compatible = "qcom,sdxprairie-mtp"

compatible = "qcom,sdxprairie-cdp"

compatible = "qcom,sa515m-ccard"

compatible = "qcom,sdmmagpie-rumi"

compatible = "qcom,sdmmagpie-idp"

compatible = "qcom,sdmmagpie-atp"

arch/arm64/boot/dts/qcom/Makefile

+4 −1
Original line number Diff line number Diff line
@@ -267,7 +267,10 @@ dtb-$(CONFIG_ARCH_SDXPRAIRIE) += sdxprairie-rumi.dtb \ 
	sdxprairie-mtp-aqc.dtb \

	sdxprairie-dsda-mtp.dtb \

	sdxprairie-v2-cdp.dtb \

	sdxprairie-v2-mtp.dtb

	sdxprairie-v2-mtp.dtb \

	sa515m-ccard.dtb \

	sa515m-ccard-pcie-ep.dtb \

	sa515m-ccard-usb-ep.dtb



ifeq ($(CONFIG_ARM64),y)

always		:= $(dtb-y)

arch/arm64/boot/dts/qcom/sa515m-ccard-pcie-ep.dts

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

 */



/dts-v1/;



#include "sa515m-ccard.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SA515M CCARD PCIE-EP";

	compatible = "qcom,sa515m-ccard",

		"qcom,sdxprairie", "qcom,ccard";

	qcom,board-id = <25 1>, <25 0x101>;

};



&restart_pshold {

	qcom,force-warm-reboot;

};



&cnss_qca6390 {

	status = "disabled";

};



&ipa_hw {

	qcom,use-ipa-in-mhi-mode;

};



&pcie0 {

	status = "disabled";

};



&pcie_ep {

	status = "ok";

};



&mhi_device {

	status = "ok";

};

arch/arm64/boot/dts/qcom/sa515m-ccard-usb-ep.dts

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

 */



/dts-v1/;



#include "sa515m-ccard.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SA515M CCARD USB-EP";

	compatible = "qcom,sa515m-ccard",

		"qcom,sdxprairie", "qcom,ccard";

	qcom,board-id = <25 2>, <25 0x102>;

};

arch/arm64/boot/dts/qcom/sa515m-ccard.dts

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

 */



/dts-v1/;



#include "sa515m-ccard.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SA515M CCARD";

	compatible = "qcom,sa515m-ccard",

		"qcom,sdxprairie", "qcom,ccard";

	qcom,board-id = <25 0>, <25 0x100>;

};