From 32483be0f46c8fd310c5dddc810c35686f2555d2 Mon Sep 17 00:00:00 2001 From: Avaneesh Kumar Dwivedi Date: Mon, 4 May 2020 19:10:34 +0530 Subject: [PATCH] ARM: dts: msm: Bring all board specific changes to common file for QCS610 For supporting device tree overlay on QCS610, need to align overlay device tree with normal device tree changes, hence bringing non SoC specific changes to common file. Change-Id: I3632a6a50665e2e399a11ee65813c6d96cf44308 Signed-off-by: Avaneesh Kumar Dwivedi Signed-off-by: Anurag Chouhan --- arch/arm64/boot/dts/qcom/Makefile | 6 ++--- .../boot/dts/qcom/qcs610-iot-overlay.dts | 4 ++-- arch/arm64/boot/dts/qcom/qcs610-iot.dts | 8 ++----- arch/arm64/boot/dts/qcom/qcs610-iot.dtsi | 23 ++++++++++++++++++- .../boot/dts/qcom/qcs610-ipc-overlay.dts | 4 ++-- arch/arm64/boot/dts/qcom/qcs610-ipc.dts | 4 +++- arch/arm64/boot/dts/qcom/qcs610-ipc.dtsi | 1 - arch/arm64/boot/dts/qcom/qcs610.dtsi | 12 +--------- 8 files changed, 35 insertions(+), 27 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/Makefile index c9af9a76daca..84ce4fe46aab 100644 --- a/arch/arm64/boot/dts/qcom/Makefile +++ b/arch/arm64/boot/dts/qcom/Makefile @@ -250,9 +250,9 @@ sa6155p-v2-adp-star-overlay.dtbo-base := sa6155p.dtb sa6155-adp-air-overlay.dtbo-base := sa6155.dtb sa6155p-adp-air-overlay.dtbo-base := sa6155p.dtb sa6155p-v2-adp-air-overlay.dtbo-base := sa6155p.dtb -qcs610-iot-overlay.dtbo-base := sm6150.dtb -qcs610-ipc-overlay.dtbo-base := sm6150.dtb -qcs410-iot-overlay.dtbo-base := sm6150.dtb +qcs610-iot-overlay.dtbo-base := qcs610.dtb +qcs610-ipc-overlay.dtbo-base := qcs610.dtb +qcs410-iot-overlay.dtbo-base := qcs410.dtb else dtb-$(CONFIG_ARCH_SM6150) += sm6150-rumi.dtb \ sm6150-qrd.dtb \ diff --git a/arch/arm64/boot/dts/qcom/qcs610-iot-overlay.dts b/arch/arm64/boot/dts/qcom/qcs610-iot-overlay.dts index 0c740154ee48..33c3fcaa7fe1 100644 --- a/arch/arm64/boot/dts/qcom/qcs610-iot-overlay.dts +++ b/arch/arm64/boot/dts/qcom/qcs610-iot-overlay.dts @@ -1,4 +1,4 @@ -/* Copyright (c) 2019, The Linux Foundation. All rights reserved. +/* Copyright (c) 2019-2020, 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 @@ -18,7 +18,7 @@ #include "qcs610-iot.dtsi" / { - model = "IOT"; + model = "Qualcomm Technologies, Inc. QCS610 IOT Overlay"; compatible = "qcom,qcs610-iot", "qcom,qcs610", "qcom,iot"; qcom,msm-id = <401 0x0>; qcom,board-id = <32 0>; diff --git a/arch/arm64/boot/dts/qcom/qcs610-iot.dts b/arch/arm64/boot/dts/qcom/qcs610-iot.dts index 76fd007b5f56..a0a6c723d172 100644 --- a/arch/arm64/boot/dts/qcom/qcs610-iot.dts +++ b/arch/arm64/boot/dts/qcom/qcs610-iot.dts @@ -1,4 +1,4 @@ -/* Copyright (c) 2019, The Linux Foundation. All rights reserved. +/* Copyright (c) 2019-2020, 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 @@ -11,7 +11,7 @@ */ /dts-v1/; - +#include "qcs610.dtsi" #include "qcs610-iot.dtsi" #include "sm6150-audio-overlay.dtsi" @@ -20,7 +20,3 @@ compatible = "qcom,qcs610-iot", "qcom,qcs610", "qcom,iot"; qcom,board-id = <32 0>; }; - -&sm6150_snd { - /delete-property/ fsa4480-i2c-handle; -}; diff --git a/arch/arm64/boot/dts/qcom/qcs610-iot.dtsi b/arch/arm64/boot/dts/qcom/qcs610-iot.dtsi index 63a8139732ba..6c1d8c88de2a 100644 --- a/arch/arm64/boot/dts/qcom/qcs610-iot.dtsi +++ b/arch/arm64/boot/dts/qcom/qcs610-iot.dtsi @@ -13,7 +13,14 @@ #include #include #include -#include "qcs610.dtsi" + +#include +#include +#include +#include +#include +#include + #include "sm6150-sde.dtsi" #include "sm6150-sde-pll.dtsi" #include "sm6150-sde-display.dtsi" @@ -25,6 +32,20 @@ qcom,board-id = <32 0>; }; +&soc { + qcom,rmnet-ipa { + status="disabled"; + }; +}; + +&ipa_hw { + status="disabled"; +}; + +&sm6150_snd { + /delete-property/ fsa4480-i2c-handle; +}; + &qupv3_se3_i2c { status = "ok"; #include "smb1390.dtsi" diff --git a/arch/arm64/boot/dts/qcom/qcs610-ipc-overlay.dts b/arch/arm64/boot/dts/qcom/qcs610-ipc-overlay.dts index dd232536ca97..df10995071fe 100644 --- a/arch/arm64/boot/dts/qcom/qcs610-ipc-overlay.dts +++ b/arch/arm64/boot/dts/qcom/qcs610-ipc-overlay.dts @@ -1,4 +1,4 @@ -/* Copyright (c) 2019, The Linux Foundation. All rights reserved. +/* Copyright (c) 2019-2020, 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 @@ -18,7 +18,7 @@ #include "qcs610-ipc.dtsi" / { - model = "IOT"; + model = "Qualcomm Technologies, Inc. QCS610 IOT IPC"; compatible = "qcom,qcs610-iot", "qcom,qcs610", "qcom,iot"; qcom,msm-id = <401 0x0>; qcom,board-id = <32 1>; diff --git a/arch/arm64/boot/dts/qcom/qcs610-ipc.dts b/arch/arm64/boot/dts/qcom/qcs610-ipc.dts index f8722b0addd9..aa9b6439e0b3 100644 --- a/arch/arm64/boot/dts/qcom/qcs610-ipc.dts +++ b/arch/arm64/boot/dts/qcom/qcs610-ipc.dts @@ -1,4 +1,4 @@ -/* Copyright (c) 2019, The Linux Foundation. All rights reserved. +/* Copyright (c) 2019-2020, 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 @@ -12,6 +12,8 @@ /dts-v1/; +#include "qcs610.dtsi" +#include "qcs610-iot.dtsi" #include "qcs610-ipc.dtsi" / { diff --git a/arch/arm64/boot/dts/qcom/qcs610-ipc.dtsi b/arch/arm64/boot/dts/qcom/qcs610-ipc.dtsi index 15cbf635b989..87c198d211ec 100644 --- a/arch/arm64/boot/dts/qcom/qcs610-ipc.dtsi +++ b/arch/arm64/boot/dts/qcom/qcs610-ipc.dtsi @@ -10,7 +10,6 @@ * GNU General Public License for more details. */ -#include "qcs610-iot.dtsi" #include "sm6150-audio-overlay.dtsi" #include "sm6150-camera-sensor-idp.dtsi" / { diff --git a/arch/arm64/boot/dts/qcom/qcs610.dtsi b/arch/arm64/boot/dts/qcom/qcs610.dtsi index dfdbba966d75..8d1fc6080003 100644 --- a/arch/arm64/boot/dts/qcom/qcs610.dtsi +++ b/arch/arm64/boot/dts/qcom/qcs610.dtsi @@ -1,4 +1,4 @@ -/* Copyright (c) 2019, The Linux Foundation. All rights reserved. +/* Copyright (c) 2019-2020, 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 @@ -17,13 +17,3 @@ qcom,msm-name = "QCS610"; qcom,msm-id = <401 0>; }; - -&soc { - qcom,rmnet-ipa { - status="disabled"; - }; -}; - -&ipa_hw { - status="disabled"; -};