From patchwork Fri Feb 17 18:49:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Kaehn X-Patchwork-Id: 13145157 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 879ACC64ED8 for ; Fri, 17 Feb 2023 18:49:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229663AbjBQStK (ORCPT ); Fri, 17 Feb 2023 13:49:10 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50432 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229574AbjBQStJ (ORCPT ); Fri, 17 Feb 2023 13:49:09 -0500 Received: from mail-oi1-x234.google.com (mail-oi1-x234.google.com [IPv6:2607:f8b0:4864:20::234]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7264E3C2C; Fri, 17 Feb 2023 10:49:08 -0800 (PST) Received: by mail-oi1-x234.google.com with SMTP id bk11so2059754oib.13; Fri, 17 Feb 2023 10:49:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=uGjpuoHToThUojmYOw0QiZ7tHvBkaksCb1ZjIQGUb8s=; b=IhuHwJ5AOQ1tMYgRa7H14VFW3Ad6DRVwGiO+2L3b5lWyZ/9qI/7ew+vp4sPhc3P40F MFmPQZ2mqZ1N6RePXea61bxkRGhCJlQtcKceMqqjVVkiWkzcpcuM/lSvNmn/23PRpAkx 9MWgh7c4x0Slo1IWFSTP73mm0nDwttAD+vGoOuoXQurzYpntafjj3fXLpe6u5iBpQLD0 woN4Y5UV6Blhg4JtIDad1CxX5gioDyy2h6rk43bIX4+wlfvM1YYSuFoeopnr1fb/a3zL IAtb0YqrEgQ1qhrM3rGjjCZgm+3GTVSXLWkoSC8w76l0l0kt2kRz/felNVCqZDZQYgop MEWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=uGjpuoHToThUojmYOw0QiZ7tHvBkaksCb1ZjIQGUb8s=; b=RX46+GOr+327eCG5iGv+7n2B42avqIcGvPYZnu5qgo5FPvq6OfTBTNjnl8j+MXL7Xf 9sRYcJQZIZb+4nS6+Z1si5jW7xjKivygyJEWJkiOeWPLpA3yAtS8GJwX6uc2/1Q2ZD3c ZCT0gb/BUZKG+n1Ck5dujoyWmczVacXq2F8iTtLJGZDb7IlSol/aCekNZiCjIg8R0nnj vZrb09j5N8MUarpcDzN0t90e3gBG8BahPzc5QKgU4GbSSma7P98Dl+chn1+1TdjajlTJ ON6Xygd3r8TDm7wxg5Z2K4y1AlsskJRsPIx9aUbsBS4EFM5WPflNmeHiOmxT/i3YxaOF ZhTw== X-Gm-Message-State: AO0yUKULls5W45BZ37jjJ0hS1UAv+9Vxc5Oz9iTdy8GYuUytIQux5/A6 6pSTgF759y4rw+S5ragghpw= X-Google-Smtp-Source: AK7set+OD1vw4/qalPmJjvKoW0eLx84iB5jzcU90B6X714jWINjVpNjwfNO5fOE2fLeCrgaax7ErZw== X-Received: by 2002:a54:4896:0:b0:378:974b:4fe6 with SMTP id r22-20020a544896000000b00378974b4fe6mr924901oic.8.1676659747607; Fri, 17 Feb 2023 10:49:07 -0800 (PST) Received: from DANNY-DESKTOP.localdomain (071-013-243-092.res.spectrum.com. [71.13.243.92]) by smtp.gmail.com with ESMTPSA id s22-20020acaa916000000b0037fa61eb1dasm1198521oie.47.2023.02.17.10.49.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Feb 2023 10:49:07 -0800 (PST) From: Danny Kaehn To: robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, jikos@kernel.org, benjamin.tissoires@redhat.com Cc: bartosz.golaszewski@linaro.org, andriy.shevchenko@linux.intel.com, dmitry.torokhov@gmail.com, devicetree@vger.kernel.org, linux-input@vger.kernel.org, ethan.twardy@plexus.com Subject: [PATCH v6 1/3] dt-bindings: i2c: Add CP2112 HID USB to SMBus Bridge Date: Fri, 17 Feb 2023 12:49:02 -0600 Message-Id: <20230217184904.1290-2-kaehndan@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230217184904.1290-1-kaehndan@gmail.com> References: <20230217184904.1290-1-kaehndan@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org This is a USB HID device which includes an I2C controller and 8 GPIO pins. The binding allows describing the chip's gpio and i2c controller in DT using the subnodes named "gpio" and "i2c", respectively. This is intended to be used in configurations where the CP2112 is permanently connected in hardware. Signed-off-by: Danny Kaehn Reviewed-by: Rob Herring --- .../bindings/i2c/silabs,cp2112.yaml | 113 ++++++++++++++++++ 1 file changed, 113 insertions(+) create mode 100644 Documentation/devicetree/bindings/i2c/silabs,cp2112.yaml diff --git a/Documentation/devicetree/bindings/i2c/silabs,cp2112.yaml b/Documentation/devicetree/bindings/i2c/silabs,cp2112.yaml new file mode 100644 index 000000000000..a27509627804 --- /dev/null +++ b/Documentation/devicetree/bindings/i2c/silabs,cp2112.yaml @@ -0,0 +1,113 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/i2c/silabs,cp2112.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: CP2112 HID USB to SMBus/I2C Bridge + +maintainers: + - Danny Kaehn + +description: + The CP2112 is a USB HID device which includes an integrated I2C controller + and 8 GPIO pins. Its GPIO pins can each be configured as inputs, open-drain + outputs, or push-pull outputs. + +properties: + compatible: + const: usb10c4,ea90 + + reg: + maxItems: 1 + description: The USB port number on the host controller + + i2c: + description: The SMBus/I2C controller node for the CP2112 + $ref: /schemas/i2c/i2c-controller.yaml# + unevaluatedProperties: false + + properties: + sda-gpios: + maxItems: 1 + + scl-gpios: + maxItems: 1 + + clock-frequency: + minimum: 10000 + default: 100000 + maximum: 400000 + + gpio: + description: The GPIO controller node for the CP2112 + type: object + unevaluatedProperties: false + + properties: + interrupt-controller: true + "#interrupt-cells": + const: 2 + + gpio-controller: true + "#gpio-cells": + const: 2 + + gpio-line-names: + minItems: 1 + maxItems: 8 + + patternProperties: + "-hog(-[0-9]+)?$": + type: object + + required: + - gpio-hog + +required: + - compatible + - reg + +additionalProperties: false + +examples: + - | + #include + #include + + usb { + #address-cells = <1>; + #size-cells = <0>; + + device@1 { + compatible = "usb10c4,ea90"; + reg = <1>; + + i2c { + #address-cells = <1>; + #size-cells = <0>; + sda-gpios = <&cp2112_gpio 0 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; + scl-gpios = <&cp2112_gpio 1 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; + + temp@48 { + compatible = "national,lm75"; + reg = <0x48>; + }; + }; + + cp2112_gpio: gpio { + gpio-controller; + interrupt-controller; + #gpio-cells = <2>; + gpio-line-names = "CP2112_SDA", "CP2112_SCL", "TEST2", + "TEST3","TEST4", "TEST5", "TEST6"; + + fan-rst-hog { + gpio-hog; + gpios = <7 GPIO_ACTIVE_HIGH>; + output-high; + line-name = "FAN_RST"; + }; + }; + }; + }; From patchwork Fri Feb 17 18:49:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Kaehn X-Patchwork-Id: 13145158 X-Patchwork-Delegate: jikos@jikos.cz 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 9F033C64ED9 for ; Fri, 17 Feb 2023 18:49:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229670AbjBQStM (ORCPT ); Fri, 17 Feb 2023 13:49:12 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50452 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229574AbjBQStK (ORCPT ); Fri, 17 Feb 2023 13:49:10 -0500 Received: from mail-oi1-x22a.google.com (mail-oi1-x22a.google.com [IPv6:2607:f8b0:4864:20::22a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A5CAF3C2C; Fri, 17 Feb 2023 10:49:09 -0800 (PST) Received: by mail-oi1-x22a.google.com with SMTP id g30so2190225oic.0; Fri, 17 Feb 2023 10:49:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=PB9yw80m4eUWIlzkt3mXh3jD0Iw3rE375qRHv4MHbow=; b=hDzVfPqBTQIJKUT2QIQPiT56235k+GG9IusgG4d+ROF+ejNxliNO+7cEn4bYzCIA2j yWBP1pscQWQi6B1Of6iqaTUpkzAdiTVaCM2uGRITFlzRYH6YPOLxXqHRWP2glaLcZe2U WQORSZ/FeRsSIS2l7YynqkFtxzOL1I4rHtldBXwdmXhaMvyJXAtLYqGD5LhThDtTB0K8 11YEnfo3UIyaR3POHPrBc/5tKQ3LzVAlXyoOxWC9Mf7pZ2+y78d1X5ekt+B8ALNB6MEU ojU+zsvlvheOhiMGll15Arf34FDwIN95B0ub3SyEUdFDq4tnWXPA6csVEQKAtusEj/Di NFAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=PB9yw80m4eUWIlzkt3mXh3jD0Iw3rE375qRHv4MHbow=; b=Isl3Rr4IyRJK8uWvpG9FBlyD9n03DcpQj8FG/z8xWUeqs3FIALgAsdeSlLnvJtuwcl pTza7hGRrtNRFj/PDwZA6d8aa4WNR4ewh1+q2wWBnT0tmpqv07k4sUGJ+ujKNLcLTYYx ZRKVobatV+g1jNQIs/5cLV27Qc0C7762ARhL1Tngk7MdinwYkcwlJSJuqHT+XvOd/zSJ tx9p7+1IWHqBX8sJfOTLzanswUNwj6xFmcmCTcyhnDUOhVYZjv/OemrCnvqi6NlYcVfA ImqRQ6JQtDAbQzIsD3AjggfCfENRMfBoK1BW1AEPpnlMkpYTGEt0mdHNmtpPlPDgHfVj SiUQ== X-Gm-Message-State: AO0yUKXSioE8BUonvgHigNcmn1G04Txx92ttL87lpLo9d17i8dtXYCkB BJNiQhgM1zCVynpUkwi2nkZ1kiX+rLeG+Q== X-Google-Smtp-Source: AK7set+v69wOFExUGByI++AQS8WvVNTG9oNF01wwy7YIuDbWJ8YT1xBtqUtoKSYrijFBKpt5sa8vcw== X-Received: by 2002:a05:6808:200d:b0:367:e4e:ed98 with SMTP id q13-20020a056808200d00b003670e4eed98mr3779696oiw.23.1676659748905; Fri, 17 Feb 2023 10:49:08 -0800 (PST) Received: from DANNY-DESKTOP.localdomain (071-013-243-092.res.spectrum.com. [71.13.243.92]) by smtp.gmail.com with ESMTPSA id s22-20020acaa916000000b0037fa61eb1dasm1198521oie.47.2023.02.17.10.49.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Feb 2023 10:49:08 -0800 (PST) From: Danny Kaehn To: robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, jikos@kernel.org, benjamin.tissoires@redhat.com Cc: bartosz.golaszewski@linaro.org, andriy.shevchenko@linux.intel.com, dmitry.torokhov@gmail.com, devicetree@vger.kernel.org, linux-input@vger.kernel.org, ethan.twardy@plexus.com Subject: [PATCH v6 2/3] HID: usbhid: Share USB device firmware node with child HID device Date: Fri, 17 Feb 2023 12:49:03 -0600 Message-Id: <20230217184904.1290-3-kaehndan@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230217184904.1290-1-kaehndan@gmail.com> References: <20230217184904.1290-1-kaehndan@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org USB HID core now shares its fwnode with its child HID device. Since there can only be one HID device on a USB interface, it is redundant to specify a hid node under the USB device. This allows usb HID device drivers to be described in firmware and make use of device properties. Signed-off-by: Danny Kaehn Reviewed-by: Andy Shevchenko --- drivers/hid/usbhid/hid-core.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c index be4c731aaa65..a0859c49d9f4 100644 --- a/drivers/hid/usbhid/hid-core.c +++ b/drivers/hid/usbhid/hid-core.c @@ -19,6 +19,7 @@ #include #include #include +#include #include #include #include @@ -1369,6 +1370,7 @@ static int usbhid_probe(struct usb_interface *intf, const struct usb_device_id * hid->hiddev_report_event = hiddev_report_event; #endif hid->dev.parent = &intf->dev; + device_set_node(&hid->dev, dev_fwnode(&intf->dev)); hid->bus = BUS_USB; hid->vendor = le16_to_cpu(dev->descriptor.idVendor); hid->product = le16_to_cpu(dev->descriptor.idProduct); From patchwork Fri Feb 17 18:49:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Kaehn X-Patchwork-Id: 13145159 X-Patchwork-Delegate: jikos@jikos.cz 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 B7503C05027 for ; Fri, 17 Feb 2023 18:49:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229668AbjBQStO (ORCPT ); Fri, 17 Feb 2023 13:49:14 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50536 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229574AbjBQStO (ORCPT ); Fri, 17 Feb 2023 13:49:14 -0500 Received: from mail-oi1-x22c.google.com (mail-oi1-x22c.google.com [IPv6:2607:f8b0:4864:20::22c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 18F565FC50; Fri, 17 Feb 2023 10:49:11 -0800 (PST) Received: by mail-oi1-x22c.google.com with SMTP id t13so2263700oiw.1; Fri, 17 Feb 2023 10:49:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=S3yNRn8MWww6wdZq63JvrvwjyqjnOgv65RZw/9AtJW8=; b=WeIZuz5swzFWt4PORzyQejSbIJdFOlwYAngYOhJeg2nCwSSn3PyCu7HlH2BL5rjMel qyajIQ75pSJL3iGudsIQcqWJC1yPuQ4RMTVdMjf3smTuIOdZQ7iCdAu0tWCwdd4eS3+g Fz5ildGg3VTyBGkx12IW6/2GsrPh///Acfx1d48y3kHG2GoVJvgasl6/AGa8getZgesp gva2G4KKxwKRRb/5sESMFZiWkF1jw/+O7GDeAwNIFwRuDWHCiaPwjoSEULnplcwwxpjd fyLi+DiboFyZ3vDGC5SJK4UcykIuyHyX2sS619zHMIVO8YJsCFDhSfLX9kegeDrbWm1+ DvHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=S3yNRn8MWww6wdZq63JvrvwjyqjnOgv65RZw/9AtJW8=; b=l/E4t0Ex666NuUqaeTu0Oyc7K1LIoTermC1E2uXpIXLmn6ihEnvXBjr2x8vt0O1AKY NTN2f6wFjk6EkkiMUpznjHYB9prdkmIAtdrd/Sk1YvQRObGlwwvSAhTtNUJz4m4CfL5n 0gMnsm6Vt1sxVgibfGE3BAjC3IJFtQfw3sPEy0bnMVh/g4wxeguCTmft/ltfVtv0ODBX TqExrjZ+Kvj4P33CoZweGyCmT7WLGLdsWTF1UvxZXIqW8rhr4a4hCJ+oaRK80knYS5EE ZlCmz8Zca7QpxfOYn4vOGpHPsTWf0eTMP64lfpUGFPV9Km3TLyX/fTalEDBtpcJOM3iq yhqw== X-Gm-Message-State: AO0yUKVX3oODV9JXfilXWnXwGshG6iYCqp+1pF9FNT/jSDf5lmq/DTYi kTXMhScntINk0HWyPIsScJI= X-Google-Smtp-Source: AK7set+FDkP+n2jORChu0F4S+5U5L8MGXN9ERX14b1GmWD+Sm+twNGSgg9lPEZ7G/F0WyREkFMH8qA== X-Received: by 2002:a05:6808:5ce:b0:37b:4e19:3fd2 with SMTP id d14-20020a05680805ce00b0037b4e193fd2mr1186396oij.55.1676659750340; Fri, 17 Feb 2023 10:49:10 -0800 (PST) Received: from DANNY-DESKTOP.localdomain (071-013-243-092.res.spectrum.com. [71.13.243.92]) by smtp.gmail.com with ESMTPSA id s22-20020acaa916000000b0037fa61eb1dasm1198521oie.47.2023.02.17.10.49.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Feb 2023 10:49:09 -0800 (PST) From: Danny Kaehn To: robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, jikos@kernel.org, benjamin.tissoires@redhat.com Cc: bartosz.golaszewski@linaro.org, andriy.shevchenko@linux.intel.com, dmitry.torokhov@gmail.com, devicetree@vger.kernel.org, linux-input@vger.kernel.org, ethan.twardy@plexus.com Subject: [PATCH v6 3/3] HID: cp2112: Fwnode Support Date: Fri, 17 Feb 2023 12:49:04 -0600 Message-Id: <20230217184904.1290-4-kaehndan@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230217184904.1290-1-kaehndan@gmail.com> References: <20230217184904.1290-1-kaehndan@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org Bind i2c and gpio interfaces to subnodes with names "i2c" and "gpio" if they exist, respectively. This allows the gpio and i2c controllers to be described in firmware as usual. Additionally, support configuring the i2c bus speed from the clock-frequency device property. Signed-off-by: Danny Kaehn --- drivers/hid/hid-cp2112.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/drivers/hid/hid-cp2112.c b/drivers/hid/hid-cp2112.c index 27cadadda7c9..0013bf863f0f 100644 --- a/drivers/hid/hid-cp2112.c +++ b/drivers/hid/hid-cp2112.c @@ -1234,6 +1234,7 @@ static int cp2112_probe(struct hid_device *hdev, const struct hid_device_id *id) u8 buf[3]; struct cp2112_smbus_config_report config; struct gpio_irq_chip *girq; + struct i2c_timings timings; int ret; dev = devm_kzalloc(&hdev->dev, sizeof(*dev), GFP_KERNEL); @@ -1292,6 +1293,10 @@ static int cp2112_probe(struct hid_device *hdev, const struct hid_device_id *id) goto err_power_normal; } + device_set_node(&dev->adap.dev, device_get_named_child_node(&hdev->dev, "i2c")); + i2c_parse_fw_timings(&dev->adap.dev, &timings, true); + + config.clock_speed = cpu_to_be32(timings.bus_freq_hz); config.retry_time = cpu_to_be16(1); ret = cp2112_hid_output(hdev, (u8 *)&config, sizeof(config), @@ -1300,7 +1305,7 @@ static int cp2112_probe(struct hid_device *hdev, const struct hid_device_id *id) hid_err(hdev, "error setting SMBus config\n"); if (ret >= 0) ret = -EIO; - goto err_power_normal; + goto err_free_i2c_of; } hid_set_drvdata(hdev, (void *)dev); @@ -1322,7 +1327,7 @@ static int cp2112_probe(struct hid_device *hdev, const struct hid_device_id *id) if (ret) { hid_err(hdev, "error registering i2c adapter\n"); - goto err_power_normal; + goto err_free_i2c_of; } hid_dbg(hdev, "adapter registered\n"); @@ -1336,6 +1341,7 @@ static int cp2112_probe(struct hid_device *hdev, const struct hid_device_id *id) dev->gc.ngpio = 8; dev->gc.can_sleep = 1; dev->gc.parent = &hdev->dev; + dev->gc.fwnode = device_get_named_child_node(&hdev->dev, "gpio"); dev->irq.name = "cp2112-gpio"; dev->irq.irq_startup = cp2112_gpio_irq_startup; @@ -1376,7 +1382,10 @@ static int cp2112_probe(struct hid_device *hdev, const struct hid_device_id *id) err_gpiochip_remove: gpiochip_remove(&dev->gc); err_free_i2c: + fwnode_handle_put(dev->gc.fwnode); i2c_del_adapter(&dev->adap); +err_free_i2c_of: + fwnode_handle_put(dev->adap.dev.fwnode); err_power_normal: hid_hw_power(hdev, PM_HINT_NORMAL); err_hid_close: @@ -1391,6 +1400,8 @@ static void cp2112_remove(struct hid_device *hdev) struct cp2112_device *dev = hid_get_drvdata(hdev); int i; + fwnode_handle_put(dev->gc.fwnode); + fwnode_handle_put(dev->adap.dev.fwnode); sysfs_remove_group(&hdev->dev.kobj, &cp2112_attr_group); i2c_del_adapter(&dev->adap);