arm64: dts: mediatek: mt8186-corsola-voltorb: Merge speaker codec nodes

Browse source

commit 26ea2459d1 upstream.

The Voltorb device uses a speaker codec different from the original
Corsola device. When the Voltorb device tree was first added, the new
codec was added as a separate node when it should have just replaced the
existing one.

Merge the two nodes. The only differences are the compatible string and
the GPIO line property name. This keeps the device node path for the
speaker codec the same across the MT8186 Chromebook line. Also rename
the related labels and node names from having rt1019p to speaker codec.

Cc: stable@vger.kernel.org # v6.11+
Signed-off-by: Chen-Yu Tsai <wenst@chromium.org>
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Link: https://lore.kernel.org/r/20241018082113.1297268-1-wenst@chromium.org
Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

...

This commit is contained in:

Chen-Yu Tsai 2024-10-18 16:21:11 +08:00 • committed by Greg Kroah-Hartman

parent 57241487a3

commit b6a1ba1915

2 changed files with 9 additions and 20 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

21

arch/arm64/boot/dts/mediatek/mt8186-corsola-voltorb.dtsi

View file

8

arch/arm64/boot/dts/mediatek/mt8186-corsola.dtsi

View file