malhuda/msm-4.14
1
0
Fork 0
mirror of https://github.com/rd-stuffs/msm-4.14.git synced 2025-02-20 11:45:48 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge "ARM: dts: msm: multi-card for SA6155/SA8155/SA8195 lxc dtbo"

Browse Source
This commit is contained in:
qctecmdr 2020-09-22 03:50:31 -07:00 committed by Gerrit - the friendly Code Review server
commit 11a49af2d6
8 changed files with 430 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,8 +7,10 @@ ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)
sa8155p-adp-star-overlay.dtbo \
sa8155p-adp-star-lpass-overlay.dtbo \
sa8155-v2-adp-air-overlay.dtbo \
sa8155p-v2-adp-air-overlay.dtbo \
sa8155p-v2-adp-air-lpass-overlay.dtbo
sa8155p-v2-adp-air-overlay.dtbo \
sa8155p-v2-adp-air-lpass-overlay.dtbo \
sa8155-v2-adp-air-lxc-overlay.dtbo \
sa8155p-v2-adp-air-lxc-overlay.dtbo
sm8150-cdp-overlay.dtbo-base := sm8150.dtb sm8150-v2.dtb sm8150p.dtb sm8150p-v2.dtb
sa8155-adp-star-overlay.dtbo-base := sa8155.dtb sa8155-v2.dtb
@ -17,6 +19,8 @@ sa8155p-adp-star-lpass-overlay.dtbo := sa8155p.dtb sa8155p-v2.dtb
sa8155-v2-adp-air-overlay.dtbo-base := sa8155.dtb sa8155-v2.dtb
sa8155p-v2-adp-air-overlay.dtbo-base := sa8155p.dtb sa8155p-v2.dtb
sa8155p-v2-adp-air-lpass-overlay.dtbo-base := sa8155p.dtb sa8155p-v2.dtb
sa8155-v2-adp-air-lxc-overlay.dtbo-base := sa8155.dtb sa8155-v2.dtb
sa8155p-v2-adp-air-lxc-overlay.dtbo-base := sa8155p.dtb sa8155p-v2.dtb
else
dtb-$(CONFIG_ARCH_SM8150) += sm8150-cdp.dtb \
sa8155-adp-star.dtb \
@ -36,11 +40,13 @@ ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)
dtbo-$(CONFIG_ARCH_SDMSHRIKE) += \
sdmshrike-cdp-overlay.dtbo \
sa8195p-adp-star-overlay.dtbo \
sa8195p-v2-adp-air-overlay.dtbo
sa8195p-v2-adp-air-overlay.dtbo \
sa8195p-v2-adp-air-lxc-overlay.dtbo
sdmshrike-cdp-overlay.dtbo-base := sdmshrike.dtb sdmshrike-v2.dtb
sa8195p-adp-star-overlay.dtbo-base := sa8195p.dtb
sa8195p-v2-adp-air-overlay.dtbo-base := sa8195p.dtb
sa8195p-v2-adp-air-lxc-overlay.dtbo-base := sa8195p.dtb
else
dtb-$(CONFIG_ARCH_SDMSHRIKE) += sdmshrike-cdp.dtb \
sa8195p-adp-star.dtb \
@ -56,7 +62,8 @@ ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)
sa6155p-adp-air-overlay.dtbo \
sa6155p-v2-adp-star-overlay.dtbo \
sa6155p-v2-adp-air-overlay.dtbo \
sa6155p-v2-adp-air-lpass-overlay.dtbo
sa6155p-v2-adp-air-lpass-overlay.dtbo \
sa6155p-v2-adp-air-lxc-overlay.dtbo
sa6155-adp-star-overlay.dtbo-base := sa6155.dtb
sa6155p-adp-star-overlay.dtbo-base := sa6155p.dtb
@ -66,6 +73,7 @@ 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
sa6155p-v2-adp-air-lpass-overlay.dtbo-base := sa6155p.dtb
sa6155p-v2-adp-air-lxc-overlay.dtbo-base := sa6155p.dtb
else
dtb-$(CONFIG_ARCH_SM6150) += sa6155-adp-star.dtb \
sa6155p-adp-star.dtb \

81
arch/arm64/boot/dts/qcom/sa6155p-v2-adp-air-display-lxc-shd.dtsi Normal file
View File

