LKML Archive on lore.kernel.org help / color / mirror / Atom feed
From: "Ivan T. Ivanov" <iivanov@mm-sol.com> To: Mark Brown <broonie@kernel.org> Cc: linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org Subject: [PATCH 1/2] spi: qup: Fix cs-num DT property parsing Date: Fri, 6 Mar 2015 17:26:17 +0200 [thread overview] Message-ID: <1425655578-22400-1-git-send-email-iivanov@mm-sol.com> (raw) num-cs is 32 bit property, don't read just upper 16 bits. Fixes: 4a8573abe965 "spi: qup: Remove chip select function" Signed-off-by: Ivan T. Ivanov <iivanov@mm-sol.com> --- drivers/spi/spi-qup.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/spi/spi-qup.c b/drivers/spi/spi-qup.c index ff9cdbd..2b2c359 100644 --- a/drivers/spi/spi-qup.c +++ b/drivers/spi/spi-qup.c @@ -498,7 +498,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; @@ -550,10 +550,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; -- 1.9.1
next reply other threads:[~2015-03-06 15:26 UTC|newest] Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-03-06 15:26 Ivan T. Ivanov [this message] 2015-03-06 15:26 ` [PATCH 2/2] spi: qup: Request CS GPIO's during probe Ivan T. Ivanov 2015-03-06 18:34 ` Stephen Boyd 2015-03-09 8:20 ` Ivan T. Ivanov 2015-03-09 18:53 ` Stephen Boyd 2015-03-10 8:31 ` Ivan T. Ivanov 2015-03-17 11:02 ` Ivan T. Ivanov 2015-03-07 10:59 ` Mark Brown [not found] ` <1425889415.2440.10.camel@mm-sol.com> [not found] ` <20150309182841.GW28806@sirena.org.uk> 2015-03-10 8:10 ` Ivan T. Ivanov 2015-03-10 11:06 ` Mark Brown 2015-03-10 12:53 ` Ivan T. Ivanov 2015-03-10 20:47 ` Mark Brown 2015-03-07 11:01 ` [PATCH 1/2] spi: qup: Fix cs-num DT property parsing Mark Brown
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=1425655578-22400-1-git-send-email-iivanov@mm-sol.com \ --to=iivanov@mm-sol.com \ --cc=broonie@kernel.org \ --cc=linux-arm-msm@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-spi@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: linkBe 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; as well as URLs for NNTP newsgroup(s).