xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

spi: rockchip: Fix error in getting num-cs property

Browse Source 
[ Upstream commit 9382df0a98aad5bbcd4d634790305a1d786ad224 ]

Get num-cs u32 from dts of_node property rather than u16.

Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
Link: https://lore.kernel.org/r/20220216014028.8123-2-jon.lin@rock-chips.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Jon Lin
2022-02-16 09:40:23 +08:00
committed by Greg Kroah-Hartman
parent 4fb9be675b
commit 889254f98e
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/spi/spi-rockchip.c
View File

@@ -636,7 +636,7 @@ static int rockchip_spi_probe(struct platform_device *pdev)
struct spi_controller *ctlr; struct spi_controller *ctlr;
struct resource *mem; struct resource *mem;
struct device_node *np = pdev->dev.of_node; struct device_node *np = pdev->dev.of_node;
u32 rsd_nsecs; u32 rsd_nsecs, num_cs;
bool slave_mode; bool slave_mode;
slave_mode = of_property_read_bool(np, "spi-slave"); slave_mode = of_property_read_bool(np, "spi-slave");
@@ -744,8 +744,9 @@ static int rockchip_spi_probe(struct platform_device *pdev)
* rk spi0 has two native cs, spi1..5 one cs only * rk spi0 has two native cs, spi1..5 one cs only
* if num-cs is missing in the dts, default to 1 * if num-cs is missing in the dts, default to 1
*/ */
if (of_property_read_u16(np, "num-cs", &ctlr->num_chipselect)) if (of_property_read_u32(np, "num-cs", &num_cs))
ctlr->num_chipselect = 1; num_cs = 1;
ctlr->num_chipselect = num_cs;
ctlr->use_gpio_descriptors = true; ctlr->use_gpio_descriptors = true;
} }
ctlr->dev.of_node = pdev->dev.of_node; ctlr->dev.of_node = pdev->dev.of_node;