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

Commit 8f522631 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: qcom: Merge smmu dt files for all msm8996 versions"

parents 904f207d 20c61890

arch/arm/boot/dts/qcom/msm-arm-smmu-8996v3.dtsi

deleted100644 → 0
+0 −13
Original line number Diff line number Diff line 
/* Copyright (c) 2015, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and

 * only version 2 as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



#include "msm-arm-smmu.dtsi"

arch/arm/boot/dts/qcom/msm8996-v2.dtsi

+0 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
 */



#include "msm8996.dtsi"

#include "msm-arm-smmu-8996v2.dtsi"

#include "msm8996-coresight-v2.dtsi"



/ {

arch/arm/boot/dts/qcom/msm8996-v3.dtsi

+0 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
 */



#include "msm8996.dtsi"

#include "msm-arm-smmu-8996v3.dtsi"

#include "msm8996-coresight-v3.dtsi"



/ {

arch/arm/boot/dts/qcom/msm8996.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -3896,3 +3896,4 @@ 
#include "msm8996-camera.dtsi"

#include "msm8996-gpu.dtsi"

#include "msm8996-pm.dtsi"

#include "msm-arm-smmu-8996.dtsi"