| Message ID | 20220413033334.1514008-3-swboyd@chromium.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Input: cros-ec-keyb: Don't register keyboard if doesn't exist | expand |
diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi index c81805ef2250..4173623cc241 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi @@ -119,6 +119,11 @@ &i2c9 { status = "disabled"; }; +&keyboard_controller { + /delete-property/keypad,num-rows; + /delete-property/keypad,num-columns; +}; + &panel { compatible = "boe,nv110wtm-n61"; }; diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi index bff2b556cc75..7205062e88b4 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi @@ -121,6 +121,11 @@ &camcc { status = "okay"; }; +&keyboard_controller { + /delete-property/keypad,num-rows; + /delete-property/keypad,num-columns; +}; + &panel { compatible = "samsung,atna33xc20"; enable-gpios = <&tlmm 12 GPIO_ACTIVE_HIGH>;
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. Let's delete the rows/columns properties of the device node to indicate that there isn't a matrix keyboard on these boards. 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> Signed-off-by: Stephen Boyd <swboyd@chromium.org> --- This is mostly to show an example. The patch will be picked up by qcom maintainer if the first patch is accepted. arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi | 5 +++++ arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi | 5 +++++ 2 files changed, 10 insertions(+)