Skip to content

Commit 9f4842a

Browse files
committed
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: David S. Miller <davem@davemloft.net>
2 parents d6df198 + af8002d commit 9f4842a

File tree

2 files changed

+13
-1
lines changed

2 files changed

+13
-1
lines changed

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

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,18 @@ interface contains.
55

66
Required properties:
77
- compatible: "renesas,etheravb-r8a7790" if the device is a part of R8A7790 SoC.
8+
"renesas,etheravb-r8a7791" if the device is a part of R8A7791 SoC.
9+
"renesas,etheravb-r8a7792" if the device is a part of R8A7792 SoC.
10+
"renesas,etheravb-r8a7793" if the device is a part of R8A7793 SoC.
811
"renesas,etheravb-r8a7794" if the device is a part of R8A7794 SoC.
912
"renesas,etheravb-r8a7795" if the device is a part of R8A7795 SoC.
13+
"renesas,etheravb-rcar-gen2" for generic R-Car Gen 2 compatible interface.
14+
"renesas,etheravb-rcar-gen3" for generic R-Car Gen 3 compatible interface.
15+
16+
When compatible with the generic version, nodes must list the
17+
SoC-specific version corresponding to the platform first
18+
followed by the generic version.
19+
1020
- reg: offset and length of (1) the register block and (2) the stream buffer.
1121
- interrupts: A list of interrupt-specifiers, one for each entry in
1222
interrupt-names.
@@ -37,7 +47,7 @@ Optional properties:
3747
Example:
3848

3949
ethernet@e6800000 {
40-
compatible = "renesas,etheravb-r8a7795";
50+
compatible = "renesas,etheravb-r8a7795", "renesas,etheravb-rcar-gen3";
4151
reg = <0 0xe6800000 0 0x800>, <0 0xe6a00000 0 0x10000>;
4252
interrupt-parent = <&gic>;
4353
interrupts = <GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>,

drivers/net/ethernet/renesas/ravb_main.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1659,7 +1659,9 @@ static int ravb_mdio_release(struct ravb_private *priv)
16591659
static const struct of_device_id ravb_match_table[] = {
16601660
{ .compatible = "renesas,etheravb-r8a7790", .data = (void *)RCAR_GEN2 },
16611661
{ .compatible = "renesas,etheravb-r8a7794", .data = (void *)RCAR_GEN2 },
1662+
{ .compatible = "renesas,etheravb-rcar-gen2", .data = (void *)RCAR_GEN2 },
16621663
{ .compatible = "renesas,etheravb-r8a7795", .data = (void *)RCAR_GEN3 },
1664+
{ .compatible = "renesas,etheravb-rcar-gen3", .data = (void *)RCAR_GEN3 },
16631665
{ }
16641666
};
16651667
MODULE_DEVICE_TABLE(of, ravb_match_table);

0 commit comments

Comments
 (0)