mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-05-11 00:42:56 -04:00
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>
This commit is contained in:
@@ -24,6 +24,7 @@ properties:
|
||||
- socionext,uniphier-ld11-ave4
|
||||
- socionext,uniphier-ld20-ave4
|
||||
- socionext,uniphier-pxs3-ave4
|
||||
- socionext,uniphier-nx1-ave4
|
||||
|
||||
reg:
|
||||
maxItems: 1
|
||||
|
||||
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user