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

Commit c28af583 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: correct order of including device tree for sdm670/710"

parents 86bceaca 8962cbd1

arch/arm64/boot/dts/qcom/sdm670-qrd-sku1.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -10,5 +10,5 @@ 
 * GNU General Public License for more details.

 */



#include "sdm670-qrd.dtsi"

#include "sdm670-audio-overlay.dtsi"

#include "sdm670-qrd.dtsi"

arch/arm64/boot/dts/qcom/sdm670-qrd-sku2-overlay.dts

+5 −0
Original line number Diff line number Diff line
@@ -13,6 +13,11 @@ 
/dts-v1/;

/plugin/;



#include <dt-bindings/clock/qcom,gcc-sdm845.h>

#include <dt-bindings/clock/qcom,camcc-sdm845.h>

#include <dt-bindings/clock/qcom,dispcc-sdm845.h>

#include <dt-bindings/clock/qcom,rpmh.h>

#include <dt-bindings/interrupt-controller/arm-gic.h>

#include "sdm670-qrd-sku2.dtsi"



/ {

arch/arm64/boot/dts/qcom/sdm670-qrd-sku2.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -9,8 +9,8 @@ 
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */

#include "sdm670-qrd.dtsi"

#include "sdm670-audio-overlay.dtsi"

#include "sdm670-qrd.dtsi"



&dsi_dual_nt36850_truly_cmd_display {

	/delete-property/ qcom,dsi-display-active;

arch/arm64/boot/dts/qcom/sdm710-qrd-overlay.dts

+5 −0
Original line number Diff line number Diff line
@@ -13,6 +13,11 @@ 
/dts-v1/;

/plugin/;



#include <dt-bindings/clock/qcom,gcc-sdm845.h>

#include <dt-bindings/clock/qcom,camcc-sdm845.h>

#include <dt-bindings/clock/qcom,dispcc-sdm845.h>

#include <dt-bindings/clock/qcom,rpmh.h>

#include <dt-bindings/interrupt-controller/arm-gic.h>

#include "sdm670-qrd-sku1.dtsi"



/ {

arch/arm64/boot/dts/qcom/sdm710-qrd-sku2-overlay.dts

+5 −0
Original line number Diff line number Diff line
@@ -13,6 +13,11 @@ 
/dts-v1/;

/plugin/;



#include <dt-bindings/clock/qcom,gcc-sdm845.h>

#include <dt-bindings/clock/qcom,camcc-sdm845.h>

#include <dt-bindings/clock/qcom,dispcc-sdm845.h>

#include <dt-bindings/clock/qcom,rpmh.h>

#include <dt-bindings/interrupt-controller/arm-gic.h>

#include "sdm670-qrd-sku2.dtsi"



/ {