From patchwork Tue Jan 5 13:39:17 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 563124 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 1E8991402ED for ; Wed, 6 Jan 2016 00:40:17 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=baylibre-com.20150623.gappssmtp.com header.i=@baylibre-com.20150623.gappssmtp.com header.b=NvjYMo+G; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752266AbcAENkN (ORCPT ); Tue, 5 Jan 2016 08:40:13 -0500 Received: from mail-wm0-f51.google.com ([74.125.82.51]:38588 "EHLO mail-wm0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751978AbcAENjd (ORCPT ); Tue, 5 Jan 2016 08:39:33 -0500 Received: by mail-wm0-f51.google.com with SMTP id b14so29477495wmb.1 for ; Tue, 05 Jan 2016 05:39:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=VREqXQnYRP4Tt6JppVCfasqqUlHvPCFvk64Ze00X7uk=; b=NvjYMo+GRiCuevJTCrVdMAnq6mrPZTWzHmqV0YbQOtlBfl8QSmgfUoOmfcZzigClQu QfGi9UOvYu5siA2n4WCPk/X4i7Rxdd59ei9hPWPwBGXYZTP/qV54aBYYKMF4ipzFx3xa dtGuRmFtBQcv4vuIOHffqqH+anAfUT1Secu+KRIRavoI/7vio2FjdrTY5X6F3d8rqAbS 2ovOzq88ji39EVZf48P4M9f7P+OTWOR/s5oXyd9rLoMG+ZJnnrvtBneI9Lpkqodc6OUY d0Lscahv0p6X/KOHZf9kun+Md93X9sMR6hUV3ZdOJ2nIvGU9SNsZ9lhwqxPxh0IP45YP ueXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=VREqXQnYRP4Tt6JppVCfasqqUlHvPCFvk64Ze00X7uk=; b=LXj4akkmQ1pdaqElF1vtO/aQbQxTh8a3yFcU575ClT3jscG1sumToyjIG1C6iijnX7 T8I5Ey0D8H9bQEEQNdqDSP0mhGkLOwHGayRceFWaYfuLPDipXRbx9ctwbZKEqT8rrJo9 KyHhStrSbpl6KxdXDombbwdlrx8EKxTVY9ZUXKgf3BlhM6AIjEp5PE4aW4bn58+ecBNr nDp+Dg8wEHjkR9xqpXTrhiJZUrJ466MY5CD86NudoOUrnN9Kps5+C6HQMl+d72MuOd9W 154af6rZXZZMm6C8p5toj65HUPnYwZyBoMR2CcdV1DEZlnYpWxI+p3VbABZJ7xlg3v9f mk3A== X-Gm-Message-State: ALoCoQmvIIAYZLZpAzU4IjJDFoliNMlSPAwBJbwa/GbnZINy6Iul62CjQQ+8cMM2J2fQ7V5wQHrbXDJA3U+nFEoz+wavXnuvKA== X-Received: by 10.194.93.102 with SMTP id ct6mr87737860wjb.157.1452001171861; Tue, 05 Jan 2016 05:39:31 -0800 (PST) Received: from localhost.localdomain ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id a126sm3636936wmh.0.2016.01.05.05.39.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 05 Jan 2016 05:39:31 -0800 (PST) From: Neil Armstrong To: nicolas.ferre@atmel.com, davem@davemloft.net, harini.katakam@xilinx.com, boris.brezillon@free-electrons.com, alexandre.belloni@free-electrons.com, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, joshc@ni.com, devicetree@vger.kernel.org Cc: Neil Armstrong Subject: [PATCH v5 net-next 2/3] net: macb: Add NP4 macb config using USRIO_DISABLED Date: Tue, 5 Jan 2016 14:39:17 +0100 Message-Id: <1452001158-20585-3-git-send-email-narmstrong@baylibre.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1452001158-20585-1-git-send-email-narmstrong@baylibre.com> References: <1451900573-22657-1-git-send-email-narmstrong@baylibre.com> <1452001158-20585-1-git-send-email-narmstrong@baylibre.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Declare a new NP4 SoC variant having USRIO_DISABLED as capability bit. Signed-off-by: Neil Armstrong Acked-by: Nicolas Ferre --- drivers/net/ethernet/cadence/macb.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c index fa53bc3..d12ee07 100644 --- a/drivers/net/ethernet/cadence/macb.c +++ b/drivers/net/ethernet/cadence/macb.c @@ -2781,6 +2781,11 @@ static const struct macb_config emac_config = { .init = at91ether_init, }; +static const struct macb_config np4_config = { + .caps = MACB_CAPS_USRIO_DISABLED, + .clk_init = macb_clk_init, + .init = macb_init, +}; static const struct macb_config zynqmp_config = { .caps = MACB_CAPS_GIGABIT_MODE_AVAILABLE | MACB_CAPS_JUMBO, @@ -2801,6 +2806,7 @@ static const struct of_device_id macb_dt_ids[] = { { .compatible = "cdns,at32ap7000-macb" }, { .compatible = "cdns,at91sam9260-macb", .data = &at91sam9260_config }, { .compatible = "cdns,macb" }, + { .compatible = "cdns,np4-macb", .data = &np4_config }, { .compatible = "cdns,pc302-gem", .data = &pc302gem_config }, { .compatible = "cdns,gem", .data = &pc302gem_config }, { .compatible = "atmel,sama5d2-gem", .data = &sama5d2_config },