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

Commit 157f6fcd 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: Move model and compatible property to dts file"

parents 03de82e2 17ee0f53

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

+1 −0
Original line number Diff line number Diff line
@@ -164,6 +164,7 @@ compatible = "qcom,msm8936-cdp" 
compatible = "qcom,msm8936-mtp"

compatible = "qcom,msm8939-cdp"

compatible = "qcom,msm8939-mtp"

compatible = "qcom,msm8939-qrd-skuk"

compatible = "qcom,msm8939-rumi"

compatible = "qcom,msm8939-sim"

compatible = "qcom,msm8960-cdp"

arch/arm/boot/dts/qcom/msm8939-qrd-skuk.dts

+2 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 
#include "msm8939-qrd-skuk.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. MSM8939 QRD SKUK";

	compatible = "qcom,msm8939-qrd-skuk", "qcom,msm8939-qrd", "qcom,msm8939", "qcom,qrd";

	qcom,board-id = <0x1000b 5>, <0x2000b 5>;

};

arch/arm/boot/dts/qcom/msm8939-qrd-skuk.dtsi

+0 −4
Original line number Diff line number Diff line
@@ -13,10 +13,6 @@ 
#include "msm8939-qrd.dtsi"

#include "dsi-panel-nt35596-1080p-skuk-video.dtsi"

#include "msm8939-camera-sensor-qrd.dtsi"

/ {

	model = "Qualcomm Technologies, Inc. MSM8939 QRD SKUK";

	compatible = "qcom,msm8939-qrd-skuk", "qcom,msm8939-qrd", "qcom,msm8939", "qcom,qrd";

};



&soc {

	i2c@78b9000 { /* BLSP1 QUP5 */