diff options
| author |   David S. Miller <davem@davemloft.net> | 2021-10-18 13:10:08 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-10-18 13:10:08 +0100 |
| commit | 91e1aef746ed8ae9f866ef34133d81d3b0b41558 (patch) | |
| tree | e010e1123ae36444ca3ac7435982260792cb8672 | |
| parent | net: w5100: Make w5100_remove() return void (diff) | |
| parent | net: ethernet: ave: Add compatible string and SoC-dependent data for NX1 SoC (diff) | |
| download | wireguard-linux-91e1aef746ed8ae9f866ef34133d81d3b0b41558.tar.xz wireguard-linux-91e1aef746ed8ae9f866ef34133d81d3b0b41558.zip | |
Merge branch 'uniphier-nx1'
Kunihiko Hayashi says:
====================
net: ethernet: ave: Introduce UniPhier NX1 SoC support
This series includes the patches to add basic support for new UniPhier NX1
SoC. NX1 SoC also has the same kinds of controls as the other UniPhier
SoCs.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | Documentation/devicetree/bindings/net/socionext,uniphier-ave4.yaml | 1 | ||||
| -rw-r--r-- | drivers/net/ethernet/socionext/sni_ave.c | 15 |
2 files changed, 16 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/net/socionext,uniphier-ave4.yaml b/Documentation/devicetree/bindings/net/socionext,uniphier-ave4.yaml index 8a03a24a2019..6bc61c42418f 100644 --- a/Documentation/devicetree/bindings/net/socionext,uniphier-ave4.yaml +++ b/Documentation/devicetree/bindings/net/socionext,uniphier-ave4.yaml @@ -24,6 +24,7 @@ properties: - socionext,uniphier-ld11-ave4 - socionext,uniphier-ld20-ave4 - socionext,uniphier-pxs3-ave4 + - socionext,uniphier-nx1-ave4 reg: maxItems: 1 diff --git a/drivers/net/ethernet/socionext/sni_ave.c b/drivers/net/ethernet/socionext/sni_ave.c index 4b0fe0f58bbf..2c48f8b8ab71 100644 --- a/drivers/net/ethernet/socionext/sni_ave.c +++ b/drivers/net/ethernet/socionext/sni_ave.c @@ -1935,6 +1935,17 @@ static const struct ave_soc_data ave_pxs3_data = { .get_pinmode = ave_pxs3_get_pinmode, }; +static const struct ave_soc_data ave_nx1_data = { + .is_desc_64bit = true, + .clock_names = { + "ether", + }, + .reset_names = { + "ether", + }, + .get_pinmode = ave_pxs3_get_pinmode, +}; + static const struct of_device_id of_ave_match[] = { { .compatible = "socionext,uniphier-pro4-ave4", @@ -1956,6 +1967,10 @@ static const struct of_device_id of_ave_match[] = { .compatible = "socionext,uniphier-pxs3-ave4", .data = &ave_pxs3_data, }, + { + .compatible = "socionext,uniphier-nx1-ave4", + .data = &ave_nx1_data, + }, { /* Sentinel */ } }; MODULE_DEVICE_TABLE(of, of_ave_match); |