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

Commit dd402411 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 linux cma alloc range for SDM429 BG"

parents 28831d88 ac44940c

arch/arm64/boot/dts/qcom/sda429-bg-wdp.dts

+4 −3
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
@@ -15,10 +15,11 @@ 


#include "sdm429-spyro.dtsi"

#include "sdm429w-bg-pm660.dtsi"

#include "sdm429-bg-memory.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SDA429 QRD BG WDP Spyro";

	compatible = "qcom,sdm429w-qrd","qcom,sdm429w","qcom,sda429w";

	model = "Qualcomm Technologies, Inc. SDA429 BG WDP";

	compatible = "qcom,sdm429w-qrd","qcom,sda429w";

	qcom,msm-id = <437 0x0>;

	qcom,board-id = <0x00010b 9>;

	qcom,pmic-id = <0x0002001b 0x0 0x0 0x0>;

arch/arm64/boot/dts/qcom/sda429-bg-wtp.dts

+4 −3
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
@@ -15,10 +15,11 @@ 


#include "sdm429-spyro.dtsi"

#include "sdm429w-bg-pm660.dtsi"

#include "sdm429-bg-memory.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SDM429 QRD DVT Spyro";

	compatible = "qcom,sdm429w-qrd", "qcom,sdm429w", "qcom,qrd";

	model = "Qualcomm Technologies, Inc. SDA429 BG WTP";

	compatible = "qcom,sdm429w-qrd", "qcom,sda429w", "qcom,qrd";

	qcom,msm-id = <437 0x0>;

	qcom,board-id = <0x00010b 8>;

	qcom,pmic-id = <0x0002001b 0x0 0x0 0x0>;

arch/arm64/boot/dts/qcom/sdm429-bg-iot-wtp.dts

+3 −2
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
@@ -16,9 +16,10 @@ 
#include "sdm429-spyro.dtsi"

#include "sdm429-spyro-qrd-evt.dtsi"

#include "sdm429w-bg-pm660.dtsi"

#include "sdm429-bg-memory.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SDM429W BG IOT WTP";

	model = "Qualcomm Technologies, Inc. SDM429 BG IOT WTP";

	compatible = "qcom,sdm429w-qrd", "qcom,sdm429w", "qcom,qrd";

	qcom,msm-id = <416 0x0>;

	qcom,board-id = <0x00010b 8>;

arch/arm64/boot/dts/qcom/sdm429-bg-memory.dtsi

0 → 100644
+23 −0
Original line number Diff line number Diff line 
/*

 * 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

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

 */



&reserved_memory {

	linux,cma {

		compatible = "shared-dma-pool";

		alloc-ranges = <0 0x00000000 0 0xa0000000>;

		reusable;

		alignment = <0 0x400000>;

		size = <0 0x1000000>;

		linux,cma-default;

	};

};

arch/arm64/boot/dts/qcom/sdm429-bg-wdp.dts

+3 −2
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
@@ -15,9 +15,10 @@ 


#include "sdm429-spyro.dtsi"

#include "sdm429w-bg-pm660.dtsi"

#include "sdm429-bg-memory.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SDM429 QRD BG WDP";

	model = "Qualcomm Technologies, Inc. SDM429 BG WDP";

	compatible = "qcom,sdm429w-qrd", "qcom,sdm429w", "qcom,qrd";

	qcom,msm-id = <416 0x0>;

	qcom,board-id = <0x01000b 9>;