From 613cbf4a41574d4b0b17cc9d652b1d56c519278f Mon Sep 17 00:00:00 2001 From: Zhiqiang Liu Date: Thu, 20 May 2021 17:46:59 +0800 Subject: [PATCH] ARM: dts: msm: add lxc overlay supoort on v1 board Add lxc overlay support on some v1 boards to fix kernel boot failed issue of LXC image. Change-Id: Ia11dd0de44741b504571db50f8ec1ca1f0dd0fde --- qcom/Makefile | 12 ++++++++++++ qcom/sa6155p-adp-air-lxc-overlay.dts | 12 ++++++++++++ qcom/sa6155p-adp-star-lxc-overlay.dts | 12 ++++++++++++ qcom/sa6155p-v2-adp-star-lxc-overlay.dts | 12 ++++++++++++ qcom/sa8155-adp-star-lxc-overlay.dts | 12 ++++++++++++ qcom/sa8155p-adp-star-lxc-overlay.dts | 12 ++++++++++++ qcom/sa8195p-adp-star-lxc-overlay.dts | 13 +++++++++++++ 7 files changed, 85 insertions(+) create mode 100644 qcom/sa6155p-adp-air-lxc-overlay.dts create mode 100644 qcom/sa6155p-adp-star-lxc-overlay.dts create mode 100644 qcom/sa6155p-v2-adp-star-lxc-overlay.dts create mode 100644 qcom/sa8155-adp-star-lxc-overlay.dts create mode 100644 qcom/sa8155p-adp-star-lxc-overlay.dts create mode 100644 qcom/sa8195p-adp-star-lxc-overlay.dts diff --git a/qcom/Makefile b/qcom/Makefile index 51ff557384fa..090447f54f6d 100644 --- a/qcom/Makefile +++ b/qcom/Makefile @@ -284,6 +284,8 @@ dtb-$(CONFIG_ARCH_SCUBA) += qrb2210-rb1.dtb ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y) ifeq ($(CONFIG_AUTO_LXC_OVERLAY), y) dtbo-$(CONFIG_ARCH_SA8155) += \ + sa8155-adp-star-lxc-overlay.dtbo \ + sa8155p-adp-star-lxc-overlay.dtbo \ sa8155-v2-adp-air-lxc-overlay.dtbo \ sa8155p-v2-adp-air-lxc-overlay.dtbo else @@ -298,6 +300,8 @@ sa8155-adp-star-overlay.dtbo-base := sa8155.dtb sa8155-v2.dtb sa8155p-adp-star-overlay.dtbo-base := 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 +sa8155-adp-star-lxc-overlay.dtbo-base := sa8155.dtb sa8155-v2.dtb +sa8155p-adp-star-lxc-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 @@ -312,6 +316,9 @@ endif ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y) ifeq ($(CONFIG_AUTO_LXC_OVERLAY), y) dtbo-$(CONFIG_ARCH_SA6155) += \ + sa6155p-adp-star-lxc-overlay.dtbo \ + sa6155p-v2-adp-star-lxc-overlay.dtbo \ + sa6155p-adp-air-lxc-overlay.dtbo \ sa6155p-v2-adp-air-lxc-overlay.dtbo else dtbo-$(CONFIG_ARCH_SA6155) += \ @@ -333,6 +340,9 @@ 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-adp-star-lxc-overlay.dtbo-base := sa6155p.dtb +sa6155p-v2-adp-star-lxc-overlay.dtbo-base := sa6155p.dtb +sa6155p-adp-air-lxc-overlay.dtbo-base := sa6155p.dtb sa6155p-v2-adp-air-lxc-overlay.dtbo-base := sa6155p.dtb else dtb-$(CONFIG_ARCH_SA6155) += sa6155-adp-star.dtb \ @@ -348,6 +358,7 @@ endif ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y) ifeq ($(CONFIG_AUTO_LXC_OVERLAY), y) dtbo-$(CONFIG_ARCH_SA8195) += \ + sa8195p-adp-star-lxc-overlay.dtbo \ sa8195p-v2-adp-air-lxc-overlay.dtbo else dtbo-$(CONFIG_ARCH_SA8195) += \ @@ -357,6 +368,7 @@ endif sa8195p-adp-star-overlay.dtbo-base := sa8195p.dtb sa8195p-v2-adp-air-overlay.dtbo-base := sa8195p.dtb +sa8195p-adp-star-lxc-overlay.dtbo-base := sa8195p.dtb sa8195p-v2-adp-air-lxc-overlay.dtbo-base := sa8195p.dtb else dtb-$(CONFIG_ARCH_SA8195) += sa8195p-adp-star.dtb \ diff --git a/qcom/sa6155p-adp-air-lxc-overlay.dts b/qcom/sa6155p-adp-air-lxc-overlay.dts new file mode 100644 index 000000000000..33b43234cbb8 --- /dev/null +++ b/qcom/sa6155p-adp-air-lxc-overlay.dts @@ -0,0 +1,12 @@ +/dts-v1/; +/plugin/; + +#include "sa6155-adp-air.dtsi" +#include "display/sa6155p-v2-adp-air-display-lxc-shd.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. SA6155P ADP-AIR"; + compatible = "qcom,sa6155p-adp-air", "qcom,sa6155p", "qcom,adp-air"; + qcom,msm-id = <377 0x0>, <380 0>; + qcom,board-id = <0x03010019 0>; +}; diff --git a/qcom/sa6155p-adp-star-lxc-overlay.dts b/qcom/sa6155p-adp-star-lxc-overlay.dts new file mode 100644 index 000000000000..21206996184c --- /dev/null +++ b/qcom/sa6155p-adp-star-lxc-overlay.dts @@ -0,0 +1,12 @@ +/dts-v1/; +/plugin/; + +#include "sa6155-adp-star.dtsi" +#include "display/sa6155p-v2-adp-air-display-lxc-shd.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. SA6155P ADP-STAR"; + compatible = "qcom,sa6155p-adp-star", "qcom,sa6155p", "qcom,adp-star"; + qcom,msm-id = <377 0x0>, <380 0>; + qcom,board-id = <0x010019 0>; +}; diff --git a/qcom/sa6155p-v2-adp-star-lxc-overlay.dts b/qcom/sa6155p-v2-adp-star-lxc-overlay.dts new file mode 100644 index 000000000000..7d4774e4737e --- /dev/null +++ b/qcom/sa6155p-v2-adp-star-lxc-overlay.dts @@ -0,0 +1,12 @@ +/dts-v1/; +/plugin/; + +#include "sa6155-adp-star.dtsi" +#include "display/sa6155p-v2-adp-air-display-lxc-shd.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. SA6155P ADP-STAR V2"; + compatible = "qcom,sa6155p-adp-star", "qcom,sa6155p", "qcom,adp-star"; + qcom,msm-id = <377 0x0>, <380 0>; + qcom,board-id = <0x020019 0>; +}; diff --git a/qcom/sa8155-adp-star-lxc-overlay.dts b/qcom/sa8155-adp-star-lxc-overlay.dts new file mode 100644 index 000000000000..b98910e9197d --- /dev/null +++ b/qcom/sa8155-adp-star-lxc-overlay.dts @@ -0,0 +1,12 @@ +/dts-v1/; +/plugin/; + +#include "sa8155-adp-star.dtsi" +#include "display/sa8155-v2-adp-air-display-lxc-shd.dtsi" + +/ { + model = "ADP-STAR"; + compatible = "qcom,sa8155-adp-star", "qcom,sa8155", + "qcom,adp-star"; + qcom,board-id = <25 0>; +}; diff --git a/qcom/sa8155p-adp-star-lxc-overlay.dts b/qcom/sa8155p-adp-star-lxc-overlay.dts new file mode 100644 index 000000000000..7cb054ee0325 --- /dev/null +++ b/qcom/sa8155p-adp-star-lxc-overlay.dts @@ -0,0 +1,12 @@ +/dts-v1/; +/plugin/; + +#include "sa8155-adp-star.dtsi" +#include "display/sa8155-v2-adp-air-display-lxc-shd.dtsi" + +/ { + model = "ADP-STAR"; + compatible = "qcom,sa8155p-adp-star", "qcom,sa8155p", + "qcom,adp-star"; + qcom,board-id = <25 0>; +}; diff --git a/qcom/sa8195p-adp-star-lxc-overlay.dts b/qcom/sa8195p-adp-star-lxc-overlay.dts new file mode 100644 index 000000000000..a5a325aabf2d --- /dev/null +++ b/qcom/sa8195p-adp-star-lxc-overlay.dts @@ -0,0 +1,13 @@ +/dts-v1/; +/plugin/; + +#include "sa8195p-adp-star.dtsi" +#include "display/sa8195p-v2-adp-air-display-lxc-shd.dtsi" + +/ { + model = "ADP-STAR"; + compatible = "qcom,sa8195p-adp-star", "qcom,sa8195p", + "qcom,adp-star"; + qcom,msm-id = <405 0x20000>; + qcom,board-id = <0x010019 0>; +};