| Message ID | 20220325234344.199841-2-swboyd@chromium.org |
|---|---|
| State | New |
| Headers | show |
| Series | arm64: dts: qcom: sc7180-trogdor: Simplify! | expand |
Hi, On Fri, Mar 25, 2022 at 4:43 PM Stephen Boyd <swboyd@chromium.org> wrote: > > Trogdor boards with a detachable keyboard don't have a trackpad over > i2c. Instead the trackpad is on the detachable keyboard base. Let's move > the enabling of the trackpad i2c bus out of the base sc7180-trogdor.dtsi > file so that each trogdor board that is detachable, of which there are > many, doesn't have to disable the trackpad bus. > > Cc: Joseph Barrera <joebar@google.com> > Cc: Douglas Anderson <dianders@chromium.org> > Signed-off-by: Stephen Boyd <swboyd@chromium.org> > --- > arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi | 4 ---- > arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi | 4 ---- > arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi | 4 ++++ > arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 1 - > 4 files changed, 4 insertions(+), 9 deletions(-) What about pompom? What about trogdor-r1?
Quoting Doug Anderson (2022-03-28 09:04:57) > Hi, > > On Fri, Mar 25, 2022 at 4:43 PM Stephen Boyd <swboyd@chromium.org> wrote: > > > > Trogdor boards with a detachable keyboard don't have a trackpad over > > i2c. Instead the trackpad is on the detachable keyboard base. Let's move > > the enabling of the trackpad i2c bus out of the base sc7180-trogdor.dtsi > > file so that each trogdor board that is detachable, of which there are > > many, doesn't have to disable the trackpad bus. > > > > Cc: Joseph Barrera <joebar@google.com> > > Cc: Douglas Anderson <dianders@chromium.org> > > Signed-off-by: Stephen Boyd <swboyd@chromium.org> > > --- > > arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi | 4 ---- > > arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi | 4 ---- > > arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi | 4 ++++ > > arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 1 - > > 4 files changed, 4 insertions(+), 9 deletions(-) > > What about pompom? > What about trogdor-r1? Oh I missed those ones. Will fix it!
diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi index c81805ef2250..8da61a52f150 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi @@ -111,10 +111,6 @@ ap_ts: touchscreen@5d { }; }; -&i2c7 { - status = "disabled"; -}; - &i2c9 { status = "disabled"; }; diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi index bff2b556cc75..532c7dcc3f73 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi @@ -88,10 +88,6 @@ map1 { }; }; -&ap_tp_i2c { - status = "disabled"; -}; - ap_ts_pen_1v8: &i2c4 { status = "okay"; clock-frequency = <400000>; diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi index 69666f92176a..75df5d1633b2 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi @@ -19,6 +19,10 @@ &ap_sar_sensor { semtech,avg-pos-strength = <64>; }; +&ap_tp_i2c { + status = "okay"; +}; + /* * Lazor is stuffed with a 47k NTC as charger thermistor which currently is * not supported by the PM6150 ADC driver. Disable the charger thermal zone diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi index 732e1181af48..3bf40b6abcba 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi @@ -728,7 +728,6 @@ ap_sar_sensor: proximity@28 { }; ap_tp_i2c: &i2c7 { - status = "okay"; clock-frequency = <400000>; trackpad: trackpad@15 {
Trogdor boards with a detachable keyboard don't have a trackpad over i2c. Instead the trackpad is on the detachable keyboard base. Let's move the enabling of the trackpad i2c bus out of the base sc7180-trogdor.dtsi file so that each trogdor board that is detachable, of which there are many, doesn't have to disable the trackpad bus. Cc: Joseph Barrera <joebar@google.com> Cc: Douglas Anderson <dianders@chromium.org> Signed-off-by: Stephen Boyd <swboyd@chromium.org> --- arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi | 4 ---- arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi | 4 ---- arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi | 4 ++++ arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 1 - 4 files changed, 4 insertions(+), 9 deletions(-)