From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Jon Lin <jon.lin@rock-chips.com>, Mark Brown <broonie@kernel.org>,
Sasha Levin <sashal@kernel.org>,
heiko@sntech.de, linux-spi@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-rockchip@lists.infradead.org
Subject: [PATCH AUTOSEL 5.15 07/23] spi: rockchip: Fix error in getting num-cs property
Date: Tue, 1 Mar 2022 15:16:06 -0500 [thread overview]
Message-ID: <20220301201629.18547-7-sashal@kernel.org> (raw)
In-Reply-To: <20220301201629.18547-1-sashal@kernel.org>
From: Jon Lin <jon.lin@rock-chips.com>
[ 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>
---
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 553b6b9d02222..4f65ba3dd19c2 100644
--- a/drivers/spi/spi-rockchip.c
+++ b/drivers/spi/spi-rockchip.c
@@ -654,7 +654,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");
@@ -764,8 +764,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
next prev parent reply other threads:[~2022-03-01 20:20 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-01 20:16 [PATCH AUTOSEL 5.15 01/23] selftests/bpf: Add test for bpf_timer overwriting crash Sasha Levin
2022-03-01 20:16 ` [PATCH AUTOSEL 5.15 02/23] swiotlb: fix info leak with DMA_FROM_DEVICE Sasha Levin
2022-03-01 20:16 ` [PATCH AUTOSEL 5.15 03/23] usb: dwc3: pci: add support for the Intel Raptor Lake-S Sasha Levin
2022-03-01 20:16 ` [PATCH AUTOSEL 5.15 04/23] pinctrl: tigerlake: Revert "Add Alder Lake-M ACPI ID" Sasha Levin
2022-03-01 20:16 ` [PATCH AUTOSEL 5.15 05/23] KVM: Fix lockdep false negative during host resume Sasha Levin
2022-03-01 20:17 ` Paolo Bonzini
2022-03-01 20:16 ` [PATCH AUTOSEL 5.15 06/23] kvm: x86: Disable KVM_HC_CLOCK_PAIRING if tsc is in always catchup mode Sasha Levin
2022-03-01 20:17 ` Paolo Bonzini
2022-03-01 20:16 ` Sasha Levin [this message]
2022-03-01 20:16 ` [PATCH AUTOSEL 5.15 08/23] spi: rockchip: terminate dma transmission when slave abort Sasha Levin
2022-03-01 20:16 ` [PATCH AUTOSEL 5.15 09/23] drm/vc4: hdmi: Unregister codec device on unbind Sasha Levin
2022-03-01 20:16 ` [PATCH AUTOSEL 5.15 10/23] x86/kvm: Don't use pv tlb/ipi/sched_yield if on 1 vCPU Sasha Levin
2022-03-01 20:17 ` Paolo Bonzini
2022-03-01 20:16 ` [PATCH AUTOSEL 5.15 11/23] net-sysfs: add check for netdevice being present to speed_show Sasha Levin
2022-03-01 20:16 ` [PATCH AUTOSEL 5.15 12/23] sr9700: sanity check for packet length Sasha Levin
2022-03-01 20:16 ` [PATCH AUTOSEL 5.15 13/23] hwmon: (pmbus) Clear pmbus fault/warning bits after read Sasha Levin
2022-03-01 20:16 ` [PATCH AUTOSEL 5.15 14/23] PCI: Mark all AMD Navi10 and Navi14 GPU ATS as broken Sasha Levin
2022-03-01 20:16 ` [PATCH AUTOSEL 5.15 15/23] gpio: Return EPROBE_DEFER if gc->to_irq is NULL Sasha Levin
2022-03-01 20:16 ` [PATCH AUTOSEL 5.15 16/23] drm/amdgpu: bypass tiling flag check in virtual display case (v2) Sasha Levin
2022-03-01 20:16 ` [PATCH AUTOSEL 5.15 17/23] Revert "xen-netback: remove 'hotplug-status' once it has served its purpose" Sasha Levin
2022-03-01 20:16 ` [PATCH AUTOSEL 5.15 18/23] Revert "xen-netback: Check for hotplug-status existence before watching" Sasha Levin
2022-03-01 20:16 ` [PATCH AUTOSEL 5.15 19/23] ipv6: prevent a possible race condition with lifetimes Sasha Levin
2022-03-01 20:16 ` [PATCH AUTOSEL 5.15 20/23] tracing: Ensure trace buffer is at least 4096 bytes large Sasha Levin
2022-03-01 20:16 ` [PATCH AUTOSEL 5.15 21/23] tracing/osnoise: Make osnoise_main to sleep for microseconds Sasha Levin
2022-03-01 20:16 ` [PATCH AUTOSEL 5.15 22/23] selftest/vm: fix map_fixed_noreplace test failure Sasha Levin
2022-03-01 20:16 ` [PATCH AUTOSEL 5.15 23/23] selftests/memfd: clean up mapping in mfd_fail_write Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220301201629.18547-7-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=broonie@kernel.org \
--cc=heiko@sntech.de \
--cc=jon.lin@rock-chips.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=linux-spi@vger.kernel.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox