Commit ffd4db9e authored by Trent Piepho's avatar Trent Piepho Committed by Mark Brown

spi: imx: Don't require platform data chipselect array

If the array is not present, assume all chip selects are native.  This
is the standard behavior for SPI masters configured via the device
tree and the behavior of this driver as well when it is configured via
device tree.

This reduces platform data vs DT differences and allows most of the
platform data based boards to remove their chip select arrays.

CC: Shawn Guo <shawnguo@kernel.org>
CC: Sascha Hauer <kernel@pengutronix.de>
CC: Fabio Estevam <fabio.estevam@nxp.com>
CC: Mark Brown <broonie@kernel.org>
Signed-off-by: default avatarTrent Piepho <tpiepho@impinj.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 4e21791e
...@@ -1526,13 +1526,15 @@ static int spi_imx_probe(struct platform_device *pdev) ...@@ -1526,13 +1526,15 @@ static int spi_imx_probe(struct platform_device *pdev)
/* Get number of chip selects, either platform data or OF */ /* Get number of chip selects, either platform data or OF */
if (mxc_platform_info) { if (mxc_platform_info) {
master->num_chipselect = mxc_platform_info->num_chipselect; master->num_chipselect = mxc_platform_info->num_chipselect;
master->cs_gpios = devm_kzalloc(&master->dev, if (mxc_platform_info->chipselect) {
sizeof(int) * master->num_chipselect, GFP_KERNEL); master->cs_gpios = devm_kzalloc(&master->dev,
if (!master->cs_gpios) sizeof(int) * master->num_chipselect, GFP_KERNEL);
return -ENOMEM; if (!master->cs_gpios)
return -ENOMEM;
for (i = 0; i < master->num_chipselect; i++)
master->cs_gpios[i] = mxc_platform_info->chipselect[i]; for (i = 0; i < master->num_chipselect; i++)
master->cs_gpios[i] = mxc_platform_info->chipselect[i];
}
} else { } else {
u32 num_cs; u32 num_cs;
......
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