Commit d277cab7 authored by Stephen Boyd's avatar Stephen Boyd Committed by Bjorn Andersson
Browse files

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: default avatarStephen Boyd <swboyd@chromium.org>
Reviewed-by: default avatarMatthias Kaehlcke <mka@chromium.org>
Signed-off-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
Link: https://lore.kernel.org/r/20220427020339.360855-3-swboyd@chromium.org
parent 51d30402

arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi

+1 −5
Original line number Diff line number Diff line
@@ -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;

arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi

+0 −3
Original line number Diff line number Diff line
@@ -5,9 +5,6 @@ 
 * Copyright 2021 Google LLC.

 */



ap_ec_spi: &spi6 {};

ap_h1_spi: &spi0 {};



#include "sc7180-trogdor.dtsi"



/ {

arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi

+0 −3
Original line number Diff line number Diff line
@@ -5,9 +5,6 @@ 
 * Copyright 2020 Google LLC.

 */



ap_ec_spi: &spi6 {};

ap_h1_spi: &spi0 {};



#include "sc7180-trogdor.dtsi"



&ap_sar_sensor {

arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi

+0 −4
Original line number Diff line number Diff line
@@ -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"

arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts

+0 −4
Original line number Diff line number Diff line
@@ -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"