From patchwork Wed Jan 17 16:55:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcin Wojtas X-Patchwork-Id: 862395 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=semihalf-com.20150623.gappssmtp.com header.i=@semihalf-com.20150623.gappssmtp.com header.b="DHeOjbkS"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zMCzx1myhz9s7f for ; Thu, 18 Jan 2018 04:01:49 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932157AbeAQQ4I (ORCPT ); Wed, 17 Jan 2018 11:56:08 -0500 Received: from mail-lf0-f65.google.com ([209.85.215.65]:39255 "EHLO mail-lf0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754204AbeAQQ4E (ORCPT ); Wed, 17 Jan 2018 11:56:04 -0500 Received: by mail-lf0-f65.google.com with SMTP id m8so22861976lfc.6 for ; Wed, 17 Jan 2018 08:56:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=semihalf-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=21Mi6hIYM3zfmLCRPrLyE3plIUz4Ga5083/xGwgP8HE=; b=DHeOjbkS+zUjewqXHxE3yJqEWbuQdpwAfuUD1HI7J6QuivOHYpWrRu4nN+hesABOAs +xz6kgp6qX8JYOpyZ1bHF0zULulpC6VpF+LVz6n0sD7eSdWpb5fASA1i0ncVLRw5jdiH bb2u56zwgmToZPA/zLRFDLjjaFxsO+5mjCY8UFK1gyq6toyVT7EZKqkB3TqKvYBahaRz PC/+M5mZ8uC/QhPeV6uI3s4V9ADJmV9zMJMb1iXiQ4jX/sejf4bTN7w/FwPEwPShmDsn uSO1pvslzp9mfwesH07RQfkIecrx70MKFpEBEHpMcmmtPmRz6so6N/tP6vpmq3gc2N3J PX3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=21Mi6hIYM3zfmLCRPrLyE3plIUz4Ga5083/xGwgP8HE=; b=NvoVUsOZKd7dLyejrSqOohHseUdP9lxMnf6qODanKPB1TLoR8LbsLkm+WSvl66zQJg xlqVPfDCBqER37Avms+1tubKs2V4b8LbAWeTsgo0IFA5+hc0DM+eY6SVqruhOHpBRnZn xHEIEJ9Q6OVilXCWW4VDcSwg2uDgp35CLCyYEyQXsr4eBu3RdGsIvWS5V4ubTWExzYIk 5dUnss3cijYNU1AccdDYbKcqphseC9Ve/c4vs6AsCVipU4d7E66J2nBbD71sTIwHB6fJ fsH20Wrko40FF70r8Ma8tnAWeF1yBjknEZnUpPJ197dkpik6WYJsBr+8L6W1cs8QBNCP KMLw== X-Gm-Message-State: AKwxyteR8zMGzcOBr28ujc8wkziZHe8E5RHUGE69FybfkZEIl/nNb5Iv zdTPQf2VQozBxYD6LeCmeYFYHA== X-Google-Smtp-Source: ACJfBov4pIlPpsHkypuBYouInsS7jh5vcghQ5TBtA+C4nKd0PDdjaFJ5Ljkz8gXn8Cg+juB7deqyfw== X-Received: by 10.46.85.149 with SMTP id g21mr19309252lje.118.1516208162761; Wed, 17 Jan 2018 08:56:02 -0800 (PST) Received: from gilgamesh.semihalf.com (31-172-191-173.noc.fibertech.net.pl. [31.172.191.173]) by smtp.gmail.com with ESMTPSA id t81sm868347lff.47.2018.01.17.08.56.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 17 Jan 2018 08:56:02 -0800 (PST) From: Marcin Wojtas To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, netdev@vger.kernel.org, linux-acpi@vger.kernel.org Cc: graeme.gregory@linaro.org, davem@davemloft.net, linux@armlinux.org.uk, rafael.j.wysocki@intel.com, andrew@lunn.ch, f.fainelli@gmail.com, antoine.tenart@free-electrons.com, thomas.petazzoni@free-electrons.com, gregory.clement@free-electrons.com, stefanc@marvell.com, nadavh@marvell.com, neta@marvell.com, ard.biesheuvel@linaro.org, mw@semihalf.com, jaz@semihalf.com, tn@semihalf.com Subject: [net-next: PATCH v3 3/7] device property: Introduce fwnode_irq_get() Date: Wed, 17 Jan 2018 17:55:42 +0100 Message-Id: <1516208146-4144-4-git-send-email-mw@semihalf.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516208146-4144-1-git-send-email-mw@semihalf.com> References: <1516208146-4144-1-git-send-email-mw@semihalf.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Until now there were two very similar functions allowing to get Linux IRQ number from ACPI handle (acpi_irq_get()) and OF node (of_irq_get()). The first one appeared to be used only as a subroutine of platform_irq_get(), which (in the generic code) limited IRQ obtaining from _CRS method only to nodes associated to kernel's struct platform_device. This patch introduces new helper routine - fwnode_irq_get(), which allows to get the IRQ number directly from the fwnode to be used as common for OF/ACPI worlds. Signed-off-by: Marcin Wojtas --- drivers/base/property.c | 27 ++++++++++++++++++++ include/linux/property.h | 2 ++ 2 files changed, 29 insertions(+) diff --git a/drivers/base/property.c b/drivers/base/property.c index 7c4a53d..adb3893 100644 --- a/drivers/base/property.c +++ b/drivers/base/property.c @@ -16,6 +16,7 @@ #include #include #include +#include #include #include #include @@ -1230,6 +1231,32 @@ void *device_get_mac_address(struct device *dev, char *addr, int alen) EXPORT_SYMBOL(device_get_mac_address); /** + * fwnode_irq_get - Get IRQ directly from a fwnode + * @fwnode: Pointer to the firmware node + * @index: Zero-based index of the IRQ + * + * Returns Linux IRQ number on success. Other values are determined + * accordingly to acpi_/of_ irq_get() operation. + */ +int fwnode_irq_get(struct fwnode_handle *fwnode, unsigned int index) +{ + struct acpi_device *adev = to_acpi_device_node(fwnode); + struct device_node *of_node = to_of_node(fwnode); + struct resource res; + int ret; + + if (IS_ENABLED(CONFIG_OF) && of_node) + return of_irq_get(of_node, index); + + ret = acpi_irq_get(acpi_device_handle(adev), index, &res); + if (ret) + return ret; + + return res.start; +} +EXPORT_SYMBOL(fwnode_irq_get); + +/** * device_graph_get_next_endpoint - Get next endpoint firmware node * @fwnode: Pointer to the parent firmware node * @prev: Previous endpoint node or %NULL to get the first diff --git a/include/linux/property.h b/include/linux/property.h index 9b13332..e05889f 100644 --- a/include/linux/property.h +++ b/include/linux/property.h @@ -103,6 +103,8 @@ struct fwnode_handle *device_get_named_child_node(struct device *dev, struct fwnode_handle *fwnode_handle_get(struct fwnode_handle *fwnode); void fwnode_handle_put(struct fwnode_handle *fwnode); +int fwnode_irq_get(struct fwnode_handle *fwnode, unsigned int index); + unsigned int device_get_child_node_count(struct device *dev); static inline bool device_property_read_bool(struct device *dev,