Skip to content

Commit 50cccdf

Browse files
committed
Merge branch 'linux-5.15-trunk/at91/base_net' into linux-5.15-mchp
2 parents db8fcde + 528fd47 commit 50cccdf

2 files changed

Lines changed: 23 additions & 0 deletions

File tree

drivers/net/dsa/microchip/ksz8795_spi.c

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,12 +124,23 @@ static const struct of_device_id ksz8795_dt_ids[] = {
124124
};
125125
MODULE_DEVICE_TABLE(of, ksz8795_dt_ids);
126126

127+
static const struct spi_device_id ksz8795_spi_ids[] = {
128+
{ "ksz8765" },
129+
{ "ksz8794" },
130+
{ "ksz8795" },
131+
{ "ksz8863" },
132+
{ "ksz8873" },
133+
{ },
134+
};
135+
MODULE_DEVICE_TABLE(spi, ksz8795_spi_ids);
136+
127137
static struct spi_driver ksz8795_spi_driver = {
128138
.driver = {
129139
.name = "ksz8795-switch",
130140
.owner = THIS_MODULE,
131141
.of_match_table = of_match_ptr(ksz8795_dt_ids),
132142
},
143+
.id_table = ksz8795_spi_ids,
133144
.probe = ksz8795_spi_probe,
134145
.remove = ksz8795_spi_remove,
135146
.shutdown = ksz8795_spi_shutdown,

drivers/net/dsa/microchip/ksz9477_spi.c

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,12 +98,24 @@ static const struct of_device_id ksz9477_dt_ids[] = {
9898
};
9999
MODULE_DEVICE_TABLE(of, ksz9477_dt_ids);
100100

101+
static const struct spi_device_id ksz9477_spi_ids[] = {
102+
{ "ksz9477" },
103+
{ "ksz9897" },
104+
{ "ksz9893" },
105+
{ "ksz9563" },
106+
{ "ksz8563" },
107+
{ "ksz9567" },
108+
{ },
109+
};
110+
MODULE_DEVICE_TABLE(spi, ksz9477_spi_ids);
111+
101112
static struct spi_driver ksz9477_spi_driver = {
102113
.driver = {
103114
.name = "ksz9477-switch",
104115
.owner = THIS_MODULE,
105116
.of_match_table = of_match_ptr(ksz9477_dt_ids),
106117
},
118+
.id_table = ksz9477_spi_ids,
107119
.probe = ksz9477_spi_probe,
108120
.remove = ksz9477_spi_remove,
109121
.shutdown = ksz9477_spi_shutdown,

0 commit comments

Comments
 (0)