@ -0,0 +1,81 @@
/* Copyright (c) 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
* 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.
*/
&soc {
sde_sh_base0: qcom,shared-display-base@0 {
qcom,shared-display-base-intf = <1>;
};
sde_sh_base1: qcom,shared-display-base@1 {
qcom,shared-display-base-intf = <0>;
qcom,shared-display-base-mst;
};
sde_sh_base2: qcom,shared-display-base@2 {
qcom,shared-display-base-intf = <3>;
qcom,shared-display-base-mst;
};
sde_sh0: qcom,shared-display@0 {
compatible = "qcom,shared-display";
qcom,shared-display-base = <&sde_sh_base0>;
qcom,blend-stage-range = <0 4>;
qcom,shared-display-name = "shared-disp-0";
qcom,display-type = "primary";
};
sde_sh1: qcom,shared-display@1 {
compatible = "qcom,shared-display";
qcom,shared-display-base = <&sde_sh_base1>;
qcom,blend-stage-range = <0 4>;
qcom,shared-display-name = "shared-disp-1";
qcom,display-type = "primary";
};
sde_sh2: qcom,shared-display@2 {
compatible = "qcom,shared-display";
qcom,shared-display-base = <&sde_sh_base2>;
qcom,blend-stage-range = <0 2>;
qcom,shared-display-name = "shared-disp-2";
qcom,display-type = "primary";
};
sde_card1: qcom,sde-kms-lease@0 {
compatible = "qcom,sde-kms-lease";
qcom,dev-name = "msm_drm";
qcom,lease-connectors = "shared-disp-0";
qcom,lease-planes = "plane-0","plane-1","plane-9",
"plane-5";
};
sde_card2: qcom,sde-kms-lease@1 {
compatible = "qcom,sde-kms-lease";
qcom,dev-name = "msm_drm";
qcom,lease-connectors = "shared-disp-1";
qcom,lease-planes = "plane-2","plane-6","plane-3","plane-7";
};
sde_card3: qcom,sde-kms-lease@2 {
compatible = "qcom,sde-kms-lease";
qcom,dev-name = "msm_drm";
qcom,lease-connectors = "shared-disp-2";
qcom,lease-planes = "plane-4","plane-8";
};
};
&mdss_mdp {
qcom,sde-reg-dma-version = <0>;
qcom,sde-crtc-num-pref = <5>;
connectors = <&sde_rscc &dsi_dp1 &sde_wb &sde_dp
&sde_sh0 &sde_sh1 &sde_sh2
&sde_card1 &sde_card2 &sde_card3>;
};

41
arch/arm64/boot/dts/qcom/sa6155p-v2-adp-air-lxc-overlay.dts Normal file
View File

@ -0,0 +1,41 @@
/* Copyright (c) 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
* 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 <dt-bindings/interrupt-controller/arm-gic.h>
#include <dt-bindings/clock/qcom,camcc-sm6150.h>
#include "sa6155-adp-air.dtsi"
#include "sa6155-display.dtsi"
#include "sa6155p-v2-adp-air-display-lxc-shd.dtsi"
/ {
model = "Qualcomm Technologies, Inc. SA6155P ADP-AIR V2";
compatible = "qcom,sa6155p-adp-air", "qcom,sa6155p", "qcom,adp-air";
qcom,msm-id = <377 0x0>, <380 0>;
qcom,board-id = <0x03020019 0>;
};
/* For Voice Call Use-Case*/
&dai_pri_auxpcm {
qcom,msm-cpudai-auxpcm-sync = <0>, <0>;
qcom,msm-cpudai-auxpcm-pcm-clk-rate = <0>, <0>;
};
&soc {
qcom,diag {
compatible = "qcom,diag";
qcom,usb-enabled;
};
};

114
arch/arm64/boot/dts/qcom/sa8155-v2-adp-air-display-lxc-shd.dtsi Normal file
View File

