From patchwork Sun Dec 31 11:58:37 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcin Wojtas X-Patchwork-Id: 854216 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="Oswlm4Q7"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3z8f5n0Pwcz9s84 for ; Sun, 31 Dec 2017 23:00:13 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751348AbdLaMAK (ORCPT ); Sun, 31 Dec 2017 07:00:10 -0500 Received: from mail-lf0-f67.google.com ([209.85.215.67]:39354 "EHLO mail-lf0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751029AbdLaL6z (ORCPT ); Sun, 31 Dec 2017 06:58:55 -0500 Received: by mail-lf0-f67.google.com with SMTP id m20so38718908lfi.6 for ; Sun, 31 Dec 2017 03:58:54 -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=Oswlm4Q7+hpomGDeCJRhxbhtS0gPidP5zdk3/HB/RWG8Y6Gm29igmyjx6fylRZQJTZ srSFZohdsz2148FuzJzmxH+k0dg0np4lb3Tr2FjMSwfNXeYcPKMvClZ+7LXRMTOvA4tI wh/OuQPWoB5yZQdWa2mIWW8PVM8ckr3No3Gbz1CNSVuf0eWqUBjcuRGUiWcj/6+hpAGY agPqno+JvODvM7g7SPN3IoubIlcPGAx4bWdDtYEBgcbWMDNfv8GjdHjF9Uvd3kJdN+o4 Nzq/kexuab1aAkULKQ3kcXOUh4wr95B+tos+hpAkpD3b5Ilygx5FelReDCL3FtNL73xC Hayg== 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=hwNtg4tOHNWZe+PueRZu1QFw0TWaa16bAzwLo58cO9gx8sRuOPnHazSm7s9mmm9jUf PL/BwVojF2iZi9D42VIrxS7JPf3y9Bs1yiKLDSy8mkQIBZyhScVbTtq31YKWKVdYq/xE KiEKIsCVwl1p1/gSAQju7sOHmnz1RWojE0s+8SPbPewsxjRkq2YP25C6MlQUUFTOknFj ZTdNzr325B6xz/y2zrVoUMSlm4kHcgQ+vL0oV9IX5QKZypqKAFJpfiG1my6leFoppahu A3DCBxpRFVnzJJUlt8ZW4YkcIi0hkjep5lrlG/OKRbKe9HAnwa5cn01AGgLKbVVM1Mli DMfQ== X-Gm-Message-State: AKGB3mLHBNd7ikKiKVPh+mP4cE6HRi/lAI2+JDJfWxgEtXOzMQYOK9e+ 6VBKq/froTlX3YMcQ5Z4ouffEg== X-Google-Smtp-Source: ACJfBoup7ovxMEtg8pxT9Oq62RjUTLmq0D2ixli9oupXGnQSxP0HkNZnW8aNGQbxnZjII4cdICn9zw== X-Received: by 10.46.46.3 with SMTP id u3mr1582856lju.117.1514721534220; Sun, 31 Dec 2017 03:58:54 -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 f10sm8646298lff.56.2017.12.31.03.58.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 31 Dec 2017 03:58:53 -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, 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 v2 2/5] device property: Introduce fwnode_get_phy_mode() Date: Sun, 31 Dec 2017 12:58:37 +0100 Message-Id: <1514721520-18964-3-git-send-email-mw@semihalf.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1514721520-18964-1-git-send-email-mw@semihalf.com> References: <1514721520-18964-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 Acked-by: Rafael J. Wysocki --- 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(