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

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

Merge "ARM: dts: msm: Add correct board name for SDX55 MTP Telematics AU DSDA"

parents 76d727dc 98f848ff

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

+0 −1
Original line number Original line Diff line number Diff line
@@ -255,7 +255,6 @@ compatible = "qcom,sa8155p-adp-alcor" 
compatible = "qcom,sdxprairie-rumi"

compatible = "qcom,sdxprairie-rumi"

compatible = "qcom,sdxprairie-mtp"

compatible = "qcom,sdxprairie-mtp"

compatible = "qcom,sdxprairie-cdp"

compatible = "qcom,sdxprairie-cdp"

compatible = "qcom,sdxprairie-ttp"

compatible = "qcom,sa515m-ccard"

compatible = "qcom,sa515m-ccard"

compatible = "qcom,sa515m-ttp"

compatible = "qcom,sa515m-ttp"

compatible = "qcom,sdmmagpie-rumi"

compatible = "qcom,sdmmagpie-rumi"

arch/arm64/boot/dts/qcom/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -444,7 +444,7 @@ dtb-$(CONFIG_ARCH_SDXPRAIRIE) += sdxprairie-rumi.dtb \ 
	sdxprairie-v2-mtp-v1.1-cpe.dtb \

	sdxprairie-v2-mtp-v1.1-cpe.dtb \

	sdxprairie-v2-mtp-v1.1.dtb \

	sdxprairie-v2-mtp-v1.1.dtb \

	sdxprairie-v2-mtp-le-cpe.dtb \

	sdxprairie-v2-mtp-le-cpe.dtb \

	sdxprairie-v2-ttp-cpe.dtb \

	sdxprairie-v2-mtp-au-dsda.dtb \

	sa515m-v2-ttp.dtb \

	sa515m-v2-ttp.dtb \

	sa515m-v2-ttp-usb-ep.dtb \

	sa515m-v2-ttp-usb-ep.dtb \

	sa515m-v2-ttp-pcie-ep.dtb \

	sa515m-v2-ttp-pcie-ep.dtb \

arch/arm64/boot/dts/qcom/sdxprairie-v2-ttp-cpe.dts→arch/arm64/boot/dts/qcom/sdxprairie-v2-mtp-au-dsda.dts

+3 −3
Original line number Original line Diff line number Diff line
@@ -15,9 +15,9 @@ 
#include "sdxprairie-v2-mtp-cpe.dtsi"

#include "sdxprairie-v2-mtp-cpe.dtsi"





/ {

/ {

	model = "Qualcomm Technologies, Inc. SDXPRAIRIE V2 TTP (CPE)";

	model = "Qualcomm Technologies, Inc. SDXPRAIRIE V2 AU DSDA";

	compatible = "qcom,sdxprairie-ttp",

	compatible = "qcom,sdxprairie-mtp",

		"qcom,sdxprairie", "qcom,ttp";

		"qcom,sdxprairie", "qcom,mtp";

	qcom,board-id = <0x08010008 0x0>;

	qcom,board-id = <0x08010008 0x0>;

};

};