Received: by 2002:a05:6500:2018:b0:1fb:9675:f89d with SMTP id t24csp697996lqh; Fri, 31 May 2024 13:39:00 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCWrQr9W5xWFSKCZY6d0n7AKd6+5VOGIElQ1WuIDZkBLeeqpyJ6aea2Jz7rEQRRdGyrTgobUmozTbtfgEQEqk7LD3aQwy4kmn2PZaN75Iw== X-Google-Smtp-Source: AGHT+IFYV0/hLBQ82nyoKOJOUp/BHVZByf+VQ0sbJ3H+Hm7mqNBhy/KUZbLVl60qgqbRDxuTkZcL X-Received: by 2002:a05:600c:2e13:b0:421:2aaf:b913 with SMTP id 5b1f17b1804b1-4212e09ccbbmr24418535e9.26.1717187940678; Fri, 31 May 2024 13:39:00 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1717187940; cv=pass; d=google.com; s=arc-20160816; b=PdbncgZ+hgGGIg3VBEs0T8z+yUGsrwgU53zNQMqBCYy2e78wdDOppr+M69kV1L73GA hcRyNpx5WOnxnWGgVjmRm/myMTl/S2i5/GI9FNH+cDLCsOhubW2nWK6Sdh87QnXeppGN JX+MOdAxO4LPjWuF/fLbQHQI69V96bbGIiioRgd8Y04yc+xN20UD/ukW2QUHHXw0YIAY xZ8GqGmQz1Vz47oaeZPkHH51oPAUtyAGSw3XiHkLW0QmxsOMTMpCb2I6U9oaIikSAFsr IpEoGgNcGD0qoB4BpvN/2sJYU0dZ/D3+j79dJ4108Qw+EF0PX6TaM9Vdro37ZVbVYxwi 4+TA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=kZRpNALw+Wsm+g/63ewe40Di/AuqoKGpyh6jDYkAfvA=; fh=Md5DIKAs4YWvfY9kKMcAxVcnhV7bYW5A6Qub+EkVGSM=; b=HM6oowkouhRh68Di73q9/sOT7z5ehU2L1tninjbzoZbhjveUe+ubT8pheWLd8PlYvB eMeFSL9olMfiWvJg/o9IZtuH8ttmL6H2/h4tYMjcbpE6++OyHh/N32O9Y1AjqX5DSGai 0JSxmIIRwEL46k0EqfBOWUXZ1n/mDbbE6fYp49yAIZgaELk1A17dmkNl1//TLtCDfWrp ueNQLSGsg+Ct+GjlbgFV2K+RqE7drEG5cXenvbajzJzQwvJbDKkANTK9RIClkcK2/f6M HgdPXWOAeIf5O2prqFyL/cK554/ln+d5RVP4CcHtaZN13y0PMWH3yxUMwzOCMslSoOaI nMyA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=BW5nWWLT; arc=pass (i=1 spf=pass spfdomain=intel.com dkim=pass dkdomain=intel.com dmarc=pass fromdomain=intel.com); spf=pass (google.com: domain of linux-kernel+bounces-197459-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-197459-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id 4fb4d7f45d1cf-57a31ba5fcesi1319849a12.158.2024.05.31.13.39.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 31 May 2024 13:39:00 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-197459-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=BW5nWWLT; arc=pass (i=1 spf=pass spfdomain=intel.com dkim=pass dkdomain=intel.com dmarc=pass fromdomain=intel.com); spf=pass (google.com: domain of linux-kernel+bounces-197459-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-197459-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 104C71F22085 for ; Fri, 31 May 2024 20:38:52 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id C3B30183A9C; Fri, 31 May 2024 20:37:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="BW5nWWLT" Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7E5A3182D01; Fri, 31 May 2024 20:37:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.17 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717187839; cv=none; b=cDlSxWW0IHwg4TTITzR7x9K8RyNyO1GSgZ2SPUlvc02ivd9rEWu4qQQobwUqS5L8snVHIv/sLFOe5ga50e9uhFH6zWFwnDggomPBCfGWrOyfI3A7ThvNuvpxy+51R+n9pciPdKSXjb5LWJRtg9jUebBG+76Ca+eYIHwu0lgw2Jg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717187839; c=relaxed/simple; bh=uwrfu/RQXE+CPGny/VIfWFI+r++v83onQnRT6WNFLOM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rU4GvyQi6khgxT5iIXn/OiaciIeYBmxdvbBAxOmPrklw8X8zG0JXmBADF+CGgMWgQkUOOlvtoLZuZhMCtmN9Cc0QVkm0nIuT7xdbVBwtFrMzc2Gjby4LbnzaF36ubz4ZufV65uYHuROODuLHtZL7jMadFSpqWEFRC6Htzmdrw3c= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=BW5nWWLT; arc=none smtp.client-ip=198.175.65.17 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1717187837; x=1748723837; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=uwrfu/RQXE+CPGny/VIfWFI+r++v83onQnRT6WNFLOM=; b=BW5nWWLTA5Fcz/Ya/05VubV9dO91UIprCdFOqGkrk7gPK5fOcyqgQsPa WRBTfrgAOPqRbAtScEIT6hZbPtglEXXhVm1J0rpMG0StFXS5Boa8zPDPw y3yaxgi8z4G5iIQx1FZxpEhwgn7f6L34yhS6nFnyIv1K9+ELqYng5Sonc lmOd2oY3twcZ2Y5yt/DjpZ7cYcR9KMmg7rL50DW/uwWt6CYs2Byp0zz2F kbatYHtVw6hLFQ6/yAK2bUFkznygbOOjCyDFkK123Z4sheduEpiD96r0T ta7Pfy673G37eqHn47LhIBW5hIJcFNmNvwCg7CnC7sxPiBFmAnDSZgpux A==; X-CSE-ConnectionGUID: 0kLsUctuTAmyGc5yakAUHg== X-CSE-MsgGUID: NAIQgE0ISUGzgwdqiCwmvA== X-IronPort-AV: E=McAfee;i="6600,9927,11089"; a="13871853" X-IronPort-AV: E=Sophos;i="6.08,205,1712646000"; d="scan'208";a="13871853" Received: from orviesa009.jf.intel.com ([10.64.159.149]) by orvoesa109.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 May 2024 13:37:13 -0700 X-CSE-ConnectionGUID: Rm6XaC6qS4OMd2shuamntA== X-CSE-MsgGUID: xSQWySafSlOgPQV7lfBwsg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,205,1712646000"; d="scan'208";a="36355396" Received: from agluck-desk3.sc.intel.com ([172.25.222.70]) by orviesa009-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 May 2024 13:37:13 -0700 From: Tony Luck To: =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= , Hans de Goede Cc: platform-driver-x86@vger.kernel.org, x86@kernel.org, linux-kernel@vger.kernel.org, patches@lists.linux.dev, Tony Luck , Kuppuswamy Sathyanarayanan Subject: [PATCH 09/11] platform/x86: intel_scu_wdt: Switch to new Intel CPU model defines Date: Fri, 31 May 2024 13:37:05 -0700 Message-ID: <20240531203706.233365-10-tony.luck@intel.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240531203706.233365-1-tony.luck@intel.com> References: <20240531203706.233365-1-tony.luck@intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit New CPU #defines encode vendor and family as well as model. Signed-off-by: Tony Luck Reviewed-by: Kuppuswamy Sathyanarayanan Acked-by: Hans de Goede --- drivers/platform/x86/intel_scu_wdt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/platform/x86/intel_scu_wdt.c b/drivers/platform/x86/intel_scu_wdt.c index a5031a25632e..d0b6637861d3 100644 --- a/drivers/platform/x86/intel_scu_wdt.c +++ b/drivers/platform/x86/intel_scu_wdt.c @@ -50,7 +50,7 @@ static struct intel_mid_wdt_pdata tangier_pdata = { }; static const struct x86_cpu_id intel_mid_cpu_ids[] = { - X86_MATCH_INTEL_FAM6_MODEL(ATOM_SILVERMONT_MID, &tangier_pdata), + X86_MATCH_VFM(INTEL_ATOM_SILVERMONT_MID, &tangier_pdata), {} }; -- 2.45.0