From patchwork Mon Jan 4 09:42:52 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 562290 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 EE08F1402DE for ; Mon, 4 Jan 2016 20:43:18 +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=RFA3KU55; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753380AbcADJnO (ORCPT ); Mon, 4 Jan 2016 04:43:14 -0500 Received: from mail-wm0-f53.google.com ([74.125.82.53]:33473 "EHLO mail-wm0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753322AbcADJnJ (ORCPT ); Mon, 4 Jan 2016 04:43:09 -0500 Received: by mail-wm0-f53.google.com with SMTP id f206so166039933wmf.0 for ; Mon, 04 Jan 2016 01:43:08 -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=zRl00JkIsXVqnCgh6wg/Jh2WsRQAN0+AWWcPy5mPZaY=; b=RFA3KU55KrFaVffQsvO9gKCXcGdOVuvkWSi1zsuMaE6+0qELy9eSWSGaNt2yDmwPK6 VbKLmGtNrs89P094asYOI7KNv2jWVpiIZHYecl/+l1hlOAaehDVWtoFMDBwxgK3UQTvJ tG/8i1EjFcKocImGHeQ4Yqrx/iIM8r9XsP1/WbO0rus6VahKBkSxkpVt1dduU9zHjBDA PVsy+pIfLNK4/cRAvqC1oZSrIKKKNKBRyuqmeV1UHmmP6RQx9LHXhZt/W5pLw/6InZlr 4xV/tQMXDFI58u8s3QOc1ouXXvXwg7GAap2woDGWC6uZEdVoVMoBcZaWxZPAwnAIgFDo lcZw== 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=zRl00JkIsXVqnCgh6wg/Jh2WsRQAN0+AWWcPy5mPZaY=; b=MGNO3sx0h111JEuYco5MkiwDQBHQtYWA1GMxD7N8i9fBEm2soOjJfsYcgB0sU9Fujn leafQR5BJ7u98JH95ldU6UMa3O/o9vUqjbxRRVQbFtc5BJmj0B/4zM0JX3YG9aD4EAvz JT1Oq4HOqlAE1Fi0jIqfdg7WVc+i5+/TM904+sWWbn1UUAt1tcgSyI7VCKfZCzlOHtqx 8Rz0fEB5NXFONmjLUNFqTZVWmxOWTZBuMUya+Z6/7mU0jLO2voqicj3+Cjj/vZikojSO pbUY4Nm0vk7wolrxvT4cQ3PUjNqD9Pk/2xLKqc9k8kxp9eOR61wG2oihC3IBuYUO/nq1 I8VA== X-Gm-Message-State: ALoCoQmuWPjWbzvp4yebZbdGZlsSTGxjy96w+Z6MYzDV4ZbdlgQijH8NaLANPP27PQWdk3u9OXlmOnBAxdhmYHS7XjByw/SfAg== X-Received: by 10.28.174.77 with SMTP id x74mr56943893wme.99.1451900587976; Mon, 04 Jan 2016 01:43:07 -0800 (PST) Received: from localhost.localdomain ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id x10sm50819626wjx.8.2016.01.04.01.43.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 04 Jan 2016 01:43:07 -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 v4 net-next 2/3] net: macb: Add NPx macb config using USRIO_DISABLED cap Date: Mon, 4 Jan 2016 10:42:52 +0100 Message-Id: <1451900573-22657-3-git-send-email-narmstrong@baylibre.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1451900573-22657-1-git-send-email-narmstrong@baylibre.com> References: <1451898103-21868-1-git-send-email-narmstrong@baylibre.com> <1451900573-22657-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 SoC variant for NPx SoCs having USRIO_DISABLED as capability bit. Signed-off-by: Neil Armstrong --- 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..a9e27a7 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 npx_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,npx-macb", .data = &npx_config }, { .compatible = "cdns,pc302-gem", .data = &pc302gem_config }, { .compatible = "cdns,gem", .data = &pc302gem_config }, { .compatible = "atmel,sama5d2-gem", .data = &sama5d2_config },