From patchwork Mon May 31 15:43:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 1485723 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=linux-pwm-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4Fv0D934ttz9sVm for ; Tue, 1 Jun 2021 01:52:25 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233549AbhEaPxv (ORCPT ); Mon, 31 May 2021 11:53:51 -0400 Received: from mga01.intel.com ([192.55.52.88]:52281 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232093AbhEaPvc (ORCPT ); Mon, 31 May 2021 11:51:32 -0400 IronPort-SDR: p26e1Z5f3/ELd9EJxyt+5dYTsqAU3hJoIMs0g3iVMR5h2WYyN34l8N/2ky3TBE1WrQz6gSG+Ls NreJ9VpaeGQA== X-IronPort-AV: E=McAfee;i="6200,9189,10001"; a="224646671" X-IronPort-AV: E=Sophos;i="5.83,237,1616482800"; d="scan'208";a="224646671" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 May 2021 08:43:45 -0700 IronPort-SDR: bUacGGLAouai1owasPOOdITRHZvnpmAWCdt0EG9QdG3Pxa5gRgBAyu2awMYUX+yPHWJZhg5l8x v35RkekfrXYQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.83,237,1616482800"; d="scan'208";a="632598639" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga006.fm.intel.com with ESMTP; 31 May 2021 08:43:43 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 1D45AC5; Mon, 31 May 2021 18:44:05 +0300 (EEST) From: Andy Shevchenko To: Andy Shevchenko , Flavio Suligoi , =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= , Thierry Reding , linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, linux-pwm@vger.kernel.org Cc: "Rafael J. Wysocki" , Len Brown , Lee Jones Subject: [PATCH v1 1/5] docs: firmware-guide: ACPI: Add a PWM example Date: Mon, 31 May 2021 18:43:47 +0300 Message-Id: <20210531154351.53614-1-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pwm@vger.kernel.org When PWM support for ACPI has been added into the kernel, it missed the documentation update. Hence update documentation here. Fixes: 4a6ef8e37c4d ("pwm: Add support referencing PWMs from ACPI") Signed-off-by: Andy Shevchenko --- .../firmware-guide/acpi/enumeration.rst | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/Documentation/firmware-guide/acpi/enumeration.rst b/Documentation/firmware-guide/acpi/enumeration.rst index 9f0d5c854fa4..0813508b45b0 100644 --- a/Documentation/firmware-guide/acpi/enumeration.rst +++ b/Documentation/firmware-guide/acpi/enumeration.rst @@ -258,6 +258,38 @@ input driver:: .id_table = mpu3050_ids, }; +Reference to PWM device +======================= + +Sometimes a device can be a consumer of PWM channel. Obviously OS would like +to know which one. To provide this mapping the special property has been +introduced, i.e.:: + + Device (DEV) + { + Name (_DSD, Package () + { + ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"), + Package () { + Package () { "compatible", Package () { "pwm-leds" } }, + Package () { "label", "alarm-led" }, + Package () { "pwms", + Package () { + "\\_SB.PCI0.PWM", // + 0, // + 600000, // + 0, // + } + } + } + + }) + ... + +In the above example the PWM-based LED driver references to the PWM channel 0 +of \_SB.PCI0.PWM device with initial period setting equal to 600 us (note that +value is given in nanoseconds). + GPIO support ============ From patchwork Mon May 31 15:43:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 1485722 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=linux-pwm-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4Fv0D36Dzkz9sVm for ; Tue, 1 Jun 2021 01:52:19 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233798AbhEaPxn (ORCPT ); Mon, 31 May 2021 11:53:43 -0400 Received: from mga17.intel.com ([192.55.52.151]:5456 "EHLO mga17.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231151AbhEaPvc (ORCPT ); Mon, 31 May 2021 11:51:32 -0400 IronPort-SDR: /LfIDPdao+dbiEowT+eGeEBaI/HQOVTXOGjnGQPoR/b+jumywikJmOQ2UFkaVJab5CvG2uwd9o 5SRz5HZDb5bA== X-IronPort-AV: E=McAfee;i="6200,9189,10001"; a="183733374" X-IronPort-AV: E=Sophos;i="5.83,237,1616482800"; d="scan'208";a="183733374" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 May 2021 08:43:45 -0700 IronPort-SDR: E2cRdlWDU8bCBCSGn0X40EqLjiY7bKk7LeaTpv7p8I5++9tIwWtMiu/FRHHC+WgEJO80mmVxpv VASRv3BWhWVA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.83,237,1616482800"; d="scan'208";a="548783833" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga004.jf.intel.com with ESMTP; 31 May 2021 08:43:43 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 2548473; Mon, 31 May 2021 18:44:06 +0300 (EEST) From: Andy Shevchenko To: Andy Shevchenko , Flavio Suligoi , =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= , Thierry Reding , linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, linux-pwm@vger.kernel.org Cc: "Rafael J. Wysocki" , Len Brown , Lee Jones Subject: [PATCH v1 2/5] pwm: core: Always require PWM flags to be provided Date: Mon, 31 May 2021 18:43:48 +0300 Message-Id: <20210531154351.53614-2-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210531154351.53614-1-andriy.shevchenko@linux.intel.com> References: <20210531154351.53614-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pwm@vger.kernel.org It makes little sense to make PWM flags optional since in case of multi-channel consumer the flags can be optional only for the last listed channel. Thus always require PWM flags to be provided. Fixes: 4a6ef8e37c4d ("pwm: Add support referencing PWMs from ACPI") Signed-off-by: Andy Shevchenko --- drivers/pwm/core.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/pwm/core.c b/drivers/pwm/core.c index c165c5822703..25f7b3370672 100644 --- a/drivers/pwm/core.c +++ b/drivers/pwm/core.c @@ -852,8 +852,10 @@ static struct pwm_chip *device_to_pwmchip(struct device *dev) * * This is analogous to of_pwm_get() except con_id is not yet supported. * ACPI entries must look like - * Package () {"pwms", Package () - * { , , [, ]}} + * Package () { "pwms", Package () { + * , , , , + * } + * } * * Returns: A pointer to the requested PWM device or an ERR_PTR()-encoded * error code on failure. @@ -877,7 +879,7 @@ static struct pwm_device *acpi_pwm_get(struct fwnode_handle *fwnode) if (!acpi) return ERR_PTR(-EINVAL); - if (args.nargs < 2) + if (args.nargs < 3) return ERR_PTR(-EPROTO); chip = device_to_pwmchip(&acpi->dev); @@ -891,7 +893,7 @@ static struct pwm_device *acpi_pwm_get(struct fwnode_handle *fwnode) pwm->args.period = args.args[1]; pwm->args.polarity = PWM_POLARITY_NORMAL; - if (args.nargs > 2 && args.args[2] & PWM_POLARITY_INVERTED) + if (args.args[2] & PWM_POLARITY_INVERTED) pwm->args.polarity = PWM_POLARITY_INVERSED; #endif From patchwork Mon May 31 15:43:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 1485721 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=linux-pwm-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4Fv0Ch5FVTz9sVm for ; Tue, 1 Jun 2021 01:52:00 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233736AbhEaPxQ (ORCPT ); Mon, 31 May 2021 11:53:16 -0400 Received: from mga18.intel.com ([134.134.136.126]:36246 "EHLO mga18.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233180AbhEaPvJ (ORCPT ); Mon, 31 May 2021 11:51:09 -0400 IronPort-SDR: MpvyMqsvtIpjIlDMJnvf2eBaGviM2hCGBMTGq481XKdr8qPWjjXOy8qBIBGgFxi8LCIByu9pHP 9lNe4lZuyiHw== X-IronPort-AV: E=McAfee;i="6200,9189,10001"; a="190738553" X-IronPort-AV: E=Sophos;i="5.83,237,1616482800"; d="scan'208";a="190738553" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 May 2021 08:43:45 -0700 IronPort-SDR: XvaeebbE9UkQYRBPBMrq2G4FzkuMC2lPXkyCIEOFZ7ip8kl+H0vQaruxmjZRRuAGy83OQjsYtL XV5zeQxA9Hng== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.83,237,1616482800"; d="scan'208";a="446639866" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga008.fm.intel.com with ESMTP; 31 May 2021 08:43:42 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 31A1F269; Mon, 31 May 2021 18:44:06 +0300 (EEST) From: Andy Shevchenko To: Andy Shevchenko , Flavio Suligoi , =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= , Thierry Reding , linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, linux-pwm@vger.kernel.org Cc: "Rafael J. Wysocki" , Len Brown , Lee Jones Subject: [PATCH v1 3/5] pwm: core: Convert to use fwnode for matching Date: Mon, 31 May 2021 18:43:49 +0300 Message-Id: <20210531154351.53614-3-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210531154351.53614-1-andriy.shevchenko@linux.intel.com> References: <20210531154351.53614-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pwm@vger.kernel.org When we traverse the list of the registered PWM controllers, use fwnode to match. This will help for further cleanup. Signed-off-by: Andy Shevchenko --- drivers/pwm/core.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/pwm/core.c b/drivers/pwm/core.c index 25f7b3370672..338d8ee369db 100644 --- a/drivers/pwm/core.c +++ b/drivers/pwm/core.c @@ -691,14 +691,14 @@ int pwm_adjust_config(struct pwm_device *pwm) } EXPORT_SYMBOL_GPL(pwm_adjust_config); -static struct pwm_chip *of_node_to_pwmchip(struct device_node *np) +static struct pwm_chip *fwnode_to_pwmchip(struct fwnode_handle *fwnode) { struct pwm_chip *chip; mutex_lock(&pwm_lock); list_for_each_entry(chip, &pwm_chips, list) - if (chip->dev && chip->dev->of_node == np) { + if (chip->dev && dev_fwnode(chip->dev) == fwnode) { mutex_unlock(&pwm_lock); return chip; } @@ -777,7 +777,7 @@ struct pwm_device *of_pwm_get(struct device *dev, struct device_node *np, return ERR_PTR(err); } - pc = of_node_to_pwmchip(args.np); + pc = fwnode_to_pwmchip(of_fwnode_handle(args.np)); if (IS_ERR(pc)) { if (PTR_ERR(pc) != -EPROBE_DEFER) pr_err("%s(): PWM chip not found\n", __func__); From patchwork Mon May 31 15:43:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 1485725 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=linux-pwm-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4Fv0Jn1bwYz9sVm for ; Tue, 1 Jun 2021 01:56:25 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233645AbhEaP55 (ORCPT ); Mon, 31 May 2021 11:57:57 -0400 Received: from mga04.intel.com ([192.55.52.120]:56056 "EHLO mga04.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233472AbhEaPzy (ORCPT ); Mon, 31 May 2021 11:55:54 -0400 IronPort-SDR: s0FTc/YbxE7QzVi/bTxlK4RSQRdK+yP/N2Rypjl0kq1qvt9HOusIUm8pnoC/BZ6uMwS0CU7AZ/ 9qVrB8dBsdOw== X-IronPort-AV: E=McAfee;i="6200,9189,10001"; a="201505433" X-IronPort-AV: E=Sophos;i="5.83,237,1616482800"; d="scan'208";a="201505433" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 May 2021 08:43:45 -0700 IronPort-SDR: TXtl/zScOFPmQNPQ8sezJRx5zr1/C0bV8LKZJwh8ibbvi946550nEEK5gsUhzGa/2NbP2pls4Y 7wQnRp/8iy7g== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.83,237,1616482800"; d="scan'208";a="635194189" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga005.fm.intel.com with ESMTP; 31 May 2021 08:43:44 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 3AFA73B6; Mon, 31 May 2021 18:44:06 +0300 (EEST) From: Andy Shevchenko To: Andy Shevchenko , Flavio Suligoi , =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= , Thierry Reding , linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, linux-pwm@vger.kernel.org Cc: "Rafael J. Wysocki" , Len Brown , Lee Jones Subject: [PATCH v1 4/5] pwm: core: Reuse fwnode_to_pwmchip() in ACPI case Date: Mon, 31 May 2021 18:43:50 +0300 Message-Id: <20210531154351.53614-4-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210531154351.53614-1-andriy.shevchenko@linux.intel.com> References: <20210531154351.53614-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pwm@vger.kernel.org In ACPI case we may use matching by fwnode as provided via fwnode_to_pwmchip(). This makes device_to_pwmchip() not needed anymore. Signed-off-by: Andy Shevchenko --- drivers/pwm/core.c | 31 +------------------------------ 1 file changed, 1 insertion(+), 30 deletions(-) diff --git a/drivers/pwm/core.c b/drivers/pwm/core.c index 338d8ee369db..2223a9b6644b 100644 --- a/drivers/pwm/core.c +++ b/drivers/pwm/core.c @@ -819,28 +819,6 @@ struct pwm_device *of_pwm_get(struct device *dev, struct device_node *np, } EXPORT_SYMBOL_GPL(of_pwm_get); -#if IS_ENABLED(CONFIG_ACPI) -static struct pwm_chip *device_to_pwmchip(struct device *dev) -{ - struct pwm_chip *chip; - - mutex_lock(&pwm_lock); - - list_for_each_entry(chip, &pwm_chips, list) { - struct acpi_device *adev = ACPI_COMPANION(chip->dev); - - if ((chip->dev == dev) || (adev && &adev->dev == dev)) { - mutex_unlock(&pwm_lock); - return chip; - } - } - - mutex_unlock(&pwm_lock); - - return ERR_PTR(-EPROBE_DEFER); -} -#endif - /** * acpi_pwm_get() - request a PWM via parsing "pwms" property in ACPI * @fwnode: firmware node to get the "pwm" property from @@ -863,9 +841,7 @@ static struct pwm_chip *device_to_pwmchip(struct device *dev) static struct pwm_device *acpi_pwm_get(struct fwnode_handle *fwnode) { struct pwm_device *pwm = ERR_PTR(-ENODEV); -#if IS_ENABLED(CONFIG_ACPI) struct fwnode_reference_args args; - struct acpi_device *acpi; struct pwm_chip *chip; int ret; @@ -875,14 +851,10 @@ static struct pwm_device *acpi_pwm_get(struct fwnode_handle *fwnode) if (ret < 0) return ERR_PTR(ret); - acpi = to_acpi_device_node(args.fwnode); - if (!acpi) - return ERR_PTR(-EINVAL); - if (args.nargs < 3) return ERR_PTR(-EPROTO); - chip = device_to_pwmchip(&acpi->dev); + chip = fwnode_to_pwmchip(args.fwnode); if (IS_ERR(chip)) return ERR_CAST(chip); @@ -895,7 +867,6 @@ static struct pwm_device *acpi_pwm_get(struct fwnode_handle *fwnode) if (args.args[2] & PWM_POLARITY_INVERTED) pwm->args.polarity = PWM_POLARITY_INVERSED; -#endif return pwm; } From patchwork Mon May 31 15:43:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 1485724 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=linux-pwm-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4Fv0G15sWWz9sVm for ; Tue, 1 Jun 2021 01:54:01 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233289AbhEaPzi (ORCPT ); Mon, 31 May 2021 11:55:38 -0400 Received: from mga01.intel.com ([192.55.52.88]:55656 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232269AbhEaPwg (ORCPT ); Mon, 31 May 2021 11:52:36 -0400 IronPort-SDR: 43H4sn0L5vaNFr+7BXNo9YCDUT845mHLaVW3ySn2nYMp+gJNsS4sPOPFSsTXy0wdiBTT3/8/ct 8UrgL1fzRUzA== X-IronPort-AV: E=McAfee;i="6200,9189,10001"; a="224646681" X-IronPort-AV: E=Sophos;i="5.83,237,1616482800"; d="scan'208";a="224646681" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 May 2021 08:43:46 -0700 IronPort-SDR: Ze6F2cxgGNTOaPBhzTKwYC/VwMvmhciO/YebQki01o/HDH95rlBCW24a69hid73wIg4t0FP1dz DXIoyF0KWuFA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.83,237,1616482800"; d="scan'208";a="616564760" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga005.jf.intel.com with ESMTP; 31 May 2021 08:43:43 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 44455456; Mon, 31 May 2021 18:44:06 +0300 (EEST) From: Andy Shevchenko To: Andy Shevchenko , Flavio Suligoi , =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= , Thierry Reding , linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, linux-pwm@vger.kernel.org Cc: "Rafael J. Wysocki" , Len Brown , Lee Jones Subject: [PATCH v1 5/5] pwm: core: Unify fwnode checks in the module Date: Mon, 31 May 2021 18:43:51 +0300 Message-Id: <20210531154351.53614-5-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210531154351.53614-1-andriy.shevchenko@linux.intel.com> References: <20210531154351.53614-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pwm@vger.kernel.org Historically we have two different approaches on how to check type of fwnode. Unify them using the latest and greatest fwnode related APIs. Signed-off-by: Andy Shevchenko --- drivers/pwm/core.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/pwm/core.c b/drivers/pwm/core.c index 2223a9b6644b..135eb5af9191 100644 --- a/drivers/pwm/core.c +++ b/drivers/pwm/core.c @@ -838,7 +838,7 @@ EXPORT_SYMBOL_GPL(of_pwm_get); * Returns: A pointer to the requested PWM device or an ERR_PTR()-encoded * error code on failure. */ -static struct pwm_device *acpi_pwm_get(struct fwnode_handle *fwnode) +static struct pwm_device *acpi_pwm_get(const struct fwnode_handle *fwnode) { struct pwm_device *pwm = ERR_PTR(-ENODEV); struct fwnode_reference_args args; @@ -922,6 +922,7 @@ void pwm_remove_table(struct pwm_lookup *table, size_t num) */ struct pwm_device *pwm_get(struct device *dev, const char *con_id) { + const struct fwnode_handle *fwnode = dev ? dev_fwnode(dev) : NULL; const char *dev_id = dev ? dev_name(dev) : NULL; struct pwm_device *pwm; struct pwm_chip *chip; @@ -932,12 +933,12 @@ struct pwm_device *pwm_get(struct device *dev, const char *con_id) int err; /* look up via DT first */ - if (IS_ENABLED(CONFIG_OF) && dev && dev->of_node) - return of_pwm_get(dev, dev->of_node, con_id); + if (is_of_node(fwnode)) + return of_pwm_get(dev, to_of_node(fwnode), con_id); /* then lookup via ACPI */ - if (dev && is_acpi_node(dev->fwnode)) { - pwm = acpi_pwm_get(dev->fwnode); + if (is_acpi_node(fwnode)) { + pwm = acpi_pwm_get(fwnode); if (!IS_ERR(pwm) || PTR_ERR(pwm) != -ENOENT) return pwm; }