Message ID | 20220617111021.v6.1.I9e299d3fa6fbf50df6fc7207050bf5c3a7bf4c61@changeid |
---|---|
State | New |
Headers | show |
Series | [v6,1/6] FROMLIST: arm64: dts: qcom: sc7180-trogdor: Split out keyboard node and describe detachables | expand |
Hi, On Fri, Jun 17, 2022 at 12:47 PM Doug Anderson <dianders@chromium.org> wrote: > > Hi, > > On Fri, Jun 17, 2022 at 11:12 AM Joseph S. Barrera III > <joebar@chromium.org> wrote: > > > > From: Stephen Boyd <swboyd@chromium.org> > > > > Trogdor devices that have a detachable keyboard still have a > > non-detachable keyboard input device present because we include the > > cros-ec-keyboard.dtsi snippet in the top-level sc7180-trogdor.dtsi file > > that every variant board includes. We do this because the > > keyboard-controller node also provides some buttons like the power > > button and volume buttons. Unfortunately, this means we register a > > keyboard input device that doesn't do anything on boards with a > > detachable keyboard. > > > > Change the node's compatible on detachables to the newly introduced > > "google,cros-ec-keyb-switches" compatible to indicate that there are > > only switches and no keyboard to register. Similarly, move the keyboard > > include that defines the keyboard-controller node out of > > sc7180-trogdor.dtsi to boards that actually have a keyboard so that the > > matrix properties are not defined on boards with the switches > > compatible. Future boards can either use the include approach or the > > node definition approach to describe a keyboard with possible switches > > or just some switches. > > > > Cc: Benson Leung <bleung@chromium.org> > > Cc: Guenter Roeck <groeck@chromium.org> > > Cc: Douglas Anderson <dianders@chromium.org> > > Cc: Hsin-Yi Wang <hsinyi@chromium.org> > > Cc: "Joseph S. Barrera III" <joebar@chromium.org> > > Signed-off-by: Stephen Boyd <swboyd@chromium.org> > > (am from https://lore.kernel.org/r/20220518172525.3319993-1-swboyd@chromium.org) > > > > evtest shows no more cros_ec device > > > > Cq-Depend: chromium:3609017 > > Tested-by: Stephen Boyd <swboyd@chromium.org> > > Reviewed-by: Douglas Anderson <dianders@chromium.org> > > Signed-off-by: Joseph S. Barrera III <joebar@chromium.org> > > It's OK to re-post Stephen's patch with your series, but: > > 1. The subject shouldn't have FROMLIST. That's just for patches picked > back to a Chromium OS kernel. > > 2. You shouldn't have "(am from...)". Again, just for patches picked > back to a Chromium OS kernel. > > 3. No Cq-Depend. That's something for patches picked back to a > Chromium OS kernel. > > 4. You should remove tags that were added by the Chromium review > system, like Stephen's "Tested-by" and my "Reviewed-by". > > > Another alternative is to not post Stephen's patch but add a note that > your patch should be applied atop his, then point to his. AKA: > > https://lore.kernel.org/r/20220518172525.3319993-1-swboyd@chromium.org A further note is that your series ought to be based on this one: https://patchwork.kernel.org/project/linux-arm-msm/patch/20220602190621.1646679-1-swboyd@chromium.org/ ...but when I apply your patch atop that one I get merge conflicts. -Doug
diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi index 8ac1f1e61006..7ee407f7b6bb 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi @@ -81,6 +81,10 @@ &camcc { }; &cros_ec { + keyboard-controller { + compatible = "google,cros-ec-keyb-switches"; + }; + cros_ec_proximity: proximity { compatible = "google,cros-ec-mkbp-proximity"; label = "proximity-wifi"; diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi index 9b3e3d13c165..5074014d5269 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi @@ -114,6 +114,12 @@ &camcc { status = "okay"; }; +&cros_ec { + keyboard-controller { + compatible = "google,cros-ec-keyb-switches"; + }; +}; + &panel { compatible = "samsung,atna33xc20"; enable-gpios = <&tlmm 12 GPIO_ACTIVE_HIGH>; diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi index fe2369c29aad..d8839ccdcf09 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi @@ -6,6 +6,8 @@ */ #include "sc7180-trogdor.dtsi" +/* Must come after sc7180-trogdor.dtsi to modify cros_ec */ +#include <arm/cros-ec-keyboard.dtsi> &ap_sar_sensor { semtech,cs0-ground; diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi index 3df4920295ad..a7582fb547ee 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi @@ -6,6 +6,8 @@ */ #include "sc7180-trogdor.dtsi" +/* Must come after sc7180-trogdor.dtsi to modify cros_ec */ +#include <arm/cros-ec-keyboard.dtsi> #include "sc7180-trogdor-ti-sn65dsi86.dtsi" / { diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts index 352827e5740a..59a23d0e9651 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts @@ -8,6 +8,8 @@ /dts-v1/; #include "sc7180-trogdor.dtsi" +/* Must come after sc7180-trogdor.dtsi to modify cros_ec */ +#include <arm/cros-ec-keyboard.dtsi> #include "sc7180-trogdor-ti-sn65dsi86.dtsi" / { diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi index e55dbaa6dc12..1a4f2e8cc3dc 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi @@ -903,7 +903,6 @@ cros_ec_fp: ec@0 { }; }; -#include <arm/cros-ec-keyboard.dtsi> #include <arm/cros-ec-sbs.dtsi> &uart3 {