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

Commit 9184cefb 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 initial device tree support for SDM855+SDX50"

parents 55845fba 7b7959e8

arch/arm64/boot/dts/qcom/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y) 
		sdm855-v2-mtp-overlay.dtbo \

		sdm855-v2-rumi-overlay.dtbo \

		sdm855-v2-qrd-overlay.dtbo

		sdm855-sdx50m-cdp-overlay.dtbo \

		sdm855-sdx50m-mtp-overlay.dtbo



sdm855-cdp-overlay.dtbo-base := sdm855.dtb

sdm855-mtp-overlay.dtbo-base := sdm855.dtb
@@ -26,6 +28,8 @@ sdm855-v2-cdp-overlay.dtbo-base := sdm855-v2.dtb 
sdm855-v2-mtp-overlay.dtbo-base := sdm855-v2.dtb

sdm855-v2-rumi-overlay.dtbo-base := sdm855-v2.dtb

sdm855-v2-qrd-overlay.dtbo-base := sdm855-v2.dtb

sdm855-sdx50m-cdp-overlay.dtbo-base := sdm855.dtb

sdm855-sdx50m-mtp-overlay.dtbo-base := sdm855.dtb

else

dtb-$(CONFIG_ARCH_SDM855)	+= sdm855-rumi.dtb \

	sdm855-mtp.dtb \

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

+70 −0
Original line number Diff line number Diff line
@@ -3086,5 +3086,75 @@ 
			};

		};



		ap2mdm {

			ap2mdm_active: ap2mdm_active {

				mux {

					/* ap2mdm-status

					 * ap2mdm-errfatal

					 * ap2mdm-vddmin

					 */

					pins = "gpio135", "gpio141";

					function = "gpio";

				};



				config {

					pins = "gpio135", "gpio141";

					drive-strength = <16>;

					bias-disable;

				};

			};

			ap2mdm_sleep: ap2mdm_sleep {

				mux {

					/* ap2mdm-status

					 * ap2mdm-errfatal

					 * ap2mdm-vddmin

					 */

					pins = "gpio135", "gpio141";

					function = "gpio";

				};



				config {

					pins = "gpio135", "gpio141";

					drive-strength = <8>;

					bias-disable;

				};



			};

		};



		mdm2ap {

			mdm2ap_active: mdm2ap_active {

				mux {

					/* mdm2ap-status

					 * mdm2ap-errfatal

					 * mdm2ap-vddmin

					 */

					pins = "gpio142", "gpio53";

					function = "gpio";

				};



				config {

					pins = "gpio142", "gpio53";

					drive-strength = <8>;

					bias-disable;

				};

			};

			mdm2ap_sleep: mdm2ap_sleep {

				mux {

					/* mdm2ap-status

					 * mdm2ap-errfatal

					 * mdm2ap-vddmin

					 */

					pins = "gpio142", "gpio53";

					function = "gpio";

				};



				config {

					pins = "gpio142", "gpio53";

					drive-strength = <8>;

					bias-disable;

				};

			};

		};

	};

};

arch/arm64/boot/dts/qcom/sdm855-sdx50m-cdp-overlay.dts

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

/plugin/;



#include <dt-bindings/clock/qcom,gcc-sdm855.h>

#include <dt-bindings/clock/qcom,camcc-sdm855.h>

#include <dt-bindings/clock/qcom,rpmh.h>

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



#include "sdm855-cdp.dtsi"

#include "sdm855-audio-overlay.dtsi"



#include "external-soc.dtsi"

#include "sdm855-sdx50m.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SDM855 v1 + SDX50M CDP";

	compatible = "qcom,sdm855-cdp", "qcom,sdm855", "qcom,cdp";

	qcom,msm-id = <339 0x10000>;

	qcom,board-id = <1 2>;

};

arch/arm64/boot/dts/qcom/sdm855-sdx50m-mtp-overlay.dts

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

/plugin/;



#include <dt-bindings/clock/qcom,gcc-sdm855.h>

#include <dt-bindings/clock/qcom,camcc-sdm855.h>

#include <dt-bindings/clock/qcom,rpmh.h>

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



#include "sdm855-mtp.dtsi"

#include "sdm855-mtp-audio-overlay.dtsi"



#include "external-soc.dtsi"

#include "sdm855-sdx50m.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SDM855 v1 + SDX50M MTP";

	compatible = "qcom,sdm855-mtp", "qcom,sdm855", "qcom,mtp";

	qcom,msm-id = <339 0x10000>;

	qcom,board-id = <8 5>;

};

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

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

 */



&mdm3 {

	pinctrl-names = "default", "mdm_active", "mdm_suspend";

	pinctrl-0 = <&ap2mdm_pon_reset_default>;

	pinctrl-1 = <&ap2mdm_active &mdm2ap_active>;

	pinctrl-2 = <&ap2mdm_sleep &mdm2ap_sleep>;

	interrupt-map = <0 &tlmm 53 0x3

			1 &tlmm 135 0x3>;

	qcom,mdm2ap-errfatal-gpio = <&tlmm 53 0x00>;

	qcom,ap2mdm-errfatal-gpio = <&tlmm 141 0x00>;

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

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

	qcom,ap2mdm-soft-reset-gpio = <&pm855l_gpios 9 0>;

	qcom,mdm-link-info = "0304_00.01.00";

	status = "ok";

};



&pm855l_gpios {

	ap2mdm_pon_reset {

		ap2mdm_pon_reset_default: ap2mdm_pon_reset_default {

			/* MDM PON conrol*/

			pins = "gpio9";

			function = "normal";

			output-low;

			power-source = <1>; /* 1.8V */

		};

	};

};