Evolution-X-Devices/kernel_xiaomi_raphael
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ARM: dts: msm: Bring all board specific changes to common file for QCS610

Browse Source 
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 <akdwived@codeaurora.org>
Signed-off-by: Anurag Chouhan <achouhan@codeaurora.org>
This commit is contained in:
Avaneesh Kumar Dwivedi
2020-05-04 19:10:34 +05:30
committed by Gerrit - the friendly Code Review server
parent be1961a61c
commit 32483be0f4
8 changed files with 35 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm64/boot/dts/qcom/Makefile
View File

@@ -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 \

4
arch/arm64/boot/dts/qcom/qcs610-iot-overlay.dts
View File

@@ -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>;

8
arch/arm64/boot/dts/qcom/qcs610-iot.dts
View File

@@ -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;
};

23
arch/arm64/boot/dts/qcom/qcs610-iot.dtsi
View File

@@ -13,7 +13,14 @@
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/iio/qcom,spmi-vadc.h>
#include <dt-bindings/input/input.h>
#include "qcs610.dtsi"
#include <dt-bindings/clock/qcom,rpmh.h>
#include <dt-bindings/clock/qcom,gcc-sm6150.h>
#include <dt-bindings/clock/qcom,camcc-sm6150.h>
#include <dt-bindings/clock/qcom,cpucc-sm8150.h>
#include <dt-bindings/clock/qcom,dispcc-sm6150.h>
#include <dt-bindings/clock/qcom,gpucc-sm6150.h>
#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"

4
arch/arm64/boot/dts/qcom/qcs610-ipc-overlay.dts
View File

@@ -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>;

4
arch/arm64/boot/dts/qcom/qcs610-ipc.dts
View File

@@ -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"
/ {

1
arch/arm64/boot/dts/qcom/qcs610-ipc.dtsi
View File

@@ -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"
/ {

12
arch/arm64/boot/dts/qcom/qcs610.dtsi
View File

@@ -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";
};