Received: by 2002:a05:6358:a55:b0:ec:fcf4:3ecf with SMTP id 21csp3330536rwb; Mon, 16 Jan 2023 06:44:56 -0800 (PST) X-Google-Smtp-Source: AMrXdXvm5DVCT77fckTZodG/nTMtNxWiakWHZsj2RT0walIxptZBf1rC6DrYDHgdpIuxpOv/YDZC X-Received: by 2002:a05:6a20:ce4d:b0:b8:71b7:b903 with SMTP id id13-20020a056a20ce4d00b000b871b7b903mr5431747pzb.31.1673880296518; Mon, 16 Jan 2023 06:44:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673880296; cv=none; d=google.com; s=arc-20160816; b=wneiOpMcuQHM3veV+Ztx+/XIFA4G6JL3uxP/MLRZ1Mssibq8+30HjDDSrm1kH1x4oc pipntGpEr+XEUpLnw2474U4i5WIZ2zjXHeBl5nPtcJ3XirGuCDNyXRNq+sy40U3AQMmP CSVozw0w3c5H7sTnEU+6rce9eRDrj9wvKPQn1T/KUej3xz3T2KttFllbN34OdcTQahoG UnI9lpBSTPyin+UbCu86Y5QD2BYacB4DbYHn5UW7fv7Ncwh6lmNIdyDOq9xO7x4bj1id qVxgRqwPn68cRY1ZHDXIzROkQAM5ddw64F7700xDgBWMyylFIIVqSilutb4EBONqTHMt mORw== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=+v43G8cFalFQLv/ZD/I43+KiOiO2Vxv5wcNiTnL59Fc=; b=bpEMqGsveOpmqiprM3SYta7jzM9QnvOviguu0WUzQzgwD+ZZoLh4bACGD6ySa/lB/m 36e9DQt2q9RaicdGBi8DMT/FQLfpOnVmAr+20vhpuRAIZ9dXBJLloWuhv4FYiy2OkiWB 2EpLWho4a/uR86fi/MeogxTz2oTr8IdIVJaJchsolPP0g9sQZjLhz2io69nBJw8noJyw xqlqXu24v5lOF7POdIhfK5sfYveO+NfMZTEgPw92Qhxu9Sm1p096npv8LOurCH8q3NHp qmymBgjR2Cd1nLauSArT7X+Lzd+tZq/rr8Mk5shIMPk+44rfFlpqYNGEfmHV+FIyb9hY G5Vg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Nlono6EM; 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=kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id k23-20020a634b57000000b00478bf0b11b1si29166862pgl.752.2023.01.16.06.44.44; Mon, 16 Jan 2023 06:44:56 -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=@kernel.org header.s=k20201202 header.b=Nlono6EM; 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=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232140AbjAPOJu (ORCPT + 50 others); Mon, 16 Jan 2023 09:09:50 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45752 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232052AbjAPOHb (ORCPT ); Mon, 16 Jan 2023 09:07:31 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5171922DCF; Mon, 16 Jan 2023 06:03:47 -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 E298860FCA; Mon, 16 Jan 2023 14:03:46 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8A84EC433D2; Mon, 16 Jan 2023 14:03:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1673877826; bh=hyoEyI3t6CGijEfcLrmkQ/ZjXV3+gIkHM+KnvOLhnBE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Nlono6EMGqTgNqYNf7KLYzOWIs0hnu7Yf2p/uQ/z2+st+acMSNm8+uckAO+JkBgwO 2/c0JVQrivmu1d5yEBSfF5pe/mdS1OaY0OZcDu05SyzZM77jZYgK2ZyDN7EER+/NyM UxQpANLZCM+JYiEGgcn5vIM5ggoeWzPpJPg669KsI0cojnfUjibpNk+8u0T9KtFPjC EiCgoMdvmG4azHfviQszEnNHvDZunHFj81L2ZOvl8YgWSg9Wj8vDr/ztgI8eztYMMG nJV0fe+rtk5O/vO3ZkfxPOM8WpHBPawXBIBrQedDni/kqJeN158BcI1YFZcM0yTt7G DT+MbytU++ABQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Henning Schild , Hans de Goede , Sasha Levin , markgross@kernel.org, andriy.shevchenko@linux.intel.com, platform-driver-x86@vger.kernel.org Subject: [PATCH AUTOSEL 6.1 49/53] platform/x86: simatic-ipc: correct name of a model Date: Mon, 16 Jan 2023 09:01:49 -0500 Message-Id: <20230116140154.114951-49-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230116140154.114951-1-sashal@kernel.org> References: <20230116140154.114951-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS 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 From: Henning Schild [ Upstream commit ed058eab22d64c00663563e8e1e112989c65c59f ] What we called IPC427G should be renamed to BX-39A to be more in line with the actual product name. Signed-off-by: Henning Schild Link: https://lore.kernel.org/r/20221222103720.8546-2-henning.schild@siemens.com Reviewed-by: Hans de Goede Signed-off-by: Hans de Goede Signed-off-by: Sasha Levin --- drivers/platform/x86/simatic-ipc.c | 2 +- include/linux/platform_data/x86/simatic-ipc.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/platform/x86/simatic-ipc.c b/drivers/platform/x86/simatic-ipc.c index ca76076fc706..2ab1f8da32b0 100644 --- a/drivers/platform/x86/simatic-ipc.c +++ b/drivers/platform/x86/simatic-ipc.c @@ -46,7 +46,7 @@ static struct { {SIMATIC_IPC_IPC427D, SIMATIC_IPC_DEVICE_427E, SIMATIC_IPC_DEVICE_NONE}, {SIMATIC_IPC_IPC427E, SIMATIC_IPC_DEVICE_427E, SIMATIC_IPC_DEVICE_427E}, {SIMATIC_IPC_IPC477E, SIMATIC_IPC_DEVICE_NONE, SIMATIC_IPC_DEVICE_427E}, - {SIMATIC_IPC_IPC427G, SIMATIC_IPC_DEVICE_227G, SIMATIC_IPC_DEVICE_227G}, + {SIMATIC_IPC_IPCBX_39A, SIMATIC_IPC_DEVICE_227G, SIMATIC_IPC_DEVICE_227G}, }; static int register_platform_devices(u32 station_id) diff --git a/include/linux/platform_data/x86/simatic-ipc.h b/include/linux/platform_data/x86/simatic-ipc.h index 632320ec8f08..a4a6cba412cb 100644 --- a/include/linux/platform_data/x86/simatic-ipc.h +++ b/include/linux/platform_data/x86/simatic-ipc.h @@ -32,7 +32,7 @@ enum simatic_ipc_station_ids { SIMATIC_IPC_IPC477E = 0x00000A02, SIMATIC_IPC_IPC127E = 0x00000D01, SIMATIC_IPC_IPC227G = 0x00000F01, - SIMATIC_IPC_IPC427G = 0x00001001, + SIMATIC_IPC_IPCBX_39A = 0x00001001, }; static inline u32 simatic_ipc_get_station_id(u8 *data, int max_len) -- 2.35.1