Changes in v5: -------------- - Do not rename the compatible property of the existing variant (Tianma) to avoid any further conflict with other projects/users. (Suggested by Krzysztof Kozlowski) Changes in v4: -------------- - Update board's compatible and model property to distinguish between the two variants. (Suggested by Krzysztof Kozlowski and Marijn Suijten) - Update the dt-bindings as per the new compatible values. (Fix checkpatch.pl script warnings) Changes in v3: -------------- - Approach suggested by Marijn Suijten and Krzysztof Kozlowski to make git handle renames more appropriately and to avoid moving large chunks of code. Helps with reviewing the patch. Changes in v2: -------------- - Fix issue with builds breaking across multiple commits making git bisect harder to find where the rename has happened. There are two variants of Xiaomi Poco F1. - Tianma variant with NOVATEK NT36672A panel + touchscreen manufactured by Tianma - EBBG variant with Focaltech FT8719 panel + touchscreen manufactured by EBBG The current sdm845-xiaomi-beryllium.dts represents Tianma panel variant. To add support for the EBBG variant: ------------------------------------ - Rename sdm845-xiaomi-beryllium.dts to sdm845-xiaomi-beryllium-common.dtsi - Generalize the display panel node by assigning label, removing compatible property and renaming the panel endpoints to be generic. - Create a dts for the Tianma variant called sdm845-xiaomi-beryllium-tianma.dts which will inherit the common dtsi and keep the existing compatible property to avoid any conflicts with other projects. - Adjust the Makefile since the sdm845-xiaomi-beryllium.dts is now called sdm845-xiaomi-beryllium-tianma.dts for the tianma variant. - Create sdm845-xiaomi-beryllium-ebbg.dts for the EBBG variant which will inherit the common dtsi and set a different compatible property to distinguish between the Tianma and EBBG variant. Note: ----- Both the panels are already upstreamed and the split is based on them. There were patches earlier for both the touchscreens, but they are not accepted in upstream yet. Once they are accepted, we will add them to respective variants. Joel Selvaraj (3): arm64: dts: qcom: split beryllium dts into common dtsi and tianma dts dt-bindings: arm: qcom: Add Xiaomi Poco F1 EBBG variant bindings arm64: dts: qcom: sdm845-xiaomi-beryllium-ebbg: introduce Xiaomi Poco F1 EBBG variant Documentation/devicetree/bindings/arm/qcom.yaml | 1 + arch/arm64/boot/dts/qcom/Makefile | 3 ++- ...um.dts => sdm845-xiaomi-beryllium-common.dtsi} | 11 +++++------ .../dts/qcom/sdm845-xiaomi-beryllium-ebbg.dts | 15 +++++++++++++++ .../dts/qcom/sdm845-xiaomi-beryllium-tianma.dts | 15 +++++++++++++++ 5 files changed, 38 insertions(+), 7 deletions(-) rename arch/arm64/boot/dts/qcom/{sdm845-xiaomi-beryllium.dts => sdm845-xiaomi-beryllium-common.dtsi} (98%) create mode 100644 arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-ebbg.dts create mode 100644 arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-tianma.dts -- 2.37.3