Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1300586

[PATCH v4 net-next 2/3] net: macb: Add NPx macb config using USRIO_DISABLED cap

Show all headers | View raw

Declare a new SoC variant for NPx SoCs having USRIO_DISABLED as
capability bit.

Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
---
 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 },
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v3 net-next] net: ethernet: cadence-macb: Add disabled usrio caps Neil Armstrong <narmstrong@baylibre.com> - 2016-01-04 10:10 +0100
  Re: [PATCH v3 net-next] net: ethernet: cadence-macb: Add disabled  usrio caps Nicolas Ferre <nicolas.ferre@atmel.com> - 2016-01-04 10:30 +0100
  [PATCH v4 net-next 1/3] net: ethernet: cadence-macb: Add disabled usrio caps Neil Armstrong <narmstrong@baylibre.com> - 2016-01-04 10:50 +0100
  [PATCH v4 net-next 3/3] dt-bindings: net: macb: Add NPx macb variant Neil Armstrong <narmstrong@baylibre.com> - 2016-01-04 10:50 +0100
  [PATCH v4 net-next 0/3] Add new capability and macb DT variant Neil Armstrong <narmstrong@baylibre.com> - 2016-01-04 10:50 +0100
    [PATCH v4 net-next 2/3] net: macb: Add NPx macb config using USRIO_DISABLED cap Neil Armstrong <narmstrong@baylibre.com> - 2016-01-04 10:50 +0100
      Re: [PATCH v4 net-next 2/3] net: macb: Add NPx macb config using  USRIO_DISABLED cap Nicolas Ferre <nicolas.ferre@atmel.com> - 2016-01-04 11:40 +0100
        Re: [PATCH v4 net-next 2/3] net: macb: Add NPx macb config using  USRIO_DISABLED cap Neil Armstrong <narmstrong@baylibre.com> - 2016-01-05 13:30 +0100
          Re: [PATCH v4 net-next 2/3] net: macb: Add NPx macb config using  USRIO_DISABLED cap Nicolas Ferre <nicolas.ferre@atmel.com> - 2016-01-05 14:30 +0100
    [PATCH v5 net-next 0/3] Add new capability and macb DT variant Neil Armstrong <narmstrong@baylibre.com> - 2016-01-05 14:40 +0100
      [PATCH v5 net-next 1/3] net: ethernet: cadence-macb: Add disabled usrio caps Neil Armstrong <narmstrong@baylibre.com> - 2016-01-05 14:40 +0100
        Re: [PATCH v5 net-next 1/3] net: ethernet: cadence-macb: Add disabled  usrio caps Nicolas Ferre <nicolas.ferre@atmel.com> - 2016-01-05 14:50 +0100
      [PATCH v5 net-next 3/3] dt-bindings: net: macb: Add NP4 macb variant Neil Armstrong <narmstrong@baylibre.com> - 2016-01-05 14:50 +0100
        Re: [PATCH v5 net-next 3/3] dt-bindings: net: macb: Add NP4 macb  variant Nicolas Ferre <nicolas.ferre@atmel.com> - 2016-01-05 14:50 +0100
        Re: [PATCH v5 net-next 3/3] dt-bindings: net: macb: Add NP4 macb  variant Rob Herring <robh@kernel.org> - 2016-01-06 16:00 +0100
      [PATCH v5 net-next 2/3] net: macb: Add NP4 macb config using USRIO_DISABLED Neil Armstrong <narmstrong@baylibre.com> - 2016-01-05 14:50 +0100
        Re: [PATCH v5 net-next 2/3] net: macb: Add NP4 macb config using  USRIO_DISABLED Nicolas Ferre <nicolas.ferre@atmel.com> - 2016-01-05 14:50 +0100
      Re: [PATCH v5 net-next 0/3] Add new capability and macb DT variant David Miller <davem@davemloft.net> - 2016-01-07 22:30 +0100

csiph-web