summaryrefslogtreecommitdiffstats
path: root/drivers/net/phy/spi_ks8995.c
diff options
context:
space:
mode:
authorHelmut Buchsbaum2016-02-09 20:47:13 +0100
committerDavid S. Miller2016-02-11 17:34:24 +0100
commitaa54c8da9a8e480861346d88b57086490bdd7b03 (patch)
treedc31f845e961256da98133c31af2b0b8fb9e82f3 /drivers/net/phy/spi_ks8995.c
parentMerge branch 'thunderx-irq-hints' (diff)
downloadkernel-qcow2-linux-aa54c8da9a8e480861346d88b57086490bdd7b03.tar.gz
kernel-qcow2-linux-aa54c8da9a8e480861346d88b57086490bdd7b03.tar.xz
kernel-qcow2-linux-aa54c8da9a8e480861346d88b57086490bdd7b03.zip
net: phy: spi_ks8995: introduce spi_device_id table
Refactor to use spi_device_id table to facilitate easy extendability. Signed-off-by: Helmut Buchsbaum <helmut.buchsbaum@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/phy/spi_ks8995.c')
-rw-r--r--drivers/net/phy/spi_ks8995.c42
1 files changed, 40 insertions, 2 deletions
diff --git a/drivers/net/phy/spi_ks8995.c b/drivers/net/phy/spi_ks8995.c
index c72c42206850..e7a215d2b1ae 100644
--- a/drivers/net/phy/spi_ks8995.c
+++ b/drivers/net/phy/spi_ks8995.c
@@ -89,6 +89,28 @@
#define KS8995_RESET_DELAY 10 /* usec */
+enum ks8995_chip_variant {
+ ks8995,
+ ksz8864,
+ max_variant
+};
+
+struct ks8995_chip_params {
+ char *name;
+ int regs_size;
+};
+
+static const struct ks8995_chip_params ks8995_chip[] = {
+ [ks8995] = {
+ .name = "KS8995MA",
+ .regs_size = KS8995_REGS_SIZE,
+ },
+ [ksz8864] = {
+ .name = "KSZ8864RMN",
+ .regs_size = KSZ8864_REGS_SIZE,
+ },
+};
+
struct ks8995_pdata {
/* not yet implemented */
};
@@ -98,8 +120,16 @@ struct ks8995_switch {
struct mutex lock;
struct ks8995_pdata *pdata;
struct bin_attribute regs_attr;
+ const struct ks8995_chip_params *chip;
};
+static const struct spi_device_id ks8995_id[] = {
+ {"ks8995", ks8995},
+ {"ksz8864", ksz8864},
+ { }
+};
+MODULE_DEVICE_TABLE(spi, ks8995_id);
+
static inline u8 get_chip_id(u8 val)
{
return (val >> ID1_CHIPID_S) & ID1_CHIPID_M;
@@ -244,17 +274,22 @@ static const struct bin_attribute ks8995_registers_attr = {
};
/* ------------------------------------------------------------------------ */
-
static int ks8995_probe(struct spi_device *spi)
{
struct ks8995_switch *ks;
struct ks8995_pdata *pdata;
u8 ids[2];
int err;
+ int variant = spi_get_device_id(spi)->driver_data;
/* Chip description */
pdata = spi->dev.platform_data;
+ if (variant >= max_variant) {
+ dev_err(&spi->dev, "bad chip variant %d\n", variant);
+ return -ENODEV;
+ }
+
ks = devm_kzalloc(&spi->dev, sizeof(*ks), GFP_KERNEL);
if (!ks)
return -ENOMEM;
@@ -262,6 +297,8 @@ static int ks8995_probe(struct spi_device *spi)
mutex_init(&ks->lock);
ks->pdata = pdata;
ks->spi = spi_dev_get(spi);
+ ks->chip = &ks8995_chip[variant];
+
spi_set_drvdata(spi, ks);
spi->mode = SPI_MODE_0;
@@ -287,6 +324,7 @@ static int ks8995_probe(struct spi_device *spi)
return -ENODEV;
}
+ ks->regs_attr.size = ks->chip->regs_size;
memcpy(&ks->regs_attr, &ks8995_registers_attr, sizeof(ks->regs_attr));
if (get_chip_id(ids[1]) != CHIPID_M) {
u8 val;
@@ -303,7 +341,6 @@ static int ks8995_probe(struct spi_device *spi)
dev_err(&spi->dev, "unknown chip:%02x,0\n", ids[1]);
return err;
}
- ks->regs_attr.size = KSZ8864_REGS_SIZE;
}
err = ks8995_reset(ks);
@@ -346,6 +383,7 @@ static struct spi_driver ks8995_driver = {
},
.probe = ks8995_probe,
.remove = ks8995_remove,
+ .id_table = ks8995_id,
};
module_spi_driver(ks8995_driver);