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

Commit 79eea076 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "soc: qcom: socinfo: Add support for SDA429W soc-id"

parents 3f9d8949 c371b03b

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

+3 −0
Original line number Diff line number Diff line
@@ -149,6 +149,9 @@ SoCs: 
- SDM429W

  compatible = "qcom,sdm429w"



- SDA429W

  compatible = "qcom,sda429w"



- QM215

  compatible = "qcom, qm215"

arch/arm64/boot/dts/qcom/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -397,6 +397,7 @@ dtbo-$(CONFIG_ARCH_SDM429) += sdm429-mtp-overlay.dtbo \ 
	sdm429-qrd-overlay.dtbo \

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

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

	sda429-spyro-qrd-dvt-overlay.dtbo \

	sdm429-spyro-qrd-wdp-overlay.dtbo



msm8940-mtp-overlay.dtbo-base := msm8940-pmi8950.dtb \
@@ -519,6 +520,7 @@ sdm429-qrd-overlay.dtbo-base := sdm429.dtb \ 
	msm8937-interposer-sdm429.dtb

sdm429-spyro-qrd-evt-overlay.dtbo-base := sdm429-spyro.dtb

sdm429-spyro-qrd-dvt-overlay.dtbo-base := sdm429-spyro-dvt.dtb

sda429-spyro-qrd-dvt-overlay.dtbo-base := sda429-spyro-dvt.dtb

sdm429-spyro-qrd-wdp-overlay.dtbo-base := sdm429-spyro-wdp.dtb

else

dtb-$(CONFIG_ARCH_MSM8953) += msm8953-cdp.dtb \
@@ -656,6 +658,7 @@ dtb-$(CONFIG_ARCH_SDM429) += sdm429-mtp.dtb \ 
	sdm429-spyro.dtb \

	sdm429-spyro-dvt.dtb \

	sdm429-spyro-wdp.dtb \

	sda429-spyro-dvt.dtb \

	sdw3300-bg-1gb-wtp.dtb



endif

arch/arm64/boot/dts/qcom/sda429-spyro-dvt.dts

0 → 100644
+24 −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 "sdm429-spyro.dtsi"



/ {

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

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

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

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

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

};

arch/arm64/boot/dts/qcom/sda429-spyro-qrd-dvt-overlay.dts

0 → 100644
+37 −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/;

/plugin/;



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



/ {

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

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

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

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

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

};



&usb_otg {

	HSUSB_3p3-supply = <&L16A>;

};



&msm_dig_codec {

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

};



&ext_smart_pa {

	dvdd-supply = <&pm660_l11>;

};

drivers/soc/qcom/socinfo.c

+5 −0
Original line number Diff line number Diff line
@@ -648,6 +648,7 @@ static struct msm_soc_info cpu_of_id[] = { 


	/* SDM429W IDs*/

	[416] = {MSM_CPU_SDM429W, "SDM429W"},

	[437] = {MSM_CPU_SDA429W, "SDA429W"},

	/* Uninitialized IDs are not known to run Linux.

	 * MSM_CPU_UNKNOWN is set to 0 to ensure these IDs are

	 * considered as unknown CPU.
@@ -1639,6 +1640,10 @@ static void * __init setup_dummy_socinfo(void) 
		dummy_socinfo.id = 416;

		strlcpy(dummy_socinfo.build_id, "sdm429w - ",

				sizeof(dummy_socinfo.build_id));

	} else if (early_machine_is_sda429w()) {

		dummy_socinfo.id = 437;

		strlcpy(dummy_socinfo.build_id, "sda429w - ",

				sizeof(dummy_socinfo.build_id));

	} else if (early_machine_is_mdm9607()) {

		dummy_socinfo.id = 290;

		strlcpy(dummy_socinfo.build_id, "mdm9607 - ",