From nobody Fri Apr 10 12:40:07 2026 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 42973C32772 for ; Tue, 23 Aug 2022 13:24:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241878AbiHWNYo (ORCPT ); Tue, 23 Aug 2022 09:24:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37232 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239409AbiHWNYW (ORCPT ); Tue, 23 Aug 2022 09:24:22 -0400 Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-eopbgr140075.outbound.protection.outlook.com [40.107.14.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EA340832FD; Tue, 23 Aug 2022 03:24:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gNI4+Q/GuJfCPUUCN5Yp5SMGl7+++9eRPMopEzRHqGtnFToKiAbb0nXhb5imUCWidv6ZDDA5MpLYxgMBxOYOPirO00AF3pi/HxiigTZs1lGVUIXD4U4FJINtc1fh02ndDetVWWQDbYQHEY17ws7ReFQKRxfXHUuaOCGX/oyv80Q4kf4NGP0Bpd1OAHJ6j4hCOhgrei1GdZWa9zef6KnX115vXv2T6Itx22LpJ/aLu+YZmpnYVrlg+Ux4AvkGD7Mf6GiBF/TeAYNoxAV+zWyh6owDwMQ64C8ysaVXQ9ksnPHvvpPt+mA6BLPiQCwLcwA7cGxzjVUXUZuiKL4Ss3wldw== 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=PJfNBa3jZQbus0nWJrpVwxiGnHo3hPjPmJQrfrkFI1E=; b=hrtntfP66XFKnvLvUZRn4dQizAb0da0y6SpVS6D90BINdcyrrldYc+dIi6AuoS2d5aEg+loO7wINnIf3UU1oP+4LvwjLIxNuFf4dbj1PVL2QvEKLCLgJNU8nyE3COr0zt8JbkKiS7Myiju9qYoerUcSBUsdeK8AoZkZo7vwWJacjDAFZhZvCNDtJTJ8aC2bl+i4Jqx19Ot/rLI19Ahd2/VuCULIeVjVr3CDYTUNdZJnTb5Y1W1DzKwPhu2Hp7AHEU1UBXmSjoo5dbGjZObDjr9oQ81FCG17hIMLqloi7Vj+Br/3g8mx//jPBldCCPP4idPK+eetX2TMNLsV6516w5Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=fail (sender ip is 194.138.21.75) smtp.rcpttodomain=linaro.org smtp.mailfrom=siemens.com; dmarc=fail (p=none sp=none 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=PJfNBa3jZQbus0nWJrpVwxiGnHo3hPjPmJQrfrkFI1E=; b=pu4baKXDYPBVMZzGLHJa0J76I/464qU003m/ZOEKA1Jljb5aYR48Iq3uVcMIrBzNbw3FV5Ils8UeQnud+WZg7Uwy8W0Rzxnqc8EUERrkU2F1xrX60vC+03+2pbWmuS9pJrpxvhlW032F6uomlppjAnjA2psIAqodDT7Jvwx+7X2Y734akC91fQ6r6S0nMf5AyQF6AnlzAgloleiuapEgocsUbSDF1dHFeybw6U3xIQDsM1R7j4Za7F5Yd3CLLWpbQX1pDYABJwDygLxq0eLXOjUsxvwFBOaSKKyGxBIv+z2cGaYjlANmovr55RDE42NRCWE14iFeJaLl865YpgCZxA== Received: from GV3P280CA0094.SWEP280.PROD.OUTLOOK.COM (2603:10a6:150:8::7) by AM9PR10MB4021.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:1f7::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5546.17; Tue, 23 Aug 2022 10:23:55 +0000 Received: from HE1EUR01FT069.eop-EUR01.prod.protection.outlook.com (2603:10a6:150:8:cafe::78) by GV3P280CA0094.outlook.office365.com (2603:10a6:150:8::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5546.19 via Frontend Transport; Tue, 23 Aug 2022 10:23:54 +0000 X-MS-Exchange-Authentication-Results: spf=fail (sender IP is 194.138.21.75) smtp.mailfrom=siemens.com; dkim=none (message not signed) header.d=none;dmarc=fail action=none header.from=siemens.com; Received-SPF: Fail (protection.outlook.com: domain of siemens.com does not designate 194.138.21.75 as permitted sender) receiver=protection.outlook.com; client-ip=194.138.21.75; helo=hybrid.siemens.com; Received: from hybrid.siemens.com (194.138.21.75) by HE1EUR01FT069.mail.protection.outlook.com (10.152.1.52) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5546.15 via Frontend Transport; Tue, 23 Aug 2022 10:23:54 +0000 Received: from DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) 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.1118.9; Tue, 23 Aug 2022 12:23:54 +0200 Received: from md1za8fc.ad001.siemens.net (139.25.0.80) by DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.9; Tue, 23 Aug 2022 12:23:53 +0200 From: Henning Schild To: Linus Walleij , Bartosz Golaszewski , Pavel Machek , Hans de Goede , Mark Gross , Andy Shevchenko , Lee Jones , , , , CC: Sheng-Yuan Huang , Tasanakorn Phaipool , , Henning Schild Subject: [PATCH v4 1/5] gpio-f7188x: Add GPIO support for Nuvoton NCT6116 Date: Tue, 23 Aug 2022 12:23:40 +0200 Message-ID: <20220823102344.17624-2-henning.schild@siemens.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220823102344.17624-1-henning.schild@siemens.com> References: <20220823102344.17624-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [139.25.0.80] X-ClientProxiedBy: DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) To DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c1d37000-f2c5-4c9b-1f63-08da84f19504 X-MS-TrafficTypeDiagnostic: AM9PR10MB4021:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8ZJeiWdjlwhms0CCgrG/hu6pgl7XwTWcDtjFUaEY3bP7hKjBd9ehSPacyr03TbLY9eNnJSX5wQ6slpn9v093vnH31gzTEjL+yMPxUliofFGhXJ74ttXagsjFV79WI81suhqGD+lmKGQ8F7QZdr9QKvgGfHUFeEksu9GziUaPjH6gIscWSE2px23UyLDJ7C84vdleYkwCosJGOkddSD95qRlbeX3Iiyb5pLCJiNLc7KdV6emeNgyY38vywk/hgdSxtXeFr08tAFrFgWPIYnR3CNgE1Rks6farbk29OoaFWZDIVTXXLuv7RgcT8hAhoUtAecsBThp5U/O9kGEBK973deCz1WOcPAQbuJt780cHwniiLXHLRIAHlgdsggzIukADanRarYxkZDzecwLGkbVXsuAvzcidkvWeGVQtO3FZaHWoU6atwXlpk6F864+g3E9EbnLbQKFxgsvd0jeY9Vcn4qBO8yZsyDBGzEV55bHzXIox4nu+iRI90HAfYFS3EpBuv15ELCFrVvwRwmwUiAxy9M/v22Sdd/UReum6wNkz3dcf68P4ePc+RvdW1UAYUEPNGwj2Ve8Y0d06DJWcn1GBRvDha5cKj55EGhMFPBR6IlFdfZIhMtk3VclPOnvyji6JKLln2nnrOZXP/+hzp6z6ZVrZ/lMomNuK1FPa93Qc6NqJYzDI2s+pa7vtGG6hJHO+PgW67FYJD4mdnmPZ9BQG14SsYdwqvYh9DibzoHSkeqqOcDUr8oAyWu5IQxMjGZRAwTFAo/Wnpf7g7FOmP4MzYOUlItjuL/w8VzrkSGXaXxLciWHJRYAhblhSnDDQlWDd1lHknHMblPMgtkxE1GH4ysjUzTehBHXEQLb162eNOSvRJkvpwY6XTNiF65+MFggN+XbF1lQFzkuFtRcGyhQ4TA== 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:(13230016)(4636009)(376002)(346002)(39860400002)(396003)(136003)(40470700004)(46966006)(36840700001)(36756003)(82740400003)(7416002)(40460700003)(34020700004)(41300700001)(81166007)(36860700001)(316002)(6666004)(8936002)(478600001)(110136005)(5660300002)(82310400005)(54906003)(83380400001)(40480700001)(356005)(921005)(26005)(2906002)(1076003)(8676002)(70586007)(16526019)(70206006)(186003)(107886003)(44832011)(47076005)(82960400001)(2616005)(336012)(956004)(86362001)(4326008)(2101003)(83996005)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Aug 2022 10:23:54.7428 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c1d37000-f2c5-4c9b-1f63-08da84f19504 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: HE1EUR01FT069.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR10MB4021 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Add GPIO support for Nuvoton NCT6116 chip. Nuvoton SuperIO chips are very similar to the ones from Fintek. In other subsystems they also share drivers and are called a family of drivers. For the GPIO subsystem the only difference is that the direction bit is reversed and that there is only one data bit per pin. On the SuperIO level the logical device is another one. On a chip level we do not have a manufacturer ID to check and also no revision. Signed-off-by: Henning Schild Reviewed-by: Andy Shevchenko --- drivers/gpio/Kconfig | 3 +- drivers/gpio/gpio-f7188x.c | 107 ++++++++++++++++++++++++++++--------- 2 files changed, 84 insertions(+), 26 deletions(-) diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig index 0642f579196f..3f64345fe40b 100644 --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig @@ -874,10 +874,11 @@ config GPIO_104_IDI_48 module parameter. =20 config GPIO_F7188X - tristate "F71869, F71869A, F71882FG, F71889F and F81866 GPIO support" + tristate "Fintek and Nuvoton Super-I/O GPIO support" help This option enables support for GPIOs found on Fintek Super-I/O chips F71869, F71869A, F71882FG, F71889F and F81866. + As well as Nuvoton Super-I/O chip NCT6116D. =20 To compile this driver as a module, choose M here: the module will be called f7188x-gpio. diff --git a/drivers/gpio/gpio-f7188x.c b/drivers/gpio/gpio-f7188x.c index 18a3147f5a42..820ac5d60fda 100644 --- a/drivers/gpio/gpio-f7188x.c +++ b/drivers/gpio/gpio-f7188x.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later /* - * GPIO driver for Fintek Super-I/O F71869, F71869A, F71882, F71889 and F8= 1866 + * GPIO driver for Fintek and Nuvoton Super-I/O chips * * Copyright (C) 2010-2013 LaCie * @@ -21,23 +21,36 @@ */ #define SIO_LDSEL 0x07 /* Logical device select */ #define SIO_DEVID 0x20 /* Device ID (2 bytes) */ -#define SIO_DEVREV 0x22 /* Device revision */ -#define SIO_MANID 0x23 /* Fintek ID (2 bytes) */ =20 -#define SIO_LD_GPIO 0x06 /* GPIO logical device */ #define SIO_UNLOCK_KEY 0x87 /* Key to enable Super-I/O */ #define SIO_LOCK_KEY 0xAA /* Key to disable Super-I/O */ =20 -#define SIO_FINTEK_ID 0x1934 /* Manufacturer ID */ +/* + * Fintek devices. + */ +#define SIO_FINTEK_DEVREV 0x22 /* Fintek Device revision */ +#define SIO_FINTEK_MANID 0x23 /* Fintek ID (2 bytes) */ + +#define SIO_FINTEK_ID 0x1934 /* Manufacturer ID */ + #define SIO_F71869_ID 0x0814 /* F71869 chipset ID */ #define SIO_F71869A_ID 0x1007 /* F71869A chipset ID */ #define SIO_F71882_ID 0x0541 /* F71882 chipset ID */ #define SIO_F71889_ID 0x0909 /* F71889 chipset ID */ #define SIO_F71889A_ID 0x1005 /* F71889A chipset ID */ #define SIO_F81866_ID 0x1010 /* F81866 chipset ID */ -#define SIO_F81804_ID 0x1502 /* F81804 chipset ID, same for f81966 */ +#define SIO_F81804_ID 0x1502 /* F81804 chipset ID, same for F81966 */ #define SIO_F81865_ID 0x0704 /* F81865 chipset ID */ =20 +#define SIO_LD_GPIO_FINTEK 0x06 /* GPIO logical device */ + +/* + * Nuvoton devices. + */ +#define SIO_NCT6116D_ID 0xD283 /* NCT6116D chipset ID */ + +#define SIO_LD_GPIO_NUVOTON 0x07 /* GPIO logical device */ + =20 enum chips { f71869, @@ -48,6 +61,7 @@ enum chips { f81866, f81804, f81865, + nct6116d, }; =20 static const char * const f7188x_names[] =3D { @@ -59,10 +73,12 @@ static const char * const f7188x_names[] =3D { "f81866", "f81804", "f81865", + "nct6116d", }; =20 struct f7188x_sio { int addr; + int device; enum chips type; }; =20 @@ -170,6 +186,9 @@ static int f7188x_gpio_set_config(struct gpio_chip *chi= p, unsigned offset, /* Output mode register (0:open drain 1:push-pull). */ #define gpio_out_mode(base) (base + 3) =20 +#define gpio_dir_invert(type) ((type) =3D=3D nct6116d) +#define gpio_data_single(type) ((type) =3D=3D nct6116d) + static struct f7188x_gpio_bank f71869_gpio_bank[] =3D { F7188X_GPIO_BANK(0, 6, 0xF0), F7188X_GPIO_BANK(10, 8, 0xE0), @@ -254,6 +273,17 @@ static struct f7188x_gpio_bank f81865_gpio_bank[] =3D { F7188X_GPIO_BANK(60, 5, 0x90), }; =20 +static struct f7188x_gpio_bank nct6116d_gpio_bank[] =3D { + F7188X_GPIO_BANK(0, 8, 0xE0), + F7188X_GPIO_BANK(10, 8, 0xE4), + F7188X_GPIO_BANK(20, 8, 0xE8), + F7188X_GPIO_BANK(30, 8, 0xEC), + F7188X_GPIO_BANK(40, 8, 0xF0), + F7188X_GPIO_BANK(50, 8, 0xF4), + F7188X_GPIO_BANK(60, 8, 0xF8), + F7188X_GPIO_BANK(70, 1, 0xFC), +}; + static int f7188x_gpio_get_direction(struct gpio_chip *chip, unsigned offs= et) { int err; @@ -264,13 +294,16 @@ static int f7188x_gpio_get_direction(struct gpio_chip= *chip, unsigned offset) err =3D superio_enter(sio->addr); if (err) return err; - superio_select(sio->addr, SIO_LD_GPIO); + superio_select(sio->addr, sio->device); =20 dir =3D superio_inb(sio->addr, gpio_dir(bank->regbase)); =20 superio_exit(sio->addr); =20 - if (dir & 1 << offset) + if (gpio_dir_invert(sio->type)) + dir =3D ~dir; + + if (dir & BIT(offset)) return GPIO_LINE_DIRECTION_OUT; =20 return GPIO_LINE_DIRECTION_IN; @@ -286,10 +319,14 @@ static int f7188x_gpio_direction_in(struct gpio_chip = *chip, unsigned offset) err =3D superio_enter(sio->addr); if (err) return err; - superio_select(sio->addr, SIO_LD_GPIO); + superio_select(sio->addr, sio->device); =20 dir =3D superio_inb(sio->addr, gpio_dir(bank->regbase)); - dir &=3D ~BIT(offset); + + if (gpio_dir_invert(sio->type)) + dir |=3D BIT(offset); + else + dir &=3D ~BIT(offset); superio_outb(sio->addr, gpio_dir(bank->regbase), dir); =20 superio_exit(sio->addr); @@ -307,11 +344,11 @@ static int f7188x_gpio_get(struct gpio_chip *chip, un= signed offset) err =3D superio_enter(sio->addr); if (err) return err; - superio_select(sio->addr, SIO_LD_GPIO); + superio_select(sio->addr, sio->device); =20 dir =3D superio_inb(sio->addr, gpio_dir(bank->regbase)); dir =3D !!(dir & BIT(offset)); - if (dir) + if (gpio_data_single(sio->type) || dir) data =3D superio_inb(sio->addr, gpio_data_out(bank->regbase)); else data =3D superio_inb(sio->addr, gpio_data_in(bank->regbase)); @@ -332,7 +369,7 @@ static int f7188x_gpio_direction_out(struct gpio_chip *= chip, err =3D superio_enter(sio->addr); if (err) return err; - superio_select(sio->addr, SIO_LD_GPIO); + superio_select(sio->addr, sio->device); =20 data_out =3D superio_inb(sio->addr, gpio_data_out(bank->regbase)); if (value) @@ -342,7 +379,10 @@ static int f7188x_gpio_direction_out(struct gpio_chip = *chip, superio_outb(sio->addr, gpio_data_out(bank->regbase), data_out); =20 dir =3D superio_inb(sio->addr, gpio_dir(bank->regbase)); - dir |=3D BIT(offset); + if (gpio_dir_invert(sio->type)) + dir &=3D ~BIT(offset); + else + dir |=3D BIT(offset); superio_outb(sio->addr, gpio_dir(bank->regbase), dir); =20 superio_exit(sio->addr); @@ -360,7 +400,7 @@ static void f7188x_gpio_set(struct gpio_chip *chip, uns= igned offset, int value) err =3D superio_enter(sio->addr); if (err) return; - superio_select(sio->addr, SIO_LD_GPIO); + superio_select(sio->addr, sio->device); =20 data_out =3D superio_inb(sio->addr, gpio_data_out(bank->regbase)); if (value) @@ -388,7 +428,7 @@ static int f7188x_gpio_set_config(struct gpio_chip *chi= p, unsigned offset, err =3D superio_enter(sio->addr); if (err) return err; - superio_select(sio->addr, SIO_LD_GPIO); + superio_select(sio->addr, sio->device); =20 data =3D superio_inb(sio->addr, gpio_out_mode(bank->regbase)); if (param =3D=3D PIN_CONFIG_DRIVE_OPEN_DRAIN) @@ -449,6 +489,10 @@ static int f7188x_gpio_probe(struct platform_device *p= dev) data->nr_bank =3D ARRAY_SIZE(f81865_gpio_bank); data->bank =3D f81865_gpio_bank; break; + case nct6116d: + data->nr_bank =3D ARRAY_SIZE(nct6116d_gpio_bank); + data->bank =3D nct6116d_gpio_bank; + break; default: return -ENODEV; } @@ -479,18 +523,15 @@ static int __init f7188x_find(int addr, struct f7188x= _sio *sio) { int err; u16 devid; + u16 manid; =20 err =3D superio_enter(addr); if (err) return err; =20 err =3D -ENODEV; - devid =3D superio_inw(addr, SIO_MANID); - if (devid !=3D SIO_FINTEK_ID) { - pr_debug(DRVNAME ": Not a Fintek device at 0x%08x\n", addr); - goto err; - } =20 + sio->device =3D SIO_LD_GPIO_FINTEK; devid =3D superio_inw(addr, SIO_DEVID); switch (devid) { case SIO_F71869_ID: @@ -517,17 +558,33 @@ static int __init f7188x_find(int addr, struct f7188x= _sio *sio) case SIO_F81865_ID: sio->type =3D f81865; break; + case SIO_NCT6116D_ID: + sio->device =3D SIO_LD_GPIO_NUVOTON; + sio->type =3D nct6116d; + break; default: - pr_info(DRVNAME ": Unsupported Fintek device 0x%04x\n", devid); + pr_info(DRVNAME ": Unsupported device 0x%04x\n", devid); goto err; } + + /* double check manufacturer where possible */ + if (sio->type !=3D nct6116d) { + manid =3D superio_inw(addr, SIO_FINTEK_MANID); + if (manid !=3D SIO_FINTEK_ID) { + pr_debug(DRVNAME ": Not a Fintek device at 0x%08x\n", addr); + goto err; + } + } + sio->addr =3D addr; err =3D 0; =20 - pr_info(DRVNAME ": Found %s at %#x, revision %d\n", + pr_info(DRVNAME ": Found %s at %#x\n", f7188x_names[sio->type], - (unsigned int) addr, - (int) superio_inb(addr, SIO_DEVREV)); + (unsigned int)addr); + if (sio->type !=3D nct6116d) + pr_info(DRVNAME ": revision %d\n", + (int)superio_inb(addr, SIO_FINTEK_DEVREV)); =20 err: superio_exit(addr); --=20 2.35.1 From nobody Fri Apr 10 12:40:07 2026 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 74348C32774 for ; Tue, 23 Aug 2022 13:25:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241437AbiHWNY7 (ORCPT ); Tue, 23 Aug 2022 09:24:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40186 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236311AbiHWNYY (ORCPT ); Tue, 23 Aug 2022 09:24:24 -0400 Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-eopbgr140040.outbound.protection.outlook.com [40.107.14.40]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4714C8D3E1; Tue, 23 Aug 2022 03:24:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nmjW6/IlzUmgUSirgd+SCCtKsTIRYObZujqFKIhQ4Bsp9T0dF8IrJF/boHlQtHKd9vJgbna9YREjINZMK5F98SpEeokdnG84fz9Zzi9paTZ/Ys637pwQKPu/5NJs3Fua71RbD7/bihTch+XYx4ue5tf6p3KvVGW8R0xantn2B8SClgLQYuzfvmWko1JQPNWXmZh4Ch7xtg+wq+bdVdef5bCNO4M/RK9EZ89a7aTR2CuXME1p4TsezwS/R18dDbl1Eg73vBUa/W/zGGAAgw4z2e8y6zy/DMaWSw4t6z39xIN39iPypKgVwvPRcWQBEaMl4bAOWiBZC3XXt0IvIzqzyQ== 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=CAqhycPKyY39OMNQW1QVgI9xbc5oqCjiBVJK6DG0S5Q=; b=NcD/xvwOjgitDW8RqYMh19X4KcPHCuDMDSIcDiBBbXNZwJv4jDhzRPW7q/MTatfxxfeGKFNPcX5EvbTVTaX1nkP8Rl5YfVVIgiV6OYiZ9og0OV5BQGEJNV++zk+o+Z3QLHFcRwEWaQZIUNs7Dkokz3mE/09PemYMP+lbYNu5n6QiCPmf6We4FrcO9t4XKkRrvz7IEwwjitdk8KElJmCIaWgPYpE5+7M6hDf8TCpBunjlHSy0Fg6IM40dq0x2SFhjW9YDyotLj5msMOKxfKnObI68RfXQotT7jcmNcIiuPdeUorwxOPQ+gJAT85mF5vGUbdG64ZE0uoRhBOTq0NmFIg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=fail (sender ip is 194.138.21.75) smtp.rcpttodomain=linaro.org smtp.mailfrom=siemens.com; dmarc=fail (p=none sp=none 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=CAqhycPKyY39OMNQW1QVgI9xbc5oqCjiBVJK6DG0S5Q=; b=Gz7aZ0F0dz4JDMoPclyFIZvVVD2XNfwUgXRMUnDCjNg6GmAcRa/s8Yy+ae9U0m8c7ypFCpv4EZbLSD5nFxm0YOyapIB9C0leOJpoxwBb1d8+2k5RxMc5WJDdQ1SIO2V6zos7q4L+8NzkOjF0KtJbLQruKYHwzZ7n8mS+LIus8b3X0g1LshA1hKcE1xSjGSARSrUbJELyvPL+5NVpEJHHB/4TnM8kauYSmxM5hcHtrVnEVO2osMYs1dhNvcf7WAzTxBnNimseP7v/pMW6qhJ763Vv/i5LrNfjcEb1loTZ8LAvL36G7vz7L5lPmJHXGkAXwZgs4M9MxMisjVqEIgMkSg== Received: from GV3P280CA0107.SWEP280.PROD.OUTLOOK.COM (2603:10a6:150:8::9) by DB8PR10MB3177.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:118::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5546.19; Tue, 23 Aug 2022 10:23:55 +0000 Received: from HE1EUR01FT069.eop-EUR01.prod.protection.outlook.com (2603:10a6:150:8:cafe::70) by GV3P280CA0107.outlook.office365.com (2603:10a6:150:8::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5546.21 via Frontend Transport; Tue, 23 Aug 2022 10:23:55 +0000 X-MS-Exchange-Authentication-Results: spf=fail (sender IP is 194.138.21.75) smtp.mailfrom=siemens.com; dkim=none (message not signed) header.d=none;dmarc=fail action=none header.from=siemens.com; Received-SPF: Fail (protection.outlook.com: domain of siemens.com does not designate 194.138.21.75 as permitted sender) receiver=protection.outlook.com; client-ip=194.138.21.75; helo=hybrid.siemens.com; Received: from hybrid.siemens.com (194.138.21.75) by HE1EUR01FT069.mail.protection.outlook.com (10.152.1.52) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5546.15 via Frontend Transport; Tue, 23 Aug 2022 10:23:55 +0000 Received: from DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) 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.1118.9; Tue, 23 Aug 2022 12:23:54 +0200 Received: from md1za8fc.ad001.siemens.net (139.25.0.80) by DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.9; Tue, 23 Aug 2022 12:23:54 +0200 From: Henning Schild To: Linus Walleij , Bartosz Golaszewski , Pavel Machek , Hans de Goede , Mark Gross , Andy Shevchenko , Lee Jones , , , , CC: Sheng-Yuan Huang , Tasanakorn Phaipool , , Henning Schild Subject: [PATCH v4 2/5] gpio-f7188x: use unique labels for banks/chips Date: Tue, 23 Aug 2022 12:23:41 +0200 Message-ID: <20220823102344.17624-3-henning.schild@siemens.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220823102344.17624-1-henning.schild@siemens.com> References: <20220823102344.17624-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [139.25.0.80] X-ClientProxiedBy: DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) To DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 86b9daae-2ee1-464f-75e3-08da84f19555 X-MS-TrafficTypeDiagnostic: DB8PR10MB3177:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: sBIQ46Ovbeprjt8DrbINAm9ubTGHJRDln0OXlYslojNZTc3vI+5Smolp2fdRoBtNOWlZ62QGepUUIls+QcJ9h5v7GR2sqtqFCnB/Q6uRpJMTQtjqE22TnbgkLTFCJBToFj/yEShp85PcJLI66ETPADf9fZ2Il5OiteHM4hnhDRIClBOuFj9uB89eV/1g7BFoupnEJ7T3ZO98bHdOfAdSi3pWAE+yDlhrayrNxcl4PXs/099qW7ifM3p9atYMkRYxr2BpuPMiiaTZyBT109UmrpRU3U1SZiH2pGcRrUOly9ZdJ9gcpy2inQ16bMsSj9orenYCvxWFJq4bPsqtSjel3P/pvEduC3Qh1n62yW+LVLwND4umVy0yD6lksgGeYLdPUr9IUaB+Q1ELOsutkl/k2l2KPyZS0kc+K6rfa8gnApqJoQEvk9cCYRiDs73K+T7vlm/4U94I0QGh2AQtth+YNdWArRMSfQtebr87KlrKWqy5nk/b913k/+LY1fKPc4h8APB7bwLs3De6OZGhjDZ8Rf1HYqWb9cQT/Tw2vcj0tQid/8kAqm6BtpKtR3b4sWwGfHFJEGZAmXkmYZw/XWpOuooHQBMp48/47CSNeCcJA9ukdQPYoBEnx5qn0RYEA1XocOEV/O4zsRfioTt0P7eW5v7OxTSTHanogpu5m5Jw/mpRA1i5CRd/6jl9+SnqnpqDy14MjQ0ykpEh+/qxx3t2So5+wHA66muVyYh0EbiR9sgCh5Ufb8TwRokQvaZTGEnrIJUEtL73g7dtVuWanGPzTvEZFGTwGGcZ/L0nnBEPxutXv87k6a63E/fVVdk0Xbz8NQHqUgs9CQt3KvgSLSIMysaKa+K58tqTup1rwdveLbaiHteRMPmCq7EZHuqP7eRp01pP5Z8EZ0mqaUZf+oJHvg== 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:(13230016)(4636009)(346002)(396003)(39860400002)(376002)(136003)(40470700004)(46966006)(36840700001)(8676002)(4326008)(70586007)(86362001)(110136005)(82740400003)(54906003)(34020700004)(81166007)(36860700001)(36756003)(82960400001)(356005)(921005)(70206006)(186003)(83380400001)(1076003)(47076005)(26005)(107886003)(6666004)(41300700001)(478600001)(7416002)(316002)(5660300002)(40460700003)(82310400005)(16526019)(40480700001)(2906002)(2616005)(336012)(8936002)(956004)(44832011)(83996005)(2101003)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Aug 2022 10:23:55.2748 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 86b9daae-2ee1-464f-75e3-08da84f19555 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: HE1EUR01FT069.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8PR10MB3177 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" So that drivers building on top can find those pins with GPIO_LOOKUP helpers. Reviewed-by: Linus Walleij Acked-by: Simon Guinot Signed-off-by: Henning Schild Reviewed-by: Andy Shevchenko --- drivers/gpio/gpio-f7188x.c | 138 ++++++++++++++++++------------------- 1 file changed, 69 insertions(+), 69 deletions(-) diff --git a/drivers/gpio/gpio-f7188x.c b/drivers/gpio/gpio-f7188x.c index 820ac5d60fda..c9b18c6d8464 100644 --- a/drivers/gpio/gpio-f7188x.c +++ b/drivers/gpio/gpio-f7188x.c @@ -162,10 +162,10 @@ static void f7188x_gpio_set(struct gpio_chip *chip, u= nsigned offset, int value); static int f7188x_gpio_set_config(struct gpio_chip *chip, unsigned offset, unsigned long config); =20 -#define F7188X_GPIO_BANK(_base, _ngpio, _regbase) \ +#define F7188X_GPIO_BANK(_base, _ngpio, _regbase, _label) \ { \ .chip =3D { \ - .label =3D DRVNAME, \ + .label =3D _label, \ .owner =3D THIS_MODULE, \ .get_direction =3D f7188x_gpio_get_direction, \ .direction_input =3D f7188x_gpio_direction_in, \ @@ -190,98 +190,98 @@ static int f7188x_gpio_set_config(struct gpio_chip *c= hip, unsigned offset, #define gpio_data_single(type) ((type) =3D=3D nct6116d) =20 static struct f7188x_gpio_bank f71869_gpio_bank[] =3D { - F7188X_GPIO_BANK(0, 6, 0xF0), - F7188X_GPIO_BANK(10, 8, 0xE0), - F7188X_GPIO_BANK(20, 8, 0xD0), - F7188X_GPIO_BANK(30, 8, 0xC0), - F7188X_GPIO_BANK(40, 8, 0xB0), - F7188X_GPIO_BANK(50, 5, 0xA0), - F7188X_GPIO_BANK(60, 6, 0x90), + F7188X_GPIO_BANK(0, 6, 0xF0, DRVNAME "-0"), + F7188X_GPIO_BANK(10, 8, 0xE0, DRVNAME "-1"), + F7188X_GPIO_BANK(20, 8, 0xD0, DRVNAME "-2"), + F7188X_GPIO_BANK(30, 8, 0xC0, DRVNAME "-3"), + F7188X_GPIO_BANK(40, 8, 0xB0, DRVNAME "-4"), + F7188X_GPIO_BANK(50, 5, 0xA0, DRVNAME "-5"), + F7188X_GPIO_BANK(60, 6, 0x90, DRVNAME "-6"), }; =20 static struct f7188x_gpio_bank f71869a_gpio_bank[] =3D { - F7188X_GPIO_BANK(0, 6, 0xF0), - F7188X_GPIO_BANK(10, 8, 0xE0), - F7188X_GPIO_BANK(20, 8, 0xD0), - F7188X_GPIO_BANK(30, 8, 0xC0), - F7188X_GPIO_BANK(40, 8, 0xB0), - F7188X_GPIO_BANK(50, 5, 0xA0), - F7188X_GPIO_BANK(60, 8, 0x90), - F7188X_GPIO_BANK(70, 8, 0x80), + F7188X_GPIO_BANK(0, 6, 0xF0, DRVNAME "-0"), + F7188X_GPIO_BANK(10, 8, 0xE0, DRVNAME "-1"), + F7188X_GPIO_BANK(20, 8, 0xD0, DRVNAME "-2"), + F7188X_GPIO_BANK(30, 8, 0xC0, DRVNAME "-3"), + F7188X_GPIO_BANK(40, 8, 0xB0, DRVNAME "-4"), + F7188X_GPIO_BANK(50, 5, 0xA0, DRVNAME "-5"), + F7188X_GPIO_BANK(60, 8, 0x90, DRVNAME "-6"), + F7188X_GPIO_BANK(70, 8, 0x80, DRVNAME "-7"), }; =20 static struct f7188x_gpio_bank f71882_gpio_bank[] =3D { - F7188X_GPIO_BANK(0, 8, 0xF0), - F7188X_GPIO_BANK(10, 8, 0xE0), - F7188X_GPIO_BANK(20, 8, 0xD0), - F7188X_GPIO_BANK(30, 4, 0xC0), - F7188X_GPIO_BANK(40, 4, 0xB0), + F7188X_GPIO_BANK(0, 8, 0xF0, DRVNAME "-0"), + F7188X_GPIO_BANK(10, 8, 0xE0, DRVNAME "-1"), + F7188X_GPIO_BANK(20, 8, 0xD0, DRVNAME "-2"), + F7188X_GPIO_BANK(30, 4, 0xC0, DRVNAME "-3"), + F7188X_GPIO_BANK(40, 4, 0xB0, DRVNAME "-4"), }; =20 static struct f7188x_gpio_bank f71889a_gpio_bank[] =3D { - F7188X_GPIO_BANK(0, 7, 0xF0), - F7188X_GPIO_BANK(10, 7, 0xE0), - F7188X_GPIO_BANK(20, 8, 0xD0), - F7188X_GPIO_BANK(30, 8, 0xC0), - F7188X_GPIO_BANK(40, 8, 0xB0), - F7188X_GPIO_BANK(50, 5, 0xA0), - F7188X_GPIO_BANK(60, 8, 0x90), - F7188X_GPIO_BANK(70, 8, 0x80), + F7188X_GPIO_BANK(0, 7, 0xF0, DRVNAME "-0"), + F7188X_GPIO_BANK(10, 7, 0xE0, DRVNAME "-1"), + F7188X_GPIO_BANK(20, 8, 0xD0, DRVNAME "-2"), + F7188X_GPIO_BANK(30, 8, 0xC0, DRVNAME "-3"), + F7188X_GPIO_BANK(40, 8, 0xB0, DRVNAME "-4"), + F7188X_GPIO_BANK(50, 5, 0xA0, DRVNAME "-5"), + F7188X_GPIO_BANK(60, 8, 0x90, DRVNAME "-6"), + F7188X_GPIO_BANK(70, 8, 0x80, DRVNAME "-7"), }; =20 static struct f7188x_gpio_bank f71889_gpio_bank[] =3D { - F7188X_GPIO_BANK(0, 7, 0xF0), - F7188X_GPIO_BANK(10, 7, 0xE0), - F7188X_GPIO_BANK(20, 8, 0xD0), - F7188X_GPIO_BANK(30, 8, 0xC0), - F7188X_GPIO_BANK(40, 8, 0xB0), - F7188X_GPIO_BANK(50, 5, 0xA0), - F7188X_GPIO_BANK(60, 8, 0x90), - F7188X_GPIO_BANK(70, 8, 0x80), + F7188X_GPIO_BANK(0, 7, 0xF0, DRVNAME "-0"), + F7188X_GPIO_BANK(10, 7, 0xE0, DRVNAME "-1"), + F7188X_GPIO_BANK(20, 8, 0xD0, DRVNAME "-2"), + F7188X_GPIO_BANK(30, 8, 0xC0, DRVNAME "-3"), + F7188X_GPIO_BANK(40, 8, 0xB0, DRVNAME "-4"), + F7188X_GPIO_BANK(50, 5, 0xA0, DRVNAME "-5"), + F7188X_GPIO_BANK(60, 8, 0x90, DRVNAME "-6"), + F7188X_GPIO_BANK(70, 8, 0x80, DRVNAME "-7"), }; =20 static struct f7188x_gpio_bank f81866_gpio_bank[] =3D { - F7188X_GPIO_BANK(0, 8, 0xF0), - F7188X_GPIO_BANK(10, 8, 0xE0), - F7188X_GPIO_BANK(20, 8, 0xD0), - F7188X_GPIO_BANK(30, 8, 0xC0), - F7188X_GPIO_BANK(40, 8, 0xB0), - F7188X_GPIO_BANK(50, 8, 0xA0), - F7188X_GPIO_BANK(60, 8, 0x90), - F7188X_GPIO_BANK(70, 8, 0x80), - F7188X_GPIO_BANK(80, 8, 0x88), + F7188X_GPIO_BANK(0, 8, 0xF0, DRVNAME "-0"), + F7188X_GPIO_BANK(10, 8, 0xE0, DRVNAME "-1"), + F7188X_GPIO_BANK(20, 8, 0xD0, DRVNAME "-2"), + F7188X_GPIO_BANK(30, 8, 0xC0, DRVNAME "-3"), + F7188X_GPIO_BANK(40, 8, 0xB0, DRVNAME "-4"), + F7188X_GPIO_BANK(50, 8, 0xA0, DRVNAME "-5"), + F7188X_GPIO_BANK(60, 8, 0x90, DRVNAME "-6"), + F7188X_GPIO_BANK(70, 8, 0x80, DRVNAME "-7"), + F7188X_GPIO_BANK(80, 8, 0x88, DRVNAME "-8"), }; =20 =20 static struct f7188x_gpio_bank f81804_gpio_bank[] =3D { - F7188X_GPIO_BANK(0, 8, 0xF0), - F7188X_GPIO_BANK(10, 8, 0xE0), - F7188X_GPIO_BANK(20, 8, 0xD0), - F7188X_GPIO_BANK(50, 8, 0xA0), - F7188X_GPIO_BANK(60, 8, 0x90), - F7188X_GPIO_BANK(70, 8, 0x80), - F7188X_GPIO_BANK(90, 8, 0x98), + F7188X_GPIO_BANK(0, 8, 0xF0, DRVNAME "-0"), + F7188X_GPIO_BANK(10, 8, 0xE0, DRVNAME "-1"), + F7188X_GPIO_BANK(20, 8, 0xD0, DRVNAME "-2"), + F7188X_GPIO_BANK(50, 8, 0xA0, DRVNAME "-3"), + F7188X_GPIO_BANK(60, 8, 0x90, DRVNAME "-4"), + F7188X_GPIO_BANK(70, 8, 0x80, DRVNAME "-5"), + F7188X_GPIO_BANK(90, 8, 0x98, DRVNAME "-6"), }; =20 static struct f7188x_gpio_bank f81865_gpio_bank[] =3D { - F7188X_GPIO_BANK(0, 8, 0xF0), - F7188X_GPIO_BANK(10, 8, 0xE0), - F7188X_GPIO_BANK(20, 8, 0xD0), - F7188X_GPIO_BANK(30, 8, 0xC0), - F7188X_GPIO_BANK(40, 8, 0xB0), - F7188X_GPIO_BANK(50, 8, 0xA0), - F7188X_GPIO_BANK(60, 5, 0x90), + F7188X_GPIO_BANK(0, 8, 0xF0, DRVNAME "-0"), + F7188X_GPIO_BANK(10, 8, 0xE0, DRVNAME "-1"), + F7188X_GPIO_BANK(20, 8, 0xD0, DRVNAME "-2"), + F7188X_GPIO_BANK(30, 8, 0xC0, DRVNAME "-3"), + F7188X_GPIO_BANK(40, 8, 0xB0, DRVNAME "-4"), + F7188X_GPIO_BANK(50, 8, 0xA0, DRVNAME "-5"), + F7188X_GPIO_BANK(60, 5, 0x90, DRVNAME "-6"), }; =20 static struct f7188x_gpio_bank nct6116d_gpio_bank[] =3D { - F7188X_GPIO_BANK(0, 8, 0xE0), - F7188X_GPIO_BANK(10, 8, 0xE4), - F7188X_GPIO_BANK(20, 8, 0xE8), - F7188X_GPIO_BANK(30, 8, 0xEC), - F7188X_GPIO_BANK(40, 8, 0xF0), - F7188X_GPIO_BANK(50, 8, 0xF4), - F7188X_GPIO_BANK(60, 8, 0xF8), - F7188X_GPIO_BANK(70, 1, 0xFC), + F7188X_GPIO_BANK(0, 8, 0xE0, DRVNAME "-0"), + F7188X_GPIO_BANK(10, 8, 0xE4, DRVNAME "-1"), + F7188X_GPIO_BANK(20, 8, 0xE8, DRVNAME "-2"), + F7188X_GPIO_BANK(30, 8, 0xEC, DRVNAME "-3"), + F7188X_GPIO_BANK(40, 8, 0xF0, DRVNAME "-4"), + F7188X_GPIO_BANK(50, 8, 0xF4, DRVNAME "-5"), + F7188X_GPIO_BANK(60, 8, 0xF8, DRVNAME "-6"), + F7188X_GPIO_BANK(70, 1, 0xFC, DRVNAME "-7"), }; =20 static int f7188x_gpio_get_direction(struct gpio_chip *chip, unsigned offs= et) --=20 2.35.1 From nobody Fri Apr 10 12:40:07 2026 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 07C54C32792 for ; Tue, 23 Aug 2022 13:33:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235937AbiHWNdl (ORCPT ); Tue, 23 Aug 2022 09:33:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49144 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241922AbiHWNcE (ORCPT ); Tue, 23 Aug 2022 09:32:04 -0400 Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-ve1eur02on0600.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe06::600]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 55A0E857EA; Tue, 23 Aug 2022 03:32:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cjYL/KMQgfDbWp0/4mzgvUN4VUWth9PQ4cksSri0LtxfFWHsLgBIJlIagZvX8XvIBggCLkHq5QOGamR34LKzpASl1EpgWP7Y7W/ohZDzzgRBMgN1+G1LjIFSqWWomfi0309CFFly/2l+KDEe3SZyQgqNVzuDEdc0iIJigkVGyqlDaNEF4NmaYj1hKFQejTfrBXUbKo0KPvx4PMSzZVHlVRk8uhk4p5prn0FY868oD9Rnh4rTZm4OLVFmYp4O6O1weTJ1fzF0Y6Dth0AZaTrN8/Vv862jvESpwn8mDJmW5z+J14sHxDxjU8x81mD1fnMpWw/f4Pp6WMfT0eN+lsa+bQ== 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=Uys8JiJg0SwsbAo1MzR11HfF9h4DwhfnG6CyB8d+G2o=; b=YYfMzqbYPw9ioKtgF2OmGhPZggFHmISsRglsAzg/65DOSKXVCt4nQgtedV12CIimXVuJsd4gkJiN6G3YELfnEOl4OtlI5Ef6f80zQ+uFGaKAosOHawDzL6+6O3QI2+QNVAMgyd6MYOx6sRpiFOT5eGOGihGEyrL0xE6X+//LvD+afu+gru781hV5Zi3WBEV1fiDpnn7v9k3THaA/MHP4T5+xRZ0ukkNGarkStSGUO8RV82B2fC1ArOfi4bJFcd+x+4Rqvq9TJqreosk4njoeg8h99OWJgnmyfy6m+7vzUDRXR5qbvQtFjZ0J2YeVLyzLMAE8t2rdeE6c6ccDXfDRnw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=fail (sender ip is 194.138.21.75) smtp.rcpttodomain=linaro.org smtp.mailfrom=siemens.com; dmarc=fail (p=none sp=none 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=Uys8JiJg0SwsbAo1MzR11HfF9h4DwhfnG6CyB8d+G2o=; b=CFmJ2WwCMXdAcwY02yEObUAcFaKCxUHfuFNvXuMhtMmRmIY3DMuTXt8VMQ2s4Jlpis4dsDEdv8Y/CQjH/fZOUDCGFFG7wGqMMWH5kVxmA2nCV87/LIH/U2eNdlJ3U6gBK5Rv88dAqNF+Y7rOuZEa/ZHQYaIQu0stb58WvD3rJgekcsNt9fePUeiypB5NGSrbboUjo8SOw7v0MMuTvPmRMQiY8Q3sJgAkj372AaInpBZAXyXNWuplFyFTN3YaCGSdfrrcMzRGWXzyq9SWJBqn0vWaLr3+no2lMIvid4RfVoZanv0VU9hV+cdwADvMe7BuuSM3jc59tftHiRXaOsjTEA== Received: from GV3P280CA0033.SWEP280.PROD.OUTLOOK.COM (2603:10a6:150:9::26) by DB8PR10MB2650.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:af::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5546.21; Tue, 23 Aug 2022 10:24:06 +0000 Received: from HE1EUR01FT029.eop-EUR01.prod.protection.outlook.com (2603:10a6:150:9:cafe::1d) by GV3P280CA0033.outlook.office365.com (2603:10a6:150:9::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5525.11 via Frontend Transport; Tue, 23 Aug 2022 10:24:06 +0000 X-MS-Exchange-Authentication-Results: spf=fail (sender IP is 194.138.21.75) smtp.mailfrom=siemens.com; dkim=none (message not signed) header.d=none;dmarc=fail action=none header.from=siemens.com; Received-SPF: Fail (protection.outlook.com: domain of siemens.com does not designate 194.138.21.75 as permitted sender) receiver=protection.outlook.com; client-ip=194.138.21.75; helo=hybrid.siemens.com; Received: from hybrid.siemens.com (194.138.21.75) by HE1EUR01FT029.mail.protection.outlook.com (10.152.0.155) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5546.15 via Frontend Transport; Tue, 23 Aug 2022 10:24:06 +0000 Received: from DEMCHDC89XA.ad011.siemens.net (139.25.226.103) 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.1118.9; Tue, 23 Aug 2022 12:24:05 +0200 Received: from md1za8fc.ad001.siemens.net (139.25.0.80) by DEMCHDC89XA.ad011.siemens.net (139.25.226.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.9; Tue, 23 Aug 2022 12:24:05 +0200 From: Henning Schild To: Linus Walleij , Bartosz Golaszewski , Pavel Machek , Hans de Goede , Mark Gross , Andy Shevchenko , Lee Jones , , , , CC: Sheng-Yuan Huang , Tasanakorn Phaipool , , Henning Schild Subject: [PATCH v4 3/5] leds: simatic-ipc-leds-gpio: add new model 227G Date: Tue, 23 Aug 2022 12:23:42 +0200 Message-ID: <20220823102344.17624-4-henning.schild@siemens.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220823102344.17624-1-henning.schild@siemens.com> References: <20220823102344.17624-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [139.25.0.80] X-ClientProxiedBy: DEMCHDC89XA.ad011.siemens.net (139.25.226.103) To DEMCHDC89XA.ad011.siemens.net (139.25.226.103) X-TM-AS-Product-Ver: SMEX-14.0.0.3080-8.6.1018-26680.007 X-TM-AS-Result: No-10--10.993400-8.000000 X-TMASE-MatchedRID: +FHTzIsWzBfFiWpUiGitMXibxqQL9M5Vn9v8HoDZ0FGJUlmL3Uj0mFF5 adRR2Ej1cJHSK1bfF9XIk1roNguAzQKr8oJXtCB2yCTsSIAWZKeEtFE/+7XCupxVZzZr7+O769x ONVZSrH2eEPi9wVyFrtP+kXNq5kuZrMaxf80qMWtTzfzVMAd4vz9ETA4D04a1CWlWR223da4Xiv wflisSrNuykrHhg4Pd836gDighvV0myTOhJRwOLSzQ05q86YIulCv0a7truiL805SSvoAPN58kB WlYDDNgmyiLZetSf8mfop0ytGwvXiq2rl3dzGQ1cjuUA+LMX8CNdtODhoevRtu7L1rWUj4KKWpC 7b5UCw235n1TT1N6/w== X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No X-TMASE-Result: 10--10.993400-8.000000 X-TMASE-Version: SMEX-14.0.0.3080-8.6.1018-26680.007 X-TM-SNTS-SMTP: 286C19467F7B8135A4ECFE34DB58B74416F1C7FA022A171B13D6BDA06D99F4E12000:8 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7027f404-48c9-420c-2154-08da84f19be2 X-MS-TrafficTypeDiagnostic: DB8PR10MB2650:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: A5xX8S5MV/+PLW0aTc5jHzf7atMCzqnWc97FvTeU9bbeB7cG61NDuFgdG+KJ5owb3AbfDPB5cb+3tFTwEqWv/133SQKz4CMKdVBfseXBCqSUYnNCJYcrpPoefRtkJ1lwd8pLDJL5Es1dWHDToXfGJH79WKvABFmG3E0E0R3EfTWdMnaTkmZPefSYHJ04LKfqGgC7UkivlknbKd54NOGEePYwPuzLZK2DTk52y/LiSyGx03A3HDB3+ozF+ZAMdwEZpTQWQWzq0K8HTwVjSxBdvtWfvK2VUe4RXVZq3qamP1qR30oW3bwMpckkEwy/HCw3Zrwc3ClDxU3bnMsxInK88er7Ri2my1ndOH5bazhTTBd44bg6kSKMHtytFBH52aRDTHwdMFEQWSmAikpg/N6x0Klx7FJ5R/EUGPdIIYsiE1kuNtOJZvhSnZ+GU4hNC8IyHJAc3sPfSnMMMOuNNL5fpZXXeKA2KMKXUa2JZgm+c6NlMt1yzsCZjq8mG1W3DiQQdCrw/I8hnKNiF8e2LOaT+VQ+NsL/iYZRnjShQi4AP40reYvElkaRuQHAL6/xSnVV4dATunZ8RDCvPFScT79dFYuRX3BTAryyUpukqYehjJBot49cwW2VOQdiF+22fG8QnZWO1sR7zBnRWPS8u8xmxT1PojCD/QZLkD7Pi9+niF97mmm589GFg6xVXoIboKACq7KKVf2SYm6mhfjfgh1/7p+AjiwcknjgrQ6p56BC4hKpAtzOLtM6OecdLqwATWbBmOOMKB7PP9jBUEGWrhRS1TVdcle5gFRpHAwW05Zpv27pxb5bBvpkOQHq/BAaPSqOM1/swlqZHMBvDtpmtEmveqwp985qbVhUuy6+tnUEs9Z5zjiiQWh0o8TbSUvup4Jbphps7O5EJspYtHw7vvVydA== 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:(13230016)(4636009)(376002)(136003)(39860400002)(396003)(346002)(46966006)(36840700001)(40470700004)(83380400001)(40460700003)(40480700001)(921005)(81166007)(356005)(82740400003)(36756003)(36860700001)(70586007)(8676002)(4326008)(70206006)(82310400005)(6666004)(54906003)(7416002)(8936002)(5660300002)(44832011)(26005)(34020700004)(316002)(478600001)(47076005)(110136005)(41300700001)(82960400001)(956004)(2616005)(336012)(86362001)(2906002)(186003)(1076003)(107886003)(16526019)(83996005)(36900700001)(2101003);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Aug 2022 10:24:06.2525 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7027f404-48c9-420c-2154-08da84f19be2 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: HE1EUR01FT029.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8PR10MB2650 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" This adds support of the Siemens Simatic IPC227G. Its LEDs are connected to GPIO pins provided by the gpio-f7188x module. We make sure that gets loaded, if not enabled in the kernel config no LED support will be available. Reviewed-by: Hans de Goede Signed-off-by: Henning Schild Reviewed-by: Andy Shevchenko --- drivers/leds/simple/simatic-ipc-leds-gpio.c | 42 ++++++++++++++++--- drivers/platform/x86/simatic-ipc.c | 4 +- .../platform_data/x86/simatic-ipc-base.h | 1 + include/linux/platform_data/x86/simatic-ipc.h | 1 + 4 files changed, 42 insertions(+), 6 deletions(-) diff --git a/drivers/leds/simple/simatic-ipc-leds-gpio.c b/drivers/leds/sim= ple/simatic-ipc-leds-gpio.c index 4c9e663a90ba..0d73dcbeec2d 100644 --- a/drivers/leds/simple/simatic-ipc-leds-gpio.c +++ b/drivers/leds/simple/simatic-ipc-leds-gpio.c @@ -13,28 +13,45 @@ #include #include #include +#include =20 -static struct gpiod_lookup_table simatic_ipc_led_gpio_table =3D { +struct gpiod_lookup_table *simatic_ipc_led_gpio_table; + +static struct gpiod_lookup_table simatic_ipc_led_gpio_table_127e =3D { .dev_id =3D "leds-gpio", .table =3D { - GPIO_LOOKUP_IDX("apollolake-pinctrl.0", 51, NULL, 0, GPIO_ACTIVE_LOW), GPIO_LOOKUP_IDX("apollolake-pinctrl.0", 52, NULL, 1, GPIO_ACTIVE_LOW), GPIO_LOOKUP_IDX("apollolake-pinctrl.0", 53, NULL, 2, GPIO_ACTIVE_LOW), GPIO_LOOKUP_IDX("apollolake-pinctrl.0", 57, NULL, 3, GPIO_ACTIVE_LOW), GPIO_LOOKUP_IDX("apollolake-pinctrl.0", 58, NULL, 4, GPIO_ACTIVE_LOW), GPIO_LOOKUP_IDX("apollolake-pinctrl.0", 60, NULL, 5, GPIO_ACTIVE_LOW), + GPIO_LOOKUP_IDX("apollolake-pinctrl.0", 51, NULL, 0, GPIO_ACTIVE_LOW), GPIO_LOOKUP_IDX("apollolake-pinctrl.0", 56, NULL, 6, GPIO_ACTIVE_LOW), GPIO_LOOKUP_IDX("apollolake-pinctrl.0", 59, NULL, 7, GPIO_ACTIVE_HIGH), }, }; =20 +static struct gpiod_lookup_table simatic_ipc_led_gpio_table_227g =3D { + .dev_id =3D "leds-gpio", + .table =3D { + GPIO_LOOKUP_IDX("gpio-f7188x-2", 0, NULL, 0, GPIO_ACTIVE_LOW), + GPIO_LOOKUP_IDX("gpio-f7188x-2", 1, NULL, 1, GPIO_ACTIVE_LOW), + GPIO_LOOKUP_IDX("gpio-f7188x-2", 2, NULL, 2, GPIO_ACTIVE_LOW), + GPIO_LOOKUP_IDX("gpio-f7188x-2", 3, NULL, 3, GPIO_ACTIVE_LOW), + GPIO_LOOKUP_IDX("gpio-f7188x-2", 4, NULL, 4, GPIO_ACTIVE_LOW), + GPIO_LOOKUP_IDX("gpio-f7188x-2", 5, NULL, 5, GPIO_ACTIVE_LOW), + GPIO_LOOKUP_IDX("gpio-f7188x-3", 6, NULL, 6, GPIO_ACTIVE_HIGH), + GPIO_LOOKUP_IDX("gpio-f7188x-3", 7, NULL, 7, GPIO_ACTIVE_HIGH), + } +}; + static const struct gpio_led simatic_ipc_gpio_leds[] =3D { - { .name =3D "green:" LED_FUNCTION_STATUS "-3" }, { .name =3D "red:" LED_FUNCTION_STATUS "-1" }, { .name =3D "green:" LED_FUNCTION_STATUS "-1" }, { .name =3D "red:" LED_FUNCTION_STATUS "-2" }, { .name =3D "green:" LED_FUNCTION_STATUS "-2" }, { .name =3D "red:" LED_FUNCTION_STATUS "-3" }, + { .name =3D "green:" LED_FUNCTION_STATUS "-3" }, }; =20 static const struct gpio_led_platform_data simatic_ipc_gpio_leds_pdata =3D= { @@ -46,7 +63,7 @@ static struct platform_device *simatic_leds_pdev; =20 static int simatic_ipc_leds_gpio_remove(struct platform_device *pdev) { - gpiod_remove_lookup_table(&simatic_ipc_led_gpio_table); + gpiod_remove_lookup_table(simatic_ipc_led_gpio_table); platform_device_unregister(simatic_leds_pdev); =20 return 0; @@ -54,10 +71,25 @@ static int simatic_ipc_leds_gpio_remove(struct platform= _device *pdev) =20 static int simatic_ipc_leds_gpio_probe(struct platform_device *pdev) { + const struct simatic_ipc_platform *plat =3D pdev->dev.platform_data; struct gpio_desc *gpiod; int err; =20 - gpiod_add_lookup_table(&simatic_ipc_led_gpio_table); + switch (plat->devmode) { + case SIMATIC_IPC_DEVICE_127E: + simatic_ipc_led_gpio_table =3D &simatic_ipc_led_gpio_table_127e; + break; + case SIMATIC_IPC_DEVICE_227G: + if (!IS_ENABLED(CONFIG_GPIO_F7188X)) + return -ENODEV; + request_module("gpio-f7188x"); + simatic_ipc_led_gpio_table =3D &simatic_ipc_led_gpio_table_227g; + break; + default: + return -ENODEV; + } + + gpiod_add_lookup_table(simatic_ipc_led_gpio_table); simatic_leds_pdev =3D platform_device_register_resndata(NULL, "leds-gpio", PLATFORM_DEVID_NONE, NULL, 0, &simatic_ipc_gpio_leds_pdata, diff --git a/drivers/platform/x86/simatic-ipc.c b/drivers/platform/x86/sima= tic-ipc.c index ca3647b751d5..1825ef21a86d 100644 --- a/drivers/platform/x86/simatic-ipc.c +++ b/drivers/platform/x86/simatic-ipc.c @@ -41,6 +41,7 @@ static struct { {SIMATIC_IPC_IPC127E, SIMATIC_IPC_DEVICE_127E, SIMATIC_IPC_DEVICE_NONE}, {SIMATIC_IPC_IPC227D, SIMATIC_IPC_DEVICE_227D, SIMATIC_IPC_DEVICE_NONE}, {SIMATIC_IPC_IPC227E, SIMATIC_IPC_DEVICE_427E, SIMATIC_IPC_DEVICE_227E}, + {SIMATIC_IPC_IPC227G, SIMATIC_IPC_DEVICE_227G, SIMATIC_IPC_DEVICE_NONE}, {SIMATIC_IPC_IPC277E, SIMATIC_IPC_DEVICE_NONE, SIMATIC_IPC_DEVICE_227E}, {SIMATIC_IPC_IPC427D, SIMATIC_IPC_DEVICE_427E, SIMATIC_IPC_DEVICE_NONE}, {SIMATIC_IPC_IPC427E, SIMATIC_IPC_DEVICE_427E, SIMATIC_IPC_DEVICE_427E}, @@ -65,7 +66,8 @@ static int register_platform_devices(u32 station_id) } =20 if (ledmode !=3D SIMATIC_IPC_DEVICE_NONE) { - if (ledmode =3D=3D SIMATIC_IPC_DEVICE_127E) + if (ledmode =3D=3D SIMATIC_IPC_DEVICE_127E || + ledmode =3D=3D SIMATIC_IPC_DEVICE_227G) pdevname =3D KBUILD_MODNAME "_leds_gpio"; platform_data.devmode =3D ledmode; ipc_led_platform_device =3D diff --git a/include/linux/platform_data/x86/simatic-ipc-base.h b/include/l= inux/platform_data/x86/simatic-ipc-base.h index 39fefd48cf4d..57d6a10dfc9e 100644 --- a/include/linux/platform_data/x86/simatic-ipc-base.h +++ b/include/linux/platform_data/x86/simatic-ipc-base.h @@ -19,6 +19,7 @@ #define SIMATIC_IPC_DEVICE_427E 2 #define SIMATIC_IPC_DEVICE_127E 3 #define SIMATIC_IPC_DEVICE_227E 4 +#define SIMATIC_IPC_DEVICE_227G 5 =20 struct simatic_ipc_platform { u8 devmode; diff --git a/include/linux/platform_data/x86/simatic-ipc.h b/include/linux/= platform_data/x86/simatic-ipc.h index f3b76b39776b..7a2e79f3be0b 100644 --- a/include/linux/platform_data/x86/simatic-ipc.h +++ b/include/linux/platform_data/x86/simatic-ipc.h @@ -31,6 +31,7 @@ enum simatic_ipc_station_ids { SIMATIC_IPC_IPC427E =3D 0x00000A01, SIMATIC_IPC_IPC477E =3D 0x00000A02, SIMATIC_IPC_IPC127E =3D 0x00000D01, + SIMATIC_IPC_IPC227G =3D 0x00000F01, }; =20 static inline u32 simatic_ipc_get_station_id(u8 *data, int max_len) --=20 2.35.1 From nobody Fri Apr 10 12:40:07 2026 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 42196C32772 for ; Tue, 23 Aug 2022 15:25:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243468AbiHWPXX (ORCPT ); Tue, 23 Aug 2022 11:23:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42546 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244651AbiHWPQB (ORCPT ); Tue, 23 Aug 2022 11:16:01 -0400 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-eopbgr70072.outbound.protection.outlook.com [40.107.7.72]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1D1501665B9; Tue, 23 Aug 2022 03:33:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VfIrjBK1Ay25VnwiuVkeq5VbeyZmCqouyfkZgjt0GELQrqOPd3hCsRhNGDcSbNf+EGwKqCIEU3srba9qvtZUTxULnVnpu1TCYcRG8g6WHEfRmGi4kAmc6t7Ko9Qut8Cx8EjWLBIc9wbPh6ABVpakyJP2mJaRcSK9CdV6dpUlcjM5kedsKChNzs8JDYB3m4nvEC06DoAmzxZXwK3QbNegIS4Q8qyymm7QKFWIvKgRyhxYLoFwKHILyufEfsaB2T8OfVjULiZegFQiMHmd9YT6j8MaYBjn9sxRUqqplz6Vbk2Tz7A95XPqGKGc4IcplNMTe0zMWNByQE9WGBmlfpJVLw== 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=Q/SIkLdlwCfAKaSHnpyBQjoFHswi4PZziFDzWcXh9Yo=; b=VBJUZqEYWashTny5uuCO8svj5qfG0WOxnInOmxbmaTPopuihx9WGxjBHlBFt+IhF9zVg1Q9q1IwpLU0jTJ7OspXtjrI/PPrSXZM4gHZZ8JilD2MWJQVPtoSQGDWfmlrIeFMdKyeDgHXDjB4ifae4tQ3Mem1ztlqhwPwNhCvw+gT32aTbiVSrYO/i/1WTg7gbxJPZR2kCfq2002ZRyhY3H/Q/UyF8EKJsbYONL/RDng18Jbf/zDDvv5k6uamCJI02mAi3Kuok24s2tW7opg1kRZAliYCI7MLDUXECSsuM6PreYF+AJwjsivG8b+3DuMpM+xZEDhapWqGvS9GmHbxXBg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=fail (sender ip is 194.138.21.75) smtp.rcpttodomain=linaro.org smtp.mailfrom=siemens.com; dmarc=fail (p=none sp=none 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=Q/SIkLdlwCfAKaSHnpyBQjoFHswi4PZziFDzWcXh9Yo=; b=qzJezurO6Gvp6kVORMpgYR6Euw/3NVBc/+bkcFVBf2cavrDZiENLHIF6p4rLFaarxxhOTrgg0S44Xxwp8MwM6if5cf29VKoPCrjcp8ZGVuBOxrc9iy3HokWGmSsch2IUubvOtdiZ7wKzGndwMYpG7lCWvcv+U7dq58Yye+t6Ll+OfiujNQLxV5O4V19Z0Wh+RyeE3fMBl7hzKEpvEH6CA8HLwplUrUqeAv5LC/8kClYT6+FAk3SCSgc9MaCg8djDLUMNu4jpoDo3jZiDpuhsWVPsk2rHjBXzN1uy4VbP38GHXFyWnrXPnaajQlhlLj8P+PSIz13OMWoHggNc832LdQ== Received: from GV3P280CA0058.SWEP280.PROD.OUTLOOK.COM (2603:10a6:150:9::28) by DB9PR10MB4846.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:2c2::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5546.16; Tue, 23 Aug 2022 10:24:07 +0000 Received: from HE1EUR01FT029.eop-EUR01.prod.protection.outlook.com (2603:10a6:150:9:cafe::7) by GV3P280CA0058.outlook.office365.com (2603:10a6:150:9::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5525.11 via Frontend Transport; Tue, 23 Aug 2022 10:24:07 +0000 X-MS-Exchange-Authentication-Results: spf=fail (sender IP is 194.138.21.75) smtp.mailfrom=siemens.com; dkim=none (message not signed) header.d=none;dmarc=fail action=none header.from=siemens.com; Received-SPF: Fail (protection.outlook.com: domain of siemens.com does not designate 194.138.21.75 as permitted sender) receiver=protection.outlook.com; client-ip=194.138.21.75; helo=hybrid.siemens.com; Received: from hybrid.siemens.com (194.138.21.75) by HE1EUR01FT029.mail.protection.outlook.com (10.152.0.155) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5546.15 via Frontend Transport; Tue, 23 Aug 2022 10:24:07 +0000 Received: from DEMCHDC89XA.ad011.siemens.net (139.25.226.103) 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.1118.9; Tue, 23 Aug 2022 12:24:05 +0200 Received: from md1za8fc.ad001.siemens.net (139.25.0.80) by DEMCHDC89XA.ad011.siemens.net (139.25.226.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.9; Tue, 23 Aug 2022 12:24:05 +0200 From: Henning Schild To: Linus Walleij , Bartosz Golaszewski , Pavel Machek , Hans de Goede , Mark Gross , Andy Shevchenko , Lee Jones , , , , CC: Sheng-Yuan Huang , Tasanakorn Phaipool , , Henning Schild Subject: [PATCH v4 4/5] platform/x86: simatic-ipc: enable watchdog for 227G Date: Tue, 23 Aug 2022 12:23:43 +0200 Message-ID: <20220823102344.17624-5-henning.schild@siemens.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220823102344.17624-1-henning.schild@siemens.com> References: <20220823102344.17624-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [139.25.0.80] X-ClientProxiedBy: DEMCHDC89XA.ad011.siemens.net (139.25.226.103) To DEMCHDC89XA.ad011.siemens.net (139.25.226.103) X-TM-AS-Product-Ver: SMEX-14.0.0.3080-8.6.1018-26680.007 X-TM-AS-Result: No-10--11.447500-8.000000 X-TMASE-MatchedRID: L90KqhDWgfOUYAP3WXIsZ3Cm15xQGrnE2mwVXKpQ3BdHg88w74mNDktc 8DbogbSE31GU/N5W5BDT/pFzauZLmXEK4P8QtiVHs3gZaLIY9no/aaS8hrB/2J4CIKY/Hg3AaZG o0EeYG97Gr09tQ7Cw/1BIVsvVu9ABIAcCikR3vq9vibMxAqYXjWHFPUyW8t4AX3DcTx0UaPNCEh brM/bogi6eQ3HQcWnw X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No X-TMASE-Result: 10--11.447500-8.000000 X-TMASE-Version: SMEX-14.0.0.3080-8.6.1018-26680.007 X-TM-SNTS-SMTP: 06510759FC19E0F5CCD4FBDB51AA4970CD0F36EA6E75AE5B40D375318C7AA1562000:8 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a25ec1f1-5b42-4212-908f-08da84f19c54 X-MS-TrafficTypeDiagnostic: DB9PR10MB4846:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6xdsrH1gmrKCcNeGeKdMaFs6BX7eaMSt46g9aQ8vtrD75gcvqhAv5do4ki5AV5YEBPnv8brz7Vs87P6A3vl8gDrHR98an5eNxoiK027kRCmiJ0vjG4HGbgeINGe04cPguU5tcsPEZWXVT38JZE+zwCRAobs4OWgTTgvLeDP4u1+piYBPPWqkg+oXMWizfEZq/wW0OvNrgCSPXffVlrcCjCZ202I9mXIlf2VZ/CfxYaRz0ZI9WSjxGQK+asjRyHibLeOs8atpuDSjggy+A+aY28Poq2hmsY4IsoJCsaEwpgmESj9ZhX7cGe1WtDDOZNTcM2QHrgl1bTYpVgZLftITTYWukQ64jaoyHwIVXJ7D4zdtRKr98Av87elHkzs8CWdJ43+J5vpbWwXe5ieYXFLrZo2UgBWwd262zS8vz2mdXNUKW375nwImk64g5TlwrGeJ6vDFE1qK6va4MBSCWiEXgmXjje40Vk1o6G2VcTcJIlJKJmfgQRUxXuLBnVg1NWvU9a6yUeaj7+yba8vMeGQYCFoT3fVnk66Jenk7DZlRGhuF0rdffUcqHAmG9TR4MgxfrW4eDJSpNRbU+hp1t7PGD/Mq8HnLGJmVg1bgz2nUtNi8MrtjfCxQoec30GRZMrf/WJJo1QlnAOv0dYJc1P7gyf34Shxwo/70EDXaV743nS51R+f4jK6nPcXxAFv9bgha+IPelXjbr9LCdic6eLGbskSXYttEha7H/m7KVEsnzPWwAW+Wn9TzeHD0RjdLno5gY/I1xUW8Yc7LhajOofaKN6Sv4N5ipoVUuKkHBU0oUqMXe1T0xd3Ma5fYzYpFUq/CNQTSVvkULusSfFNoEBE3kMi4F5L7yvbgz/ye+5orpXBf6YyXOMsjx89vApVmCDRBkj+QvFkOZkrF32YREZqikQ== 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:(13230016)(4636009)(346002)(396003)(136003)(376002)(39860400002)(36840700001)(46966006)(40470700004)(2906002)(36756003)(82310400005)(5660300002)(40480700001)(8676002)(4326008)(70586007)(70206006)(6666004)(316002)(107886003)(110136005)(54906003)(41300700001)(478600001)(26005)(82740400003)(81166007)(82960400001)(356005)(921005)(186003)(86362001)(16526019)(47076005)(336012)(956004)(2616005)(36860700001)(8936002)(7416002)(44832011)(4744005)(1076003)(34020700004)(83380400001)(40460700003)(36900700001)(83996005)(2101003);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Aug 2022 10:24:07.0025 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a25ec1f1-5b42-4212-908f-08da84f19c54 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: HE1EUR01FT029.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR10MB4846 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Just load the watchdog module, after having identified that machine. That watchdog module does not have any autoloading support. Signed-off-by: Henning Schild Reviewed-by: Andy Shevchenko --- drivers/platform/x86/simatic-ipc.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/platform/x86/simatic-ipc.c b/drivers/platform/x86/sima= tic-ipc.c index 1825ef21a86d..8dd686d1c9f1 100644 --- a/drivers/platform/x86/simatic-ipc.c +++ b/drivers/platform/x86/simatic-ipc.c @@ -96,6 +96,9 @@ static int register_platform_devices(u32 station_id) ipc_wdt_platform_device->name); } =20 + if (station_id =3D=3D SIMATIC_IPC_IPC227G) + request_module("w83627hf_wdt"); + if (ledmode =3D=3D SIMATIC_IPC_DEVICE_NONE && wdtmode =3D=3D SIMATIC_IPC_DEVICE_NONE) { pr_warn("unsupported IPC detected, station id=3D%08x\n", --=20 2.35.1 From nobody Fri Apr 10 12:40:07 2026 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 564E1C32772 for ; Tue, 23 Aug 2022 13:27:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237661AbiHWN1U (ORCPT ); Tue, 23 Aug 2022 09:27:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40746 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241072AbiHWN0y (ORCPT ); Tue, 23 Aug 2022 09:26:54 -0400 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on20624.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e1b::624]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C2236152408; Tue, 23 Aug 2022 03:26:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AkDZawPpu95EOeyTz97gzk/BkkJr8IBcEQqZR3HH+XSJjMYUigHwgYG6Vv94LT4G5eLTbYy4QoT3AC3+EfAmL1I82Y+yWxhs/50wKCUZYIruBxDV2OkTHVxwVL+5V8ggqKD9LD4BaNKJSsJWf2qchVCMYUFe4pdDg/nuYMs2S8/ziTMlo+gFQ2izqQuXIJQ3z/FMxcue19h7IY7HBdB8PWlY7N4W+iPehcK7+QStWWMb4bdP6ujqYRucvD5xwVr4DEzPD68+m7xd0yoIHp7+VcrvW03L+2TnROKz9c4CV46GaWP1pO2mR3rgh0OZAYCXJfiBC8UsvIQUGHbtxekkTA== 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=Ig+9ZYMBm2YHvnFvLRT991etlN1SNWpA3AH0N8kLqgg=; b=AZwmqC2mSXz4gc5CQvnsxBXoa2iFEkn1HUeYohfjSjL6CnB4CjumK2ptoCjPsVX9wuBnPCLtgj/b/kTzciWrjK73qq5qghsE36DYYq/b1P6fBt8EE99IhGAJs/myX6/+8yMb41sGUrgvmSwR95LJSxHe7U19EU2uPfPaJtDWm6j1+va4lRbY+ZKmofS5/+b2JPEiXmSbHl+dOSzXfEk1CFOpD8LKZsRVbJ7T4n9n846zw1BpsDJ9li1Cc/UfjGXs7YqGuKqBPSL3aUyOmnlR2zgK2BSqITixyj8Xse7URvixgc7HBS1t1rXEMGr38y0EYlpIq8llROGG3rjxk5rJag== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=fail (sender ip is 194.138.21.75) smtp.rcpttodomain=linaro.org smtp.mailfrom=siemens.com; dmarc=fail (p=none sp=none 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=Ig+9ZYMBm2YHvnFvLRT991etlN1SNWpA3AH0N8kLqgg=; b=Cb6Jq7ZfhntfWuUus8vCzU2/c7zR/vZeKBX/hd5a9aPTHFz6PykBCNaDK8w12vjy5Q+sF+ihFug7hYtrGlwlEqe0Ng+7s0oWTcnCc0O2WDw+DdJ+jujSE8VThpfU/JE6H1LBBa24E5topuR2zeuko2w9uJVYdKbwmysjDzpmTOysr2WNjmkpyWOzXBQvQfc2RLMSYcblXMihzmWxCTr7CWtxNCHa686r6Bfa08qADlz/oFN05DClvcJSCivyOt8ZcSyqUZXmvsx96HukIXdOi1c1q2s2aJWRhDoFU9bGRm0btiAiSx1Kk2ZlSh3QTF70BsJGOmz9jbRvffsXfJGoJg== Received: from GV3P280CA0046.SWEP280.PROD.OUTLOOK.COM (2603:10a6:150:9::17) by VI1PR1001MB1455.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:800:e7::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5546.16; Tue, 23 Aug 2022 10:24:08 +0000 Received: from HE1EUR01FT029.eop-EUR01.prod.protection.outlook.com (2603:10a6:150:9:cafe::e) by GV3P280CA0046.outlook.office365.com (2603:10a6:150:9::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5546.16 via Frontend Transport; Tue, 23 Aug 2022 10:24:08 +0000 X-MS-Exchange-Authentication-Results: spf=fail (sender IP is 194.138.21.75) smtp.mailfrom=siemens.com; dkim=none (message not signed) header.d=none;dmarc=fail action=none header.from=siemens.com; Received-SPF: Fail (protection.outlook.com: domain of siemens.com does not designate 194.138.21.75 as permitted sender) receiver=protection.outlook.com; client-ip=194.138.21.75; helo=hybrid.siemens.com; Received: from hybrid.siemens.com (194.138.21.75) by HE1EUR01FT029.mail.protection.outlook.com (10.152.0.155) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5546.15 via Frontend Transport; Tue, 23 Aug 2022 10:24:07 +0000 Received: from DEMCHDC89XA.ad011.siemens.net (139.25.226.103) 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.1118.9; Tue, 23 Aug 2022 12:24:05 +0200 Received: from md1za8fc.ad001.siemens.net (139.25.0.80) by DEMCHDC89XA.ad011.siemens.net (139.25.226.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.9; Tue, 23 Aug 2022 12:24:05 +0200 From: Henning Schild To: Linus Walleij , Bartosz Golaszewski , Pavel Machek , Hans de Goede , Mark Gross , Andy Shevchenko , Lee Jones , , , , CC: Sheng-Yuan Huang , Tasanakorn Phaipool , , Henning Schild Subject: [PATCH v4 5/5] platform/x86: simatic-ipc: add new model 427G Date: Tue, 23 Aug 2022 12:23:44 +0200 Message-ID: <20220823102344.17624-6-henning.schild@siemens.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220823102344.17624-1-henning.schild@siemens.com> References: <20220823102344.17624-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [139.25.0.80] X-ClientProxiedBy: DEMCHDC89XA.ad011.siemens.net (139.25.226.103) To DEMCHDC89XA.ad011.siemens.net (139.25.226.103) X-TM-AS-Product-Ver: SMEX-14.0.0.3080-8.6.1018-26680.007 X-TM-AS-Result: No-10--11.432500-8.000000 X-TMASE-MatchedRID: DRSU/fc/F+JM7wVZoURWlF0WokuUDzPm55gySjxbin5+J3gtIe0gA0+c rEA4+nhZ6Mw4RnkAvRLIk1roNguAzWxgjTXTl/F39YmJ+rCjjhEh4UgUH4JX7APZZctd3P4B2Ll btF/6zpCeEPi9wVyFrqzIaRs+qc7T7pA1TBPNQ93oszdb+c82BXBgpI59xlp2x5sgyUhLCNt9LQ inZ4QefPcjNeVeWlqY+gtHj7OwNO0LH2qjGZLbHROhkFlKRCzwLsiJq/wF5KQuSJb6i9HMGxiCF Are61nE X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No X-TMASE-Result: 10--11.432500-8.000000 X-TMASE-Version: SMEX-14.0.0.3080-8.6.1018-26680.007 X-TM-SNTS-SMTP: 7F726871172C5A8D85E1A005B314EAA269C188B499D1A4300ED37D24E2E1A0702000:8 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 196fec99-1354-4693-1260-08da84f19cda X-MS-TrafficTypeDiagnostic: VI1PR1001MB1455:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: deGXeoZulfYVusQsOMffLGUbURMRtW7T63B4Dx0b4Gs+GE6NNkSeK9gEkMXKW/JdSh1DYWDLrVBWcu0aEQKAxyGQ0kyYkvs7OLI2b3V1X5Bs2bid8Ckx/ziwQiCrcizjhU2aQrMwhP7G8Aq5smZOtHg26e7/GUVoV2RrIAZJI0y6rBpaHMZ4f2Uv/kevEPtnnWmZQIR+Lt+UHz6gxPV5PoU4Jh2LxgkACGuQ3RB0IVhZ5wYnNLMPZs8Bv7wkRoUOZLAeS2Cq6ILVc1kcrAScjLRtLr3l7UwR3aIeHPP23+8vptxrAADdGyp7Pn4pQKeVQRGMmzsvFTAgt6c0+bYHcnToGeA6ea/ifgdI50spMqh/Fm2fisjyn98rVoqv7IYoqWWkFsdblMd9VhcLoha09CoN1GgVcZyl8RaL70e9H+WYqVRBwago/TgjXKjh3N3TfcQbP1h7hz1YSRHqyj+3ldGzNQ/TajrjPLmFCp4s/AASkEk5ERpqX0NTroP9fOfelETTYvfcy6MuFB8P6Q2Vf4iMkYHWm3xJu5HEyTsD99d570PEUKbTzSG1HNdBeTa4hSTRUm1j+6XQ+fHpabrIjbgMcJvRjCU16U5fnOKLIZ8T0UvyYQVIil6TmzDL8ILpO6vICi3u1A8NCRB9TqqYlf+nLEop8zUi0pTio80RSaU5tarrcsOuyXZZ5wtviRo0gqoXbdafRjUmkJfimAWkj0/92CUBvgrvUoS+pCvMjBPmeLOggwiHrZrV3BmH4u8G8aCr+NV1fkcmxov0zXKPoq990JqXCbWHPrLBIfgZljUg/djZGphlwcUVODfvJ7Fwdz0cSmhSZSM3uMYtJ4h2QYqsxw3bMoSmE9TErkfaggxyg5+oN8KBLubiaqwexXcYUugNxOWOoLFVHgqRFwMPgg== 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:(13230016)(4636009)(396003)(39860400002)(136003)(346002)(376002)(40470700004)(46966006)(36840700001)(82960400001)(921005)(356005)(107886003)(6666004)(86362001)(81166007)(36756003)(83380400001)(26005)(16526019)(956004)(2616005)(336012)(1076003)(41300700001)(186003)(47076005)(478600001)(110136005)(70586007)(82310400005)(40460700003)(40480700001)(54906003)(316002)(4326008)(8676002)(70206006)(82740400003)(34020700004)(36860700001)(44832011)(5660300002)(7416002)(8936002)(2906002)(36900700001)(2101003)(83996005);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Aug 2022 10:24:07.8931 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 196fec99-1354-4693-1260-08da84f19cda 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: HE1EUR01FT029.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR1001MB1455 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" This adds support for the Siemens Simatic IPC427G. A board which basically works like the 227G added in a previous patch. So all there is to do is to add the station_id and make it take all the 227G branches. Signed-off-by: Henning Schild Reviewed-by: Andy Shevchenko --- drivers/platform/x86/simatic-ipc.c | 11 +++++++---- include/linux/platform_data/x86/simatic-ipc.h | 1 + 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/platform/x86/simatic-ipc.c b/drivers/platform/x86/sima= tic-ipc.c index 8dd686d1c9f1..ca76076fc706 100644 --- a/drivers/platform/x86/simatic-ipc.c +++ b/drivers/platform/x86/simatic-ipc.c @@ -41,11 +41,12 @@ static struct { {SIMATIC_IPC_IPC127E, SIMATIC_IPC_DEVICE_127E, SIMATIC_IPC_DEVICE_NONE}, {SIMATIC_IPC_IPC227D, SIMATIC_IPC_DEVICE_227D, SIMATIC_IPC_DEVICE_NONE}, {SIMATIC_IPC_IPC227E, SIMATIC_IPC_DEVICE_427E, SIMATIC_IPC_DEVICE_227E}, - {SIMATIC_IPC_IPC227G, SIMATIC_IPC_DEVICE_227G, SIMATIC_IPC_DEVICE_NONE}, + {SIMATIC_IPC_IPC227G, SIMATIC_IPC_DEVICE_227G, SIMATIC_IPC_DEVICE_227G}, {SIMATIC_IPC_IPC277E, SIMATIC_IPC_DEVICE_NONE, SIMATIC_IPC_DEVICE_227E}, {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}, }; =20 static int register_platform_devices(u32 station_id) @@ -82,6 +83,11 @@ static int register_platform_devices(u32 station_id) ipc_led_platform_device->name); } =20 + if (wdtmode =3D=3D SIMATIC_IPC_DEVICE_227G) { + request_module("w83627hf_wdt"); + return 0; + } + if (wdtmode !=3D SIMATIC_IPC_DEVICE_NONE) { platform_data.devmode =3D wdtmode; ipc_wdt_platform_device =3D @@ -96,9 +102,6 @@ static int register_platform_devices(u32 station_id) ipc_wdt_platform_device->name); } =20 - if (station_id =3D=3D SIMATIC_IPC_IPC227G) - request_module("w83627hf_wdt"); - if (ledmode =3D=3D SIMATIC_IPC_DEVICE_NONE && wdtmode =3D=3D SIMATIC_IPC_DEVICE_NONE) { pr_warn("unsupported IPC detected, station id=3D%08x\n", diff --git a/include/linux/platform_data/x86/simatic-ipc.h b/include/linux/= platform_data/x86/simatic-ipc.h index 7a2e79f3be0b..632320ec8f08 100644 --- a/include/linux/platform_data/x86/simatic-ipc.h +++ b/include/linux/platform_data/x86/simatic-ipc.h @@ -32,6 +32,7 @@ enum simatic_ipc_station_ids { SIMATIC_IPC_IPC477E =3D 0x00000A02, SIMATIC_IPC_IPC127E =3D 0x00000D01, SIMATIC_IPC_IPC227G =3D 0x00000F01, + SIMATIC_IPC_IPC427G =3D 0x00001001, }; =20 static inline u32 simatic_ipc_get_station_id(u8 *data, int max_len) --=20 2.35.1