Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

arm64: dts: qcom: sc7180-trogdor: Split out keyboard node and describe detachables

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>
Reviewed-by: Douglas Anderson <dianders@chromium.org>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Link: https://lore.kernel.org/r/20220627212802.3593012-1-swboyd@chromium.org

authored by

Stephen Boyd and committed by
Bjorn Andersson
a10b760b b3996165

+33 -2
+4
arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi
··· 81 81 }; 82 82 83 83 &cros_ec { 84 + keyboard-controller { 85 + compatible = "google,cros-ec-keyb-switches"; 86 + }; 87 + 84 88 cros_ec_proximity: proximity { 85 89 compatible = "google,cros-ec-mkbp-proximity"; 86 90 label = "proximity-wifi";
+6
arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi
··· 114 114 status = "okay"; 115 115 }; 116 116 117 + &cros_ec { 118 + keyboard-controller { 119 + compatible = "google,cros-ec-keyb-switches"; 120 + }; 121 + }; 122 + 117 123 &panel { 118 124 compatible = "samsung,atna33xc20"; 119 125 enable-gpios = <&tlmm 12 GPIO_ACTIVE_HIGH>;
+1 -1
arch/arm64/boot/dts/qcom/sc7180-trogdor-kingoftown.dtsi
··· 6 6 */ 7 7 8 8 /* This file must be included after sc7180-trogdor.dtsi */ 9 - 9 + #include <arm/cros-ec-keyboard.dtsi> 10 10 #include "sc7180-trogdor-lte-sku.dtsi" 11 11 12 12 &alc5682 {
+1
arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi
··· 6 6 */ 7 7 8 8 #include "sc7180-trogdor.dtsi" 9 + #include <arm/cros-ec-keyboard.dtsi> 9 10 10 11 &ap_sar_sensor { 11 12 semtech,cs0-ground;
+6
arch/arm64/boot/dts/qcom/sc7180-trogdor-mrbland.dtsi
··· 58 58 status = "okay"; 59 59 }; 60 60 61 + &cros_ec { 62 + keyboard-controller { 63 + compatible = "google,cros-ec-keyb-switches"; 64 + }; 65 + }; 66 + 61 67 &dsi0 { 62 68 63 69 panel: panel@0 {
+1
arch/arm64/boot/dts/qcom/sc7180-trogdor-pazquel.dtsi
··· 6 6 */ 7 7 8 8 /* This file must be included after sc7180-trogdor.dtsi */ 9 + #include <arm/cros-ec-keyboard.dtsi> 9 10 10 11 &ap_sar_sensor { 11 12 compatible = "semtech,sx9324";
+2
arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi
··· 6 6 */ 7 7 8 8 #include "sc7180-trogdor.dtsi" 9 + /* Must come after sc7180-trogdor.dtsi to modify cros_ec */ 10 + #include <arm/cros-ec-keyboard.dtsi> 9 11 #include "sc7180-trogdor-ti-sn65dsi86.dtsi" 10 12 11 13 / {
+6
arch/arm64/boot/dts/qcom/sc7180-trogdor-quackingstick.dtsi
··· 46 46 status = "okay"; 47 47 }; 48 48 49 + &cros_ec { 50 + keyboard-controller { 51 + compatible = "google,cros-ec-keyb-switches"; 52 + }; 53 + }; 54 + 49 55 &dsi0 { 50 56 panel: panel@0 { 51 57 /* Compatible will be filled in per-board */
+2
arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts
··· 8 8 /dts-v1/; 9 9 10 10 #include "sc7180-trogdor.dtsi" 11 + /* Must come after sc7180-trogdor.dtsi to modify cros_ec */ 12 + #include <arm/cros-ec-keyboard.dtsi> 11 13 #include "sc7180-trogdor-ti-sn65dsi86.dtsi" 12 14 13 15 / {
+4
arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler.dtsi
··· 104 104 base_detection: cbas { 105 105 compatible = "google,cros-cbas"; 106 106 }; 107 + 108 + keyboard-controller { 109 + compatible = "google,cros-ec-keyb-switches"; 110 + }; 107 111 }; 108 112 109 113 &dsi0 {
-1
arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
··· 906 906 }; 907 907 }; 908 908 909 - #include <arm/cros-ec-keyboard.dtsi> 910 909 #include <arm/cros-ec-sbs.dtsi> 911 910 912 911 &uart3 {