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

Commit 42135450 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 device tree support for sdm429 bg variants"

parents 0d1a567c aec255d4

arch/arm64/boot/dts/qcom/Makefile

+5 −1
Original line number Diff line number Diff line
@@ -401,9 +401,11 @@ dtbo-$(CONFIG_ARCH_SDM429) += sdm429-mtp-overlay.dtbo \ 
	sda429-spyro-qrd-dvt-overlay.dtbo \

	sdm429-spyro-qrd-wdp-overlay.dtbo \

	sdm429-bg-wtp-overlay.dtbo \

	sdm429-bg-dvt2-wtp-overlay.dtbo \

	sdm429-bg-wdp-overlay.dtbo \

	sda429-bg-wdp-overlay.dtbo \

	sda429-bg-wtp-overlay.dtbo

	sda429-bg-wtp-overlay.dtbo \

	sda429-bg-dvt2-wtp-overlay.dtbo



msm8940-mtp-overlay.dtbo-base := msm8940-pmi8950.dtb \

	msm8940-pmi8937.dtb \
@@ -523,6 +525,8 @@ sda429-spyro-qrd-dvt-overlay.dtbo-base := sda429-spyro-dvt.dtb 
sdm429-spyro-qrd-wdp-overlay.dtbo-base := sdm429-spyro-wdp.dtb

sdm429-bg-wtp-overlay.dtbo-base := sdm429-bg-wtp.dtb

sda429-bg-wtp-overlay.dtbo-base := sda429-bg-wtp.dtb

sdm429-bg-dvt2-wtp-overlay.dtbo-base := sdm429-bg-dvt2-wtp.dtb

sda429-bg-dvt2-wtp-overlay.dtbo-base := sda429-bg-dvt2-wtp.dtb

sdm429-bg-wdp-overlay.dtbo-base := sdm429-bg-wdp.dtb

sda429-bg-wdp-overlay.dtbo-base := sda429-bg-wdp.dtb

else

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

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

 * 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

 * 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 "sdm429-spyro-qrd-evt.dtsi"

#include "sdm429-bg-soc.dtsi"



/ {

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

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

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

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

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

};



&mdss_dsi0 {

	qcom,dsi-pref-prim-pan = <&dsi_auo_416p_amoled_cmd>;

	/delete-property/ vdd-supply;

	pinctrl-names = "mdss_default", "mdss_sleep";

	pinctrl-0 = <&mdss_te_active>;

	pinctrl-1 = <&mdss_te_suspend>;

	vddio-supply = <&L11A>;

	qcom,platform-enable-gpio = <&pm660_gpios 12 0>;

};



&dsi_pm660_panel_pwr_supply {

	/delete-node/ qcom,panel-supply-entry@0;

};



&usb_otg {

	HSUSB_3p3-supply = <&L16A>;

};



&msm_dig_codec {

	cdc-vdd-digital-supply = <&pm660_l11>;

};



&ext_smart_pa {

	dvdd-supply = <&pm660_l11>;

};



&firmware {

	android {

		fstab {

			system {

				status = "disabled";

			};

		};

	};

};



&msm_gpu {

	qcom,initial-pwrlevel = <0>;

	qcom,gpu-pwrlevels {

		qcom,gpu-pwrlevel@0 {

			reg = <0>;

			qcom,gpu-freq = <320000000>;

			qcom,bus-freq = <2>;

			qcom,bus-min = <2>;

			qcom,bus-max = <2>;

		};

		qcom,gpu-pwrlevel@1{

			reg = <1>;

			qcom,gpu-freq = <19200000>;

			qcom,bus-freq = <0>;

			qcom,bus-min = <0>;

			qcom,bus-max = <0>;

		};

	};

};



&msm_cpufreq {

	qcom,cpufreq-table =

		<  960000 >,

		< 1305600 >,

		< 1497600 >,

		< 1708800 >;

};



