Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7cc582d4 authored by Ivan T. Ivanov's avatar Ivan T. Ivanov Committed by Sasha Levin
Browse files

spi: qup: Fix cs-num DT property parsing 



[ Upstream commit 12cb89e37a0c25fae7a0f1d2e4985558db9d0b13 ]

num-cs is 32 bit property, don't read just upper 16 bits.

Fixes: 4a8573ab (spi: qup: Remove chip select function)
Signed-off-by: default avatarIvan T. Ivanov <iivanov@mm-sol.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarSasha Levin <sasha.levin@oracle.com>
parent c280422c

drivers/spi/spi-qup.c

+5 −4
Original line number Diff line number Diff line
@@ -489,7 +489,7 @@ static int spi_qup_probe(struct platform_device *pdev) 
	struct resource *res;

	struct device *dev;

	void __iomem *base;

	u32 max_freq, iomode;

	u32 max_freq, iomode, num_cs;

	int ret, irq, size;



	dev = &pdev->dev;
@@ -541,10 +541,11 @@ static int spi_qup_probe(struct platform_device *pdev) 
	}



	/* use num-cs unless not present or out of range */

	if (of_property_read_u16(dev->of_node, "num-cs",

			&master->num_chipselect) ||

			(master->num_chipselect > SPI_NUM_CHIPSELECTS))

	if (of_property_read_u32(dev->of_node, "num-cs", &num_cs) ||

	    num_cs > SPI_NUM_CHIPSELECTS)

		master->num_chipselect = SPI_NUM_CHIPSELECTS;

	else

		master->num_chipselect = num_cs;



	master->bus_num = pdev->id;

	master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH | SPI_LOOP;