spi: imx: Don't require platform data chipselect array (ffd4db9e) · Commits · 戴 / test

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:

Trent Piepho <tpiepho@impinj.com> Signed-off-by:

Mark Brown <broonie@kernel.org>

drivers/spi/spi-imx.c

+9 −7

Original line number	Original line	Diff line number	Diff line
	@@ -1526,6 +1526,7 @@ 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;
			if (mxc_platform_info->chipselect) {
	master->cs_gpios = devm_kzalloc(&master->dev,		master->cs_gpios = devm_kzalloc(&master->dev,
	sizeof(int) * master->num_chipselect, GFP_KERNEL);		sizeof(int) * master->num_chipselect, GFP_KERNEL);
	if (!master->cs_gpios)		if (!master->cs_gpios)
	@@ -1533,6 +1534,7 @@ static int spi_imx_probe(struct platform_device *pdev)

	for (i = 0; i < master->num_chipselect; i++)		for (i = 0; i < master->num_chipselect; i++)
	master->cs_gpios[i] = mxc_platform_info->chipselect[i];		master->cs_gpios[i] = mxc_platform_info->chipselect[i];
			}
	} else {		} else {
	u32 num_cs;		u32 num_cs;

Admin message