Commit 91e1aef7 authored by David S. Miller's avatar David S. Miller
Browse files

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: default avatarDavid S. Miller <davem@davemloft.net>
parents d40dfa0c 9fd3d5dc

Documentation/devicetree/bindings/net/socionext,uniphier-ave4.yaml

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ properties: 
      - socionext,uniphier-ld11-ave4

      - socionext,uniphier-ld20-ave4

      - socionext,uniphier-pxs3-ave4

      - socionext,uniphier-nx1-ave4



  reg:

    maxItems: 1

drivers/net/ethernet/socionext/sni_ave.c

+15 −0
Original line number Diff line number Diff line
@@ -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);