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, In the PATCH 1/2, let's ----------------------- - 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 set the compatible property for the respective display panel. - Adjust the Makefile since the sdm845-xiaomi-beryllium.dts is now called sdm845-xiaomi-beryllium-tianma.dts for the tianma variant. In the PATCH 2/2, let's ----------------------- - Create sdm845-xiaomi-beryllium-ebbg.dts for the EBBG variant which will inherit the common dtsi and set the compatible property for the respective display panel. 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. 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 (2): arm64: dts: qcom: split beryllium dts into common dtsi and tianma dts arm64: dts: qcom: sdm845-xiaomi-beryllium-ebbg: introduce Xiaomi Poco F1 EBBG variant arch/arm64/boot/dts/qcom/Makefile | 3 ++- ...ryllium.dts => sdm845-xiaomi-beryllium-common.dtsi} | 9 +++++---- .../boot/dts/qcom/sdm845-xiaomi-beryllium-ebbg.dts | 10 ++++++++++ .../boot/dts/qcom/sdm845-xiaomi-beryllium-tianma.dts | 10 ++++++++++ 4 files changed, 27 insertions(+), 5 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.1