]> git.hungrycats.org Git - linux/commit
arm64: dts: mediatek: mt8186-corsola-voltorb: Merge speaker codec nodes
authorChen-Yu Tsai <wenst@chromium.org>
Fri, 18 Oct 2024 08:21:11 +0000 (16:21 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 5 Dec 2024 12:54:22 +0000 (13:54 +0100)
commit7a9d083a7d1fe794e357e7b2dbfd2a2c184f4496
treed9342734f9904213fa654806d8708345df9fc7e6
parented4524c87249edc3104f6bb28ab11325bed3d536
arm64: dts: mediatek: mt8186-corsola-voltorb: Merge speaker codec nodes

commit 26ea2459d1724406bf0b342df6b4b1f002d7f8e3 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>
arch/arm64/boot/dts/mediatek/mt8186-corsola-voltorb.dtsi
arch/arm64/boot/dts/mediatek/mt8186-corsola.dtsi