@ -0,0 +1,114 @@
/* Copyright (c) 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
* 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.
*/
&soc {
sde_sh_base0: qcom,shared-display-base@0 {
qcom,shared-display-base-intf = <3>;
qcom,shared-display-base-mst;
};
sde_sh_base1: qcom,shared-display-base@1 {
qcom,shared-display-base-intf = <1>;
};
sde_sh_base2: qcom,shared-display-base@2 {
qcom,shared-display-base-intf = <2>;
};
sde_sh_base3: qcom,shared-display-base@3 {
qcom,shared-display-base-intf = <0>;
qcom,shared-display-base-mst;
};
sde_sh_base4: qcom,shared-display-base@4 {
qcom,shared-display-base-intf = <0>;
};
sde_sh0: qcom,shared-display@0 {
compatible = "qcom,shared-display";
qcom,shared-display-base = <&sde_sh_base0>;
qcom,blend-stage-range = <0 4>;
qcom,shared-display-name = "shared-disp-0";
qcom,display-type = "primary";
};
sde_sh1: qcom,shared-display@1 {
compatible = "qcom,shared-display";
qcom,shared-display-base = <&sde_sh_base1>;
qcom,blend-stage-range = <0 4>;
qcom,display-type = "primary";
qcom,shared-display-name = "shared-disp-1";
};
sde_sh2: qcom,shared-display@2 {
compatible = "qcom,shared-display";
qcom,shared-display-base = <&sde_sh_base2>;
qcom,blend-stage-range = <0 4>;
qcom,display-type = "primary";
qcom,shared-display-name = "shared-disp-2";
};
sde_sh3: qcom,shared-display@3 {
compatible = "qcom,shared-display";
qcom,shared-display-base = <&sde_sh_base3>;
qcom,blend-stage-range = <0 4>;
qcom,shared-display-name = "shared-disp-3";
qcom,display-type = "primary";
};
sde_sh4: qcom,shared-display@4 {
compatible = "qcom,shared-display";
qcom,shared-display-base = <&sde_sh_base4>;
qcom,blend-stage-range = <0 4>;
qcom,shared-display-name = "shared-disp-4";
qcom,display-type = "primary";
};
sde_card1: qcom,sde-kms-lease@0 {
compatible = "qcom,sde-kms-lease";
qcom,dev-name = "msm_drm";
qcom,lease-connectors = "shared-disp-1";
qcom,lease-planes = "plane-0", "plane-1",
"plane-12", "plane-13";
};
sde_card2: qcom,sde-kms-lease@1 {
compatible = "qcom,sde-kms-lease";
qcom,dev-name = "msm_drm";
qcom,lease-connectors = "shared-disp-2";
qcom,lease-planes = "plane-2", "plane-3",
"plane-14", "plane-15";
};
sde_card3: qcom,sde-kms-lease@2 {
compatible = "qcom,sde-kms-lease";
qcom,dev-name = "msm_drm";
qcom,lease-connectors = "shared-disp-3","shared-disp-4";
qcom,lease-planes = "plane-4", "plane-5",
"plane-8", "plane-9";
};
sde_card4: qcom,sde-kms-lease@3 {
compatible = "qcom,sde-kms-lease";
qcom,dev-name = "msm_drm";
qcom,lease-connectors = "shared-disp-0";
qcom,lease-planes = "plane-6", "plane-7",
"plane-10", "plane-11";
};
};
&mdss_mdp {
qcom,sde-reg-dma-version = <0>;
connectors = <&dsi_dp1 &dsi_dp2 &sde_dp &sde_wb
&sde_sh0 &sde_sh1 &sde_sh2 &sde_sh3 &sde_sh4
&sde_card1 &sde_card2 &sde_card3 &sde_card4>;
};

25
arch/arm64/boot/dts/qcom/sa8155-v2-adp-air-lxc-overlay.dts Normal file
View File

