From patchwork Wed Jul 19 15:35:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Henning Schild X-Patchwork-Id: 704554 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 CD018C0015E for ; Wed, 19 Jul 2023 15:35:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231873AbjGSPfk (ORCPT ); Wed, 19 Jul 2023 11:35:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42132 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230526AbjGSPfj (ORCPT ); Wed, 19 Jul 2023 11:35:39 -0400 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on2082.outbound.protection.outlook.com [40.107.7.82]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 51CC8B7; Wed, 19 Jul 2023 08:35:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=W7gDVBVOprph10J0P/CL/WWC4ke4w6ERIGnVw21wAd2ydNicuthxEsRqCB+cMAPWUwHzMtZl6tYaCxaFzBhH/BY4FgKRW9Dayv1irCS8EimYWO08z+OfbGwqaQjcJiNYTjDVqSGF/qRhhay+JyRAf980muQQuz/syZa+eYWZP41FkDA0qz2On50ClY+iGvKZab/g+hCoUSQ/7687T7nQg4C8fs6FjBB/Xqbevnuz4kJlVZ1ekj8TvlhnXMEHzysnyipaJplgU+9ap66VZ9AXfjQZ28WuIAYXgp1zq0B2Kp4IEmGoFWxU2xhGWRGU+dpbEaDZqcgXL3GDR8ZcoikyVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=+iimuwI233p1lJKOpfdYddROMKOqlCEyj5OpcRhIFN4=; b=AQcjwMbcbQtK8wjP8kol/VE8bq8kRkRM25Fa5pwXuyJSBGfJhW+6pceXNEdXw+COt3dungZ/uufwAZPrXSsVSengQkPzMo58CZTA29agBkYFyUFPRnz7aK2ULyIkKrV6914RjyXMwo/o8ZoMPoPbl2vyOsLlifSUhhlTqwPiML8jTCsjdqnscdJAcHyW21YlzNJwRBPkOBYl8aDIA1AvSqu5PvbmfndwUx7Rd2IQXHpHVrSxk0OtaMG6IDeZHZuAQoJUERON1x8v9Qpy+CH8eKQq1sZLeRerlSJ/9JbUTbvERgXOu0UoUFi32sRcpc4KJg+EpcMq42tjkyWUFyTl6Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 194.138.21.74) smtp.rcpttodomain=kernel.org smtp.mailfrom=siemens.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=siemens.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=siemens.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=+iimuwI233p1lJKOpfdYddROMKOqlCEyj5OpcRhIFN4=; b=a8N/GQqJPJIfPk2t3xpM0ojKvmRlClZvrMXzHUaUtsa9Mzti1rlVZ/6K62qD8VLULk7LR1WOAhwOirOeK/iHxPfDkZPcQXYzYns5Fya0yZYjX/3187pf+iWr9WrBbC2+JdejnEFwgr5wSRcqMMyqWpcqh03vOLPLZNTBVWJH+tGAwKcOjavIqOKA52JmkDCEPtsklerbDvQHPG/oLaxy4kIEpTafcIw0whJpPD5bXX3vQsRDsvNGssw7LzaK7+W1RKLU0yP6Hx5BOz/ml5da4w9RqvM+LjzGNpaiLBimyIekN2ge7R/mip92Yd2ZAb5bRinCpfNl44zPPgTiCBF5PQ== Received: from GV3P280CA0075.SWEP280.PROD.OUTLOOK.COM (2603:10a6:150:a::24) by AM7PR10MB3350.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:10c::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6588.33; Wed, 19 Jul 2023 15:35:35 +0000 Received: from HE1EUR01FT025.eop-EUR01.prod.protection.outlook.com (2603:10a6:150:a:cafe::17) by GV3P280CA0075.outlook.office365.com (2603:10a6:150:a::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6609.24 via Frontend Transport; Wed, 19 Jul 2023 15:35:35 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 194.138.21.74) smtp.mailfrom=siemens.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=siemens.com; Received-SPF: Pass (protection.outlook.com: domain of siemens.com designates 194.138.21.74 as permitted sender) receiver=protection.outlook.com; client-ip=194.138.21.74; helo=hybrid.siemens.com; pr=C Received: from hybrid.siemens.com (194.138.21.74) by HE1EUR01FT025.mail.protection.outlook.com (10.152.0.182) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6609.24 via Frontend Transport; Wed, 19 Jul 2023 15:35:35 +0000 Received: from DEMCHDC8WAA.ad011.siemens.net (139.25.226.104) by DEMCHDC8VQA.ad011.siemens.net (194.138.21.74) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1258.12; Wed, 19 Jul 2023 17:35:29 +0200 Received: from md1za8fc.ppmd.siemens.net (139.25.68.175) by DEMCHDC8WAA.ad011.siemens.net (139.25.226.104) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.25; Wed, 19 Jul 2023 17:35:29 +0200 From: Henning Schild To: Lee Jones , Hans de Goede , "Wim Van Sebroeck" , Guenter Roeck , , , , CC: Pavel Machek , Mark Gross , "Andy Shevchenko" , Tobias Schaffner , Henning Schild Subject: [PATCH v2 1/3] watchdog: make Siemens Simatic watchdog driver default on platform Date: Wed, 19 Jul 2023 17:35:16 +0200 Message-ID: <20230719153518.13073-2-henning.schild@siemens.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230719153518.13073-1-henning.schild@siemens.com> References: <20230719153518.13073-1-henning.schild@siemens.com> MIME-Version: 1.0 X-Originating-IP: [139.25.68.175] X-ClientProxiedBy: DEMCHDC8WAA.ad011.siemens.net (139.25.226.104) To DEMCHDC8WAA.ad011.siemens.net (139.25.226.104) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1EUR01FT025:EE_|AM7PR10MB3350:EE_ X-MS-Office365-Filtering-Correlation-Id: 2f844089-60e2-46ce-7a80-08db886dcbbd X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2uaM1CEc5L4RnYWA079jlf4vKEBSo2RuHKqTzLAUu0IRkIvbRZIs9iksO3ewh+sbhaNihfK+WR0qxzRK5PJmWMR6fpmkHlZxLo3upab2dObUCd0bsOw3ynAS6MsDdT3kqLHiSMAsJV3w5+uj8YpMILju4bd/U06oP4z9SmaZu45ZF2JmH9U6CXwbeq0yi9+49q5ibL8bRduIwjaz61xNy4mx8eMwvb5o9He9q1kuNAX/lhb345EWzebizkDF3v5SAMIyxuOFQjvGcDSa6BW14xAlWyTkhLHKUODc8fpdoAnUrjDB9WmJtTx23wPVxmrSDBpaqpRu6hans3tjCGV2LvO7qLvTpuoEMxEAEHE3na67naDS1qvWU906HHihmlguCeJL2oVtX4wX+W1XRPunxcYZ9F1J2RTFdFi95A2DVp3XGRj6ervVy0lurOozSO2x3cyUyGQT52r1cWMvUCxmoROnh6Iilj1GKG7ZVeKAaRXGTaEwKOh+G/7JXGnI8Ug9EQuJph5DJHO0rC//dQHuDckiv+O/aUBqNKDhkiimA0Nyp9ws4Rvub6kEkCefrM/IEKh72udQsSJ8W8cBOXxn7gTXHolk3JbWxhygtJmhnmLnbQ8zJZySiL2jPYrLdlQfGmCA6Sm6kwHzlKB/ZHJB0VJPW92WUYowwQkZNdbrC3W+YYAfJDRF9pFRfcxv7UMeLvDOIuXWa+uLwoEMjhj8zUfF17DfBVYr1A+uARnOCQLA55iH0KObBd/cli8DRGAIR/K3KLPOFJQbmLEyiaLE4A== X-Forefront-Antispam-Report: CIP:194.138.21.74; CTRY:DE; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:hybrid.siemens.com; PTR:hybrid.siemens.com; CAT:NONE; SFS:(13230028)(4636009)(39860400002)(396003)(376002)(136003)(346002)(82310400008)(451199021)(36840700001)(40470700004)(46966006)(36860700001)(336012)(47076005)(956004)(2616005)(40460700003)(40480700001)(4744005)(2906002)(4326008)(110136005)(8676002)(7416002)(8936002)(5660300002)(41300700001)(70206006)(44832011)(186003)(16526019)(70586007)(316002)(82740400003)(356005)(478600001)(7596003)(86362001)(7636003)(6666004)(82960400001)(54906003)(36756003)(1076003)(26005)(107886003)(2101003); DIR:OUT; SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jul 2023 15:35:35.3069 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2f844089-60e2-46ce-7a80-08db886dcbbd X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=38ae3bcd-9579-4fd4-adda-b42e1495d55a; Ip=[194.138.21.74]; Helo=[hybrid.siemens.com] X-MS-Exchange-CrossTenant-AuthSource: HE1EUR01FT025.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR10MB3350 Precedence: bulk List-ID: X-Mailing-List: linux-watchdog@vger.kernel.org If a user did choose to enable Siemens Simatic platform support they likely want that driver to be enabled without having to flip more config switches. So we make the watchdog driver config switch default to the platform driver switches value. Signed-off-by: Henning Schild Reviewed-by: Guenter Roeck --- drivers/watchdog/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index ee97d89dfc11..04e9b40cf7d5 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -1681,6 +1681,7 @@ config NIC7018_WDT config SIEMENS_SIMATIC_IPC_WDT tristate "Siemens Simatic IPC Watchdog" depends on SIEMENS_SIMATIC_IPC + default y select WATCHDOG_CORE select P2SB help From patchwork Wed Jul 19 15:35:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Henning Schild X-Patchwork-Id: 704555 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 985ACC0015E for ; Wed, 19 Jul 2023 15:35:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231854AbjGSPfg (ORCPT ); Wed, 19 Jul 2023 11:35:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42124 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230526AbjGSPff (ORCPT ); Wed, 19 Jul 2023 11:35:35 -0400 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2087.outbound.protection.outlook.com [40.107.21.87]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D85F9BE; Wed, 19 Jul 2023 08:35:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aAy3bjby50/GnjTu4eJnxh8fWTUWWYZvfbLcGVZX3nkIjMPNQ9keQ7JJ1RKSlvgBsOOQK4z3Hyc8a7Acpva5fqoJjFhg3iF18Bl/OJiQq2Eb+Fj9FEhAue3vtCK9Yef7GyRAyrWg51QqhQFrL0BJ5GarpQ2YVlNdLs+Pe7AQkbBygmiX7d92fiAu2+T49kX1fswCxGYJ2rg0UcfxNlC2Ny8ALtVPIVlridk41N8cTtFYU0FdlUVCrwkN4eTU8c9Goy2e6iOCFWiPpN4vJRF//fe9EIXRRmJzHp0+XN3UR0kayzw62/06YNWbzTqYC8PcNyBc95vtyCE24rEVvh3Tbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=DYgkHS6MhJEFqymp4OhhqkicICgB5/roHN4qvz27Hqw=; b=DMnyom5XjdQurtrW9j+z0MP3XJ2TLzEjMFtDmEd3zfve/9Dio7FLYtGR8IQLkz18ELUNmnnh3E8qckB6fsoJKgQ6GsKH2JbD/6d+t6YXAYdds2qkZpkPr85WRZafq30e7TvO1VFhHCUy71NLYsv1NFV3JeqnqKPT4URki0mCSLz/KKnU/b0EuQGPGM9xBsu4pWn3HI3kUMUms5jScnvIqQddpWbj8K7cpPvZVvCrivXyjJTMu2NY3k0/2lL2TUscNSitafilGC9ICMzJoVTzwWX2NqxYYdM/NJuiSNBTKup/jaezHRfvUBKFQOnEMW+5IxUYQ9vx1OtMCIt16J8wog== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 194.138.21.76) smtp.rcpttodomain=kernel.org smtp.mailfrom=siemens.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=siemens.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=siemens.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=DYgkHS6MhJEFqymp4OhhqkicICgB5/roHN4qvz27Hqw=; b=lFrVZGdC36CEJV+Dw6FFIJk6hoLYy+ryqkKNZsHB1s5UrCobJygrNrZItPL0Zlwm3tiXMuC4lifE+mWtvNsWcfybxTKuduiXQSA4BNzG4Sabz/M4SrST3cBMx2ro8Y5mKjPBgWKPZwNMxdFTzR/8k/bQb2W8/nI9WjmCjdQ5xiDg5DHvypE6B0Ka1qLDk6yy5CRQhjNVRox+seFbcJyFKd1fLm5oRTAdh66lNvTlea8pep83TbVJiY5E3WXjq5o5pw4lpcopbn4rcHmOO40kdHWUEnKmMbY1uslLOaXnS8uO8DOUzxxJfdRwQk90dx2WLx2xOYYeZ93z5RYU3o2oiQ== Received: from OS6P279CA0144.NORP279.PROD.OUTLOOK.COM (2603:10a6:e10:3a::12) by DU0PR10MB7213.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:44b::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6588.31; Wed, 19 Jul 2023 15:35:31 +0000 Received: from HE1EUR01FT089.eop-EUR01.prod.protection.outlook.com (2603:10a6:e10:3a:cafe::9d) by OS6P279CA0144.outlook.office365.com (2603:10a6:e10:3a::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6588.33 via Frontend Transport; Wed, 19 Jul 2023 15:35:30 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 194.138.21.76) smtp.mailfrom=siemens.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=siemens.com; Received-SPF: Pass (protection.outlook.com: domain of siemens.com designates 194.138.21.76 as permitted sender) receiver=protection.outlook.com; client-ip=194.138.21.76; helo=hybrid.siemens.com; pr=C Received: from hybrid.siemens.com (194.138.21.76) by HE1EUR01FT089.mail.protection.outlook.com (10.152.1.43) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6609.24 via Frontend Transport; Wed, 19 Jul 2023 15:35:30 +0000 Received: from DEMCHDC8WAA.ad011.siemens.net (139.25.226.104) by DEMCHDC8VSA.ad011.siemens.net (194.138.21.76) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1258.12; Wed, 19 Jul 2023 17:35:30 +0200 Received: from md1za8fc.ppmd.siemens.net (139.25.68.175) by DEMCHDC8WAA.ad011.siemens.net (139.25.226.104) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.25; Wed, 19 Jul 2023 17:35:29 +0200 From: Henning Schild To: Lee Jones , Hans de Goede , "Wim Van Sebroeck" , Guenter Roeck , , , , CC: Pavel Machek , Mark Gross , "Andy Shevchenko" , Tobias Schaffner , Henning Schild Subject: [PATCH v2 2/3] leds: simatic-ipc-leds: default config switch to platform switch Date: Wed, 19 Jul 2023 17:35:17 +0200 Message-ID: <20230719153518.13073-3-henning.schild@siemens.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230719153518.13073-1-henning.schild@siemens.com> References: <20230719153518.13073-1-henning.schild@siemens.com> MIME-Version: 1.0 X-Originating-IP: [139.25.68.175] X-ClientProxiedBy: DEMCHDC8WAA.ad011.siemens.net (139.25.226.104) To DEMCHDC8WAA.ad011.siemens.net (139.25.226.104) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1EUR01FT089:EE_|DU0PR10MB7213:EE_ X-MS-Office365-Filtering-Correlation-Id: caa474c7-18a5-422d-308f-08db886dc8ee X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: mMUUXAiyOHDTzha3T/7yJixzLrIEGn9fVTWa5SSTnfOW9gOVPL8mosnYx/LS8arzP++quTc+jRfeOAn5iOEpevbhgVVl9ytfS1J+wrlfc30YxTfu8tZhcPV08kv5KZQAuPJEylYNTYobQ4F0rFlcjC2MgZDA7UfiasTy/myL2pHrdxI8orGeIlQ4IbLsNwq//Pe8ptoECmpx1Z0PXqyY43ygji/e8DIeXiuesd7fq4oVNApQEfuM4G7opx0EVFodaWoVkHMWm/MGMiTMv50htc6XglMSwc7AITky4fWW4MVOZK5GtVvt/S4PkN8zlSYg5YQzeYBbtQzpdiSSBtIRqgTOd3aZxi4/hloJN5MSJubYPBTpT3itT2DWzuAqw5DyknGrl7LvchIJk6lsvfVwTnJlAoAMXO/d2hqZ7wkw1pDYt11HomfCdeFDwGJ+JuoDE5Ntw5ilhOU9EWEdfI6jwO/FE26z/3VMgK72s8uyoj6iJP2CHf36rEzY8bz75i98LUdSv2laqfXYbbe1H7kiCCYGVOQCtaWNZsLPSNkD0491mi+0BvOrMiPx9t6mEzbP5RREQb7+DjgVoQWmG6cUDvw2zc8UfUmy3AYx3NlTTCGH3OeNYEwQsiWk5BqjKQfTeMZmC6R4vqsVzqApdikoh+fXJ5SlKo8tftj0QI8JE+umX9nmAfBk/rC2Ol48JFx9p8301R7tTtoI5dmW+QjVF7NpEnOEs9PzwJpmVET+EICc5Lm1h/FEc1x4t+f4/oWsHhePLmfhXDDQTw+v1Ev9hP3tp0jw2/xN3i56JPFPHpQ= X-Forefront-Antispam-Report: CIP:194.138.21.76; CTRY:DE; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:hybrid.siemens.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230028)(4636009)(39860400002)(136003)(346002)(376002)(396003)(82310400008)(451199021)(40470700004)(36840700001)(46966006)(7416002)(86362001)(4744005)(2906002)(36756003)(44832011)(40460700003)(40480700001)(2616005)(47076005)(336012)(16526019)(186003)(36860700001)(1076003)(107886003)(26005)(82960400001)(81166007)(6666004)(54906003)(82740400003)(110136005)(356005)(4326008)(956004)(70206006)(70586007)(478600001)(5660300002)(41300700001)(316002)(8676002)(8936002)(2101003)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jul 2023 15:35:30.5985 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: caa474c7-18a5-422d-308f-08db886dc8ee X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=38ae3bcd-9579-4fd4-adda-b42e1495d55a; Ip=[194.138.21.76]; Helo=[hybrid.siemens.com] X-MS-Exchange-CrossTenant-AuthSource: HE1EUR01FT089.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU0PR10MB7213 Precedence: bulk List-ID: X-Mailing-List: linux-watchdog@vger.kernel.org If a user did choose to enable Siemens Simatic platform support they likely want the LED drivers to be enabled without having to flip more config switches. So we make the LED drivers config switch default to the platform driver switches value. Signed-off-by: Henning Schild Acked-by: Lee Jones --- drivers/leds/simple/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/leds/simple/Kconfig b/drivers/leds/simple/Kconfig index 44fa0f93cb3b..609e438af9f6 100644 --- a/drivers/leds/simple/Kconfig +++ b/drivers/leds/simple/Kconfig @@ -2,6 +2,7 @@ config LEDS_SIEMENS_SIMATIC_IPC tristate "LED driver for Siemens Simatic IPCs" depends on SIEMENS_SIMATIC_IPC + default y help This option enables support for the LEDs of several Industrial PCs from Siemens. From patchwork Wed Jul 19 15:35:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Henning Schild X-Patchwork-Id: 704922 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 70C97C00528 for ; Wed, 19 Jul 2023 15:35:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231876AbjGSPfy (ORCPT ); Wed, 19 Jul 2023 11:35:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42396 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231879AbjGSPft (ORCPT ); Wed, 19 Jul 2023 11:35:49 -0400 Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04on2043.outbound.protection.outlook.com [40.107.6.43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BE5E619A1; Wed, 19 Jul 2023 08:35:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SVB2Xh7fUZtC0SXpN5iDjjN8oRrArVk2ZfXCWDXTjDvP+SPAdHGwfnL6/hJElQvig7/YPBz481pSiPosp6EuwQZEN4DsTOKjbbC2CLE6iYvGGEPd4DvNN9ZMb3DjJYOgcvMQ/gfQaJvnZGvbhrLV5zN3GNraKoMjYBH5TRg3TPjIPC0mTi/u5sCB6xVnZO1PnjgwyPDbLBMD7aiH7VM8hPjJaHowEhwTCmrJiFvpuKY0ZgBSEBJAllpuQda7LV4PeM7EbXo0fYmEKGyGJfOYq6EbSzwj3TP8w+P4oN3MZCNgEkWhzwNgVtI3R3YmCrbr5wgHdEtd4B2oLtvb+XtP2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Tqik8iP8FzEi/5kPGZ6HsYqSscAUByBvOaO9lCdnDR4=; b=FeSJjZrTYufdtvA0+HLXEJvd5XBL6PmKciR+LuVFmt6NNqd0iQg5sbT14nIv7GZD2jby/qUmZPar3zGOW9PlU1iyl9+DGOtW0zblZMjjZoBtX3MWQiTDsTzS3sTn5fxyNY2QVFmQSS9llsm44YNFqNpHbzbhy639BamT9WgfiEOl0Uh8poJMOMdtCA7Kwe2jfBvP2qw28Q0tj1vN+p1ET4yicKaTd+57Nffq6oXLnhQagEpOQ6HcF/KRWQMivGHjOvPC37iiGIZcMp4qT+6fpQEFt1UoRClUW2X19JqiYzILc9c0y2/bWqVlEP5uJCkWLIOrLkqpnAsswcoXSA43fQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 194.138.21.75) smtp.rcpttodomain=kernel.org smtp.mailfrom=siemens.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=siemens.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=siemens.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Tqik8iP8FzEi/5kPGZ6HsYqSscAUByBvOaO9lCdnDR4=; b=ZwsGPK7Johotb7m0DQKLc/9f029V6Yv25t+efu4NFhSxSg07n4eV2UvRBEGs4artWGkxgMkXOVUvhkl90ReHxlce42DQiAqe3RxAjFgY7Akg9jxVbO5JiHQh4AhGry92iNK89TIQxVafTMJiRf6sHmhdBqT9/kXt+qNx+zPcaZtizciKz5WuDPY3rENvjoyBUQvORE0QlB6q2ImizOAbByIINj1HJN6JmMk2X+Jn1tbI/wgBfkhG9h1j+YLF0p3FB+aCZSMYSFOU520MYFT8q/HvfeiIDiElgfvCCD74rG6veJK3E8noD9Nc8P1MY6hs1+lgBvu03wwgpS9/O5gnmg== Received: from FR0P281CA0206.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:ad::15) by DB8PR10MB3562.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:132::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6609.24; Wed, 19 Jul 2023 15:35:42 +0000 Received: from VE1EUR01FT061.eop-EUR01.prod.protection.outlook.com (2603:10a6:d10:ad:cafe::73) by FR0P281CA0206.outlook.office365.com (2603:10a6:d10:ad::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6609.23 via Frontend Transport; Wed, 19 Jul 2023 15:35:42 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 194.138.21.75) smtp.mailfrom=siemens.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=siemens.com; Received-SPF: Pass (protection.outlook.com: domain of siemens.com designates 194.138.21.75 as permitted sender) receiver=protection.outlook.com; client-ip=194.138.21.75; helo=hybrid.siemens.com; pr=C Received: from hybrid.siemens.com (194.138.21.75) by VE1EUR01FT061.mail.protection.outlook.com (10.152.3.81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6609.24 via Frontend Transport; Wed, 19 Jul 2023 15:35:42 +0000 Received: from DEMCHDC8WAA.ad011.siemens.net (139.25.226.104) by DEMCHDC8VRA.ad011.siemens.net (194.138.21.75) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1258.12; Wed, 19 Jul 2023 17:35:41 +0200 Received: from md1za8fc.ppmd.siemens.net (139.25.68.175) by DEMCHDC8WAA.ad011.siemens.net (139.25.226.104) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.25; Wed, 19 Jul 2023 17:35:41 +0200 From: Henning Schild To: Lee Jones , Hans de Goede , "Wim Van Sebroeck" , Guenter Roeck , , , , CC: Pavel Machek , Mark Gross , "Andy Shevchenko" , Tobias Schaffner , Henning Schild Subject: [PATCH v2 3/3] platform/x86: Move all simatic ipc drivers to the subdirectory siemens Date: Wed, 19 Jul 2023 17:35:18 +0200 Message-ID: <20230719153518.13073-4-henning.schild@siemens.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230719153518.13073-1-henning.schild@siemens.com> References: <20230719153518.13073-1-henning.schild@siemens.com> MIME-Version: 1.0 X-Originating-IP: [139.25.68.175] X-ClientProxiedBy: DEMCHDC8WBA.ad011.siemens.net (139.25.226.105) To DEMCHDC8WAA.ad011.siemens.net (139.25.226.104) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VE1EUR01FT061:EE_|DB8PR10MB3562:EE_ X-MS-Office365-Filtering-Correlation-Id: 7390170d-dd6b-418e-1294-08db886dcfb3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: GK/8X9AMVefWEfZWnr62tvvz/lW5azShCsSR2GbwWZ9gFyMppVPdEvf/4YMc6w2PQNj9zKjuXxSihpG7WqWskYZMS3Lc8NAQl8QaUImmN7oCx46217zIzpMYCeB6IsCSntxG96gaHbSPWlMb0MCpJWeTK5rcTvyDRDl8lLXc63MXGMpthK92zsMKDBFS9QllqxY2CRdJZtmXhZxK31IwYcy9oI1URhIz+530xqluqkNjRQQvHltCXl+uvHb5crTeLfr73OjNs3uLClldqkfodYU/7OKUJJjB2yrZmHZYBke/+nx3voVUslL0HixP06ekaolsvk/2p6YkjcGjySGuGfsl0lvba4yOegn7lrJIkGc9JeDVjFC9ULClymVZKtrQi/IJIPcwlOYL+/2U1O9aX90844j0PScBP5wZKlxSwrf0RAOEwD2KLibArKMWffHIJVRuwhznEVfpOehP79bAFEKSp4BTkE3ofkYfYyzH0gkLvaENplgSGg5aiL7q69utEa/KmBWcJR2pGI6rmrP3zU/pNNOJhtyV2LL5dhhebbJPBqDqJqOBKlo+vsdbtUsFl92XGGiKMvP1zmTdn7IWCOGRfnGnF4ixdE8GnmqqtgmNFXWqaUJYJDGxzbTK9xJ4/bx7HZgYd01B8ViWm6AHWYPS5B6KDRwbeJ/8arqrix4czAefoMoBOTbTKCrcz8pFtIPe5yOPnoGxri1yMNGsbBGmY9EFJ9A7xTisD+x21/vgc5xBSzbBGMQ2llQMfwylIZYHbAKFDbUgfdxNvUcLsfnlPUZGlPQXlVr0e2o0bu4= X-Forefront-Antispam-Report: CIP:194.138.21.75; CTRY:DE; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:hybrid.siemens.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230028)(4636009)(396003)(136003)(346002)(39860400002)(376002)(451199021)(82310400008)(40470700004)(36840700001)(46966006)(5660300002)(44832011)(4326008)(7416002)(70206006)(70586007)(41300700001)(8676002)(40460700003)(8936002)(316002)(86362001)(36756003)(2906002)(40480700001)(6666004)(478600001)(82740400003)(186003)(336012)(16526019)(107886003)(1076003)(26005)(2616005)(956004)(110136005)(54906003)(36860700001)(356005)(81166007)(82960400001)(83380400001)(47076005)(36900700001)(2101003); DIR:OUT; SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jul 2023 15:35:42.0020 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7390170d-dd6b-418e-1294-08db886dcfb3 X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=38ae3bcd-9579-4fd4-adda-b42e1495d55a; Ip=[194.138.21.75]; Helo=[hybrid.siemens.com] X-MS-Exchange-CrossTenant-AuthSource: VE1EUR01FT061.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8PR10MB3562 Precedence: bulk List-ID: X-Mailing-List: linux-watchdog@vger.kernel.org With more files around move everything to a subdirectory. Users will only see the several options once they enable the main one. Suggested-by: Hans de Goede Signed-off-by: Henning Schild --- drivers/platform/x86/Kconfig | 59 +---------------- drivers/platform/x86/Makefile | 6 +- drivers/platform/x86/siemens/Kconfig | 63 +++++++++++++++++++ drivers/platform/x86/siemens/Makefile | 11 ++++ .../simatic-ipc-batt-apollolake.c | 0 .../simatic-ipc-batt-elkhartlake.c | 0 .../{ => siemens}/simatic-ipc-batt-f7188x.c | 0 .../x86/{ => siemens}/simatic-ipc-batt.c | 0 .../x86/{ => siemens}/simatic-ipc-batt.h | 0 .../platform/x86/{ => siemens}/simatic-ipc.c | 0 10 files changed, 76 insertions(+), 63 deletions(-) create mode 100644 drivers/platform/x86/siemens/Kconfig create mode 100644 drivers/platform/x86/siemens/Makefile rename drivers/platform/x86/{ => siemens}/simatic-ipc-batt-apollolake.c (100%) rename drivers/platform/x86/{ => siemens}/simatic-ipc-batt-elkhartlake.c (100%) rename drivers/platform/x86/{ => siemens}/simatic-ipc-batt-f7188x.c (100%) rename drivers/platform/x86/{ => siemens}/simatic-ipc-batt.c (100%) rename drivers/platform/x86/{ => siemens}/simatic-ipc-batt.h (100%) rename drivers/platform/x86/{ => siemens}/simatic-ipc.c (100%) diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig index 487d3d8f4da9..f5fcb1ca1b63 100644 --- a/drivers/platform/x86/Kconfig +++ b/drivers/platform/x86/Kconfig @@ -1074,64 +1074,7 @@ config INTEL_SCU_IPC_UTIL low level access for debug work and updating the firmware. Say N unless you will be doing this on an Intel MID platform. -config SIEMENS_SIMATIC_IPC - tristate "Siemens Simatic IPC Class driver" - help - This Simatic IPC class driver is the central of several drivers. It - is mainly used for system identification, after which drivers in other - classes will take care of driving specifics of those machines. - i.e. LEDs and watchdog. - - To compile this driver as a module, choose M here: the module - will be called simatic-ipc. - -config SIEMENS_SIMATIC_IPC_BATT - tristate "CMOS battery driver for Siemens Simatic IPCs" - depends on HWMON - depends on SIEMENS_SIMATIC_IPC - default SIEMENS_SIMATIC_IPC - help - This option enables support for monitoring the voltage of the CMOS - batteries of several Industrial PCs from Siemens. - - To compile this driver as a module, choose M here: the module - will be called simatic-ipc-batt. - -config SIEMENS_SIMATIC_IPC_BATT_APOLLOLAKE - tristate "CMOS Battery monitoring for Simatic IPCs based on Apollo Lake GPIO" - depends on PINCTRL_BROXTON - depends on SIEMENS_SIMATIC_IPC_BATT - default SIEMENS_SIMATIC_IPC_BATT - help - This option enables CMOS battery monitoring for Simatic Industrial PCs - from Siemens based on Apollo Lake GPIO. - - To compile this driver as a module, choose M here: the module - will be called simatic-ipc-batt-apollolake. - -config SIEMENS_SIMATIC_IPC_BATT_ELKHARTLAKE - tristate "CMOS Battery monitoring for Simatic IPCs based on Elkhart Lake GPIO" - depends on PINCTRL_ELKHARTLAKE - depends on SIEMENS_SIMATIC_IPC_BATT - default SIEMENS_SIMATIC_IPC_BATT - help - This option enables CMOS battery monitoring for Simatic Industrial PCs - from Siemens based on Elkhart Lake GPIO. - - To compile this driver as a module, choose M here: the module - will be called simatic-ipc-batt-elkhartlake. - -config SIEMENS_SIMATIC_IPC_BATT_F7188X - tristate "CMOS Battery monitoring for Simatic IPCs based on Nuvoton GPIO" - depends on GPIO_F7188X - depends on SIEMENS_SIMATIC_IPC_BATT - default SIEMENS_SIMATIC_IPC_BATT - help - This option enables CMOS battery monitoring for Simatic Industrial PCs - from Siemens based on Nuvoton GPIO. - - To compile this driver as a module, choose M here: the module - will be called simatic-ipc-batt-elkhartlake. +source "drivers/platform/x86/siemens/Kconfig" config WINMATE_FM07_KEYS tristate "Winmate FM07/FM07P front-panel keys driver" diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile index 522da0d1584d..d4a6c18d0dde 100644 --- a/drivers/platform/x86/Makefile +++ b/drivers/platform/x86/Makefile @@ -131,11 +131,7 @@ obj-$(CONFIG_INTEL_SCU_IPC_UTIL) += intel_scu_ipcutil.o obj-$(CONFIG_X86_INTEL_LPSS) += pmc_atom.o # Siemens Simatic Industrial PCs -obj-$(CONFIG_SIEMENS_SIMATIC_IPC) += simatic-ipc.o -obj-$(CONFIG_SIEMENS_SIMATIC_IPC_BATT) += simatic-ipc-batt.o -obj-$(CONFIG_SIEMENS_SIMATIC_IPC_BATT_APOLLOLAKE) += simatic-ipc-batt-apollolake.o -obj-$(CONFIG_SIEMENS_SIMATIC_IPC_BATT_ELKHARTLAKE) += simatic-ipc-batt-elkhartlake.o -obj-$(CONFIG_SIEMENS_SIMATIC_IPC_BATT_F7188X) += simatic-ipc-batt-f7188x.o +obj-y += siemens/ # Winmate obj-$(CONFIG_WINMATE_FM07_KEYS) += winmate-fm07-keys.o diff --git a/drivers/platform/x86/siemens/Kconfig b/drivers/platform/x86/siemens/Kconfig new file mode 100644 index 000000000000..8e78dc609a38 --- /dev/null +++ b/drivers/platform/x86/siemens/Kconfig @@ -0,0 +1,63 @@ +# SPDX-License-Identifier: GPL-2.0-only +# +# Siemens X86 Platform Specific Drivers +# + +config SIEMENS_SIMATIC_IPC + tristate "Siemens Simatic IPC Class driver" + help + This Simatic IPC class driver is the central of several drivers. It + is mainly used for system identification, after which drivers in other + classes will take care of driving specifics of those machines. + i.e. LEDs and watchdog. + + To compile this driver as a module, choose M here: the module + will be called simatic-ipc. + +config SIEMENS_SIMATIC_IPC_BATT + tristate "CMOS battery driver for Siemens Simatic IPCs" + depends on HWMON + depends on SIEMENS_SIMATIC_IPC + default SIEMENS_SIMATIC_IPC + help + This option enables support for monitoring the voltage of the CMOS + batteries of several Industrial PCs from Siemens. + + To compile this driver as a module, choose M here: the module + will be called simatic-ipc-batt. + +config SIEMENS_SIMATIC_IPC_BATT_APOLLOLAKE + tristate "CMOS Battery monitoring for Simatic IPCs based on Apollo Lake GPIO" + depends on PINCTRL_BROXTON + depends on SIEMENS_SIMATIC_IPC_BATT + default SIEMENS_SIMATIC_IPC_BATT + help + This option enables CMOS battery monitoring for Simatic Industrial PCs + from Siemens based on Apollo Lake GPIO. + + To compile this driver as a module, choose M here: the module + will be called simatic-ipc-batt-apollolake. + +config SIEMENS_SIMATIC_IPC_BATT_ELKHARTLAKE + tristate "CMOS Battery monitoring for Simatic IPCs based on Elkhart Lake GPIO" + depends on PINCTRL_ELKHARTLAKE + depends on SIEMENS_SIMATIC_IPC_BATT + default SIEMENS_SIMATIC_IPC_BATT + help + This option enables CMOS battery monitoring for Simatic Industrial PCs + from Siemens based on Elkhart Lake GPIO. + + To compile this driver as a module, choose M here: the module + will be called simatic-ipc-batt-elkhartlake. + +config SIEMENS_SIMATIC_IPC_BATT_F7188X + tristate "CMOS Battery monitoring for Simatic IPCs based on Nuvoton GPIO" + depends on GPIO_F7188X + depends on SIEMENS_SIMATIC_IPC_BATT + default SIEMENS_SIMATIC_IPC_BATT + help + This option enables CMOS battery monitoring for Simatic Industrial PCs + from Siemens based on Nuvoton GPIO. + + To compile this driver as a module, choose M here: the module + will be called simatic-ipc-batt-elkhartlake. diff --git a/drivers/platform/x86/siemens/Makefile b/drivers/platform/x86/siemens/Makefile new file mode 100644 index 000000000000..2b384b4cb8ba --- /dev/null +++ b/drivers/platform/x86/siemens/Makefile @@ -0,0 +1,11 @@ +# SPDX-License-Identifier: GPL-2.0 +# +# Makefile for linux/drivers/platform/x86/siemens +# Siemens x86 Platform-Specific Drivers +# + +obj-$(CONFIG_SIEMENS_SIMATIC_IPC) += simatic-ipc.o +obj-$(CONFIG_SIEMENS_SIMATIC_IPC_BATT) += simatic-ipc-batt.o +obj-$(CONFIG_SIEMENS_SIMATIC_IPC_BATT_APOLLOLAKE) += simatic-ipc-batt-apollolake.o +obj-$(CONFIG_SIEMENS_SIMATIC_IPC_BATT_ELKHARTLAKE) += simatic-ipc-batt-elkhartlake.o +obj-$(CONFIG_SIEMENS_SIMATIC_IPC_BATT_F7188X) += simatic-ipc-batt-f7188x.o diff --git a/drivers/platform/x86/simatic-ipc-batt-apollolake.c b/drivers/platform/x86/siemens/simatic-ipc-batt-apollolake.c similarity index 100% rename from drivers/platform/x86/simatic-ipc-batt-apollolake.c rename to drivers/platform/x86/siemens/simatic-ipc-batt-apollolake.c diff --git a/drivers/platform/x86/simatic-ipc-batt-elkhartlake.c b/drivers/platform/x86/siemens/simatic-ipc-batt-elkhartlake.c similarity index 100% rename from drivers/platform/x86/simatic-ipc-batt-elkhartlake.c rename to drivers/platform/x86/siemens/simatic-ipc-batt-elkhartlake.c diff --git a/drivers/platform/x86/simatic-ipc-batt-f7188x.c b/drivers/platform/x86/siemens/simatic-ipc-batt-f7188x.c similarity index 100% rename from drivers/platform/x86/simatic-ipc-batt-f7188x.c rename to drivers/platform/x86/siemens/simatic-ipc-batt-f7188x.c diff --git a/drivers/platform/x86/simatic-ipc-batt.c b/drivers/platform/x86/siemens/simatic-ipc-batt.c similarity index 100% rename from drivers/platform/x86/simatic-ipc-batt.c rename to drivers/platform/x86/siemens/simatic-ipc-batt.c diff --git a/drivers/platform/x86/simatic-ipc-batt.h b/drivers/platform/x86/siemens/simatic-ipc-batt.h similarity index 100% rename from drivers/platform/x86/simatic-ipc-batt.h rename to drivers/platform/x86/siemens/simatic-ipc-batt.h diff --git a/drivers/platform/x86/simatic-ipc.c b/drivers/platform/x86/siemens/simatic-ipc.c similarity index 100% rename from drivers/platform/x86/simatic-ipc.c rename to drivers/platform/x86/siemens/simatic-ipc.c