Merge branch 'ethernet-ave-add-UniPhier-PXs3-support' (40a94f7a) · Commits · 戴 / test

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

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -9,6 +9,7 @@ Required properties:
	- "socionext,uniphier-pxs2-ave4" : for PXs2 SoC		- "socionext,uniphier-pxs2-ave4" : for PXs2 SoC
	- "socionext,uniphier-ld11-ave4" : for LD11 SoC		- "socionext,uniphier-ld11-ave4" : for LD11 SoC
	- "socionext,uniphier-ld20-ave4" : for LD20 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.		- reg: Address where registers are mapped and size of region.
	- interrupts: Should contain the MAC interrupt.		- interrupts: Should contain the MAC interrupt.
	- phy-mode: See ethernet.txt in the same directory. Allow to choose		- phy-mode: See ethernet.txt in the same directory. Allow to choose

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1701,6 +1701,10 @@ static const struct ave_soc_data ave_ld20_data = {
	.is_desc_64bit = true,		.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[] = {		static const struct of_device_id of_ave_match[] = {
	{		{
	.compatible = "socionext,uniphier-pro4-ave4",		.compatible = "socionext,uniphier-pro4-ave4",
	@@ -1718,6 +1722,10 @@ static const struct of_device_id of_ave_match[] = {
	.compatible = "socionext,uniphier-ld20-ave4",		.compatible = "socionext,uniphier-ld20-ave4",
	.data = &ave_ld20_data,		.data = &ave_ld20_data,
	},		},
			{
			.compatible = "socionext,uniphier-pxs3-ave4",
			.data = &ave_pxs3_data,
			},
	{ /* Sentinel */ }		{ /* Sentinel */ }
	};		};
	MODULE_DEVICE_TABLE(of, of_ave_match);		MODULE_DEVICE_TABLE(of, of_ave_match);