| Message ID | 20240131084043.3970576-1-wenst@chromium.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | arm64: dts: mediatek: mt8183-pico6: Fix wake-on-X event node names | expand |
Il 31/01/24 09:40, Chen-Yu Tsai ha scritto: > The wake-on-bt and wake-on-wlan nodes don't have a button- or event- > prefix that the gpio-keys binding requires. > > Fix up the node names to satisfy the binding. While at it, also fix up > the GPIO overriding structure for the wake-on-wlan node. Instead of > referencing the gpio-keys node and then open coding the node, add a > label for the event node, and use that to reference and override the > GPIO settings. > > Fixes: 055ef10ccdd4 ("arm64: dts: mt8183: Add jacuzzi pico/pico6 board") > Signed-off-by: Chen-Yu Tsai <wenst@chromium.org> Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
On Wed, 31 Jan 2024 16:40:41 +0800, Chen-Yu Tsai wrote: > The wake-on-bt and wake-on-wlan nodes don't have a button- or event- > prefix that the gpio-keys binding requires. > > Fix up the node names to satisfy the binding. While at it, also fix up > the GPIO overriding structure for the wake-on-wlan node. Instead of > referencing the gpio-keys node and then open coding the node, add a > label for the event node, and use that to reference and override the > GPIO settings. > > [...] Applied to v6.10-next/dts64, thanks! [1/1] arm64: dts: mediatek: mt8183-pico6: Fix wake-on-X event node names commit: 754e69efd5012248786c47c83d6204599feb315e Cheers, Angelo
diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-pico6.dts b/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-pico6.dts index 6a7ae616512d..0d5a11c93c68 100644 --- a/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-pico6.dts +++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-pico6.dts @@ -17,7 +17,7 @@ bt_wakeup: bt-wakeup { pinctrl-names = "default"; pinctrl-0 = <&bt_pins_wakeup>; - wobt { + event-wobt { label = "Wake on BT"; gpios = <&pio 42 GPIO_ACTIVE_HIGH>; linux,code = <KEY_WAKEUP>; @@ -47,10 +47,8 @@ trackpad@2c { }; }; -&wifi_wakeup { - wowlan { - gpios = <&pio 113 GPIO_ACTIVE_LOW>; - }; +&wifi_wakeup_event { + gpios = <&pio 113 GPIO_ACTIVE_LOW>; }; &wifi_pwrseq { diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi b/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi index a241bb70cd76..89932984889d 100644 --- a/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi @@ -142,7 +142,7 @@ wifi_wakeup: wifi-wakeup { pinctrl-names = "default"; pinctrl-0 = <&wifi_pins_wakeup>; - button-wowlan { + wifi_wakeup_event: event-wowlan { label = "Wake on WiFi"; gpios = <&pio 113 GPIO_ACTIVE_HIGH>; linux,code = <KEY_WAKEUP>;
The wake-on-bt and wake-on-wlan nodes don't have a button- or event- prefix that the gpio-keys binding requires. Fix up the node names to satisfy the binding. While at it, also fix up the GPIO overriding structure for the wake-on-wlan node. Instead of referencing the gpio-keys node and then open coding the node, add a label for the event node, and use that to reference and override the GPIO settings. Fixes: 055ef10ccdd4 ("arm64: dts: mt8183: Add jacuzzi pico/pico6 board") Signed-off-by: Chen-Yu Tsai <wenst@chromium.org> --- .../boot/dts/mediatek/mt8183-kukui-jacuzzi-pico6.dts | 8 +++----- arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-)