From e2698c923ab8ec49bb8239826aef72e2802c6b9f Mon Sep 17 00:00:00 2001 From: Swetha Chikkaboraiah Date: Thu, 17 Jan 2019 09:19:08 +0530 Subject: [PATCH] ARM: dts: msm: add device tree overlay for 8996 Add device tree overlay support for 8996. Change-Id: Ibdeab45acad17d3e487ba1108cd0cc3cff7fb377 Signed-off-by: Swetha Chikkaboraiah --- arch/arm/boot/dts/qcom/Makefile | 9 ++++ arch/arm/boot/dts/qcom/msm8996-auto-cdp.dtsi | 4 +- .../arm/boot/dts/qcom/msm8996-mtp-overlay.dts | 23 ++++++++++ arch/arm/boot/dts/qcom/msm8996-mtp.dtsi | 15 +------ arch/arm/boot/dts/qcom/msm8996-pinctrl.dtsi | 4 +- arch/arm/boot/dts/qcom/msm8996-pm.dtsi | 8 ++-- arch/arm/boot/dts/qcom/msm8996-v3-pmi8996.dts | 24 ++++++++++ arch/arm/boot/dts/qcom/msm8996.dtsi | 45 ++++++++++--------- .../boot/dts/qcom/msm8996pro-v1.1-pmi8996.dts | 24 ++++++++++ 9 files changed, 113 insertions(+), 43 deletions(-) create mode 100644 arch/arm/boot/dts/qcom/msm8996-mtp-overlay.dts create mode 100644 arch/arm/boot/dts/qcom/msm8996-v3-pmi8996.dts create mode 100644 arch/arm/boot/dts/qcom/msm8996pro-v1.1-pmi8996.dts diff --git a/arch/arm/boot/dts/qcom/Makefile b/arch/arm/boot/dts/qcom/Makefile index a84b606f94db..c5e693497838 100644 --- a/arch/arm/boot/dts/qcom/Makefile +++ b/arch/arm/boot/dts/qcom/Makefile @@ -1,3 +1,11 @@ +ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y) +dtbo-$(CONFIG_ARCH_MSM8996) += \ + msm8996-mtp-overlay.dtbo + +msm8996-mtp-overlay.dtbo-base := msm8996pro-v1.1-pmi8996.dtb \ + msm8996-v3-pmi8996.dtb + +else dtb-$(CONFIG_ARCH_MSM8996) += msm8996-v2-pmi8994-cdp.dtb \ msm8996-v2-pmi8994-mtp.dtb \ msm8996-v2-pmi8994-pmk8001-cdp.dtb \ @@ -115,6 +123,7 @@ dtb-$(CONFIG_ARCH_MSM8996) += msm8996-v2-pmi8994-cdp.dtb \ apq8096-v3-pmi8996-mdm9x55-slimbus-mtp.dtb \ apq8096-v3-pmi8996-dragonboard.dtb \ msm8996-auto-mizar.dtb +endif dtb-$(CONFIG_MSM_GVM_QUIN) += vplatform-lfv-msm8996-telematics.dtb \ vplatform-lfv-msm8996-ivi.dtb \ diff --git a/arch/arm/boot/dts/qcom/msm8996-auto-cdp.dtsi b/arch/arm/boot/dts/qcom/msm8996-auto-cdp.dtsi index b0ff859d560f..5384db451dab 100644 --- a/arch/arm/boot/dts/qcom/msm8996-auto-cdp.dtsi +++ b/arch/arm/boot/dts/qcom/msm8996-auto-cdp.dtsi @@ -1,4 +1,4 @@ -/* Copyright (c) 2015-2018, The Linux Foundation. All rights reserved. +/* Copyright (c) 2015-2019, 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 @@ -833,7 +833,7 @@ }; }; - pinctrl@01010000 { + pinctrl@1010000 { pcie2 { pcie2_perst_default: pcie2_perst_default { mux { diff --git a/arch/arm/boot/dts/qcom/msm8996-mtp-overlay.dts b/arch/arm/boot/dts/qcom/msm8996-mtp-overlay.dts new file mode 100644 index 000000000000..7f31ceaab42b --- /dev/null +++ b/arch/arm/boot/dts/qcom/msm8996-mtp-overlay.dts @@ -0,0 +1,23 @@ +/* Copyright (c) 2019, 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. + */ + + +/dts-v1/; +/plugin/; + +#include "msm8996-mtp.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. MSM 8996 MTP"; + compatible = "qcom,mtp"; + qcom,board-id = <8 0>; +}; diff --git a/arch/arm/boot/dts/qcom/msm8996-mtp.dtsi b/arch/arm/boot/dts/qcom/msm8996-mtp.dtsi index 9442239c56a5..f17d8c1f3c46 100644 --- a/arch/arm/boot/dts/qcom/msm8996-mtp.dtsi +++ b/arch/arm/boot/dts/qcom/msm8996-mtp.dtsi @@ -1,4 +1,4 @@ -/* Copyright (c) 2015-2018, The Linux Foundation. All rights reserved. +/* Copyright (c) 2015-2019, 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 @@ -10,7 +10,7 @@ * GNU General Public License for more details. */ -#include "msm8996-pinctrl.dtsi" +#include #include "msm8996-camera-sensor-mtp.dtsi" #include "msm8996-wsa881x.dtsi" @@ -182,17 +182,6 @@ qcom,hw-settle-time = <2>; qcom,fast-avg-setup = <0>; }; - - chan@7c { - label = "xo_therm_buf"; - reg = <0x7c>; - qcom,decimation = <0>; - qcom,pre-div-channel-scaling = <0>; - qcom,calibration-type = "ratiometric"; - qcom,scale-function = <4>; - qcom,hw-settle-time = <2>; - qcom,fast-avg-setup = <0>; - }; }; &pm8994_adc_tm { diff --git a/arch/arm/boot/dts/qcom/msm8996-pinctrl.dtsi b/arch/arm/boot/dts/qcom/msm8996-pinctrl.dtsi index 3e2e7bbf56f6..dc964124829f 100644 --- a/arch/arm/boot/dts/qcom/msm8996-pinctrl.dtsi +++ b/arch/arm/boot/dts/qcom/msm8996-pinctrl.dtsi @@ -1,4 +1,4 @@ -/* Copyright (c) 2014-2018, The Linux Foundation. All rights reserved. +/* Copyright (c) 2014-2019, 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 @@ */ &soc { - tlmm: pinctrl@01010000 { + tlmm: pinctrl@1010000 { compatible = "qcom,msm8996-pinctrl"; reg = <0x01010000 0x300000>; interrupts = <0 208 0>; diff --git a/arch/arm/boot/dts/qcom/msm8996-pm.dtsi b/arch/arm/boot/dts/qcom/msm8996-pm.dtsi index 74c964bc466d..501da260bcdf 100644 --- a/arch/arm/boot/dts/qcom/msm8996-pm.dtsi +++ b/arch/arm/boot/dts/qcom/msm8996-pm.dtsi @@ -1,4 +1,4 @@ -/* Copyright (c) 2015-2017, The Linux Foundation. All rights reserved. +/* Copyright (c) 2015-2017, 2019, 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 @@ -14,7 +14,7 @@ #include &soc { - qcom,spm@9A10000 { + qcom,spm@9a10000 { compatible = "qcom,spm-v2"; #address-cells = <1>; #size-cells = <1>; @@ -525,13 +525,13 @@ <69 145>; }; - rpm_msg_ram: memory@0x200000 { + rpm_msg_ram: memory@200000 { compatible = "qcom,rpm-msg-ram"; reg = <0x200000 0x1000>, <0x290000 0x1000>; }; - rpm_code_ram: rpm-memory@0x68000 { + rpm_code_ram: rpm-memory@68000 { compatible = "qcom,rpm-code-ram"; reg = <0x68000 0x5000>; }; diff --git a/arch/arm/boot/dts/qcom/msm8996-v3-pmi8996.dts b/arch/arm/boot/dts/qcom/msm8996-v3-pmi8996.dts new file mode 100644 index 000000000000..2337447c048e --- /dev/null +++ b/arch/arm/boot/dts/qcom/msm8996-v3-pmi8996.dts @@ -0,0 +1,24 @@ +/* Copyright (c) 2019, 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. + */ + +/dts-v1/; + +#include "msm8996-v3.dtsi" +#include "msm-pmi8996.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. MSM 8996 v3 + PMI8996"; + compatible = "qcom,msm8996"; + qcom,pmic-id = <0x20009 0x10013 0x0 0x0>; + qcom,msm-id = <246 0x30001>; + qcom,pmic-name = "PMI8996"; +}; diff --git a/arch/arm/boot/dts/qcom/msm8996.dtsi b/arch/arm/boot/dts/qcom/msm8996.dtsi index 192345d3c67c..b626fdb16964 100644 --- a/arch/arm/boot/dts/qcom/msm8996.dtsi +++ b/arch/arm/boot/dts/qcom/msm8996.dtsi @@ -257,6 +257,7 @@ }; }; +#include "msm8996-pinctrl.dtsi" #include "msm8996-ion.dtsi" #include "msm8996-mdss.dtsi" #include "msm8996-mdss-pll.dtsi" @@ -317,7 +318,7 @@ qcom,clock-source-override; }; - intc: interrupt-controller@09bc0000 { + intc: interrupt-controller@9bc0000 { compatible = "arm,gic-v3"; reg = <0x9bc0000 0x10000>, /* GICD */ <0x9c00000 0x100000>; /* GICR * 4 */ @@ -331,7 +332,7 @@ interrupts = <1 9 4>; - gic-its@09BE0000 { + gic-its@9be0000 { compatible = "arm,gic-v3-its"; msi-contoller; reg = <0x9be0000 0x20000>; @@ -360,7 +361,7 @@ qcom,pipe-attr-ee; }; - uartblsp2dm1: serial@075b0000 { + uartblsp2dm1: serial@75b0000 { compatible = "qcom,msm-uartdm-v1.4", "qcom,msm-uartdm"; reg = <0x75b0000 0x1000>; interrupts = ; @@ -369,7 +370,7 @@ clock-names = "core", "iface"; }; - uartblsp1dm1: serial@07570000 { + uartblsp1dm1: serial@7570000 { compatible = "qcom,msm-lsuart-v14"; reg = <0x7570000 0x1000>; interrupts = <0 108 0>; @@ -405,7 +406,7 @@ }; - dma_blsp1: qcom,sps-dma@0x7544000{ /* BLSP1 */ + dma_blsp1: qcom,sps-dma@7544000{ /* BLSP1 */ #dma-cells = <4>; compatible = "qcom,sps-dma"; reg = <0x7544000 0x2b000>; @@ -413,7 +414,7 @@ qcom,summing-threshold = <0x10>; }; - dma_blsp2: qcom,sps-dma@0x7584000{ /* BLSP2 */ + dma_blsp2: qcom,sps-dma@7584000{ /* BLSP2 */ #dma-cells = <4>; compatible = "qcom,sps-dma"; reg = <0x7584000 0x2b000>; @@ -496,7 +497,7 @@ pinctrl-2 = <&i2c_8_bitbang>; }; - blsp1_uart2: uart@07570000 { /* BLSP1 UART2 */ + blsp1_uart2: uart@7570000 { /* BLSP1 UART2 */ compatible = "qcom,msm-hsuart-v14"; reg = <0x07570000 0x1000>, <0x7544000 0x2b000>; @@ -921,7 +922,7 @@ pinctrl-1 = <&spkr_i2s_clk_active>; }; - tspp: msm_tspp@075e7000 { + tspp: msm_tspp@75e7000 { compatible = "qcom,msm_tspp"; reg = <0x075e7000 0x1000>, /* MSM_TSIF0_PHYS */ <0x075e8000 0x1000>, /* MSM_TSIF1_PHYS */ @@ -1097,7 +1098,7 @@ status = "disabled"; }; - sdhc_2: sdhci@74A4900 { + sdhc_2: sdhci@74a4900 { compatible = "qcom,sdhci-msm"; reg = <0x74A4900 0x314>, <0x74A4000 0x800>; reg-names = "hc_mem", "core_mem"; @@ -1302,7 +1303,7 @@ status = "disabled"; }; - pcie0: qcom,pcie@00600000 { + pcie0: qcom,pcie@600000 { compatible = "qcom,pci-msm"; cell-index = <0>; @@ -1458,7 +1459,7 @@ <0>, <0>, <0>, <0>, <0>, <0>, <0>; }; - pcie1: qcom,pcie@00608000 { + pcie1: qcom,pcie@608000 { compatible = "qcom,pci-msm"; cell-index = <1>; @@ -1610,7 +1611,7 @@ <0>, <0>, <0>, <0>, <0>, <0>, <0>; }; - pcie2: qcom,pcie@00610000 { + pcie2: qcom,pcie@610000 { compatible = "qcom,pci-msm"; cell-index = <2>; @@ -2552,7 +2553,7 @@ qcom,ipa-advertise-sg-support; }; - pcie_ep: qcom,pcie-ep@00600000 { + pcie_ep: qcom,pcie-ep@600000 { compatible = "qcom,pcie-ep"; reg = <0x0c001000 0x1000>, @@ -4258,7 +4259,7 @@ "l2_irq_err_0", "l2_irq_err_1", "l3_irq"; }; - qcom,m4m_erp64@9A40000 { + qcom,m4m_erp64@9a40000 { compatible = "qcom,m4m_erp"; reg = <0x9A40000 0x40000>; interrupts = <0 22 0>; @@ -4270,7 +4271,7 @@ interrupts = <0 23 4>; }; - timer@09840000 { + timer@9840000 { #address-cells = <1>; #size-cells = <1>; ranges; @@ -4278,7 +4279,7 @@ reg = <0x09840000 0x1000>; clock-frequency = <19200000>; - frame@09850000 { + frame@9850000 { frame-number = <0>; interrupts = <0 31 0x4>, <0 30 0x4>; @@ -4286,42 +4287,42 @@ <0x09860000 0x1000>; }; - frame@09870000 { + frame@9870000 { frame-number = <1>; interrupts = <0 32 0x4>; reg = <0x09870000 0x1000>; status = "disabled"; }; - frame@09880000 { + frame@9880000 { frame-number = <2>; interrupts = <0 33 0x4>; reg = <0x09880000 0x1000>; status = "disabled"; }; - frame@09890000 { + frame@9890000 { frame-number = <3>; interrupts = <0 34 0x4>; reg = <0x09890000 0x1000>; status = "disabled"; }; - frame@098a0000 { + frame@98a0000 { frame-number = <4>; interrupts = <0 35 0x4>; reg = <0x098a0000 0x1000>; status = "disabled"; }; - frame@098b0000 { + frame@98b0000 { frame-number = <5>; interrupts = <0 36 0x4>; reg = <0x098b0000 0x1000>; status = "disabled"; }; - frame@098c0000 { + frame@98c0000 { frame-number = <6>; interrupts = <0 37 0x4>; reg = <0x098c0000 0x1000>; diff --git a/arch/arm/boot/dts/qcom/msm8996pro-v1.1-pmi8996.dts b/arch/arm/boot/dts/qcom/msm8996pro-v1.1-pmi8996.dts new file mode 100644 index 000000000000..321ebb275603 --- /dev/null +++ b/arch/arm/boot/dts/qcom/msm8996pro-v1.1-pmi8996.dts @@ -0,0 +1,24 @@ +/* Copyright (c) 2019, 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. + */ + +/dts-v1/; + +#include "msm8996pro-v1.1.dtsi" +#include "msm-pmi8996.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. MSM 8996pro v1.1 + PMI8996"; + compatible = "qcom,msm8996"; + qcom,pmic-id = <0x20009 0x10013 0x0 0x0>; + qcom,msm-id = <305 0x10001>; + qcom,pmic-name = "PMI8996"; +};