From patchwork Wed Mar 1 09:54:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans de Goede X-Patchwork-Id: 62814 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp3539484wrd; Wed, 1 Mar 2023 01:56:40 -0800 (PST) X-Google-Smtp-Source: AK7set8FCCEiEofkCfB0q2maQU+Xx31vEh3iEuxKL84CHNYbrivo2ZSQtbSv67dwdMKZxf9SBKmP X-Received: by 2002:a05:6a20:1a91:b0:cb:2c8e:14c with SMTP id ci17-20020a056a201a9100b000cb2c8e014cmr5643458pzb.10.1677664600281; Wed, 01 Mar 2023 01:56:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677664600; cv=none; d=google.com; s=arc-20160816; b=Sl1RbNT83YAq2qhRYWr6AahUn+fi32/YBZSS5IeYudasHbAt7KFMJw1ojIQkvICWbU UPst64bZ6Sp0OXvyS76wo8ziK9X4OsdgFmdvbT8Jz0E1tUl8ryxAl5hUgUk1SuEIALvt Y3oVfgxsOy4W44xyr4DTYwciGUaCr4aEUd8lATs5D0QhYXFygCivFSwJ+lQLGf3jtxNY 4C9uEGjtQydIPVMZ58d/V2Z6x6qTLUr2zK5UTbNiPFPK4vDGsQjPd6WfmDqc7f+bmZGV yTDWUK3pJ+Ehg9DS3Jx4tisi1NDkKHQGvZ2P+sc0nXiUefobyZKiTrp5Ko1z8hHd25X4 f6JA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=wAONpmhyXCAc8IuPgZm7NNqmRfPmkcrYxjcUYUA2L7U=; b=KN1F6cojqcm17tkLW8TjDjqB2VFl+A4aM/brsQaDf+C009E8tBrApBpAH0osKGgRrZ AE8oUy7y8PpVdGxpFlMZ0W5et42qOoweWtAV4uvClnm0wjeHAUdu0UCZAj9osGvqKwBc priZRrBHfZld06w8HdfibernucSD9TubhmxdzEijVeXbMbiWa/VwjR88faULNCBY1HJg T/BynmQoBK9wayTK6XdlB9MyPn7QydCLFsnF3/AULK4uKFLV6F3/Fzmp9rbhx+w5sE5P N/Z9JxJtdf7SqRMcMJ0va24yO1H/1bfjFyNqABvteiZ2HASh/5XwegIIkYRjj6V5YKtq L1BQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=L6+AhYOk; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id j190-20020a638bc7000000b00503a2a21d1esi524865pge.728.2023.03.01.01.56.27; Wed, 01 Mar 2023 01:56:40 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=L6+AhYOk; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229825AbjCAJzG (ORCPT + 99 others); Wed, 1 Mar 2023 04:55:06 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39152 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229534AbjCAJzF (ORCPT ); Wed, 1 Mar 2023 04:55:05 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 377B917163 for ; Wed, 1 Mar 2023 01:54:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677664457; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=wAONpmhyXCAc8IuPgZm7NNqmRfPmkcrYxjcUYUA2L7U=; b=L6+AhYOkBWHlAWRD4ypv5Cp1iPRufrNvZcbl8Q/ixiXJy3OwAaUC6dW6iW4PtGYlz/d6Ab QnFGrmONz0sl70Yo4HwEEX+3R2dDEcGxhY4ls6UOz/gvncSGY7OjcVDa2ljgFdmuHUpNWP 81rxeo94dIMvZrL+S+GUo25JjadiyZY= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-663-tRJc_4MnMhe5Sf1XRyfyvg-1; Wed, 01 Mar 2023 04:54:14 -0500 X-MC-Unique: tRJc_4MnMhe5Sf1XRyfyvg-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4BC2E101B42B; Wed, 1 Mar 2023 09:54:12 +0000 (UTC) Received: from localhost.localdomain (unknown [10.39.194.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9BAF12166B26; Wed, 1 Mar 2023 09:54:11 +0000 (UTC) From: Hans de Goede To: Andy Shevchenko , Lee Jones Cc: Hans de Goede , linux-kernel@vger.kernel.org Subject: [PATCH 2/3] mfd: intel_soc_pmic_chtwc: Add Lenovo Yoga Book X90F to intel_cht_wc_models Date: Wed, 1 Mar 2023 10:54:02 +0100 Message-Id: <20230301095402.28582-1-hdegoede@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759158836091946436?= X-GMAIL-MSGID: =?utf-8?q?1759158836091946436?= The Android Lenovo Yoga Book X90F / X90L uses the same charger / fuelgauge setup as the already supported Windows Lenovo Yoga Book X91F/L, add a DMI match for this to intel_cht_wc_models with driver_data set to INTEL_CHT_WC_LENOVO_YOGABOOK1. When the quirk for the X91F/L was initially added it was written to also apply to the X90F/L but this does not work because the Android version of the Yoga Book uses completely different DMI strings. Also adjust the X91F/L quirk to reflect that it only applies to the X91F/L models. Signed-off-by: Hans de Goede Reviewed-by: Andy Shevchenko --- drivers/mfd/intel_soc_pmic_chtwc.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/drivers/mfd/intel_soc_pmic_chtwc.c b/drivers/mfd/intel_soc_pmic_chtwc.c index d53dae255490..871776d511e3 100644 --- a/drivers/mfd/intel_soc_pmic_chtwc.c +++ b/drivers/mfd/intel_soc_pmic_chtwc.c @@ -159,11 +159,19 @@ static const struct dmi_system_id cht_wc_model_dmi_ids[] = { DMI_MATCH(DMI_PRODUCT_NAME, "Mipad2"), }, }, { - /* Lenovo Yoga Book X90F / X91F / X91L */ + /* Lenovo Yoga Book X90F / X90L */ .driver_data = (void *)(long)INTEL_CHT_WC_LENOVO_YOGABOOK1, .matches = { - /* Non exact match to match all versions */ - DMI_MATCH(DMI_PRODUCT_NAME, "Lenovo YB1-X9"), + DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Intel Corporation"), + DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "CHERRYVIEW D1 PLATFORM"), + DMI_EXACT_MATCH(DMI_PRODUCT_VERSION, "YETI-11"), + }, + }, { + /* Lenovo Yoga Book X91F / X91L */ + .driver_data = (void *)(long)INTEL_CHT_WC_LENOVO_YOGABOOK1, + .matches = { + /* Non exact match to match F + L versions */ + DMI_MATCH(DMI_PRODUCT_NAME, "Lenovo YB1-X91"), }, }, { /* Lenovo Yoga Tab 3 Pro YT3-X90F */