diff options
| author | David S. Miller <davem@davemloft.net> | 2018-03-26 11:29:11 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-03-26 11:29:11 -0400 |
| commit | 40a94f7a6b5b1e7dee2bfd6a29c08fbf761f60de (patch) | |
| tree | bea5c77153eeda8f4467574b23f2c4941a63caa5 | |
| parent | 996bfed118748c128ad4b6c05c09fd2f5fdfa1b4 (diff) | |
| parent | 469e3d79b85caf4e218ad55a65c18f7e81541f55 (diff) | |
| download | linux-stable-40a94f7a6b5b1e7dee2bfd6a29c08fbf761f60de.tar.gz linux-stable-40a94f7a6b5b1e7dee2bfd6a29c08fbf761f60de.tar.bz2 linux-stable-40a94f7a6b5b1e7dee2bfd6a29c08fbf761f60de.zip | |
Merge branch 'ethernet-ave-add-UniPhier-PXs3-support'
Kunihiko Hayashi says:
====================
net: ethernet: ave: add UniPhier PXs3 support
Add ethernet controller support on UniPhier PXs3 SoC.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | Documentation/devicetree/bindings/net/socionext,uniphier-ave4.txt | 1 | ||||
| -rw-r--r-- | drivers/net/ethernet/socionext/sni_ave.c | 8 |
2 files changed, 9 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/net/socionext,uniphier-ave4.txt b/Documentation/devicetree/bindings/net/socionext,uniphier-ave4.txt index 270ea4efff13..96398cc2982f 100644 --- a/Documentation/devicetree/bindings/net/socionext,uniphier-ave4.txt +++ b/Documentation/devicetree/bindings/net/socionext,uniphier-ave4.txt @@ -9,6 +9,7 @@ Required properties: - "socionext,uniphier-pxs2-ave4" : for PXs2 SoC - "socionext,uniphier-ld11-ave4" : for LD11 SoC - "socionext,uniphier-ld20-ave4" : for LD20 SoC + - "socionext,uniphier-pxs3-ave4" : for PXs3 SoC - reg: Address where registers are mapped and size of region. - interrupts: Should contain the MAC interrupt. - phy-mode: See ethernet.txt in the same directory. Allow to choose diff --git a/drivers/net/ethernet/socionext/sni_ave.c b/drivers/net/ethernet/socionext/sni_ave.c index f5c5984afefb..0b3b7a460641 100644 --- a/drivers/net/ethernet/socionext/sni_ave.c +++ b/drivers/net/ethernet/socionext/sni_ave.c @@ -1701,6 +1701,10 @@ static const struct ave_soc_data ave_ld20_data = { .is_desc_64bit = true, }; +static const struct ave_soc_data ave_pxs3_data = { + .is_desc_64bit = false, +}; + static const struct of_device_id of_ave_match[] = { { .compatible = "socionext,uniphier-pro4-ave4", @@ -1718,6 +1722,10 @@ static const struct of_device_id of_ave_match[] = { .compatible = "socionext,uniphier-ld20-ave4", .data = &ave_ld20_data, }, + { + .compatible = "socionext,uniphier-pxs3-ave4", + .data = &ave_pxs3_data, + }, { /* Sentinel */ } }; MODULE_DEVICE_TABLE(of, of_ave_match); |