&cpubw {

	qcom,bw-tbl =

		<  1611 /*  211.2 MHz */ >,     /*Low SVS*/

		<  2929 /*  384   MHz */ >,     /* SVS */

		<  5053 /*  662.4 MHz */ >,     /* SVS+  */

		<  5712 /*  748.8 MHz */ >;     /* NOM   */

};

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

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

 * 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

 * 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 "sdm429-spyro.dtsi"

#include "sdm429w-bg-pm660.dtsi"

#include "sdm429-bg-memory.dtsi"



/ {

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

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

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

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

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

};



&msm_gpu {

	/delete-property/qcom,enable-ca-jump;

	/delete-property/qcom,ca-busy-penalty;

	/delete-property/qcom,ca-target-pwrlevel;



	qcom,gpu-pwrlevels {

		/delete-node/qcom,gpu-pwrlevel@2;

		/delete-node/qcom,gpu-pwrlevel@3;

		/delete-node/qcom,gpu-pwrlevel@4;

		/delete-node/qcom,gpu-pwrlevel@5;

	};

};

arch/arm64/boot/dts/qcom/sdm429-bg-dvt2-wtp-overlay.dts

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

 * 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

 * 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 "sdm429-spyro-qrd-evt.dtsi"

#include "sdm429-bg-soc.dtsi"



/ {

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

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

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

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

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

};



&mdss_dsi0 {

	qcom,dsi-pref-prim-pan = <&dsi_auo_416p_amoled_cmd>;

	/delete-property/ vdd-supply;

	vddio-supply = <&L11A>;

	pinctrl-names = "mdss_default", "mdss_sleep";

	pinctrl-0 = <&mdss_te_active>;

	pinctrl-1 = <&mdss_te_suspend>;

	qcom,platform-enable-gpio = <&pm660_gpios 12 0>;

};



&dsi_pm660_panel_pwr_supply {

	/delete-node/ qcom,panel-supply-entry@0;

};



&usb_otg {

	HSUSB_3p3-supply = <&L16A>;

};



&msm_dig_codec {

	cdc-vdd-digital-supply = <&pm660_l11>;

};



&ext_smart_pa {

	dvdd-supply = <&pm660_l11>;

};



&firmware {

	android {

		fstab {

			system {

				status = "disabled";

			};

		};

	};

};



&msm_gpu {

	qcom,initial-pwrlevel = <0>;

	qcom,gpu-pwrlevels {

		qcom,gpu-pwrlevel@0 {

			reg = <0>;

			qcom,gpu-freq = <320000000>;

			qcom,bus-freq = <2>;

			qcom,bus-min = <2>;

			qcom,bus-max = <2>;

		};

		qcom,gpu-pwrlevel@1{

			reg = <1>;

			qcom,gpu-freq = <19200000>;

			qcom,bus-freq = <0>;

			qcom,bus-min = <0>;

			qcom,bus-max = <0>;

		};

	};

};



&msm_cpufreq {

	qcom,cpufreq-table =

		<  960000 >,

		< 1305600 >,

		< 1497600 >,

		< 1708800 >;

};

&cpubw {

	qcom,bw-tbl =

		<  1611 /*  211.2 MHz */ >,     /*Low SVS*/

		<  2929 /*  384   MHz */ >,     /* SVS */

		<  5053 /*  662.4 MHz */ >,     /* SVS+  */

		<  5712 /*  748.8 MHz */ >;     /* NOM   */

};

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

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

 * 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

 * 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 "sdm429-spyro.dtsi"

#include "sdm429w-bg-pm660.dtsi"

#include "sdm429-bg-memory.dtsi"



/ {

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

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

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

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

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

};



&msm_gpu {

	/delete-property/qcom,enable-ca-jump;

	/delete-property/qcom,ca-busy-penalty;

	/delete-property/qcom,ca-target-pwrlevel;



	qcom,gpu-pwrlevels {

		/delete-node/qcom,gpu-pwrlevel@2;

		/delete-node/qcom,gpu-pwrlevel@3;

		/delete-node/qcom,gpu-pwrlevel@4;

		/delete-node/qcom,gpu-pwrlevel@5;

	};

};