FAILED: patch "[PATCH] arm64: dts: mt8183: kukui: Fix underscores in node names" failed to apply to 6.6-stable tree
Subsystems (3)
[email protected]
maintainerThe patch below does not apply to the 6.6-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.6.y
git checkout FETCH_HEAD
git cherry-pick -x 8980c30141d3986beab815d85762b9c67196ed72
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2023120951-immunize-skyrocket-9db5@gregkh' --subject-prefix 'PATCH 6.6.y' HEAD^..
Possible dependencies:
8980c30141d3 ("arm64: dts: mt8183: kukui: Fix underscores in node names") a9c740c57f97 ("arm64: dts: mediatek: add missing space before {")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 8980c30141d3986beab815d85762b9c67196ed72 Mon Sep 17 00:00:00 2001
From: Hsin-Yi Wang <[email protected]>
Date: Thu, 26 Oct 2023 12:09:10 -0700
Subject: [PATCH] arm64: dts: mt8183: kukui: Fix underscores in node names
Replace underscores with hyphens in pinctrl node names both for consistency and to adhere to the bindings.
arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi.dtsi +3 -3
@@ -441,20 +441,20 @@ pins2 { }; touchscreen_pins: touchscreen-pins { - touch_int_odl { + touch-int-odl { pinmux = <PINMUX_GPIO155__FUNC_GPIO155>; input-enable; bias-pull-up; }; - touch_rst_l { + touch-rst-l { pinmux = <PINMUX_GPIO156__FUNC_GPIO156>; output-high; }; }; trackpad_pins: trackpad-pins { - trackpad_int { + trackpad-int { pinmux = <PINMUX_GPIO7__FUNC_GPIO7>; input-enable; bias-disable; /* pulled externally */
arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi +47 -47
344 lines not on this page · raw message