From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1C1A6C433EF for ; Tue, 1 Mar 2022 20:21:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238171AbiCAUWH (ORCPT ); Tue, 1 Mar 2022 15:22:07 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34872 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238074AbiCAUVu (ORCPT ); Tue, 1 Mar 2022 15:21:50 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CEF588F61E; Tue, 1 Mar 2022 12:19:08 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id D1B93B81D41; Tue, 1 Mar 2022 20:18:51 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9499CC340EF; Tue, 1 Mar 2022 20:18:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1646165930; bh=FTy4iMlhuHS/L/W/z6cl/6cZ3QZspAbdvD8Y7KiVPIk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=flNa+q88rrzFEwK9IsdcwxpJ7nlcoD+CwI3fKPDDE1WV5CifxJp6uUP2RLbe0N4lU f2GbhM0tKu61HDL3zWWXEoQcukK+hxgteAlW0jefdDwM8A6dIRg4abMH+YfNRqdxrZ DqVNaeikv0pu4OKcLdtZZgamFJUblofBfx4VX17/2tuPuJWIotFevg4YwUrky6aDip 67nRq8xwlZS4uvxrlg9lrid9Wi8XmMi7iXercMZkXdsqWmZa8Am9kVNTCIpwnk95y9 w4eD4cdZ2dCfLFYaNarVK/wc1R7YVe5dZ8PcBceWS8xYxU8nkNKT4xvMe8Pgiy8K/e 26mEy/Pm/23Eg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Jon Lin , Mark Brown , Sasha Levin , heiko@sntech.de, linux-spi@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org Subject: [PATCH AUTOSEL 5.10 03/14] spi: rockchip: Fix error in getting num-cs property Date: Tue, 1 Mar 2022 15:18:15 -0500 Message-Id: <20220301201833.18841-3-sashal@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220301201833.18841-1-sashal@kernel.org> References: <20220301201833.18841-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org From: Jon Lin [ Upstream commit 9382df0a98aad5bbcd4d634790305a1d786ad224 ] Get num-cs u32 from dts of_node property rather than u16. Signed-off-by: Jon Lin Link: https://lore.kernel.org/r/20220216014028.8123-2-jon.lin@rock-chips.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- drivers/spi/spi-rockchip.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/spi/spi-rockchip.c b/drivers/spi/spi-rockchip.c index 624273d0e727f..a594310754111 100644 --- a/drivers/spi/spi-rockchip.c +++ b/drivers/spi/spi-rockchip.c @@ -636,7 +636,7 @@ static int rockchip_spi_probe(struct platform_device *pdev) struct spi_controller *ctlr; struct resource *mem; struct device_node *np = pdev->dev.of_node; - u32 rsd_nsecs; + u32 rsd_nsecs, num_cs; bool slave_mode; 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 * if num-cs is missing in the dts, default to 1 */ - if (of_property_read_u16(np, "num-cs", &ctlr->num_chipselect)) - ctlr->num_chipselect = 1; + if (of_property_read_u32(np, "num-cs", &num_cs)) + num_cs = 1; + ctlr->num_chipselect = num_cs; ctlr->use_gpio_descriptors = true; } ctlr->dev.of_node = pdev->dev.of_node; -- 2.34.1