@ -0,0 +1,25 @@
/* Copyright (c) 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
* 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 "sa8155-adp-common.dtsi"
#include "sa8155-adp-star-display.dtsi"
#include "sa8155-v2-adp-air-display-lxc-shd.dtsi"
/ {
model = "ADP-AIR";
compatible = "qcom,sa8155-v2-adp-air", "qcom,sa8155",
"qcom,adp-air";
qcom,board-id = <0X01000019 0>;
};

25
arch/arm64/boot/dts/qcom/sa8155p-v2-adp-air-lxc-overlay.dts Normal file
View File

@ -0,0 +1,25 @@
/* Copyright (c) 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
* 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 "sa8155-adp-common.dtsi"
#include "sa8155-adp-star-display.dtsi"
#include "sa8155-v2-adp-air-display-lxc-shd.dtsi"
/ {
model = "ADP-AIR";
compatible = "qcom,sa8155p-v2-adp-air", "qcom,sa8155p",
"qcom,adp-air";
qcom,board-id = <0x01000019 0>;
};

101
arch/arm64/boot/dts/qcom/sa8195p-v2-adp-air-display-lxc-shd.dtsi Normal file
View File

@ -0,0 +1,101 @@
/* Copyright (c) 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
* 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.
*/
&soc {
sde_sh_base0: qcom,shared-display-base@0 {
qcom,shared-display-base-intf = <1>;
};
sde_sh_base1: qcom,shared-display-base@1 {
qcom,shared-display-base-intf = <2>;
};
sde_sh_base2: qcom,shared-display-base@2 {
qcom,shared-display-base-intf = <0>;
};
sde_sh_base3: qcom,shared-display-base@3 {
qcom,shared-display-base-intf = <4>;
};
sde_sh0: qcom,shared-display@0 {
compatible = "qcom,shared-display";
qcom,shared-display-base = <&sde_sh_base0>;
qcom,blend-stage-range = <0 4>;
qcom,shared-display-name = "shared-disp-0";
qcom,display-type = "primary";
};
sde_sh1: qcom,shared-display@1 {
compatible = "qcom,shared-display";
qcom,shared-display-base = <&sde_sh_base1>;
qcom,blend-stage-range = <0 4>;
qcom,display-type = "primary";
qcom,shared-display-name = "shared-disp-1";
};
sde_sh2: qcom,shared-display@2 {
compatible = "qcom,shared-display";
qcom,shared-display-base = <&sde_sh_base2>;
qcom,blend-stage-range = <0 4>;
qcom,display-type = "primary";
qcom,shared-display-name = "shared-disp-2";
};
sde_sh3: qcom,shared-display@3 {
compatible = "qcom,shared-display";
qcom,shared-display-base = <&sde_sh_base3>;
qcom,blend-stage-range = <0 4>;
qcom,shared-display-name = "shared-disp-3";
qcom,display-type = "primary";
};
sde_card1: qcom,sde-kms-lease@0 {
compatible = "qcom,sde-kms-lease";
qcom,dev-name = "msm_drm";
qcom,lease-connectors = "shared-disp-0";
qcom,lease-planes = "plane-0", "plane-1",
"plane-12","plane-13";
};
sde_card2: qcom,sde-kms-lease@1 {
compatible = "qcom,sde-kms-lease";
qcom,dev-name = "msm_drm";
qcom,lease-connectors = "shared-disp-1";
qcom,lease-planes = "plane-2","plane-3",
"plane-14","plane-15";
};
sde_card3: qcom,sde-kms-lease@2 {
compatible = "qcom,sde-kms-lease";
qcom,dev-name = "msm_drm";
qcom,lease-connectors = "shared-disp-2";
qcom,lease-planes = "plane-4","plane-5",
"plane-8","plane-9";
};
sde_card4: qcom,sde-kms-lease@3 {
compatible = "qcom,sde-kms-lease";
qcom,dev-name = "msm_drm";
qcom,lease-connectors = "shared-disp-3";
qcom,lease-planes = "plane-6","plane-7",
"plane-10","plane-11";
};
};
&mdss_mdp {
qcom,sde-crtc-num-pref = <7>;
qcom,sde-reg-dma-version = <0>;
connectors = <&dsi_dp1 &dsi_dp2 &sde_dp0 &sde_dp1 &sde_edp &sde_wb
&sde_sh0 &sde_sh1 &sde_sh2 &sde_sh3
&sde_card1 &sde_card2 &sde_card3 &sde_card4>;
};

31
arch/arm64/boot/dts/qcom/sa8195p-v2-adp-air-lxc-overlay.dts Normal file
View File

@ -0,0 +1,31 @@
/* Copyright (c) 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
* 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 "sa8195p-adp-common.dtsi"
#include "sa8195p-adp-star-display.dtsi"
#include "sa8195p-v2-adp-air-display-lxc-shd.dtsi"
/ {
model = "ADP-AIR";
compatible = "qcom,sa8195p-v2-adp-air", "qcom,sa8195p",
"qcom,adp-air";
qcom,board-id = <0x02010019 0>;
};
&qupv3_se0_spi {
can-controller@0 {
status = "disabled";
};
};