From patchwork Mon Dec 18 09:17:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcin Wojtas X-Patchwork-Id: 849919 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="vEGlVfvI"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3z0bBg03pGz9rxm for ; Mon, 18 Dec 2017 20:21:31 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933359AbdLRJVM (ORCPT ); Mon, 18 Dec 2017 04:21:12 -0500 Received: from mail-lf0-f68.google.com ([209.85.215.68]:36522 "EHLO mail-lf0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933307AbdLRJSQ (ORCPT ); Mon, 18 Dec 2017 04:18:16 -0500 Received: by mail-lf0-f68.google.com with SMTP id f20so16950592lfe.3 for ; Mon, 18 Dec 2017 01:18:15 -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=bNAT0y0tuLP3KP1q1q4PpjvzgVJR2LG8mUxU6Y+V3J8=; b=vEGlVfvIc8Me8213FBUuOYrBfLWE3dhnd655ix3a1o81O5LADBCyQPAe4Hwz10Q3fl 8VeQ49+xTaabpPpqX4Jsltqo4JZ/cBnY99YroO4AxxUrxcaJmBrfQpdjsTRjCITMrSBj WTc4jqfPj426mjHHB0CMeV7PFb9qUYIHNHQBRFDPi5dMctVhx5lXFSjkj5YwS0GFFGXn 4ppxOlT2Y7Z2LTFee2GCd+PaUrB/2TiA+ryhErgEVnEzNZWfmoQYhOoam8uWf1RulG/O YZ5cO2FNjWVwrFXjXAgmba7uIUaaH1U0tp85nXuPIxIqWo7k0c3YDC3lPnRcFZm5Qkqs RLuw== 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=bNAT0y0tuLP3KP1q1q4PpjvzgVJR2LG8mUxU6Y+V3J8=; b=YtNVoL8OOl6EEbf/+GWT5e5DBUqFWQfCE5ZU/d9hUvZlB8FXALdoWwu7xy/GTj+s4Z C3QFfy9uEtQrRbKvdPXiLpCtEN8LpFytLCLyVb9XrqWRmsJmEdRRVoJh+FPU/AJJpegn dSpWsRJGQXpX3nEEW7N3uFzFj1mRsnzQISg1RWUVCN+pbUSqGxrrdj7+tZOSQpPQ4u0o oVgNGNFe5oBXPKhpqcsvhM/k1qMpK3Tw/naQvlLv/NP77T8w+5lto1qCL/M8M8ODxQeQ 80knMs2Hj2n0TPx82NzqrHkUwIazfgAJYxcXKgJrAmOIFZL/Mb0a99JlBt6OAZnLqGxX +6Fw== X-Gm-Message-State: AKGB3mLJf/4O2034RIeYtvw61XRt7X+FsZjyaVuHvON7L0JjesRaNpYu NDcbTAQMI1nAS1uCUVAyZxqE8Q== X-Google-Smtp-Source: ACJfBosqjVKT7GvsY2a44/ODq9lzaSQzVZTbym9qUIp2tlE78a78s68VGRkZP1Z4cl9JIz9jTKQ7RA== X-Received: by 10.46.4.2 with SMTP id 2mr10762096lje.133.1513588695006; Mon, 18 Dec 2017 01:18:15 -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 r16sm2407186ljd.18.2017.12.18.01.18.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 18 Dec 2017 01:18:14 -0800 (PST) From: Marcin Wojtas To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, netdev@vger.kernel.org Cc: davem@davemloft.net, linux@arm.linux.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, ezequiel.garcia@free-electrons.com, nadavh@marvell.com, neta@marvell.com, ard.biesheuvel@linaro.org, mw@semihalf.com, jaz@semihalf.com, tn@semihalf.com Subject: [net-next: PATCH 2/8] device property: Introduce fwnode_get_phy_mode() Date: Mon, 18 Dec 2017 10:17:58 +0100 Message-Id: <1513588684-15647-3-git-send-email-mw@semihalf.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1513588684-15647-1-git-send-email-mw@semihalf.com> References: <1513588684-15647-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 almost identical functions for obtaining network PHY mode - of_get_phy_mode() and, more generic, device_get_phy_mode(). However it is not uncommon, that the network interface is represented as a child of the actual controller, hence it is not associated directly to any struct device, required by the latter routine. This commit allows for getting the PHY mode for children nodes in the ACPI world by introducing a new function - fwnode_get_phy_mode(). This commit also changes device_get_phy_mode() routine to be its wrapper, in order to prevent unnecessary duplication. Signed-off-by: Marcin Wojtas --- drivers/base/property.c | 24 ++++++++++++++++---- include/linux/property.h | 1 + 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/drivers/base/property.c b/drivers/base/property.c index f261d1a..7c4a53d 100644 --- a/drivers/base/property.c +++ b/drivers/base/property.c @@ -1126,21 +1126,21 @@ enum dev_dma_attr device_get_dma_attr(struct device *dev) EXPORT_SYMBOL_GPL(device_get_dma_attr); /** - * device_get_phy_mode - Get phy mode for given device - * @dev: Pointer to the given device + * fwnode_get_phy_mode - Get phy mode for given firmware node + * @fwnode: Pointer to the given node * * The function gets phy interface string from property 'phy-mode' or * 'phy-connection-type', and return its index in phy_modes table, or errno in * error case. */ -int device_get_phy_mode(struct device *dev) +int fwnode_get_phy_mode(struct fwnode_handle *fwnode) { const char *pm; int err, i; - err = device_property_read_string(dev, "phy-mode", &pm); + err = fwnode_property_read_string(fwnode, "phy-mode", &pm); if (err < 0) - err = device_property_read_string(dev, + err = fwnode_property_read_string(fwnode, "phy-connection-type", &pm); if (err < 0) return err; @@ -1151,6 +1151,20 @@ int device_get_phy_mode(struct device *dev) return -ENODEV; } +EXPORT_SYMBOL_GPL(fwnode_get_phy_mode); + +/** + * device_get_phy_mode - Get phy mode for given device + * @dev: Pointer to the given device + * + * The function gets phy interface string from property 'phy-mode' or + * 'phy-connection-type', and return its index in phy_modes table, or errno in + * error case. + */ +int device_get_phy_mode(struct device *dev) +{ + return fwnode_get_phy_mode(dev_fwnode(dev)); +} EXPORT_SYMBOL_GPL(device_get_phy_mode); static void *fwnode_get_mac_addr(struct fwnode_handle *fwnode, diff --git a/include/linux/property.h b/include/linux/property.h index 35620e0..9b13332 100644 --- a/include/linux/property.h +++ b/include/linux/property.h @@ -279,6 +279,7 @@ int device_get_phy_mode(struct device *dev); void *device_get_mac_address(struct device *dev, char *addr, int alen); +int fwnode_get_phy_mode(struct fwnode_handle *fwnode); void *fwnode_get_mac_address(struct fwnode_handle *fwnode, char *addr, int alen); struct fwnode_handle *fwnode_graph_get_next_endpoint(