From: Julian Calaby <julian.calaby@gmail.com>
To: Michal Suchanek <hramrach@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 07/13] spi: sunxi: rename constants to match between sun4i and sun6i
Date: Tue, 14 Jun 2016 09:31:44 +1000 [thread overview]
Message-ID: <CAGRGNgWFKXd64-wYbG0dQez8hbzC1BPWFsBXBr7tCjVO_DBwGQ@mail.gmail.com> (raw)
In-Reply-To: <c27d58f634daa4785e90c2716c8bb90399db3bf2.1465490774.git.hramrach@gmail.com>
Hi Michal,
On Tue, Jun 14, 2016 at 3:46 AM, Michal Suchanek <hramrach@gmail.com> wrote:
> SUNXI_CTL_ -> SUNXI_TFR_CTL_
> SUNXI_TFR_CTL_LMTF -> SUNXI_TFR_CTL_FBS
I don't know these abbreviations, are they both referring to the same thing?
> SUNXI_TFR_CTL_CS_ACTIVE_LOW -> SUNXI_TFR_CTL_SPOL
It looks like you're making the constant name less descriptive here.
Is the old version (CS_ACTIVE_LOW) incorrect?
> and some SUNXI_???_CTL_ -> SUNXI_CTL_
> for constants migrated to different registers between sun4i and sun6i
>
> No functional change.
>
> Signed-off-by: Michal Suchanek <hramrach@gmail.com>
> ---
> drivers/spi/spi-sun4i.c | 68 ++++++++++++++++++++++++-------------------------
> drivers/spi/spi-sun6i.c | 14 +++++-----
> 2 files changed, 41 insertions(+), 41 deletions(-)
>
> diff --git a/drivers/spi/spi-sun4i.c b/drivers/spi/spi-sun4i.c
> index 155d720..b7f8de1 100644
> --- a/drivers/spi/spi-sun4i.c
> +++ b/drivers/spi/spi-sun4i.c
> @@ -28,21 +28,21 @@
>
> #define SUNXI_TXDATA_REG 0x04
>
> -#define SUNXI_CTL_REG 0x08
> +#define SUNXI_TFR_CTL_REG 0x08
> #define SUNXI_CTL_ENABLE BIT(0)
> #define SUNXI_CTL_MASTER BIT(1)
> -#define SUNXI_CTL_CPHA BIT(2)
> -#define SUNXI_CTL_CPOL BIT(3)
> -#define SUNXI_CTL_CS_ACTIVE_LOW BIT(4)
> -#define SUNXI_CTL_LMTF BIT(6)
> +#define SUNXI_TFR_CTL_CPHA BIT(2)
> +#define SUNXI_TFR_CTL_CPOL BIT(3)
> +#define SUNXI_TFR_CTL_SPOL BIT(4)
> +#define SUNXI_TFR_CTL_FBS BIT(6)
> #define SUNXI_CTL_TF_RST BIT(8)
> #define SUNXI_CTL_RF_RST BIT(9)
> -#define SUNXI_CTL_XCH BIT(10)
> -#define SUNXI_CTL_CS_MASK 0x3000
> -#define SUNXI_CTL_CS(cs) (((cs) << 12) & SUNXI_CTL_CS_MASK)
> -#define SUNXI_CTL_DHB BIT(15)
> -#define SUNXI_CTL_CS_MANUAL BIT(16)
> -#define SUNXI_CTL_CS_LEVEL BIT(17)
> +#define SUNXI_TFR_CTL_XCH BIT(10)
> +#define SUNXI_TFR_CTL_CS_MASK 0x3000
> +#define SUNXI_TFR_CTL_CS(cs) (((cs) << 12) & SUNXI_TFR_CTL_CS_MASK)
> +#define SUNXI_TFR_CTL_DHB BIT(15)
> +#define SUNXI_TFR_CTL_CS_MANUAL BIT(16)
> +#define SUNXI_TFR_CTL_CS_LEVEL BIT(17)
> #define SUNXI_CTL_TP BIT(18)
>
> #define SUNXI_INT_CTL_REG 0x0c
> diff --git a/drivers/spi/spi-sun6i.c b/drivers/spi/spi-sun6i.c
> index a27bf8f..f26b52a 100644
> --- a/drivers/spi/spi-sun6i.c
> +++ b/drivers/spi/spi-sun6i.c
> @@ -26,9 +26,9 @@
> #define SUNXI_FIFO_DEPTH 128
>
> #define SUNXI_GBL_CTL_REG 0x04
> -#define SUNXI_GBL_CTL_BUS_ENABLE BIT(0)
> -#define SUNXI_GBL_CTL_MASTER BIT(1)
> -#define SUNXI_GBL_CTL_TP BIT(7)
> +#define SUNXI_CTL_ENABLE BIT(0)
> +#define SUNXI_CTL_MASTER BIT(1)
> +#define SUNXI_CTL_TP BIT(7)
If these are bit definitions for the GBL register, why throw that
information away?
> #define SUNXI_GBL_CTL_RST BIT(31)
>
> #define SUNXI_TFR_CTL_REG 0x08
> @@ -50,8 +50,8 @@
> #define SUNXI_INT_STA_REG 0x14
>
> #define SUNXI_FIFO_CTL_REG 0x18
> -#define SUNXI_FIFO_CTL_RF_RST BIT(15)
> -#define SUNXI_FIFO_CTL_TF_RST BIT(31)
> +#define SUNXI_CTL_RF_RST BIT(15)
> +#define SUNXI_CTL_TF_RST BIT(31)
Same here with FIFO.
>
> #define SUNXI_FIFO_STA_REG 0x1c
> #define SUNXI_FIFO_STA_RF_CNT_MASK 0x7f
My gut feeling on this is that we have a lot of cases of a definition
of a register offset, then definitions of the bits in that register
with that register encoded into the constant's name. You appear to be
throwing a lot of that information away which makes me worry.
Thanks,
--
Julian Calaby
Email: julian.calaby@gmail.com
Profile: http://www.google.com/profiles/julian.calaby/
next prev parent reply other threads:[~2016-06-13 23:32 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 ` Julian Calaby [this message]
2016-06-14 4:43 ` [linux-sunxi] [PATCH v3 07/13] spi: sunxi: rename constants to match between sun4i and sun6i 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
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=CAGRGNgWFKXd64-wYbG0dQez8hbzC1BPWFsBXBr7tCjVO_DBwGQ@mail.gmail.com \
--to=julian.calaby@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=hramrach@gmail.com \
--cc=ijc+devicetree@hellion.org.uk \
--cc=info@gerhard-bertelsmann.de \
--cc=javier@osg.samsung.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).