Hi, On Fri, Oct 29, 2021 at 3:27 PM Philip Chen <philipchen@xxxxxxxxxxxx> wrote: > > Support Lazor/Limozeen rev9 board where Parade ps8640 is added as the > second source edp bridge. > > To support different edp bridge chips in different board revisions, > now we move the #incldue line of the edp bridge dts fragment (e.g. > sc7180-trogdor-ti-sn65dsi86.dtsi) from "sc7180-trogdor-lazor.dtsi" to > per-board-rev dts files. > > Since the edp bridge dts fragment overrides 'dsi0_out', which is > defined in "sc7180.dtsi", move the #incldue line of "sc7180.dtsi" from > "sc7180-trogdor-lazor.dtsi" to per-board-rev dts files too, before > the #include line of the edp bridge dts fragment. > > Signed-off-by: Philip Chen <philipchen@xxxxxxxxxxxx> > Reviewed-by: Stephen Boyd <swboyd@xxxxxxxxxxxx> > --- > Retroactively edit the v2 change log slightly > > (no changes since v2) > > Changes in v2: > - Explain why "sc7180.dtsi" is moved out of "sc7180-trogdor-lazor.dtsi" > in the commit message. > - In limozeen (nots) r5 dts, replace "google,rev5-sku5" with > "google,lazor-rev5-sku5" and sort it > - In limozeen (nots) r9 dts, drop the support for "sku5". > - In limozeen r4 dts, remove the redundant "google,lazor-rev6-sku4" and > add "google,lazor-rev7-sku4". > - Do not add panel compatible in -r9 dts files. > - Move the #include line of gpio.h from sc7180.dtsi to the bridge dts > fragments, and factor out this change to patch 1/3. > > arch/arm64/boot/dts/qcom/Makefile | 9 +++- > .../sc7180-trogdor-lazor-limozeen-nots-r4.dts | 2 +- > .../sc7180-trogdor-lazor-limozeen-nots-r5.dts | 31 +++++++++++++ > ...sc7180-trogdor-lazor-limozeen-nots-r9.dts} | 8 ++-- > .../qcom/sc7180-trogdor-lazor-limozeen-r4.dts | 46 +++++++++++++++++++ > ...s => sc7180-trogdor-lazor-limozeen-r9.dts} | 6 ++- > .../boot/dts/qcom/sc7180-trogdor-lazor-r0.dts | 2 + > .../boot/dts/qcom/sc7180-trogdor-lazor-r1.dts | 2 + > .../dts/qcom/sc7180-trogdor-lazor-r3-kb.dts | 9 +++- > .../dts/qcom/sc7180-trogdor-lazor-r3-lte.dts | 9 +++- > .../boot/dts/qcom/sc7180-trogdor-lazor-r3.dts | 8 +++- > .../dts/qcom/sc7180-trogdor-lazor-r9-kb.dts | 22 +++++++++ > .../dts/qcom/sc7180-trogdor-lazor-r9-lte.dts | 30 ++++++++++++ > .../boot/dts/qcom/sc7180-trogdor-lazor-r9.dts | 18 ++++++++ > .../boot/dts/qcom/sc7180-trogdor-lazor.dtsi | 3 -- > 15 files changed, 188 insertions(+), 17 deletions(-) > create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots-r5.dts > rename arch/arm64/boot/dts/qcom/{sc7180-trogdor-lazor-limozeen-nots.dts => sc7180-trogdor-lazor-limozeen-nots-r9.dts} (60%) > create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-r4.dts > rename arch/arm64/boot/dts/qcom/{sc7180-trogdor-lazor-limozeen.dts => sc7180-trogdor-lazor-limozeen-r9.dts} (82%) > create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r9-kb.dts > create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r9-lte.dts > create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r9.dts Reviewed-by: Douglas Anderson <dianders@xxxxxxxxxxxx>