Hi, On Fri, Jun 24, 2022 at 11:57 AM Joseph S. Barrera III <joebar@xxxxxxxxxxxx> wrote: > > This series adds five new trogdor-based boards to upstream. > The patches should be applied *after* applying > https://lore.kernel.org/all/20220602190621.1646679-1-swboyd@xxxxxxxxxxxx/ > (arm64: dts: qcom: Remove duplicate sc7180-trogdor include on lazor/homestar) > > The patches do *not* expect > https://lore.kernel.org/all/20220518172525.3319993-1-swboyd@xxxxxxxxxxxx/ > (sc7180-trogdor: Split out keyboard node and describe detachables) > to be applied. > > The compatibles in this series are documented by Doug's series > https://lore.kernel.org/r/20220520143502.v4.5.Ie8713bc0377672ed8dd71189e66fc0b77226fb85@changeid > > Changes in v11: > - Add 'include sc7180-trogdor.dtsi' to sc7180-trogdor-pazquel-* files. > - Add 'include sc7180-trogdor.dtsi' to sc7180-trogdor-kingoftown-* files. > - Restore 'include sc7180.dtsi' to sc7180-trogdor-ti-sn65dsi86.dtsi. I'm a bit baffled. Why did you add an include of "sc7180.dtsi" to sc7180-trogdor-ti-sn65dsi86.dtsi? Am I missing something? The way you have it will cause "sc7180.dtsi" to be included twice. For instance, let's look at "sc7180-trogdor-coachz-r3.dts". It has: #include "sc7180-trogdor-coachz.dtsi" That will in turn cause these includes: #include "sc7180-trogdor.dtsi" #include "sc7180-trogdor-ti-sn65dsi86.dtsi" That will in turn do: /* From sc7180-trogdor.dtsi */ #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/input/gpio-keys.h> #include <dt-bindings/input/input.h> #include <dt-bindings/regulator/qcom,rpmh-regulator.h> #include <dt-bindings/sound/sc7180-lpass.h> #include "sc7180.dtsi" #include "pm6150.dtsi" #include "pm6150l.dtsi" /* From sc7180-trogdor-ti-sn65dsi86.dtsi */ #include "sc7180.dtsi" #include <dt-bindings/gpio/gpio.h> ...and, as you can see, "sc7180.dtsi" will get included twice. That will break things since it will undo some of the changes that sc7180-trogdor.dtsi did. ...and, in fact, I just tried putting your patches on an sc7180 device that uses the TI bridge chip and it, unsurprisingly, doesn't boot. If you just remove that one addition then I think we can finally be done with this series. I tried that and my device boots. -Doug
