From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C215DC433FE for ; Wed, 23 Nov 2022 12:43:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237032AbiKWMna (ORCPT ); Wed, 23 Nov 2022 07:43:30 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48886 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237001AbiKWMmi (ORCPT ); Wed, 23 Nov 2022 07:42:38 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 281266CA15; Wed, 23 Nov 2022 04:41:45 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id A04E161C99; Wed, 23 Nov 2022 12:41:44 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0905FC433C1; Wed, 23 Nov 2022 12:41:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1669207304; bh=VwXXeRt6xQyQwBK4ROVGyz1SFb5IlEYz5klkPODi2E8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qeKDB2vriV2OCj1D2Zbd0eNOYQlG09TN3yAgUWdRBw/QccFAHAeyRTyqYxbpeB6aD zWAzqSMBkyaw/87LN/wFXCKKZC5riXHYsc7Nw3Qd2PIjqAfTI8G6bgql2bTAdb3LjT hBziyJlSa7t07hSgesIWKYM/eVMDj0GNXQcW6/FPxtJ9kAb7zbQhcHIWJhEM66AzN8 UWWXIalD0n0cWKVbO5pu02UBGfERHPpa5ftrUmYpfENlYVCamHAjXFpi7iTRAAknxb CfKmCn6888F7CjIDsinXkfeuluZSZN/ohUFQFBElshl3wLk0lEmaUCqZ6hmPDGQerR ezFwhat9/ZvxA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Takashi Iwai , Dmitry Torokhov , Sasha Levin , hdegoede@redhat.com, wse@tuxedocomputers.com, chenhuacai@kernel.org, samuel@cavoj.net, wsa+renesas@sang-engineering.com, linux-input@vger.kernel.org Subject: [PATCH AUTOSEL 6.0 18/44] Input: i8042 - apply probe defer to more ASUS ZenBook models Date: Wed, 23 Nov 2022 07:40:27 -0500 Message-Id: <20221123124057.264822-18-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221123124057.264822-1-sashal@kernel.org> References: <20221123124057.264822-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org From: Takashi Iwai [ Upstream commit 26c263bf1847d4dadba016a0457c4c5f446407bf ] There are yet a few more ASUS ZenBook models that require the deferred probe. At least, there are different ZenBook UX325x and UX425x models. Let's extend the DMI matching table entries for adapting those missing models. Signed-off-by: Takashi Iwai Link: https://lore.kernel.org/r/20221108142027.28480-1-tiwai@suse.de Signed-off-by: Dmitry Torokhov Signed-off-by: Sasha Levin --- drivers/input/serio/i8042-x86ia64io.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h index 4fbec7bbecca..5043dc7b8fb3 100644 --- a/drivers/input/serio/i8042-x86ia64io.h +++ b/drivers/input/serio/i8042-x86ia64io.h @@ -114,18 +114,18 @@ static const struct dmi_system_id i8042_dmi_quirk_table[] __initconst = { .driver_data = (void *)(SERIO_QUIRK_NOMUX | SERIO_QUIRK_RESET_NEVER) }, { - /* ASUS ZenBook UX425UA */ + /* ASUS ZenBook UX425UA/QA */ .matches = { DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), - DMI_MATCH(DMI_PRODUCT_NAME, "ZenBook UX425UA"), + DMI_MATCH(DMI_PRODUCT_NAME, "ZenBook UX425"), }, .driver_data = (void *)(SERIO_QUIRK_PROBE_DEFER | SERIO_QUIRK_RESET_NEVER) }, { - /* ASUS ZenBook UM325UA */ + /* ASUS ZenBook UM325UA/QA */ .matches = { DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), - DMI_MATCH(DMI_PRODUCT_NAME, "ZenBook UX325UA_UM325UA"), + DMI_MATCH(DMI_PRODUCT_NAME, "ZenBook UX325"), }, .driver_data = (void *)(SERIO_QUIRK_PROBE_DEFER | SERIO_QUIRK_RESET_NEVER) }, -- 2.35.1