From patchwork Mon Jun 12 20:55:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergei Shtylyov X-Patchwork-Id: 774837 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3wmlnR3pyMz9ryv for ; Tue, 13 Jun 2017 07:06:35 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=cogentembedded-com.20150623.gappssmtp.com header.i=@cogentembedded-com.20150623.gappssmtp.com header.b="LcllQdPC"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753016AbdFLVG1 (ORCPT ); Mon, 12 Jun 2017 17:06:27 -0400 Received: from mail-lf0-f51.google.com ([209.85.215.51]:35660 "EHLO mail-lf0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752901AbdFLVGC (ORCPT ); Mon, 12 Jun 2017 17:06:02 -0400 Received: by mail-lf0-f51.google.com with SMTP id p189so58031100lfe.2 for ; Mon, 12 Jun 2017 14:06:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cogentembedded-com.20150623.gappssmtp.com; s=20150623; h=from:message-id:user-agent:date:to:subject:mime-version :content-disposition:cc; bh=M2orI+WcE6tIImtOEJ3Mydk5UEhFj1t9cCQAMPhYWKE=; b=LcllQdPCGsQWo8gU8g275HVjmYxbVZfJmKzgo2WUkC5IVCNkQ54M5Rm1ubXbjXIhKK DJ7+AJ+ttieOgkNuNA1qxOEEPxSu17LneT3LfMovbaTET+7bYTuu7GWGQBDhRVzfUiij zYT2lv7rhY43nAlVzQ36OJf2PYiDSwjSKuEKid0YSLouP5X1XOiDceH8Pwc9Jep8308/ PbhTq5MsPKdtSVqEJKAxQIL/aPttuDrdAyFqeDcXI+ugcVx4oBFL+sZ9+wtFgD6JIpIp u6iGyK5dB6H7bHUmoh4a2KypOcda+qgu4TT9Yt+Vtbt1FLvw0u8uS3HL4x4pNwxnha/K 7euw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:message-id:user-agent:date:to:subject :mime-version:content-disposition:cc; bh=M2orI+WcE6tIImtOEJ3Mydk5UEhFj1t9cCQAMPhYWKE=; b=BP7OSDj7QI5Z2V+Oh1h7KK3i88kthOEP4v+a2ct6aBPTka5W2We8SCfyXIGHhZw+0e eWW9wptQ1H0dsL0kPti3ik9ReJVIZ4iQYaI+hRdlvS/DWPUOQuTgRsTnnc0RFBw6geia kxc9jH8scgnRrm9YHublRLPcxDthwa5YbJrkSQwtfZb4fegwhottumesp05zRYjauV0b tFhIsg7W5qd2dIwOgIvLjdSfndNj+mCNutsCPgIEynsJGbpYKLvVJ4/llF84mT5TeMzq BHk1mtl6TYB/7C3D9EMS22iEGV0HaeF6L3iS6dtRAfXWAAP58PxrJ15kSs+I6/XOBsRi KcBA== X-Gm-Message-State: AODbwcAueQOKx/EkzsVb+1Tc98F4yzM9WkGK9ubByFzH2G6DUhcX7UyY MdWxIXqRFfYO5zHx X-Received: by 10.25.87.79 with SMTP id l76mr17704465lfb.90.1497301551105; Mon, 12 Jun 2017 14:05:51 -0700 (PDT) Received: from wasted.cogentembedded.com ([31.173.83.60]) by smtp.gmail.com with ESMTPSA id x66sm2897015lfb.20.2017.06.12.14.05.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 12 Jun 2017 14:05:50 -0700 (PDT) From: Sergei Shtylyov X-Google-Original-From: "Sergei Shtylyov" Received: by wasted.cogentembedded.com (sSMTP sendmail emulation); Tue, 13 Jun 2017 00:05:47 +0300 Message-Id: <20170612210547.823996341@cogentembedded.com> User-Agent: quilt/0.64 Date: Mon, 12 Jun 2017 23:55:38 +0300 To: Andrew Lunn , Florian Fainelli , Rob Herring , Frank Rowand , netdev@vger.kernel.org, devicetree@vger.kernel.org Subject: [PATCH 1/2] mdio_bus: handle only single PHY reset GPIO MIME-Version: 1.0 Content-Disposition: inline; filename=mdio_bus-handle-only-single-PHY-reset-GPIO.patch Cc: Sergei Shtylyov Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Commit 4c5e7a2c0501 ("dt-bindings: mdio: Clarify binding document") declared that a MDIO reset GPIO property should have only a single GPIO reference/specifier, however the supporting code was left intact, still burdening the kernel with now apparently useless loops -- get rid of them. Signed-off-by: Sergei Shtylyov --- drivers/net/phy/mdio_bus.c | 53 ++++++++++++++++----------------------------- drivers/of/of_mdio.c | 1 include/linux/phy.h | 6 +---- 3 files changed, 21 insertions(+), 39 deletions(-) Index: net-next/drivers/net/phy/mdio_bus.c =================================================================== --- net-next.orig/drivers/net/phy/mdio_bus.c +++ net-next/drivers/net/phy/mdio_bus.c @@ -353,33 +353,22 @@ int __mdiobus_register(struct mii_bus *b mutex_init(&bus->mdio_lock); - /* de-assert bus level PHY GPIO resets */ - if (bus->num_reset_gpios > 0) { - bus->reset_gpiod = devm_kcalloc(&bus->dev, - bus->num_reset_gpios, - sizeof(struct gpio_desc *), - GFP_KERNEL); - if (!bus->reset_gpiod) - return -ENOMEM; - } - - for (i = 0; i < bus->num_reset_gpios; i++) { - gpiod = devm_gpiod_get_index(&bus->dev, "reset", i, - GPIOD_OUT_LOW); - if (IS_ERR(gpiod)) { - err = PTR_ERR(gpiod); - if (err != -ENOENT) { - dev_err(&bus->dev, - "mii_bus %s couldn't get reset GPIO\n", - bus->id); - return err; - } - } else { - bus->reset_gpiod[i] = gpiod; - gpiod_set_value_cansleep(gpiod, 1); - udelay(bus->reset_delay_us); - gpiod_set_value_cansleep(gpiod, 0); + /* de-assert bus level PHY GPIO reset */ + gpiod = devm_gpiod_get(&bus->dev, "reset", GPIOD_OUT_LOW); + if (IS_ERR(gpiod)) { + err = PTR_ERR(gpiod); + if (err != -ENOENT) { + dev_err(&bus->dev, + "mii_bus %s couldn't get reset GPIO\n", + bus->id); + return err; } + } else { + bus->reset_gpiod = gpiod; + + gpiod_set_value_cansleep(gpiod, 1); + udelay(bus->reset_delay_us); + gpiod_set_value_cansleep(gpiod, 0); } if (bus->reset) @@ -414,10 +403,8 @@ error: } /* Put PHYs in RESET to save power */ - for (i = 0; i < bus->num_reset_gpios; i++) { - if (bus->reset_gpiod[i]) - gpiod_set_value_cansleep(bus->reset_gpiod[i], 1); - } + if (bus->reset_gpiod) + gpiod_set_value_cansleep(bus->reset_gpiod, 1); device_del(&bus->dev); return err; @@ -442,10 +429,8 @@ void mdiobus_unregister(struct mii_bus * } /* Put PHYs in RESET to save power */ - for (i = 0; i < bus->num_reset_gpios; i++) { - if (bus->reset_gpiod[i]) - gpiod_set_value_cansleep(bus->reset_gpiod[i], 1); - } + if (bus->reset_gpiod) + gpiod_set_value_cansleep(bus->reset_gpiod, 1); device_del(&bus->dev); } Index: net-next/drivers/of/of_mdio.c =================================================================== --- net-next.orig/drivers/of/of_mdio.c +++ net-next/drivers/of/of_mdio.c @@ -226,7 +226,6 @@ int of_mdiobus_register(struct mii_bus * /* Get bus level PHY reset GPIO details */ mdio->reset_delay_us = DEFAULT_GPIO_RESET_DELAY; of_property_read_u32(np, "reset-delay-us", &mdio->reset_delay_us); - mdio->num_reset_gpios = of_gpio_named_count(np, "reset-gpios"); /* Register the MDIO bus */ rc = mdiobus_register(mdio); Index: net-next/include/linux/phy.h =================================================================== --- net-next.orig/include/linux/phy.h +++ net-next/include/linux/phy.h @@ -226,10 +226,8 @@ struct mii_bus { /* GPIO reset pulse width in microseconds */ int reset_delay_us; - /* Number of reset GPIOs */ - int num_reset_gpios; - /* Array of RESET GPIO descriptors */ - struct gpio_desc **reset_gpiod; + /* RESET GPIO descriptor pointer */ + struct gpio_desc *reset_gpiod; }; #define to_mii_bus(d) container_of(d, struct mii_bus, dev)