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: 900227 Return-Path: X-Original-To: incoming-dt@patchwork.ozlabs.org Delivered-To: patchwork-incoming-dt@bilbo.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=devicetree-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=raspberrypi.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; secure) header.d=raspberrypi.org header.i=@raspberrypi.org header.b="asb3FqFU"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=raspberrypi-org.20150623.gappssmtp.com header.i=@raspberrypi-org.20150623.gappssmtp.com header.b="THFLmCRB"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40R62S5p70z9s4q for ; Thu, 19 Apr 2018 01:47:44 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753611AbeDRPqe (ORCPT ); Wed, 18 Apr 2018 11:46:34 -0400 Received: from mx07-00252a01.pphosted.com ([62.209.51.214]:44445 "EHLO mx07-00252a01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753602AbeDRPpd (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 w3IFZqi2029549 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-f199.google.com (mail-wr0-f199.google.com [209.85.128.199]) by mx07-00252a01.pphosted.com with ESMTP id 2hdrya8ds0-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-f199.google.com with SMTP id m7-v6so2204772wrb.16 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=a4U5Yu+yaEq1GmfFR+MwbaVxZ4fRvZVRSPNhwBx2/92oAx8nZ5hdUw3zwnSHAHi6DM mJXCJ9kUj6xBxcrBin8VmhOQOUJzcMe8oJXu+f4giqwEUBWVkGcV/kAvu51QaDYTSns6 LPnqjAqXxq630YPUef2qQqtZbwM4LMSZXpI2lfd3UCaO8V73D3SzKL4qdhjaW2WAlqXN tKeszZf6f2fOEAFEdQls1v3WRkL3B7KW09mowrjoRmQRqSyhKAq5b4AMP1I1p6z+uMrJ G6/mFQxDH7H/JsoYMsqn7H9llF4969RhyC2++wOlID6Uf220tEaWQbuI+4i3a5m87XbY gdqA== X-Gm-Message-State: ALQs6tAiX1TYuvjgZbU8kTc79lBUWK7hl2Riknq6HDOwlbZ5VDn1rPQF HYy/L6WMLczdcQKZp8D4oWBcDA2c5sq6sU3H4H0AuYdSVzpjiJrJGj5pf5EhfTVyLYK8qsiyLaT ZYZEN/ZXH2+dhwDPXDraG+A== X-Received: by 10.28.16.18 with SMTP id 18mr2231956wmq.81.1524066331497; 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: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org 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 From patchwork Wed Apr 18 15:45:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Phil Elwell X-Patchwork-Id: 900222 Return-Path: X-Original-To: incoming-dt@patchwork.ozlabs.org Delivered-To: patchwork-incoming-dt@bilbo.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=devicetree-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=raspberrypi.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; secure) header.d=raspberrypi.org header.i=@raspberrypi.org header.b="xPukQPD9"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=raspberrypi-org.20150623.gappssmtp.com header.i=@raspberrypi-org.20150623.gappssmtp.com header.b="s7VJWtnv"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40R60w3dvJz9s1v for ; Thu, 19 Apr 2018 01:46:24 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753236AbeDRPqW (ORCPT ); Wed, 18 Apr 2018 11:46:22 -0400 Received: from mx07-00252a01.pphosted.com ([62.209.51.214]:24579 "EHLO mx07-00252a01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752899AbeDRPpe (ORCPT ); Wed, 18 Apr 2018 11:45:34 -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 w3IFXfSi028597 for ; Wed, 18 Apr 2018 16:45:33 +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=wUE2TTVV8QF3wix5vZWhrGyAHU9PTxsEiBoyo+Df3o4=; b=xPukQPD9Etdo+OChx3fj1EiyIVzXXBehns450wiiEu2DQ9HCrGq+xoyJ12+BZ3LdVgTr 0d0YDAp+mZAlPw4gkKws6X9BE92+ScE1+ocyq6kyjfg2T1F3z0/7IrQPK9vJYw6NPp2b sWDpv2R5XYd0DBql9ltoe+pe2LT5K7jB6lT71a2ztAnfIv0wEgikzNlSN+FIZj2lWHUG +IlrvyDMmmLkWQ5+oNL9as/XMoxZLrtKEMfa5OOPXVjmuZs4Hx/cau9yWnvC9/5EVZpn 1rDIponfa2xLxwOdxitbUvDPZE3utzHy7x14dmoK+xSUwsa1tda93Jieu0/vsEL7RzYU 9w== Received: from mail-wr0-f197.google.com (mail-wr0-f197.google.com [209.85.128.197]) by mx07-00252a01.pphosted.com with ESMTP id 2hdrya8dsa-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=OK) for ; Wed, 18 Apr 2018 16:45:33 +0100 Received: by mail-wr0-f197.google.com with SMTP id p11-v6so2221429wrd.20 for ; Wed, 18 Apr 2018 08:45:33 -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=wUE2TTVV8QF3wix5vZWhrGyAHU9PTxsEiBoyo+Df3o4=; b=s7VJWtnv7zRGMzglASv+1imVlVYnqdL0s3Y0bhE4IZ/YrClwZyTBfVSq53NvzlilIT akvw9LIYvInP6YaICkak+KKUaFzH2EzOPGmib1/MJDrPdNBZUnbldNnaiANSAPyF9XK/ uWYqjoG6s8TsiWUvR3eOLnHHzudqBpSQ6xypxhql7PRmROv+EAyNkuSuAmwq+HTr44ll wLXZacr1jPmo++8VQWZurBpx5Li7l6GqH5UyuXdi4rUa6qMTgN+dum1RK9zt+hwWMA5z eNtG8sEIMUF2M+Qa39g0lh7rJ4HOUrhjMiPnu1AlFJEGuiJ5cL+sPw9qA3mmrDYaNEIR OXLg== 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=wUE2TTVV8QF3wix5vZWhrGyAHU9PTxsEiBoyo+Df3o4=; b=oGuc1f5yj8cFNLtDbXFIn0HD+kQ/h0ypmnXtYPxlEN/7DNZOiLx2n4TOaomrk2uLxU hojhXvEncO5D4z5ZYi3j7nLqgICmGZ6oTom4dYWzVSPW+c65HY+krlZZsae8+FBESyuu JUq2ioZ7vdbuHZrLcoWRdOwUxUabG9A2RHEMiEkPr8lL91FxgwWcDhvh+OhkxTB+1qFl 8hU0vx+7n0KVB33OZ6rYTJVFA1vI4HTchtssy2g0aK9mvUhWjMUEurjrbpMEo06hdw3c byQbq6XjnCvn1XkscgwyoBxflhX8XJEIOCO3MaFPqBEYZQhBdFcf8VhgIoy+JvuGshdK RRcQ== X-Gm-Message-State: ALQs6tDC7wl4Vg+RDd+q+GQs63T/DDLBfAIitPB/DkRGWg+FN7K0v8t9 sLBw1TlpbfciFelbw/Ek3CnUOgNtlfkaBBVQOSAos7aBWK5AGFYgTjNfFTBJ/YutPnyEYPM1l2l V4BwPbvmy+5ch+Agzua42aA== X-Received: by 10.28.150.71 with SMTP id y68mr2262504wmd.139.1524066332628; Wed, 18 Apr 2018 08:45:32 -0700 (PDT) X-Google-Smtp-Source: AIpwx49FepXo2Ntwt7KsxmxmYBtFYPcqZlnz5SczesDyBo6RXY/u12twqLnYs4F47NypoTfr8b45YQ== X-Received: by 10.28.150.71 with SMTP id y68mr2262474wmd.139.1524066332392; Wed, 18 Apr 2018 08:45:32 -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.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 18 Apr 2018 08:45:31 -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 3/3] dt-bindings: Document the DT bindings for lan78xx Date: Wed, 18 Apr 2018 16:45:23 +0100 Message-Id: <1524066323-109628-4-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: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org The Microchip LAN78XX family of devices are Ethernet controllers with a USB interface. Despite being discoverable devices it can be useful to be able to configure them from Device Tree, particularly in low-cost applications without an EEPROM or programmed OTP. Document the supported properties in a bindings file. Signed-off-by: Phil Elwell --- .../devicetree/bindings/net/microchip,lan78xx.txt | 44 ++++++++++++++++++++++ MAINTAINERS | 1 + 2 files changed, 45 insertions(+) create mode 100644 Documentation/devicetree/bindings/net/microchip,lan78xx.txt diff --git a/Documentation/devicetree/bindings/net/microchip,lan78xx.txt b/Documentation/devicetree/bindings/net/microchip,lan78xx.txt new file mode 100644 index 0000000..fa68f9b --- /dev/null +++ b/Documentation/devicetree/bindings/net/microchip,lan78xx.txt @@ -0,0 +1,44 @@ +Microchip LAN78xx Gigabit Ethernet controller + +The LAN78XX devices are usually configured by programming their OTP or with +an external EEPROM, but some platforms (e.g. Raspberry Pi 3 B+) have neither. +The Device Tree properties, if present, override the OTP and EEPROM. + +Required properties: +- compatible: Should be one of "usb424,7800", "usb424,7801" or "usb424,7850". + +Optional properties: +- local-mac-address: see ethernet.txt +- mac-address: see ethernet.txt +- microchip,led-modes: a 0..4 element vector, with each element configuring + the operating mode of an LED. Omitted LEDs are turned off. Allowed values + are defined in "include/dt-bindings/net/microchip-78xx.h". + +Example: + +/* Standard configuration for a Raspberry Pi 3 B+ */ +&usb { + usb1@1 { + compatible = "usb424,2514"; + reg = <1>; + #address-cells = <1>; + #size-cells = <0>; + + usb1_1@1 { + compatible = "usb424,2514"; + reg = <1>; + #address-cells = <1>; + #size-cells = <0>; + + ethernet: usbether@1 { + compatible = "usb424,7800"; + reg = <1>; + local-mac-address = [ 00 11 22 33 44 55 ]; + microchip,led-modes = < + LAN78XX_LINK_1000_ACTIVITY + LAN78XX_LINK_10_100_ACTIVITY + >; + }; + }; + }; +}; diff --git a/MAINTAINERS b/MAINTAINERS index 9c9bc63..5352bbb 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -14572,6 +14572,7 @@ M: Woojung Huh M: Microchip Linux Driver Support L: netdev@vger.kernel.org S: Maintained +F: Documentation/devicetree/bindings/net/microchip,lan78xx.txt F: drivers/net/usb/lan78xx.* F: include/dt-bindings/net/microchip-78xx.h