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

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

Merge "ARM: dts: msm: Correct the soc dts info for HHG HSP Pro platform"

parents d8cfd218 8dcc7782

qcom/Makefile

+3 −3
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ dtbo-$(CONFIG_ARCH_LAHAINA) += lahaina-rumi-overlay.dtbo \ 
	lahaina-atp-overlay.dtbo \

	lahaina-hdk-overlay.dtbo \

	lahaina-hhg-overlay.dtbo \

	lahaina-hhg-hsp-pro-overlay.dtbo \

	lahainap-hhg-hsp-pro-overlay.dtbo \

	lahaina-qrd-hsp-overlay.dtbo \

	lahaina-qrd-module-overlay.dtbo \

	lahainap-mtp-overlay.dtbo \
@@ -29,7 +29,7 @@ lahaina-cdp-overlay.dtbo-base := lahaina.dtb lahaina-v2.dtb lahaina-v2.1.dtb 
lahaina-atp-overlay.dtbo-base := lahaina.dtb lahaina-v2.dtb lahaina-v2.1.dtb

lahaina-hdk-overlay.dtbo-base := lahaina.dtb lahaina-v2.dtb lahaina-v2.1.dtb

lahaina-hhg-overlay.dtbo-base := lahaina.dtb lahaina-v2.dtb lahaina-v2.1.dtb

lahaina-hhg-hsp-pro-overlay.dtbo-base := lahaina.dtb lahaina-v2.dtb lahaina-v2.1.dtb

lahainap-hhg-hsp-pro-overlay.dtbo-base := lahainap.dtb lahainap-v2.dtb lahainap-v2.1.dtb

lahaina-qrd-hsp-overlay.dtbo-base := lahaina.dtb

lahaina-qrd-overlay.dtbo-base := lahaina.dtb lahaina-v2.dtb lahaina-v2.1.dtb

lahaina-qrd-module-overlay.dtbo-base := lahaina.dtb lahaina-v2.dtb lahaina-v2.1.dtb
@@ -79,7 +79,7 @@ dtb-$(CONFIG_ARCH_LAHAINA) += lahaina-rumi.dtb \ 
	lahaina-v2.1-atp.dtb \

	lahaina-v2.1-hdk.dtb \

	lahaina-v2.1-hhg.dtb \

	lahaina-v2.1-hhg-hsp-pro.dtb \

	lahainap-v2.1-hhg-hsp-pro.dtb \

	lahaina-v2.1-qrd.dtb \

	lahaina-v2.1-qrd-module.dtb \

	lahainap-v2.1-mtp.dtb \

qcom/lahaina-hhg-hsp-pro-overlay.dts→qcom/lahainap-hhg-hsp-pro-overlay.dts

+2 −2
Original line number Diff line number Diff line 
/dts-v1/;

/plugin/;



#include "lahaina-hhg-hsp-pro.dtsi"

#include "lahainap-hhg-hsp-pro.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. Lahaina HHG-HSP-PRO";

	model = "Qualcomm Technologies, Inc. Lahainap HHG-HSP-PRO";

	compatible = "qcom,lahaina-hdk", "qcom,lahaina", "qcom,hdk";

	qcom,board-id = <0x1001f 0x02>;

};

qcom/lahaina-v2.1-hhg-hsp-pro.dts→qcom/lahainap-v2.1-hhg-hsp-pro.dts

+10 −0
Original line number Diff line number Diff line 
/dts-v1/;



#include "lahaina-v2.1.dtsi"

#include "lahaina-hhg-hsp-pro.dtsi"

#include "lahainap-v2.1.dtsi"

#include "lahainap-hhg-hsp-pro.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. Lahaina HHG-HSP-PRO";

	model = "Qualcomm Technologies, Inc. Lahainap HHG-HSP-PRO";

	compatible = "qcom,lahaina-hdk", "qcom,lahaina", "qcom,hdk";

	qcom,board-id = <0x1001f 0x02>;

};