| Message ID | 20230323005925.23179-1-lujianhua000@gmail.com |
|---|---|
| State | Accepted |
| Commit | 68434024dae509455bdd2a9e321a2cf58a6d0a75 |
| Headers | show |
| Series | [v3,1/3] arm64: dts: qcom: Split elish dts into common dtsi and elish-boe dts | expand |
On Thu, 23 Mar 2023 08:59:23 +0800, Jianhua Lu wrote: > There are two panel variants of xiaomi-elish, BOE and CSOT panels. > In order to support both panels, so split elish dts into common dtsi > and elish-boe dts. > > Applied, thanks! [1/3] arm64: dts: qcom: Split elish dts into common dtsi and elish-boe dts commit: 68434024dae509455bdd2a9e321a2cf58a6d0a75 [2/3] arm64: dts: qcom: sm8250-xiaomi-elish-boe: Add mdss and dsi panel commit: 51c4c2bd6f314de8b1bb7b5c949d2432be19d419 [3/3] arm64: dts: qcom: sm8250-xiaomi-elish-csot: Add Xiaomi Mi Pad 5 Pro CSOT variant commit: 8a786036c7b682c4d77abf7f396b87bc7eec98f9 Best regards,
diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/Makefile index 1a29403400b7..808f46947661 100644 --- a/arch/arm64/boot/dts/qcom/Makefile +++ b/arch/arm64/boot/dts/qcom/Makefile @@ -183,7 +183,7 @@ dtb-$(CONFIG_ARCH_QCOM) += sm8250-hdk.dtb dtb-$(CONFIG_ARCH_QCOM) += sm8250-mtp.dtb dtb-$(CONFIG_ARCH_QCOM) += sm8250-sony-xperia-edo-pdx203.dtb dtb-$(CONFIG_ARCH_QCOM) += sm8250-sony-xperia-edo-pdx206.dtb -dtb-$(CONFIG_ARCH_QCOM) += sm8250-xiaomi-elish.dtb +dtb-$(CONFIG_ARCH_QCOM) += sm8250-xiaomi-elish-boe.dtb dtb-$(CONFIG_ARCH_QCOM) += sm8350-hdk.dtb dtb-$(CONFIG_ARCH_QCOM) += sm8350-microsoft-surface-duo2.dtb dtb-$(CONFIG_ARCH_QCOM) += sm8350-mtp.dtb diff --git a/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-boe.dts b/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-boe.dts new file mode 100644 index 000000000000..bd9ad109daf9 --- /dev/null +++ b/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-boe.dts @@ -0,0 +1,13 @@ +// SPDX-License-Identifier: BSD-3-Clause +/* + * Copyright (c) 2023 Jianhua Lu <lujianhua000@gmail.com> + */ + +/dts-v1/; + +#include "sm8250-xiaomi-elish-common.dtsi" + +/ { + model = "Xiaomi Mi Pad 5 Pro (BOE)"; + compatible = "xiaomi,elish", "qcom,sm8250"; +}; diff --git a/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish.dts b/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi similarity index 99% rename from arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish.dts rename to arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi index dd79671f5614..a43d4b73ffca 100644 --- a/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish.dts +++ b/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi @@ -3,8 +3,6 @@ * Copyright (c) 2022, 2023 Jianhua Lu <lujianhua000@gmail.com> */ -/dts-v1/; - #include <dt-bindings/arm/qcom,ids.h> #include <dt-bindings/regulator/qcom,rpmh-regulator.h> #include "sm8250.dtsi" @@ -24,8 +22,6 @@ /delete-node/ &xbl_aop_mem; / { - model = "Xiaomi Mi Pad 5 Pro"; - compatible = "xiaomi,elish", "qcom,sm8250"; classis-type = "tablet"; /* required for bootloader to select correct board */
There are two panel variants of xiaomi-elish, BOE and CSOT panels. In order to support both panels, so split elish dts into common dtsi and elish-boe dts. Signed-off-by: Jianhua Lu <lujianhua000@gmail.com> --- Changes in v2: - Remove sm8250-xiaomi-elish.dtb to avoid build failure. Changes in v3: - squash patch[3/4] arch/arm64/boot/dts/qcom/Makefile | 2 +- .../arm64/boot/dts/qcom/sm8250-xiaomi-elish-boe.dts | 13 +++++++++++++ ...mi-elish.dts => sm8250-xiaomi-elish-common.dtsi} | 4 ---- 3 files changed, 14 insertions(+), 5 deletions(-) create mode 100644 arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-boe.dts rename arch/arm64/boot/dts/qcom/{sm8250-xiaomi-elish.dts => sm8250-xiaomi-elish-common.dtsi} (99%)