Unverified Commit 70bf81dd authored by Chen-Yu Tsai's avatar Chen-Yu Tsai Committed by AngeloGioacchino Del Regno
Browse files

arm64: dts: mediatek: mt8183-pico6: Fix wake-on-X event node names 



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: 055ef10c ("arm64: dts: mt8183: Add jacuzzi pico/pico6 board")
Signed-off-by: default avatarChen-Yu Tsai <wenst@chromium.org>
Reviewed-by: default avatarAngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Link: https://lore.kernel.org/r/20240131084043.3970576-1-wenst@chromium.org


Signed-off-by: default avatarAngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
parent 0b2f9d0e

arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-pico6.dts

+3 −5
Original line number Diff line number Diff line
@@ -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,11 +47,9 @@ trackpad@2c { 
	};

};



&wifi_wakeup {

	wowlan {

&wifi_wakeup_event {

	gpios = <&pio 113 GPIO_ACTIVE_LOW>;

};

};



&wifi_pwrseq {

	post-power-on-delay-ms = <50>;

arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -152,7 +152,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>;