mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-12-06 02:24:14 +08:00
arm64: dts: qcom: Only include sc7180.dtsi in sc7180-trogdor.dtsi
The SoC is always present on sc7180-trogdor.dtsi and thus we should include it in the "generic" dtsi file for trogdor. Previously we had removed it from there because we had to do the spi6/spi0 swizzle, so each trogdor variant board had to include sc7180.dtsi and then sc7180-trogdor.dtsi so that the latter dtsi file could modify the right spi bus for EC and H1 properties that are common to all trogdor boards. Now that we're done with that we can replace sc7180.dtsi includes with sc7180-trogdor.dtsi and include sc7180.dtsi in sc7180-trogdor.dtsi as was originally intended. We still need to include sc7180-trogdor.dtsi before the bridge dtsi files though because those rely on the panel label. Cc: "Joseph S. Barrera III" <joebar@chromium.org> Cc: Douglas Anderson <dianders@chromium.org> Signed-off-by: Stephen Boyd <swboyd@chromium.org> Reviewed-by: Matthias Kaehlcke <mka@chromium.org> Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org> Link: https://lore.kernel.org/r/20220427020339.360855-4-swboyd@chromium.org
This commit is contained in:
parent
d277cab7af
commit
19794489fa
@ -5,7 +5,6 @@
|
||||
* Copyright 2020 Google LLC.
|
||||
*/
|
||||
|
||||
#include "sc7180.dtsi"
|
||||
#include "sc7180-trogdor.dtsi"
|
||||
#include "sc7180-trogdor-ti-sn65dsi86.dtsi"
|
||||
|
||||
|
@ -7,7 +7,7 @@
|
||||
|
||||
/dts-v1/;
|
||||
|
||||
#include "sc7180.dtsi"
|
||||
#include "sc7180-trogdor.dtsi"
|
||||
#include "sc7180-trogdor-ti-sn65dsi86.dtsi"
|
||||
#include "sc7180-trogdor-homestar.dtsi"
|
||||
|
||||
|
@ -7,7 +7,7 @@
|
||||
|
||||
/dts-v1/;
|
||||
|
||||
#include "sc7180.dtsi"
|
||||
#include "sc7180-trogdor.dtsi"
|
||||
#include "sc7180-trogdor-ti-sn65dsi86.dtsi"
|
||||
#include "sc7180-trogdor-homestar.dtsi"
|
||||
|
||||
|
@ -7,7 +7,7 @@
|
||||
|
||||
/dts-v1/;
|
||||
|
||||
#include "sc7180.dtsi"
|
||||
#include "sc7180-trogdor.dtsi"
|
||||
#include "sc7180-trogdor-parade-ps8640.dtsi"
|
||||
#include "sc7180-trogdor-homestar.dtsi"
|
||||
|
||||
|
@ -7,7 +7,7 @@
|
||||
|
||||
/dts-v1/;
|
||||
|
||||
#include "sc7180.dtsi"
|
||||
#include "sc7180-trogdor.dtsi"
|
||||
#include "sc7180-trogdor-ti-sn65dsi86.dtsi"
|
||||
#include "sc7180-trogdor-lazor.dtsi"
|
||||
#include "sc7180-trogdor-lte-sku.dtsi"
|
||||
|
@ -7,7 +7,7 @@
|
||||
|
||||
/dts-v1/;
|
||||
|
||||
#include "sc7180.dtsi"
|
||||
#include "sc7180-trogdor.dtsi"
|
||||
#include "sc7180-trogdor-parade-ps8640.dtsi"
|
||||
#include "sc7180-trogdor-lazor.dtsi"
|
||||
#include "sc7180-trogdor-lte-sku.dtsi"
|
||||
|
@ -7,7 +7,7 @@
|
||||
|
||||
/dts-v1/;
|
||||
|
||||
#include "sc7180.dtsi"
|
||||
#include "sc7180-trogdor.dtsi"
|
||||
#include "sc7180-trogdor-ti-sn65dsi86.dtsi"
|
||||
#include "sc7180-trogdor-lazor.dtsi"
|
||||
#include "sc7180-trogdor-lte-sku.dtsi"
|
||||
|
@ -7,7 +7,7 @@
|
||||
|
||||
/dts-v1/;
|
||||
|
||||
#include "sc7180.dtsi"
|
||||
#include "sc7180-trogdor.dtsi"
|
||||
#include "sc7180-trogdor-parade-ps8640.dtsi"
|
||||
#include "sc7180-trogdor-lazor.dtsi"
|
||||
#include "sc7180-trogdor-lte-sku.dtsi"
|
||||
|
@ -7,7 +7,7 @@
|
||||
|
||||
/dts-v1/;
|
||||
|
||||
#include "sc7180.dtsi"
|
||||
#include "sc7180-trogdor.dtsi"
|
||||
#include "sc7180-trogdor-ti-sn65dsi86.dtsi"
|
||||
#include "sc7180-trogdor-lazor.dtsi"
|
||||
|
||||
|
@ -7,7 +7,7 @@
|
||||
|
||||
/dts-v1/;
|
||||
|
||||
#include "sc7180.dtsi"
|
||||
#include "sc7180-trogdor.dtsi"
|
||||
#include "sc7180-trogdor-ti-sn65dsi86.dtsi"
|
||||
#include "sc7180-trogdor-lazor.dtsi"
|
||||
|
||||
|
@ -7,7 +7,7 @@
|
||||
|
||||
/dts-v1/;
|
||||
|
||||
#include "sc7180.dtsi"
|
||||
#include "sc7180-trogdor.dtsi"
|
||||
#include "sc7180-trogdor-ti-sn65dsi86.dtsi"
|
||||
#include "sc7180-trogdor-lazor.dtsi"
|
||||
#include "sc7180-lite.dtsi"
|
||||
|
@ -7,7 +7,7 @@
|
||||
|
||||
/dts-v1/;
|
||||
|
||||
#include "sc7180.dtsi"
|
||||
#include "sc7180-trogdor.dtsi"
|
||||
#include "sc7180-trogdor-ti-sn65dsi86.dtsi"
|
||||
#include "sc7180-trogdor-lazor.dtsi"
|
||||
#include "sc7180-trogdor-lte-sku.dtsi"
|
||||
|
@ -7,7 +7,7 @@
|
||||
|
||||
/dts-v1/;
|
||||
|
||||
#include "sc7180.dtsi"
|
||||
#include "sc7180-trogdor.dtsi"
|
||||
#include "sc7180-trogdor-ti-sn65dsi86.dtsi"
|
||||
#include "sc7180-trogdor-lazor.dtsi"
|
||||
#include "sc7180-lite.dtsi"
|
||||
|
@ -7,7 +7,7 @@
|
||||
|
||||
/dts-v1/;
|
||||
|
||||
#include "sc7180.dtsi"
|
||||
#include "sc7180-trogdor.dtsi"
|
||||
#include "sc7180-trogdor-parade-ps8640.dtsi"
|
||||
#include "sc7180-trogdor-lazor.dtsi"
|
||||
#include "sc7180-lite.dtsi"
|
||||
|
@ -7,7 +7,7 @@
|
||||
|
||||
/dts-v1/;
|
||||
|
||||
#include "sc7180.dtsi"
|
||||
#include "sc7180-trogdor.dtsi"
|
||||
#include "sc7180-trogdor-parade-ps8640.dtsi"
|
||||
#include "sc7180-trogdor-lazor.dtsi"
|
||||
#include "sc7180-trogdor-lte-sku.dtsi"
|
||||
|
@ -7,7 +7,7 @@
|
||||
|
||||
/dts-v1/;
|
||||
|
||||
#include "sc7180.dtsi"
|
||||
#include "sc7180-trogdor.dtsi"
|
||||
#include "sc7180-trogdor-parade-ps8640.dtsi"
|
||||
#include "sc7180-trogdor-lazor.dtsi"
|
||||
#include "sc7180-lite.dtsi"
|
||||
|
@ -5,7 +5,6 @@
|
||||
* Copyright 2020 Google LLC.
|
||||
*/
|
||||
|
||||
#include "sc7180.dtsi"
|
||||
#include "sc7180-trogdor.dtsi"
|
||||
#include "sc7180-trogdor-ti-sn65dsi86.dtsi"
|
||||
|
||||
|
@ -7,7 +7,6 @@
|
||||
|
||||
/dts-v1/;
|
||||
|
||||
#include "sc7180.dtsi"
|
||||
#include "sc7180-trogdor.dtsi"
|
||||
#include "sc7180-trogdor-ti-sn65dsi86.dtsi"
|
||||
|
||||
|
@ -11,7 +11,8 @@
|
||||
#include <dt-bindings/regulator/qcom,rpmh-regulator.h>
|
||||
#include <dt-bindings/sound/sc7180-lpass.h>
|
||||
|
||||
/* PMICs depend on spmi_bus label and so must come after SoC */
|
||||
#include "sc7180.dtsi"
|
||||
/* PMICs depend on spmi_bus label and so must come after sc7180.dtsi */
|
||||
#include "pm6150.dtsi"
|
||||
#include "pm6150l.dtsi"
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user