From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on sa.local.altlinux.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00 autolearn=unavailable autolearn_force=no version=3.4.1 From: kovalev@altlinux.org To: devel-kernel@lists.altlinux.org Date: Fri, 8 Dec 2023 20:09:31 +0300 Message-Id: <20231208170938.175868-2-kovalev@altlinux.org> X-Mailer: git-send-email 2.33.8 In-Reply-To: <20231208170938.175868-1-kovalev@altlinux.org> References: <20231208170938.175868-1-kovalev@altlinux.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [d-kernel] [PATCH 1/9] Revert "ASoC: Intel: sof_es8336: add ES8326 component support" X-BeenThere: devel-kernel@lists.altlinux.org X-Mailman-Version: 2.1.12 Precedence: list Reply-To: ALT Linux kernel packages development List-Id: ALT Linux kernel packages development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Dec 2023 17:09:56 -0000 Archived-At: List-Archive: List-Post: From: Vasiliy Kovalev This reverts commit 15942fcf7b5fa138e8e7b597f327d252f7895d2c. We remove our changes before applying a set of patches from the upstream. Signed-off-by: Vasiliy Kovalev name = codec_name; + + /* also fixup codec dai name if relevant */ + if (!strncmp(mach->id, "ESSX8326", SND_ACPI_I2C_ID_LEN)) + dai_links[0].codecs->dai_name = "ES8326 HiFi"; } else { dev_err(dev, "Error cannot find '%s' dev\n", mach->id); return -ENXIO; } - card->components = devm_kasprintf(dev, GFP_KERNEL, "spk:es83%d6", - strstr(codec_name, "ESSX8326") - ? 1 : 2); - if (!card->components) - return -ENOMEM; - codec_dev = acpi_get_first_physical_node(adev); acpi_dev_put(adev); if (!codec_dev) -- 2.33.8