From patchwork Wed Apr 18 15:45:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Phil Elwell X-Patchwork-Id: 10348597 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 70EEF60365 for ; Wed, 18 Apr 2018 15:47:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 62BA5286D4 for ; Wed, 18 Apr 2018 15:47:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 56F54286E1; Wed, 18 Apr 2018 15:47:47 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A9FE1286D4 for ; Wed, 18 Apr 2018 15:47:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753540AbeDRPqe (ORCPT ); Wed, 18 Apr 2018 11:46:34 -0400 Received: from mx07-00252a01.pphosted.com ([62.209.51.214]:48270 "EHLO mx07-00252a01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753657AbeDRPpd (ORCPT ); Wed, 18 Apr 2018 11:45:33 -0400 Received: from pps.filterd (m0102628.ppops.net [127.0.0.1]) by mx07-00252a01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w3IFZqi4029549 for ; Wed, 18 Apr 2018 16:45:32 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.org; h=from : to : cc : subject : date : message-id : in-reply-to : references; s=pp; bh=cLKe+qIrNv5pnPHEsax93vMZLCHW5DLe4gWgW2qbWWk=; b=asb3FqFU3kRl1qNdK/pnVaoai/rOebDRetXOodsP1Dz+B0XkxvAxCyOa4owiRb2AzzfO wDbb1YythSQ6aMYPXE1p4XOJqFhlGSH/uF1vbyxyOSoO/RPcQoqKoQpJQXfk7HwrjBrX mu7Pwms/q8rgrEIRCGP2Amr3rCt5UCtIqHyupJduGklCxm3cSdns3la9VuM7AUQmkVTE O8hK7jcelmAQy0gw1ljEJDBkBpi33kUlGfReaKy2UEsnqdIin9yZscpRclci+hpEe9Ve g+37DHCareEACOUMbhdTyElSy9HcguQGo8v+yePoceqWtJRG4pYoE/oJyGE+fhjXPe5A vQ== Received: from mail-wr0-f198.google.com (mail-wr0-f198.google.com [209.85.128.198]) by mx07-00252a01.pphosted.com with ESMTP id 2hdrya8ds3-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=OK) for ; Wed, 18 Apr 2018 16:45:32 +0100 Received: by mail-wr0-f198.google.com with SMTP id b10-v6so2220127wrf.3 for ; Wed, 18 Apr 2018 08:45:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=cLKe+qIrNv5pnPHEsax93vMZLCHW5DLe4gWgW2qbWWk=; b=THFLmCRBo3jaJZDfx0ut/vdVJ8rH1Hl0rqtmg9TrZ0sN2RTyyz6Pi26JcwLk14cAYh pnAIUTD/gIs9bpUowiztMvW9mMX7xzWAwjSM5+cPWJatnVh+8THRGWL2kbYbDXfpGyog kr9WcF/5/2lHP+IdojR5rZVUzDE/nTuBdXOT4P4bZfJMq7oNgl7hA3e4/E7coSppgjjR yqDJN2ZEEdrmMKIcJHgoFWKVgMh9qXg4VkL2x0yA0jjLwW9Bc3+wH98OtS+3JnNpbwUh IwzHTQthJG6PYFoKmEq0IJ5yd0kYtYafetZnKXNBZIe7gzoe/o2gVpf9MH/pjl4QHRjT bGRw== 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=cLKe+qIrNv5pnPHEsax93vMZLCHW5DLe4gWgW2qbWWk=; b=ShGS29kRYh2Igq9CnON3R2MnjVAohhkDM+xzJ3TVQOx6lINAVVigTeJoLDXgvpjmqe pBddZAdL2QoLozfibfp/Zfc4XA7EYZfN2LbvgYFynnQBHyOxrIj2GjmkloeIAI9+RwPL zJnfHnM3++x5PyYHaS8SGmMEun7K+d39zGJyZcv+AlukoAhnL1bbfYvVoLKdNEwfIGUh PvA3fcrJ85GGBf32C1UULxRd6zRz7e/DEYbcHbvFeb1C1fWmyB2W1v7we4TSx31Rg9Pr aY9t3WiB1vBBiyNv6QFG14D7abGukFQEUUY18HmV+1XhBhKlr65qu/v5mOgHR6QXdstM UHOQ== X-Gm-Message-State: ALQs6tAFfatZFcFF9FXmxZPMyCOci5a12TrojVdNsQaFZRcpvGe9pq8K m/9+8JWJIuXuQVvlWs33F3MfI2CYLBqKb+Jw57UdOOrqkD/q52XtAYlsydCpp3a/CTOJEW3Aml1 fOUYx4L7Edkw37TeiFx4e X-Received: by 10.28.16.18 with SMTP id 18mr2231959wmq.81.1524066331500; Wed, 18 Apr 2018 08:45:31 -0700 (PDT) X-Google-Smtp-Source: AIpwx48qPDz4uOcyHO1E0Zt/NqKrVqxOQ19iysfYc8bBRt8UVzmpBBa9KY0cQDOmUorUPGLMMmVSag== X-Received: by 10.28.16.18 with SMTP id 18mr2231936wmq.81.1524066331220; Wed, 18 Apr 2018 08:45:31 -0700 (PDT) Received: from buildbot.pitowers.org ([2a00:2381:fdf7:14:7931:3b7a:4272:adad]) by smtp.gmail.com with ESMTPSA id n79sm2752689wmi.20.2018.04.18.08.45.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 18 Apr 2018 08:45:30 -0700 (PDT) From: Phil Elwell To: Woojung Huh , Microchip Linux Driver Support , Rob Herring , Mark Rutland , "David S. Miller" , Mauro Carvalho Chehab , Greg Kroah-Hartman , Linus Walleij , Andrew Morton , Randy Dunlap , netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org Cc: Phil Elwell Subject: [PATCH v2 2/3] lan78xx: Read LED states from Device Tree Date: Wed, 18 Apr 2018 16:45:22 +0100 Message-Id: <1524066323-109628-3-git-send-email-phil@raspberrypi.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1524066323-109628-1-git-send-email-phil@raspberrypi.org> References: <1524066323-109628-1-git-send-email-phil@raspberrypi.org> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2018-04-18_03:, , signatures=0 Sender: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add support for DT property "microchip,led-modes", a vector of zero to four cells (u32s) in the range 0-15, each of which sets the mode for one of the LEDs. Some possible values are: 0=link/activity 1=link1000/activity 2=link100/activity 3=link10/activity 4=link100/1000/activity 5=link10/1000/activity 6=link10/100/activity 14=off 15=on These values are given symbolic constants in a dt-bindings header. Also use the presence of the DT property to indicate that the LEDs should be enabled - necessary in the event that no valid OTP or EEPROM is available. Signed-off-by: Phil Elwell --- MAINTAINERS | 1 + drivers/net/usb/lan78xx.c | 35 ++++++++++++++++++++++++++++++++ include/dt-bindings/net/microchip-78xx.h | 21 +++++++++++++++++++ 3 files changed, 57 insertions(+) create mode 100644 include/dt-bindings/net/microchip-78xx.h diff --git a/MAINTAINERS b/MAINTAINERS index b60179d..9c9bc63 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -14573,6 +14573,7 @@ M: Microchip Linux Driver Support L: netdev@vger.kernel.org S: Maintained F: drivers/net/usb/lan78xx.* +F: include/dt-bindings/net/microchip-78xx.h USB MASS STORAGE DRIVER M: Alan Stern diff --git a/drivers/net/usb/lan78xx.c b/drivers/net/usb/lan78xx.c index a823f01..f47ffea 100644 --- a/drivers/net/usb/lan78xx.c +++ b/drivers/net/usb/lan78xx.c @@ -38,6 +38,7 @@ #include #include #include +#include #include "lan78xx.h" #define DRIVER_AUTHOR "WOOJUNG HUH " @@ -74,6 +75,9 @@ #define LAN78XX_EEPROM_MAGIC (0x78A5) #define LAN78XX_OTP_MAGIC (0x78F3) +/* This register is specific to the LAN7800 and LAN7850 embedded PHYs */ +#define LAN78XX_PHY_LED_MODE_SELECT 29 + #define MII_READ 1 #define MII_WRITE 0 @@ -2005,6 +2009,8 @@ static int lan78xx_phy_init(struct lan78xx_net *dev) { int ret; u32 mii_adv; + u32 led_modes[4]; + int len; struct phy_device *phydev; phydev = phy_find_first(dev->mdiobus); @@ -2077,6 +2083,35 @@ static int lan78xx_phy_init(struct lan78xx_net *dev) mii_adv = (u32)mii_advertise_flowctrl(dev->fc_request_control); phydev->advertising |= mii_adv_to_ethtool_adv_t(mii_adv); + len = of_property_read_variable_u32_array(dev->udev->dev.of_node, + "microchip,led-modes", + led_modes, + 0, + ARRAY_SIZE(led_modes)); + if (len >= 0) { + u32 reg = 0; + int i; + + for (i = 0; i < len; i++) { + if (led_modes[i] > 15) { + ret = -EINVAL; + goto error; + } + reg |= led_modes[i] << (i * 4); + } + for (; i < ARRAY_SIZE(led_modes); i++) + reg |= LAN78XX_FORCE_LED_OFF << (i * 4); + (void)phy_write(phydev, LAN78XX_PHY_LED_MODE_SELECT, reg); + + /* Ensure the LEDs are enabled */ + lan78xx_read_reg(dev, HW_CFG, ®); + reg |= HW_CFG_LED0_EN_ | HW_CFG_LED1_EN_; + lan78xx_write_reg(dev, HW_CFG, reg); + } else if (len == -EOVERFLOW) { + ret = -EINVAL; + goto error; + } + genphy_config_aneg(phydev); dev->fc_autoneg = phydev->autoneg; diff --git a/include/dt-bindings/net/microchip-78xx.h b/include/dt-bindings/net/microchip-78xx.h new file mode 100644 index 0000000..dcf4a43 --- /dev/null +++ b/include/dt-bindings/net/microchip-78xx.h @@ -0,0 +1,21 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _DT_BINDINGS_MICROCHIP_LAN78XX_H +#define _DT_BINDINGS_MICROCHIP_LAN78XX_H + +/* LED modes */ + +#define LAN78XX_LINK_ACTIVITY 0 +#define LAN78XX_LINK_1000_ACTIVITY 1 +#define LAN78XX_LINK_100_ACTIVITY 2 +#define LAN78XX_LINK_10_ACTIVITY 3 +#define LAN78XX_LINK_100_1000_ACTIVITY 4 +#define LAN78XX_LINK_10_1000_ACTIVITY 5 +#define LAN78XX_LINK_10_100_ACTIVITY 6 +#define LAN78XX_DUPLEX_COLLISION 8 +#define LAN78XX_COLLISION 9 +#define LAN78XX_ACTIVITY 10 +#define LAN78XX_AUTONEG_FAULT 12 +#define LAN78XX_FORCE_LED_OFF 14 +#define LAN78XX_FORCE_LED_ON 15 + +#endif