diff options
| author | Tom Rini <trini@konsulko.com> | 2023-02-10 13:41:27 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-02-10 13:41:27 -0500 |
| commit | a1e6b529e57c622e862e93fa6da03d9504565089 (patch) | |
| tree | 1b756fb08296e17f4edec6f4dd40c7a6e2fb9a80 /arch/sandbox | |
| parent | 8b301102e246350a0ccedc370f7c9923b02f86f2 (diff) | |
| parent | add396d66703c6c422353f950e584fae2a786a20 (diff) | |
Merge branch '2023-02-10-assorted-updates-and-additions'
- DM_SERIAL conversion for bcm7xxx, button input driver, qcom updates,
environment and network related cleanup, ftmac100 update, add a
IS_ENABLED conversion that was just missed.
Diffstat (limited to 'arch/sandbox')
| -rw-r--r-- | arch/sandbox/dts/sandbox.dtsi | 4 | ||||
| -rw-r--r-- | arch/sandbox/dts/test.dts | 16 |
2 files changed, 20 insertions, 0 deletions
diff --git a/arch/sandbox/dts/sandbox.dtsi b/arch/sandbox/dts/sandbox.dtsi index 18bf1cb5b69..7e7fcff6d28 100644 --- a/arch/sandbox/dts/sandbox.dtsi +++ b/arch/sandbox/dts/sandbox.dtsi @@ -4,6 +4,8 @@ * and sandbox64 builds. */ +#include <dt-bindings/input/input.h> + #define USB_CLASS_HUB 9 / { @@ -36,11 +38,13 @@ btn1 { gpios = <&gpio_a 3 0>; label = "button1"; + linux,code = <BTN_1>; }; btn2 { gpios = <&gpio_a 4 0>; label = "button2"; + linux,code = <BTN_2>; }; }; diff --git a/arch/sandbox/dts/test.dts b/arch/sandbox/dts/test.dts index f98f0152ee8..88d4d3cb983 100644 --- a/arch/sandbox/dts/test.dts +++ b/arch/sandbox/dts/test.dts @@ -172,11 +172,13 @@ btn1 { gpios = <&gpio_a 3 0>; label = "button1"; + linux,code = <BTN_1>; }; btn2 { gpios = <&gpio_a 4 0>; label = "button2"; + linux,code = <BTN_2>; }; }; @@ -1537,6 +1539,20 @@ }; }; + ofnode-foreach { + compatible = "foreach"; + + first { + prop1 = <1>; + prop2 = <2>; + }; + + second { + prop1 = <1>; + prop2 = <2>; + }; + }; + osd { compatible = "sandbox,sandbox_osd"; }; |
