mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-20 14:16:02 +00:00
spi: core: Extract of_spi_parse_dt()
Extract the parsing of SPI slave-specific properties into its own function, so it can be reused later for SPI slave controllers. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
parent
fafd679407
commit
c2e51ac3d0
1 changed files with 36 additions and 24 deletions
|
@ -1502,37 +1502,18 @@ static int spi_master_initialize_queue(struct spi_master *master)
|
|||
/*-------------------------------------------------------------------------*/
|
||||
|
||||
#if defined(CONFIG_OF)
|
||||
static struct spi_device *
|
||||
of_register_spi_device(struct spi_master *master, struct device_node *nc)
|
||||
static int of_spi_parse_dt(struct spi_master *master, struct spi_device *spi,
|
||||
struct device_node *nc)
|
||||
{
|
||||
struct spi_device *spi;
|
||||
int rc;
|
||||
u32 value;
|
||||
|
||||
/* Alloc an spi_device */
|
||||
spi = spi_alloc_device(master);
|
||||
if (!spi) {
|
||||
dev_err(&master->dev, "spi_device alloc error for %s\n",
|
||||
nc->full_name);
|
||||
rc = -ENOMEM;
|
||||
goto err_out;
|
||||
}
|
||||
|
||||
/* Select device driver */
|
||||
rc = of_modalias_node(nc, spi->modalias,
|
||||
sizeof(spi->modalias));
|
||||
if (rc < 0) {
|
||||
dev_err(&master->dev, "cannot find modalias for %s\n",
|
||||
nc->full_name);
|
||||
goto err_out;
|
||||
}
|
||||
int rc;
|
||||
|
||||
/* Device address */
|
||||
rc = of_property_read_u32(nc, "reg", &value);
|
||||
if (rc) {
|
||||
dev_err(&master->dev, "%s has no valid 'reg' property (%d)\n",
|
||||
nc->full_name, rc);
|
||||
goto err_out;
|
||||
return rc;
|
||||
}
|
||||
spi->chip_select = value;
|
||||
|
||||
|
@ -1590,10 +1571,41 @@ of_register_spi_device(struct spi_master *master, struct device_node *nc)
|
|||
if (rc) {
|
||||
dev_err(&master->dev, "%s has no valid 'spi-max-frequency' property (%d)\n",
|
||||
nc->full_name, rc);
|
||||
goto err_out;
|
||||
return rc;
|
||||
}
|
||||
spi->max_speed_hz = value;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static struct spi_device *
|
||||
of_register_spi_device(struct spi_master *master, struct device_node *nc)
|
||||
{
|
||||
struct spi_device *spi;
|
||||
int rc;
|
||||
|
||||
/* Alloc an spi_device */
|
||||
spi = spi_alloc_device(master);
|
||||
if (!spi) {
|
||||
dev_err(&master->dev, "spi_device alloc error for %s\n",
|
||||
nc->full_name);
|
||||
rc = -ENOMEM;
|
||||
goto err_out;
|
||||
}
|
||||
|
||||
/* Select device driver */
|
||||
rc = of_modalias_node(nc, spi->modalias,
|
||||
sizeof(spi->modalias));
|
||||
if (rc < 0) {
|
||||
dev_err(&master->dev, "cannot find modalias for %s\n",
|
||||
nc->full_name);
|
||||
goto err_out;
|
||||
}
|
||||
|
||||
rc = of_spi_parse_dt(master, spi, nc);
|
||||
if (rc)
|
||||
goto err_out;
|
||||
|
||||
/* Store a pointer to the node in the device structure */
|
||||
of_node_get(nc);
|
||||
spi->dev.of_node = nc;
|
||||
|
|
Loading…
Reference in a new issue