From: Mark Brown <broonie@kernel.org> To: Varadarajan Narayanan <varada@codeaurora.org> Cc: Sham Muthayyan <smuthayy@codeaurora.org>, Mark Brown <broonie@kernel.org>broonie@kernel.org, robh+dt@kernel.org, mark.rutland@arm.com, andy.gross@linaro.org, david.brown@linaro.org, linux-spi@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-soc@vger.kernel.orgSham Muthayyan <smuthayy@codeaurora.org>linux-spi@vger.kernel.org Subject: Applied "spi: qup: Enable chip select support" to the spi tree Date: Tue, 08 Aug 2017 12:18:43 +0100 [thread overview] Message-ID: <E1df2X5-0006R8-H4@finisterre> (raw) In-Reply-To: <1497419551-21834-2-git-send-email-varada@codeaurora.org> The patch spi: qup: Enable chip select support has been applied to the spi tree at git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From b702b9fb393ed1c19ab3ecb1552757522c982746 Mon Sep 17 00:00:00 2001 From: Varadarajan Narayanan <varada@codeaurora.org> Date: Fri, 28 Jul 2017 12:22:48 +0530 Subject: [PATCH] spi: qup: Enable chip select support Enable chip select support for QUP versions later than v1. The chip select support was broken in QUP version 1. Hence the chip select support was removed earlier in an earlier commit (4a8573abe "spi: qup: Remove chip select function"). Since the chip select support is functional in recent versions of QUP, re-enabling it for QUP versions later than v1. Signed-off-by: Sham Muthayyan <smuthayy@codeaurora.org> Signed-off-by: Varadarajan Narayanan <varada@codeaurora.org> Signed-off-by: Mark Brown <broonie@kernel.org> --- drivers/spi/spi-qup.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/drivers/spi/spi-qup.c b/drivers/spi/spi-qup.c index 1bfa889b8427..c0d4defc1c13 100644 --- a/drivers/spi/spi-qup.c +++ b/drivers/spi/spi-qup.c @@ -750,6 +750,24 @@ static int spi_qup_init_dma(struct spi_master *master, resource_size_t base) return ret; } +static void spi_qup_set_cs(struct spi_device *spi, bool val) +{ + struct spi_qup *controller; + u32 spi_ioc; + u32 spi_ioc_orig; + + controller = spi_master_get_devdata(spi->master); + spi_ioc = readl_relaxed(controller->base + SPI_IO_CONTROL); + spi_ioc_orig = spi_ioc; + if (!val) + spi_ioc |= SPI_IO_C_FORCE_CS; + else + spi_ioc &= ~SPI_IO_C_FORCE_CS; + + if (spi_ioc != spi_ioc_orig) + writel_relaxed(spi_ioc, controller->base + SPI_IO_CONTROL); +} + static int spi_qup_probe(struct platform_device *pdev) { struct spi_master *master; @@ -846,6 +864,9 @@ static int spi_qup_probe(struct platform_device *pdev) if (of_device_is_compatible(dev->of_node, "qcom,spi-qup-v1.1.1")) controller->qup_v1 = 1; + if (!controller->qup_v1) + master->set_cs = spi_qup_set_cs; + spin_lock_init(&controller->lock); init_completion(&controller->done); -- 2.13.2
WARNING: multiple messages have this Message-ID (diff)
From: Mark Brown <broonie@kernel.org> To: Varadarajan Narayanan <varada@codeaurora.org> Cc: Sham Muthayyan <smuthayy@codeaurora.org>, Mark Brown <broonie@kernel.org>, broonie@kernel.org, robh+dt@kernel.org, mark.rutland@arm.com, andy.gross@linaro.org, david.brown@linaro.org, linux-spi@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-soc@vger.kernel.org, Sham Muthayyan <smuthayy@codeaurora.org>, linux-spi@vger.kernel.org Subject: Applied "spi: qup: Enable chip select support" to the spi tree Date: Tue, 08 Aug 2017 12:18:43 +0100 [thread overview] Message-ID: <E1df2X5-0006R8-H4@finisterre> (raw) In-Reply-To: <1497419551-21834-2-git-send-email-varada@codeaurora.org> The patch spi: qup: Enable chip select support has been applied to the spi tree at git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From b702b9fb393ed1c19ab3ecb1552757522c982746 Mon Sep 17 00:00:00 2001 From: Varadarajan Narayanan <varada@codeaurora.org> Date: Fri, 28 Jul 2017 12:22:48 +0530 Subject: [PATCH] spi: qup: Enable chip select support Enable chip select support for QUP versions later than v1. The chip select support was broken in QUP version 1. Hence the chip select support was removed earlier in an earlier commit (4a8573abe "spi: qup: Remove chip select function"). Since the chip select support is functional in recent versions of QUP, re-enabling it for QUP versions later than v1. Signed-off-by: Sham Muthayyan <smuthayy@codeaurora.org> Signed-off-by: Varadarajan Narayanan <varada@codeaurora.org> Signed-off-by: Mark Brown <broonie@kernel.org> --- drivers/spi/spi-qup.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/drivers/spi/spi-qup.c b/drivers/spi/spi-qup.c index 1bfa889b8427..c0d4defc1c13 100644 --- a/drivers/spi/spi-qup.c +++ b/drivers/spi/spi-qup.c @@ -750,6 +750,24 @@ static int spi_qup_init_dma(struct spi_master *master, resource_size_t base) return ret; } +static void spi_qup_set_cs(struct spi_device *spi, bool val) +{ + struct spi_qup *controller; + u32 spi_ioc; + u32 spi_ioc_orig; + + controller = spi_master_get_devdata(spi->master); + spi_ioc = readl_relaxed(controller->base + SPI_IO_CONTROL); + spi_ioc_orig = spi_ioc; + if (!val) + spi_ioc |= SPI_IO_C_FORCE_CS; + else + spi_ioc &= ~SPI_IO_C_FORCE_CS; + + if (spi_ioc != spi_ioc_orig) + writel_relaxed(spi_ioc, controller->base + SPI_IO_CONTROL); +} + static int spi_qup_probe(struct platform_device *pdev) { struct spi_master *master; @@ -846,6 +864,9 @@ static int spi_qup_probe(struct platform_device *pdev) if (of_device_is_compatible(dev->of_node, "qcom,spi-qup-v1.1.1")) controller->qup_v1 = 1; + if (!controller->qup_v1) + master->set_cs = spi_qup_set_cs; + spin_lock_init(&controller->lock); init_completion(&controller->done); -- 2.13.2
next prev parent reply other threads:[~2017-08-08 11:18 UTC|newest] Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-06-14 5:52 [PATCH 00/18] spi: qup: Fixes and add support for >64k transfers Varadarajan Narayanan 2017-06-14 5:52 ` Varadarajan Narayanan 2017-06-14 5:52 ` [PATCH 01/18] spi: qup: Enable chip select support Varadarajan Narayanan 2017-06-14 9:47 ` Stanimir Varbanov 2017-08-08 11:18 ` Mark Brown [this message] 2017-08-08 11:18 ` Applied "spi: qup: Enable chip select support" to the spi tree Mark Brown [not found] ` <1497419551-21834-1-git-send-email-varada-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org> 2017-06-14 5:52 ` [PATCH 02/18] spi: qup: Setup DMA mode correctly Varadarajan Narayanan 2017-06-14 5:52 ` Varadarajan Narayanan 2017-08-08 11:18 ` Applied "spi: qup: Setup DMA mode correctly" to the spi tree Mark Brown 2017-08-08 11:18 ` Mark Brown 2017-06-14 5:52 ` [PATCH 06/18] spi: qup: Fix error handling in spi_qup_prep_sg Varadarajan Narayanan 2017-06-14 5:52 ` Varadarajan Narayanan 2017-06-14 5:52 ` [PATCH 03/18] spi: qup: Add completion timeout for dma mode Varadarajan Narayanan 2017-06-14 5:52 ` [PATCH 04/18] spi: qup: Add completion timeout for fifo/block mode Varadarajan Narayanan 2017-06-14 5:52 ` [PATCH 05/18] spi: qup: Place the QUP in run mode before DMA transactions Varadarajan Narayanan 2017-06-14 5:52 ` [PATCH 07/18] spi: qup: Fix transaction done signaling Varadarajan Narayanan 2017-06-14 7:13 ` Sricharan R [not found] ` <4b81a4c7-b85c-a35d-15fb-4aaaec3c7e8c-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org> 2017-06-14 19:51 ` Andy Gross 2017-06-14 19:51 ` Andy Gross [not found] ` <20170614195155.GB32733-5taXn+FmohyKb9UB7mSz9QC/G2K4zDHf@public.gmane.org> 2017-06-15 5:14 ` Sricharan R 2017-06-15 5:14 ` Sricharan R 2017-06-14 5:52 ` [PATCH 08/18] spi: qup: Handle v1 dma completion differently Varadarajan Narayanan [not found] ` <1497419551-21834-9-git-send-email-varada-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org> 2017-06-14 7:15 ` Sricharan R 2017-06-14 7:15 ` Sricharan R [not found] ` <a0e499a7-8f89-96d6-9463-c2b3f774cd6d-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org> 2017-06-14 19:53 ` Andy Gross 2017-06-14 19:53 ` Andy Gross 2017-06-14 5:52 ` [PATCH 09/18] spi: qup: Do block sized read/write in block mode Varadarajan Narayanan 2017-06-14 5:52 ` [PATCH 10/18] spi: qup: Fix DMA mode interrupt handling Varadarajan Narayanan 2017-06-14 7:21 ` Sricharan R [not found] ` <66ba7dfb-6ff3-884e-6db0-8d5191f87c93-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org> 2017-06-14 20:06 ` Andy Gross 2017-06-14 20:06 ` Andy Gross 2017-06-15 5:52 ` Sricharan R 2017-06-14 5:52 ` [PATCH 11/18] spi: qup: properly detect extra interrupts Varadarajan Narayanan [not found] ` <1497419551-21834-12-git-send-email-varada-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org> 2017-06-14 7:27 ` Sricharan R 2017-06-14 7:27 ` Sricharan R 2017-06-14 19:59 ` Andy Gross [not found] ` <20170614195953.GD32733-5taXn+FmohyKb9UB7mSz9QC/G2K4zDHf@public.gmane.org> 2017-06-14 21:51 ` Matthew McClintock 2017-06-14 21:51 ` Matthew McClintock 2017-06-15 5:27 ` Sricharan R 2017-06-14 5:52 ` [PATCH 12/18] spi: qup: refactor spi_qup_io_config into two functions Varadarajan Narayanan 2017-06-14 5:52 ` [PATCH 13/18] spi: qup: call io_config in mode specific function Varadarajan Narayanan 2017-06-14 5:52 ` [PATCH 14/18] spi: qup: allow block mode to generate multiple transactions Varadarajan Narayanan 2017-06-14 5:52 ` [PATCH 15/18] spi: qup: refactor spi_qup_prep_sg Varadarajan Narayanan 2017-06-14 5:52 ` [PATCH 16/18] spi: qup: allow multiple DMA transactions per spi xfer Varadarajan Narayanan 2017-06-14 5:52 ` [PATCH 17/18] spi: qup: Ensure done detection Varadarajan Narayanan 2017-06-14 5:52 ` [PATCH 18/18] spi: qup: support for qup v1 dma Varadarajan Narayanan
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=E1df2X5-0006R8-H4@finisterre \ --to=broonie@kernel.org \ --cc=smuthayy@codeaurora.org \ --cc=varada@codeaurora.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 an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.