From 6fefd2589f015f10b794cdc650a6c20b9deee697 Mon Sep 17 00:00:00 2001 From: Jan200101 Date: Fri, 9 Aug 2024 09:52:27 +0200 Subject: kernel v6.9.12 Ally X audio correction --- SOURCES/0001-ally-x-audio-quirk.patch | 22 ---------- .../0001-patch_realtek-Fix-ROG-ALLY-X-audio.patch | 50 ++++++++++++++++++++++ SPECS/kernel.spec | 11 +++-- 3 files changed, 57 insertions(+), 26 deletions(-) delete mode 100644 SOURCES/0001-ally-x-audio-quirk.patch create mode 100644 SOURCES/0001-patch_realtek-Fix-ROG-ALLY-X-audio.patch diff --git a/SOURCES/0001-ally-x-audio-quirk.patch b/SOURCES/0001-ally-x-audio-quirk.patch deleted file mode 100644 index 0fd97b1..0000000 --- a/SOURCES/0001-ally-x-audio-quirk.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Jan200101 -Date: Sat, 13 Jul 2024 07:34:05 +0200 -Subject: [PATCH] Add Rog Ally X tas2781 audio quirk - -Signed-off-by: Jan200101 ---- - sound/pci/hda/patch_realtek.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c -index 3a56434c8..b9712c4e0 100644 ---- a/sound/pci/hda/patch_realtek.c -+++ b/sound/pci/hda/patch_realtek.c -@@ -10250,6 +10250,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { - SND_PCI_QUIRK(0x1043, 0x1740, "ASUS UX430UA", ALC295_FIXUP_ASUS_DACS), - SND_PCI_QUIRK(0x1043, 0x17d1, "ASUS UX431FL", ALC294_FIXUP_ASUS_DUAL_SPK), - SND_PCI_QUIRK(0x1043, 0x17f3, "ROG Ally NR2301L/X", ALC294_FIXUP_ASUS_ALLY), -+ SND_PCI_QUIRK(0x1043, 0x1eb3, "ROG Ally X RC72LA", ALC287_FIXUP_TAS2781_I2C), - SND_PCI_QUIRK(0x1043, 0x1863, "ASUS UX6404VI/VV", ALC245_FIXUP_CS35L41_SPI_2), - SND_PCI_QUIRK(0x1043, 0x1881, "ASUS Zephyrus S/M", ALC294_FIXUP_ASUS_GX502_PINS), - SND_PCI_QUIRK(0x1043, 0x18b1, "Asus MJ401TA", ALC256_FIXUP_ASUS_HEADSET_MIC), diff --git a/SOURCES/0001-patch_realtek-Fix-ROG-ALLY-X-audio.patch b/SOURCES/0001-patch_realtek-Fix-ROG-ALLY-X-audio.patch new file mode 100644 index 0000000..bcb222a --- /dev/null +++ b/SOURCES/0001-patch_realtek-Fix-ROG-ALLY-X-audio.patch @@ -0,0 +1,50 @@ +From ac9fa29b679959fc58c9180942a74e6687a63584 Mon Sep 17 00:00:00 2001 +From: Jonathan LoBue +Date: Thu, 25 Jul 2024 08:22:38 -0700 +Subject: [PATCH] ALSA: hda/realtek: tas2781: Fix ROG ALLY X audio + +Fix the loading of the proper TI TAS2781 amplifier +for the ROG ALLY X, while keeping the other Realtek +codec and pin portions from original ROG ALLY. + +Add proper credit and tag lines before submitting... +This patch is for sharing and testing (6.10.1) +--- + sound/pci/hda/patch_realtek.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c +index 766f0b1..8d118df 100644 +--- a/sound/pci/hda/patch_realtek.c ++++ b/sound/pci/hda/patch_realtek.c +@@ -7409,6 +7409,7 @@ enum { + ALC285_FIXUP_THINKPAD_X1_GEN7, + ALC285_FIXUP_THINKPAD_HEADSET_JACK, + ALC294_FIXUP_ASUS_ALLY, ++ ALC294_FIXUP_ASUS_ALLY_X, + ALC294_FIXUP_ASUS_ALLY_PINS, + ALC294_FIXUP_ASUS_ALLY_VERBS, + ALC294_FIXUP_ASUS_ALLY_SPEAKER, +@@ -8875,6 +8876,12 @@ static const struct hda_fixup alc269_fixups[] = { + .chained = true, + .chain_id = ALC294_FIXUP_ASUS_ALLY_PINS + }, ++ [ALC294_FIXUP_ASUS_ALLY_X] = { ++ .type = HDA_FIXUP_FUNC, ++ .v.func = tas2781_fixup_i2c, ++ .chained = true, ++ .chain_id = ALC294_FIXUP_ASUS_ALLY_PINS ++ }, + [ALC294_FIXUP_ASUS_ALLY_PINS] = { + .type = HDA_FIXUP_PINS, + .v.pins = (const struct hda_pintbl[]) { +@@ -10306,6 +10313,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { + SND_PCI_QUIRK(0x1043, 0x1740, "ASUS UX430UA", ALC295_FIXUP_ASUS_DACS), + SND_PCI_QUIRK(0x1043, 0x17d1, "ASUS UX431FL", ALC294_FIXUP_ASUS_DUAL_SPK), + SND_PCI_QUIRK(0x1043, 0x17f3, "ROG Ally NR2301L/X", ALC294_FIXUP_ASUS_ALLY), ++ SND_PCI_QUIRK(0x1043, 0x1eb3, "ROG Ally X RC72LA", ALC294_FIXUP_ASUS_ALLY_X), + SND_PCI_QUIRK(0x1043, 0x1863, "ASUS UX6404VI/VV", ALC245_FIXUP_CS35L41_SPI_2), + SND_PCI_QUIRK(0x1043, 0x1881, "ASUS Zephyrus S/M", ALC294_FIXUP_ASUS_GX502_PINS), + SND_PCI_QUIRK(0x1043, 0x18b1, "Asus MJ401TA", ALC256_FIXUP_ASUS_HEADSET_MIC), +-- +2.45.2 diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec index 7968303..e379ed1 100644 --- a/SPECS/kernel.spec +++ b/SPECS/kernel.spec @@ -169,7 +169,7 @@ Summary: The Linux kernel # This is needed to do merge window version magic %define patchlevel 9 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 203%{?buildid}%{?dist} +%define specrelease 204%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.9.12 @@ -1003,7 +1003,7 @@ Patch321: v14.8-0004-HID-asus-add-ROG-Ally-xpad-settings.patch Patch322: rog-ally-gyro-fix.patch Patch323: 0001-Revert-drm-i915-mtl-Add-fake-PCH-for-Meteor-Lake.patch Patch336: 0001-add-ally-x-dmi-quirk-for-controller-suspend.patch -Patch337: 0001-ally-x-audio-quirk.patch +Patch337: 0001-patch_realtek-Fix-ROG-ALLY-X-audio.patch # hdr: https://github.com/CachyOS/kernel-patches Patch208: 0001-ntsync.patch @@ -1908,7 +1908,7 @@ ApplyOptionalPatch v14.8-0004-HID-asus-add-ROG-Ally-xpad-settings.patch ApplyOptionalPatch rog-ally-gyro-fix.patch ApplyOptionalPatch 0001-Revert-drm-i915-mtl-Add-fake-PCH-for-Meteor-Lake.patch ApplyOptionalPatch 0001-add-ally-x-dmi-quirk-for-controller-suspend.patch -ApplyOptionalPatch 0001-ally-x-audio-quirk.patch +ApplyOptionalPatch 0001-patch_realtek-Fix-ROG-ALLY-X-audio.patch # https://github.com/CachyOS/kernel-patches ApplyOptionalPatch 0001-ntsync.patch @@ -4135,11 +4135,14 @@ fi\ # # %changelog +* Fri Aug 09 2024 Jan200101 - 6.9.12-204.fsync +- kernel-fsync v6.9.12 Ally X audio correction + * Sat Aug 03 2024 Jan200101 - 6.9.12-203.fsync - kernel-fsync v6.9.12 work around DCN issue * Wed Jul 31 2024 Jan200101 - 6.9.12-202.fsync -- kernel v6.9.12 loki mini +- kernel-fsync v6.9.12 loki mini * Mon Jul 29 2024 Jan200101 - 6.9.12-201.fsync - kernel-fsync v6.9.12 -- cgit v1.2.3