diff options
| author | Ingo Molnar <mingo@kernel.org> | 2022-09-02 11:31:58 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2022-09-02 11:33:33 +0300 |
| commit | 1043897681808118c0f7e70b210774000fe06621 (patch) | |
| tree | ec8c0aa114e8585a73b9a7afddf9e6a6f65e992e /arch/arm/boot/dts/rk3188-bqedison2qc.dts | |
| parent | 652c5bf380ad018e15006a7f8349800245ddbbad (diff) | |
| parent | 42e66b1cc3a070671001f8a1e933a80818a192bf (diff) | |
| download | linux-1043897681808118c0f7e70b210774000fe06621.tar.xz | |
Merge branch 'linus' into x86/mm, to refresh the branch
This branch is ~14k commits behind upstream, and has an old merge base
from early into the merge window, refresh it to v6.0-rc3+fixes before
queueing up new commits.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm/boot/dts/rk3188-bqedison2qc.dts')
| -rw-r--r-- | arch/arm/boot/dts/rk3188-bqedison2qc.dts | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/rk3188-bqedison2qc.dts b/arch/arm/boot/dts/rk3188-bqedison2qc.dts index 35b7a5798eee..9312be362a7a 100644 --- a/arch/arm/boot/dts/rk3188-bqedison2qc.dts +++ b/arch/arm/boot/dts/rk3188-bqedison2qc.dts @@ -37,7 +37,7 @@ pinctrl-names = "default"; pinctrl-0 = <&pwr_key &usb_int>; - power { + key-power { gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_LOW>; linux,code = <KEY_POWER>; label = "GPIO Key Power"; @@ -46,7 +46,7 @@ wakeup-source; }; - wake_on_usb: wake-on-usb { + wake_on_usb: key-wake-on-usb { label = "Wake-on-USB"; gpios = <&gpio0 RK_PA7 GPIO_ACTIVE_LOW>; linux,code = <KEY_WAKEUP>; |