From: Simon Horman <horms@verge.net.au>
To: linux-sh@vger.kernel.org
Subject: Re: [PATCH 1/2] sh-pfc: Share common PORTCR macro definition
Date: Thu, 28 Nov 2013 07:51:17 +0000 [thread overview]
Message-ID: <20131128075116.GI24146@verge.net.au> (raw)
In-Reply-To: <1385430334-12141-2-git-send-email-laurent.pinchart+renesas@ideasonboard.com>
On Tue, Nov 26, 2013 at 02:45:33AM +0100, Laurent Pinchart wrote:
> The macro is defined identically in four different locations. Share it.
>
> Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Reviewed-by: Simon Horman <horms+renesas@verge.net.au>
> ---
> drivers/pinctrl/sh-pfc/pfc-r8a73a4.c | 11 -----------
> drivers/pinctrl/sh-pfc/pfc-r8a7740.c | 11 -----------
> drivers/pinctrl/sh-pfc/pfc-sh7372.c | 11 -----------
> drivers/pinctrl/sh-pfc/pfc-sh73a0.c | 10 ----------
> drivers/pinctrl/sh-pfc/sh_pfc.h | 3 +--
> 5 files changed, 1 insertion(+), 45 deletions(-)
>
> diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a73a4.c b/drivers/pinctrl/sh-pfc/pfc-r8a73a4.c
> index d25fd4e..d76cc34 100644
> --- a/drivers/pinctrl/sh-pfc/pfc-r8a73a4.c
> +++ b/drivers/pinctrl/sh-pfc/pfc-r8a73a4.c
> @@ -2061,17 +2061,6 @@ static const struct sh_pfc_function pinmux_functions[] = {
> SH_PFC_FUNCTION(sdhi2),
> };
>
> -#undef PORTCR
> -#define PORTCR(nr, reg) \
> - { \
> - PINMUX_CFG_REG("PORT" nr "CR", reg, 8, 4) { \
> - _PCRH(PORT##nr##_IN, 0, 0, PORT##nr##_OUT), \
> - PORT##nr##_FN0, PORT##nr##_FN1, \
> - PORT##nr##_FN2, PORT##nr##_FN3, \
> - PORT##nr##_FN4, PORT##nr##_FN5, \
> - PORT##nr##_FN6, PORT##nr##_FN7 } \
> - }
> -
> static const struct pinmux_cfg_reg pinmux_config_regs[] = {
> PORTCR(0, 0xe6050000),
> PORTCR(1, 0xe6050001),
> diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7740.c b/drivers/pinctrl/sh-pfc/pfc-r8a7740.c
> index 009174d..7ac0065 100644
> --- a/drivers/pinctrl/sh-pfc/pfc-r8a7740.c
> +++ b/drivers/pinctrl/sh-pfc/pfc-r8a7740.c
> @@ -3234,17 +3234,6 @@ static const struct sh_pfc_function pinmux_functions[] = {
> SH_PFC_FUNCTION(tpu0),
> };
>
> -#undef PORTCR
> -#define PORTCR(nr, reg) \
> - { \
> - PINMUX_CFG_REG("PORT" nr "CR", reg, 8, 4) { \
> - _PCRH(PORT##nr##_IN, 0, 0, PORT##nr##_OUT), \
> - PORT##nr##_FN0, PORT##nr##_FN1, \
> - PORT##nr##_FN2, PORT##nr##_FN3, \
> - PORT##nr##_FN4, PORT##nr##_FN5, \
> - PORT##nr##_FN6, PORT##nr##_FN7 } \
> - }
> -
> static const struct pinmux_cfg_reg pinmux_config_regs[] = {
> PORTCR(0, 0xe6050000), /* PORT0CR */
> PORTCR(1, 0xe6050001), /* PORT1CR */
> diff --git a/drivers/pinctrl/sh-pfc/pfc-sh7372.c b/drivers/pinctrl/sh-pfc/pfc-sh7372.c
> index 70b522d..4fea6ce 100644
> --- a/drivers/pinctrl/sh-pfc/pfc-sh7372.c
> +++ b/drivers/pinctrl/sh-pfc/pfc-sh7372.c
> @@ -2118,17 +2118,6 @@ static const struct sh_pfc_function pinmux_functions[] = {
> SH_PFC_FUNCTION(usb1),
> };
>
> -#undef PORTCR
> -#define PORTCR(nr, reg) \
> - { \
> - PINMUX_CFG_REG("PORT" nr "CR", reg, 8, 4) { \
> - _PCRH(PORT##nr##_IN, 0, 0, PORT##nr##_OUT), \
> - PORT##nr##_FN0, PORT##nr##_FN1, \
> - PORT##nr##_FN2, PORT##nr##_FN3, \
> - PORT##nr##_FN4, PORT##nr##_FN5, \
> - PORT##nr##_FN6, PORT##nr##_FN7 } \
> - }
> -
> static const struct pinmux_cfg_reg pinmux_config_regs[] = {
> PORTCR(0, 0xE6051000), /* PORT0CR */
> PORTCR(1, 0xE6051001), /* PORT1CR */
> diff --git a/drivers/pinctrl/sh-pfc/pfc-sh73a0.c b/drivers/pinctrl/sh-pfc/pfc-sh73a0.c
> index 7e278a9..b81b56e 100644
> --- a/drivers/pinctrl/sh-pfc/pfc-sh73a0.c
> +++ b/drivers/pinctrl/sh-pfc/pfc-sh73a0.c
> @@ -3138,16 +3138,6 @@ static const struct sh_pfc_function pinmux_functions[] = {
> SH_PFC_FUNCTION(usb),
> };
>
> -#undef PORTCR
> -#define PORTCR(nr, reg) \
> - { \
> - PINMUX_CFG_REG("PORT" nr "CR", reg, 8, 4) { \
> - _PCRH(PORT##nr##_IN, 0, 0, PORT##nr##_OUT), \
> - PORT##nr##_FN0, PORT##nr##_FN1, \
> - PORT##nr##_FN2, PORT##nr##_FN3, \
> - PORT##nr##_FN4, PORT##nr##_FN5, \
> - PORT##nr##_FN6, PORT##nr##_FN7 } \
> - }
> static const struct pinmux_cfg_reg pinmux_config_regs[] = {
> PORTCR(0, 0xe6050000), /* PORT0CR */
> PORTCR(1, 0xe6050001), /* PORT1CR */
> diff --git a/drivers/pinctrl/sh-pfc/sh_pfc.h b/drivers/pinctrl/sh-pfc/sh_pfc.h
> index 11bd0d9..8a494e5 100644
> --- a/drivers/pinctrl/sh-pfc/sh_pfc.h
> +++ b/drivers/pinctrl/sh-pfc/sh_pfc.h
> @@ -304,8 +304,7 @@ struct sh_pfc_soc_info {
> #define PORTCR(nr, reg) \
> { \
> PINMUX_CFG_REG("PORT" nr "CR", reg, 8, 4) { \
> - _PCRH(PORT##nr##_IN, PORT##nr##_IN_PD, \
> - PORT##nr##_IN_PU, PORT##nr##_OUT), \
> + _PCRH(PORT##nr##_IN, 0, 0, PORT##nr##_OUT), \
> PORT##nr##_FN0, PORT##nr##_FN1, \
> PORT##nr##_FN2, PORT##nr##_FN3, \
> PORT##nr##_FN4, PORT##nr##_FN5, \
> --
> 1.8.3.2
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-sh" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
next prev parent reply other threads:[~2013-11-28 7:51 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-26 1:45 [PATCH 1/2] sh-pfc: Share common PORTCR macro definition Laurent Pinchart
2013-11-28 7:51 ` Simon Horman [this message]
2013-12-03 9:33 ` Linus Walleij
2013-12-04 1:01 ` Laurent Pinchart
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=20131128075116.GI24146@verge.net.au \
--to=horms@verge.net.au \
--cc=linux-sh@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