Commit 2e44e28a authored by Richard Fitzgerald's avatar Richard Fitzgerald Committed by Lee Jones

mfd: arizona: Use correct type ID for device tree config

In the case of a device tree config the code uses the device ID
from the DT entry to check which codec is required but when storing
the ID into struct arizona it was always using the non-DT SPI device
table to get an ID.

This patch changes the code to store the correct ID into struct arizona.
Signed-off-by: default avatarRichard Fitzgerald <rf@opensource.wolfsonmicro.com>
Acked-by: default avatarLee Jones <lee.jones@linaro.org>
Signed-off-by: default avatarCharles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent b61c1ec0
...@@ -56,8 +56,7 @@ static int arizona_i2c_probe(struct i2c_client *i2c, ...@@ -56,8 +56,7 @@ static int arizona_i2c_probe(struct i2c_client *i2c,
regmap_config = &wm8998_i2c_regmap; regmap_config = &wm8998_i2c_regmap;
break; break;
default: default:
dev_err(&i2c->dev, "Unknown device type %ld\n", dev_err(&i2c->dev, "Unknown device type %ld\n", type);
id->driver_data);
return -EINVAL; return -EINVAL;
} }
...@@ -79,7 +78,7 @@ static int arizona_i2c_probe(struct i2c_client *i2c, ...@@ -79,7 +78,7 @@ static int arizona_i2c_probe(struct i2c_client *i2c,
return ret; return ret;
} }
arizona->type = id->driver_data; arizona->type = type;
arizona->dev = &i2c->dev; arizona->dev = &i2c->dev;
arizona->irq = i2c->irq; arizona->irq = i2c->irq;
......
...@@ -47,8 +47,7 @@ static int arizona_spi_probe(struct spi_device *spi) ...@@ -47,8 +47,7 @@ static int arizona_spi_probe(struct spi_device *spi)
regmap_config = &wm5110_spi_regmap; regmap_config = &wm5110_spi_regmap;
break; break;
default: default:
dev_err(&spi->dev, "Unknown device type %ld\n", dev_err(&spi->dev, "Unknown device type %ld\n", type);
id->driver_data);
return -EINVAL; return -EINVAL;
} }
...@@ -70,7 +69,7 @@ static int arizona_spi_probe(struct spi_device *spi) ...@@ -70,7 +69,7 @@ static int arizona_spi_probe(struct spi_device *spi)
return ret; return ret;
} }
arizona->type = id->driver_data; arizona->type = type;
arizona->dev = &spi->dev; arizona->dev = &spi->dev;
arizona->irq = spi->irq; arizona->irq = spi->irq;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment