mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-12-05 18:14:07 +08:00
arm64: dts: qcom: sc7180-trogdor: Simplify spi0/spi6 labeling
We had to do this spi0/spi6 flip-flop on trogdor-r0 because the spi buses got swizzled between r0 and r1. The swizzle stopped after r1, but we kept this around to support either hardware possibility and to keep trogdor-r0 working. trogdor-r0 isn't supported upstream, so this swizzle is not doing anything besides making a pattern that others tryt to copy for the EC and H1 nodes. Let's remove it and simplify the dts files. 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-3-swboyd@chromium.org
This commit is contained in:
parent
51d30402be
commit
d277cab7af
@ -6,14 +6,10 @@
|
||||
*/
|
||||
|
||||
#include "sc7180.dtsi"
|
||||
|
||||
ap_ec_spi: &spi6 {};
|
||||
ap_h1_spi: &spi0 {};
|
||||
|
||||
#include "sc7180-trogdor.dtsi"
|
||||
#include "sc7180-trogdor-ti-sn65dsi86.dtsi"
|
||||
|
||||
/* Deleted nodes from trogdor.dtsi */
|
||||
/* Deleted nodes from sc7180-trogdor.dtsi */
|
||||
|
||||
/delete-node/ &alc5682;
|
||||
/delete-node/ &pp3300_codec;
|
||||
|
@ -5,9 +5,6 @@
|
||||
* Copyright 2021 Google LLC.
|
||||
*/
|
||||
|
||||
ap_ec_spi: &spi6 {};
|
||||
ap_h1_spi: &spi0 {};
|
||||
|
||||
#include "sc7180-trogdor.dtsi"
|
||||
|
||||
/ {
|
||||
|
@ -5,9 +5,6 @@
|
||||
* Copyright 2020 Google LLC.
|
||||
*/
|
||||
|
||||
ap_ec_spi: &spi6 {};
|
||||
ap_h1_spi: &spi0 {};
|
||||
|
||||
#include "sc7180-trogdor.dtsi"
|
||||
|
||||
&ap_sar_sensor {
|
||||
|
@ -6,10 +6,6 @@
|
||||
*/
|
||||
|
||||
#include "sc7180.dtsi"
|
||||
|
||||
ap_ec_spi: &spi6 {};
|
||||
ap_h1_spi: &spi0 {};
|
||||
|
||||
#include "sc7180-trogdor.dtsi"
|
||||
#include "sc7180-trogdor-ti-sn65dsi86.dtsi"
|
||||
|
||||
|
@ -8,10 +8,6 @@
|
||||
/dts-v1/;
|
||||
|
||||
#include "sc7180.dtsi"
|
||||
|
||||
ap_ec_spi: &spi6 {};
|
||||
ap_h1_spi: &spi0 {};
|
||||
|
||||
#include "sc7180-trogdor.dtsi"
|
||||
#include "sc7180-trogdor-ti-sn65dsi86.dtsi"
|
||||
|
||||
|
@ -626,7 +626,7 @@
|
||||
};
|
||||
};
|
||||
|
||||
&ap_ec_spi {
|
||||
ap_ec_spi: &spi6 {
|
||||
status = "okay";
|
||||
cros_ec: ec@0 {
|
||||
compatible = "google,cros-ec-spi";
|
||||
@ -675,7 +675,7 @@
|
||||
};
|
||||
};
|
||||
|
||||
&ap_h1_spi {
|
||||
ap_h1_spi: &spi0 {
|
||||
status = "okay";
|
||||
cr50: tpm@0 {
|
||||
compatible = "google,cr50";
|
||||
|
Loading…
Reference in New Issue
Block a user