Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1f02c09b authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'macb-sama5d2' 



Nicolas Ferre says:

====================
net/macb: add sama5d2 support

This series is basically the support for another flavor of the GEM IP
configuration. It ended up being a series because of some little fixes made to
the binding documentation before adding the new compatibility string.

Bye,

v2: - fix bindings
    - add sama5d2 compatibility string to the binding documentation
====================

Acked-by: default avatarAlexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 3b188443 5c8fe711

Documentation/devicetree/bindings/net/macb.txt

+3 −2
Original line number Original line Diff line number Diff line
@@ -7,8 +7,9 @@ Required properties: 
  Use "cdns,at32ap7000-macb" for other 10/100 usage or use the generic form: "cdns,macb".

  Use "cdns,at32ap7000-macb" for other 10/100 usage or use the generic form: "cdns,macb".

  Use "cdns,pc302-gem" for Picochip picoXcell pc302 and later devices based on

  Use "cdns,pc302-gem" for Picochip picoXcell pc302 and later devices based on

  the Cadence GEM, or the generic form: "cdns,gem".

  the Cadence GEM, or the generic form: "cdns,gem".

  Use "cdns,sama5d3-gem" for the Gigabit IP available on Atmel sama5d3 SoCs.

  Use "atmel,sama5d2-gem" for the GEM IP (10/100) available on Atmel sama5d2 SoCs.

  Use "cdns,sama5d4-gem" for the Gigabit IP available on Atmel sama5d4 SoCs.

  Use "atmel,sama5d3-gem" for the Gigabit IP available on Atmel sama5d3 SoCs.

  Use "atmel,sama5d4-gem" for the GEM IP (10/100) available on Atmel sama5d4 SoCs.

  Use "cdns,zynqmp-gem" for Zynq Ultrascale+ MPSoC.

  Use "cdns,zynqmp-gem" for Zynq Ultrascale+ MPSoC.

- reg: Address and length of the register set for the device

- reg: Address and length of the register set for the device

- interrupts: Should contain macb interrupt

- interrupts: Should contain macb interrupt

drivers/net/ethernet/cadence/macb.c

+8 −0
Original line number Original line Diff line number Diff line
@@ -2713,6 +2713,13 @@ static const struct macb_config pc302gem_config = { 
	.init = macb_init,

	.init = macb_init,

};

};





static const struct macb_config sama5d2_config = {

	.caps = 0,

	.dma_burst_length = 16,

	.clk_init = macb_clk_init,

	.init = macb_init,

};



static const struct macb_config sama5d3_config = {

static const struct macb_config sama5d3_config = {

	.caps = MACB_CAPS_SG_DISABLED | MACB_CAPS_GIGABIT_MODE_AVAILABLE,

	.caps = MACB_CAPS_SG_DISABLED | MACB_CAPS_GIGABIT_MODE_AVAILABLE,

	.dma_burst_length = 16,

	.dma_burst_length = 16,
@@ -2756,6 +2763,7 @@ static const struct of_device_id macb_dt_ids[] = { 
	{ .compatible = "cdns,macb" },

	{ .compatible = "cdns,macb" },

	{ .compatible = "cdns,pc302-gem", .data = &pc302gem_config },

	{ .compatible = "cdns,pc302-gem", .data = &pc302gem_config },

	{ .compatible = "cdns,gem", .data = &pc302gem_config },

	{ .compatible = "cdns,gem", .data = &pc302gem_config },

	{ .compatible = "atmel,sama5d2-gem", .data = &sama5d2_config },

	{ .compatible = "atmel,sama5d3-gem", .data = &sama5d3_config },

	{ .compatible = "atmel,sama5d3-gem", .data = &sama5d3_config },

	{ .compatible = "atmel,sama5d4-gem", .data = &sama5d4_config },

	{ .compatible = "atmel,sama5d4-gem", .data = &sama5d4_config },

	{ .compatible = "cdns,at91rm9200-emac", .data = &emac_config },

	{ .compatible = "cdns,at91rm9200-emac", .data = &emac_config },