From: Michal Suchanek <hramrach@gmail.com>
To: Julian Calaby <julian.calaby@gmail.com>
Cc: linux-sunxi <linux-sunxi@googlegroups.com>,
Rob Herring <robh+dt@kernel.org>, Pawel Moll <pawel.moll@arm.com>,
Mark Rutland <mark.rutland@arm.com>,
Ian Campbell <ijc+devicetree@hellion.org.uk>,
Kumar Gala <galak@codeaurora.org>,
Maxime Ripard <maxime.ripard@free-electrons.com>,
Chen-Yu Tsai <wens@csie.org>,
Russell King <linux@armlinux.org.uk>,
Mark Brown <broonie@kernel.org>, Arnd Bergmann <arnd@arndb.de>,
Olof Johansson <olof@lixom.net>,
Krzysztof Kozlowski <k.kozlowski@samsung.com>,
Javier Martinez Canillas <javier@osg.samsung.com>,
Simon Horman <horms+renesas@verge.net.au>,
Sjoerd Simons <sjoerd.simons@collabora.co.uk>,
Thierry Reding <treding@nvidia.com>,
Alison Wang <b18965@freescale.com>,
Timo Sigurdsson <public_timo.s@silentcreek.de>,
Jonathan Liu <net147@gmail.com>,
Gerhard Bertelsmann <info@gerhard-bertelsmann.de>,
Priit Laes <plaes@plaes.org>,
devicetree <devicetree@vger.kernel.org>,
"Mailing List, Arm" <linux-arm-kernel@lists.infradead.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
linux-spi <linux-spi@vger.kernel.org>
Subject: Re: [linux-sunxi] [PATCH v3 10/13] spi: sunxi: merge sun4i and sun6i SPI driver
Date: Tue, 14 Jun 2016 06:34:45 +0200 [thread overview]
Message-ID: <CAOMqctQD=o6YBk-QRiqbE9Cj+ZAH1nAM33rW6ZHefV8dU3aucQ@mail.gmail.com> (raw)
In-Reply-To: <CAGRGNgVONS+i=57D52VeW8J6SvfmX=iG+3VpxNS8=kJOV+WSLw@mail.gmail.com>
Hello,
On 14 June 2016 at 01:43, Julian Calaby <julian.calaby@gmail.com> wrote:
> Hi Michal,
>
> On Tue, Jun 14, 2016 at 3:46 AM, Michal Suchanek <hramrach@gmail.com> wrote:
>> The drivers are very similar and share multiple flaws which needed
>> separate fixes for both drivers.
>>
>> Signed-off-by: Michal Suchanek <hramrach@gmail.com>
>> ---
>> drivers/spi/Kconfig | 8 +-
>> drivers/spi/Makefile | 1 -
>> drivers/spi/spi-sun4i.c | 156 +++++++++++--
>> drivers/spi/spi-sun6i.c | 598 ------------------------------------------------
>> 4 files changed, 143 insertions(+), 620 deletions(-)
>> delete mode 100644 drivers/spi/spi-sun6i.c
>>
>> diff --git a/drivers/spi/spi-sun4i.c b/drivers/spi/spi-sun4i.c
>> index 0b8e6c6..c76f8e4 100644
>> --- a/drivers/spi/spi-sun4i.c
>> +++ b/drivers/spi/spi-sun4i.c
>> @@ -279,9 +321,14 @@ static int sunxi_spi_transfer_one(struct spi_master *master,
>> reg = sunxi_spi_read(sspi, SUNXI_TFR_CTL_REG);
>>
>> /* Reset FIFOs */
>> - sunxi_spi_write(sspi, SUNXI_TFR_CTL_REG,
>> - reg | sspi_bits(sspi, SUNXI_CTL_RF_RST) |
>> - sspi_bits(sspi, SUNXI_CTL_TF_RST));
>> + if (sspi->type == SPI_SUN4I)
>> + sunxi_spi_write(sspi, SUNXI_TFR_CTL_REG,
>> + reg | sspi_bits(sspi, SUNXI_CTL_RF_RST) |
>> + sspi_bits(sspi, SUNXI_CTL_TF_RST));
>> + else
>> + sunxi_spi_write(sspi, SUNXI_FIFO_CTL_REG,
>> + sspi_bits(sspi, SUNXI_CTL_RF_RST) |
>> + sspi_bits(sspi, SUNXI_CTL_TF_RST));
>
> If we're already doing different stuff for each generation of the IP,
> why not just use the register offsets and bit definitions directly?
Because having (*sspi->regmap)[SUNXI_FIFO_CTL_REG] all over the place
makes my eyes bleed and you cannot use the check that you are
accessing a register that actually exists.
>> @@ -491,10 +558,37 @@ static int sunxi_spi_probe(struct platform_device *pdev)
>> }
>>
>> sspi->master = master;
>> - sspi->fifo_depth = SUN4I_FIFO_DEPTH;
>> - sspi->type = SPI_SUN4I;
>> - sspi->regmap = &sun4i_regmap;
>> - sspi->bitmap = &sun4i_bitmap;
>> + if (of_device_is_compatible(pdev->dev.of_node, SUN4I_COMPATIBLE)) {
>> + sspi->fifo_depth = SUN4I_FIFO_DEPTH;
>> + sspi->type = SPI_SUN4I;
>> + sspi->regmap = &sun4i_regmap;
>> + sspi->bitmap = &sun4i_bitmap;
>> + } else if (of_device_is_compatible(pdev->dev.of_node,
>> + SUN6I_COMPATIBLE)) {
>> + sspi->fifo_depth = SUN6I_FIFO_DEPTH;
>> + sspi->type = SPI_SUN6I;
>> + sspi->regmap = &sun6i_regmap;
>> + sspi->bitmap = &sun6i_bitmap;
>
> Can you store data in the match table instead of doing this?
That might be nicer. Will look into this.
Thanks
Michal
next prev parent reply other threads:[~2016-06-14 4:35 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <cover.1465490774.git.hramrach@gmail.com>
[not found] ` <2db0ce0ea1ddc17e9bb790c8cc50bcb4bb97be58.1465490774.git.hramrach@gmail.com>
2016-06-13 19:55 ` [PATCH v3 01/13] spi: sunxi: set maximum and minimum speed of SPI master Maxime Ripard
[not found] ` <064955d033503f129c3e138b0563817d1fffab27.1465490774.git.hramrach@gmail.com>
2016-06-13 19:55 ` [PATCH v3 02/13] spi: sunxi: fix transfer timeout Maxime Ripard
[not found] ` <6495575d7c7e14da06f86d88a6a15042b4c6b96a.1465490774.git.hramrach@gmail.com>
2016-06-13 19:56 ` [PATCH v3 03/13] spi: sun4i: fix FIFO limit Maxime Ripard
[not found] ` <6962eec8da0b5255cafd7782bcc39ca19041c2b1.1465490774.git.hramrach@gmail.com>
2016-06-13 19:56 ` [PATCH v3 04/13] spi: sunxi: expose maximum transfer size limit Maxime Ripard
2016-06-13 19:57 ` [PATCH v3 00/13] sunxi spi fixes Maxime Ripard
2016-06-14 4:50 ` Michal Suchanek
2016-06-17 10:34 ` Michal Suchanek
2016-07-25 7:32 ` Maxime Ripard
2016-07-25 8:03 ` Michal Suchanek
2016-07-29 20:22 ` Maxime Ripard
2016-07-30 17:32 ` Michal Suchanek
[not found] ` <c27d58f634daa4785e90c2716c8bb90399db3bf2.1465490774.git.hramrach@gmail.com>
2016-06-13 23:31 ` [linux-sunxi] [PATCH v3 07/13] spi: sunxi: rename constants to match between sun4i and sun6i Julian Calaby
2016-06-14 4:43 ` Michal Suchanek
[not found] ` <ad0ec30ef6b01f58e1b3b92da06e6cbd5c947354.1465490774.git.hramrach@gmail.com>
2016-06-13 23:43 ` [linux-sunxi] [PATCH v3 10/13] spi: sunxi: merge sun4i and sun6i SPI driver Julian Calaby
2016-06-14 4:34 ` Michal Suchanek [this message]
2016-06-14 4:47 ` Julian Calaby
2016-06-14 5:28 ` Michal Suchanek
2016-06-14 5:45 ` Julian Calaby
2016-06-14 6:35 ` Michal Suchanek
2016-06-14 11:20 ` Julian Calaby
[not found] ` <cccbd6c3f0a194ec6eecd6627c4874da7b936f37.1465490774.git.hramrach@gmail.com>
2016-06-13 23:45 ` [linux-sunxi] [PATCH v3 11/13] dt: spi: sun4i: merge sun4i and sun6i binding doc Julian Calaby
2016-06-14 4:40 ` Michal Suchanek
2016-06-14 4:48 ` Julian Calaby
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='CAOMqctQD=o6YBk-QRiqbE9Cj+ZAH1nAM33rW6ZHefV8dU3aucQ@mail.gmail.com' \
--to=hramrach@gmail.com \
--cc=arnd@arndb.de \
--cc=b18965@freescale.com \
--cc=broonie@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=galak@codeaurora.org \
--cc=horms+renesas@verge.net.au \
--cc=ijc+devicetree@hellion.org.uk \
--cc=info@gerhard-bertelsmann.de \
--cc=javier@osg.samsung.com \
--cc=julian.calaby@gmail.com \
--cc=k.kozlowski@samsung.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-spi@vger.kernel.org \
--cc=linux-sunxi@googlegroups.com \
--cc=linux@armlinux.org.uk \
--cc=mark.rutland@arm.com \
--cc=maxime.ripard@free-electrons.com \
--cc=net147@gmail.com \
--cc=olof@lixom.net \
--cc=pawel.moll@arm.com \
--cc=plaes@plaes.org \
--cc=public_timo.s@silentcreek.de \
--cc=robh+dt@kernel.org \
--cc=sjoerd.simons@collabora.co.uk \
--cc=treding@nvidia.com \
--cc=wens@csie.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;
as well as URLs for NNTP newsgroup(s).