Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-23 12:42:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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: Richard Fitzgerald <rf@opensource.wolfsonmicro.com>
Acked-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
This commit is contained in:
Richard Fitzgerald 2015-10-02 13:29:15 +01:00 committed by Lee Jones
parent b61c1ec058
commit 2e44e28ad2
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/mfd/arizona-i2c.c
View File

@ -56,8 +56,7 @@ static int arizona_i2c_probe(struct i2c_client *i2c,
regmap_config = &wm8998_i2c_regmap;
break;
default:
dev_err(&i2c->dev, "Unknown device type %ld\n",
id->driver_data);
dev_err(&i2c->dev, "Unknown device type %ld\n", type);
return -EINVAL;
}
@ -79,7 +78,7 @@ static int arizona_i2c_probe(struct i2c_client *i2c,
return ret;
}
arizona->type = id->driver_data;
arizona->type = type;
arizona->dev = &i2c->dev;
arizona->irq = i2c->irq;

5
drivers/mfd/arizona-spi.c
View File

@ -47,8 +47,7 @@ static int arizona_spi_probe(struct spi_device *spi)
regmap_config = &wm5110_spi_regmap;
break;
default:
dev_err(&spi->dev, "Unknown device type %ld\n",
id->driver_data);
dev_err(&spi->dev, "Unknown device type %ld\n", type);
return -EINVAL;
}
@ -70,7 +69,7 @@ static int arizona_spi_probe(struct spi_device *spi)
return ret;
}
arizona->type = id->driver_data;
arizona->type = type;
arizona->dev = &spi->dev;
arizona->irq = spi->irq;