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

Commit 9f4842a8 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'rsvb-compat-strings' 



Simon Horman says:

====================
ravb: More compatibility strings

this short series adds generic gen2 and gen3, and soc-specific
compatibility strings for the missing gen2 SoCs.

Key Changes in v2:
* Include "rcar-" in generic bindings
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents d6df198d af8002d3

Documentation/devicetree/bindings/net/renesas,ravb.txt

+11 −1
Original line number Diff line number Diff line
@@ -5,8 +5,18 @@ interface contains. 


Required properties:

- compatible: "renesas,etheravb-r8a7790" if the device is a part of R8A7790 SoC.

	      "renesas,etheravb-r8a7791" if the device is a part of R8A7791 SoC.

	      "renesas,etheravb-r8a7792" if the device is a part of R8A7792 SoC.

	      "renesas,etheravb-r8a7793" if the device is a part of R8A7793 SoC.

	      "renesas,etheravb-r8a7794" if the device is a part of R8A7794 SoC.

	      "renesas,etheravb-r8a7795" if the device is a part of R8A7795 SoC.

	      "renesas,etheravb-rcar-gen2" for generic R-Car Gen 2 compatible interface.

	      "renesas,etheravb-rcar-gen3" for generic R-Car Gen 3 compatible interface.



	      When compatible with the generic version, nodes must list the

	      SoC-specific version corresponding to the platform first

	      followed by the generic version.



- reg: offset and length of (1) the register block and (2) the stream buffer.

- interrupts: A list of interrupt-specifiers, one for each entry in

	      interrupt-names.
@@ -37,7 +47,7 @@ Optional properties: 
Example:



	ethernet@e6800000 {

		compatible = "renesas,etheravb-r8a7795";

		compatible = "renesas,etheravb-r8a7795", "renesas,etheravb-rcar-gen3";

		reg = <0 0xe6800000 0 0x800>, <0 0xe6a00000 0 0x10000>;

		interrupt-parent = <&gic>;

		interrupts = <GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>,

drivers/net/ethernet/renesas/ravb_main.c

+2 −0
Original line number Diff line number Diff line
@@ -1659,7 +1659,9 @@ static int ravb_mdio_release(struct ravb_private *priv) 
static const struct of_device_id ravb_match_table[] = {

	{ .compatible = "renesas,etheravb-r8a7790", .data = (void *)RCAR_GEN2 },

	{ .compatible = "renesas,etheravb-r8a7794", .data = (void *)RCAR_GEN2 },

	{ .compatible = "renesas,etheravb-rcar-gen2", .data = (void *)RCAR_GEN2 },

	{ .compatible = "renesas,etheravb-r8a7795", .data = (void *)RCAR_GEN3 },

	{ .compatible = "renesas,etheravb-rcar-gen3", .data = (void *)RCAR_GEN3 },

	{ }

};

MODULE_DEVICE_TABLE(of, ravb_match_table);