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

Commit 9a50beb0 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: rename automotive device tree files for SA8155"

parents 717c950a 87d7e03d

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

+2 −2
Original line number Diff line number Diff line
@@ -163,8 +163,8 @@ compatible = "qcom,sm6150-idp" 
compatible = "qcom,qcs405-rumi"

compatible = "qcom,qcs405-iot"

compatible = "qcom,qcs403-iot"

compatible = "qcom,sa8150-adp-star"

compatible = "qcom,sa8150p-adp-star"

compatible = "qcom,sa8155-adp-star"

compatible = "qcom,sa8155p-adp-star"

compatible = "qcom,adp-star"

compatible = "qcom,sdxprairie-rumi"

compatible = "qcom,sdxprairie-mtp"

arch/arm64/boot/dts/qcom/Makefile

+6 −6
Original line number Diff line number Diff line
@@ -25,8 +25,8 @@ ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y) 
		sm8150-rumi-overlay.dtbo \

		sm8150-qrd-overlay.dtbo \

		sm8150-qrd-dvt-overlay.dtbo \

		sa8150-adp-star-overlay.dtbo \

                sa8150p-adp-star-overlay.dtbo \

		sa8155-adp-star-overlay.dtbo \

                sa8155p-adp-star-overlay.dtbo \

		sm8150p-cdp-overlay.dtbo \

		sm8150p-mtp-overlay.dtbo \

		sm8150p-qrd-overlay.dtbo \
@@ -40,8 +40,8 @@ sm8150-mtp-overlay.dtbo-base := sm8150.dtb sm8150-v2.dtb 
sm8150-rumi-overlay.dtbo-base := sm8150.dtb sm8150-v2.dtb

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

sm8150-qrd-dvt-overlay.dtbo-base := sm8150-v2.dtb

sa8150-adp-star-overlay.dtbo-base := sa8150.dtb

sa8150p-adp-star-overlay.dtbo-base := sa8150p.dtb

sa8155-adp-star-overlay.dtbo-base := sa8155.dtb

sa8155p-adp-star-overlay.dtbo-base := sa8155p.dtb

sm8150-sdx50m-cdp-overlay.dtbo-base := sm8150.dtb sm8150-v2.dtb

sm8150-sdx50m-mtp-overlay.dtbo-base := sm8150.dtb sm8150-v2.dtb

sm8150-sdx50m-mtp-2.5k-panel-overlay.dtbo-base := sm8150.dtb sm8150-v2.dtb
@@ -53,8 +53,8 @@ dtb-$(CONFIG_ARCH_SM8150) += sm8150-rumi.dtb \ 
	sm8150-mtp.dtb \

	sm8150-cdp.dtb \

	sm8150-qrd.dtb \

	sa8150-adp-star.dtb \

        sa8150p-adp-star.dtb \

	sa8155-adp-star.dtb \

        sa8155p-adp-star.dtb \

	sm8150-v2-rumi.dtb \

	sm8150-v2-mtp.dtb \

	sm8150-v2-cdp.dtb \

arch/arm64/boot/dts/qcom/sa8150-adp-star-overlay.dts→arch/arm64/boot/dts/qcom/sa8155-adp-star-overlay.dts

+2 −2
Original line number Diff line number Diff line
@@ -13,11 +13,11 @@ 
/dts-v1/;

/plugin/;



#include "sa8150-adp-star.dtsi"

#include "sa8155-adp-star.dtsi"



/ {

	model = "ADP-STAR";

	compatible = "qcom,sa8150-adp-star", "qcom,sa8150",

	compatible = "qcom,sa8155-adp-star", "qcom,sa8155",

		"qcom,adp-star";

	qcom,board-id = <25 0>;

};

arch/arm64/boot/dts/qcom/sa8150-adp-star.dts→arch/arm64/boot/dts/qcom/sa8155-adp-star.dts

+4 −4
Original line number Diff line number Diff line
@@ -11,12 +11,12 @@ 
 */



/dts-v1/;

#include "sa8150.dtsi"

#include "sa8150-adp-star.dtsi"

#include "sa8155.dtsi"

#include "sa8155-adp-star.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SA8150 ADP-STAR";

	compatible = "qcom,sa8150-adp-star", "qcom,sa8150",

	model = "Qualcomm Technologies, Inc. SA8155 ADP-STAR";

	compatible = "qcom,sa8155-adp-star", "qcom,sa8155",

		"qcom,adp-star";

	qcom,board-id = <25 0>;

};

arch/arm64/boot/dts/qcom/sa8150-adp-star.dtsi→arch/arm64/boot/dts/qcom/sa8155-adp-star.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
#include <dt-bindings/gpio/gpio.h>

#include <dt-bindings/input/input.h>



#include "sa8150-pmic-overlay.dtsi"

#include "sa8155-pmic-overlay.dtsi"



&qupv3_se0_spi {

	status = "ok";