* [U-Boot] [PATCH v2] arm: mx6: Change defines ENET_xxMHz to ENET_xxMHZ (no CamelCase)
@ 2014-11-27 12:46 Stefan Roese
2014-11-27 12:53 ` Fabio Estevam
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Stefan Roese @ 2014-11-27 12:46 UTC (permalink / raw)
To: u-boot
As checkpatch complaines about these camel-case defines, lets change
them to only use upper-case characters.
Signed-off-by: Stefan Roese <sr@denx.de>
Acked-by: Heiko Schocher <hs@denx.de>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
Cc: Jon Nettleton <jon.nettleton@gmail.com>
Cc: Stefano Babic <sbabic@denx.de>
---
v2:
- Rebased on current master
arch/arm/cpu/armv7/mx6/clock.c | 2 +-
arch/arm/include/asm/arch-mx6/clock.h | 8 ++++----
board/aristainetos/aristainetos.c | 2 +-
board/freescale/mx6slevk/mx6slevk.c | 2 +-
board/freescale/mx6sxsabresd/mx6sxsabresd.c | 2 +-
board/solidrun/hummingboard/hummingboard.c | 2 +-
6 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/arch/arm/cpu/armv7/mx6/clock.c b/arch/arm/cpu/armv7/mx6/clock.c
index ab7ac3d..93a02ad 100644
--- a/arch/arm/cpu/armv7/mx6/clock.c
+++ b/arch/arm/cpu/armv7/mx6/clock.c
@@ -443,7 +443,7 @@ int enable_fec_anatop_clock(enum enet_freq freq)
struct anatop_regs __iomem *anatop =
(struct anatop_regs __iomem *)ANATOP_BASE_ADDR;
- if (freq < ENET_25MHz || freq > ENET_125MHz)
+ if (freq < ENET_25MHZ || freq > ENET_125MHZ)
return -EINVAL;
reg = readl(&anatop->pll_enet);
diff --git a/arch/arm/include/asm/arch-mx6/clock.h b/arch/arm/include/asm/arch-mx6/clock.h
index 323805c..226a4cd 100644
--- a/arch/arm/include/asm/arch-mx6/clock.h
+++ b/arch/arm/include/asm/arch-mx6/clock.h
@@ -43,10 +43,10 @@ enum mxc_clock {
};
enum enet_freq {
- ENET_25MHz,
- ENET_50MHz,
- ENET_100MHz,
- ENET_125MHz,
+ ENET_25MHZ,
+ ENET_50MHZ,
+ ENET_100MHZ,
+ ENET_125MHZ,
};
u32 imx_get_uartclk(void);
diff --git a/board/aristainetos/aristainetos.c b/board/aristainetos/aristainetos.c
index 06922c0..67ac260 100644
--- a/board/aristainetos/aristainetos.c
+++ b/board/aristainetos/aristainetos.c
@@ -301,7 +301,7 @@ int board_eth_init(bd_t *bis)
/* clear gpr1[14], gpr1[18:17] to select anatop clock */
clrsetbits_le32(&iomuxc_regs->gpr[1], IOMUX_GPR1_FEC_MASK, 0);
- ret = enable_fec_anatop_clock(ENET_50MHz);
+ ret = enable_fec_anatop_clock(ENET_50MHZ);
if (ret)
return ret;
diff --git a/board/freescale/mx6slevk/mx6slevk.c b/board/freescale/mx6slevk/mx6slevk.c
index 8111edf..cac6d73 100644
--- a/board/freescale/mx6slevk/mx6slevk.c
+++ b/board/freescale/mx6slevk/mx6slevk.c
@@ -234,7 +234,7 @@ static int setup_fec(void)
/* clear gpr1[14], gpr1[18:17] to select anatop clock */
clrsetbits_le32(&iomuxc_regs->gpr[1], IOMUX_GPR1_FEC_MASK, 0);
- return enable_fec_anatop_clock(ENET_50MHz);
+ return enable_fec_anatop_clock(ENET_50MHZ);
}
#endif
diff --git a/board/freescale/mx6sxsabresd/mx6sxsabresd.c b/board/freescale/mx6sxsabresd/mx6sxsabresd.c
index 7aee074..8b959b9 100644
--- a/board/freescale/mx6sxsabresd/mx6sxsabresd.c
+++ b/board/freescale/mx6sxsabresd/mx6sxsabresd.c
@@ -168,7 +168,7 @@ static int setup_fec(void)
reg |= BM_ANADIG_PLL_ENET_REF_25M_ENABLE;
writel(reg, &anatop->pll_enet);
- return enable_fec_anatop_clock(ENET_125MHz);
+ return enable_fec_anatop_clock(ENET_125MHZ);
}
int board_eth_init(bd_t *bis)
diff --git a/board/solidrun/hummingboard/hummingboard.c b/board/solidrun/hummingboard/hummingboard.c
index 6d204b3..52c384b 100644
--- a/board/solidrun/hummingboard/hummingboard.c
+++ b/board/solidrun/hummingboard/hummingboard.c
@@ -146,7 +146,7 @@ int board_eth_init(bd_t *bis)
{
struct iomuxc *const iomuxc_regs = (struct iomuxc *)IOMUXC_BASE_ADDR;
- int ret = enable_fec_anatop_clock(ENET_25MHz);
+ int ret = enable_fec_anatop_clock(ENET_25MHZ);
if (ret)
return ret;
--
2.1.3
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [U-Boot] [PATCH v2] arm: mx6: Change defines ENET_xxMHz to ENET_xxMHZ (no CamelCase)
2014-11-27 12:46 [U-Boot] [PATCH v2] arm: mx6: Change defines ENET_xxMHz to ENET_xxMHZ (no CamelCase) Stefan Roese
@ 2014-11-27 12:53 ` Fabio Estevam
2014-12-01 9:38 ` Stefano Babic
2014-12-15 22:34 ` Pavel Machek
2 siblings, 0 replies; 4+ messages in thread
From: Fabio Estevam @ 2014-11-27 12:53 UTC (permalink / raw)
To: u-boot
On Thu, Nov 27, 2014 at 10:46 AM, Stefan Roese <sr@denx.de> wrote:
> As checkpatch complaines about these camel-case defines, lets change
> them to only use upper-case characters.
>
> Signed-off-by: Stefan Roese <sr@denx.de>
> Acked-by: Heiko Schocher <hs@denx.de>
> Cc: Fabio Estevam <fabio.estevam@freescale.com>
> Cc: Jon Nettleton <jon.nettleton@gmail.com>
> Cc: Stefano Babic <sbabic@denx.de>
Reviewed-by: Fabio Estevam <fabio.estevam@freescale.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
* [U-Boot] [PATCH v2] arm: mx6: Change defines ENET_xxMHz to ENET_xxMHZ (no CamelCase)
2014-11-27 12:46 [U-Boot] [PATCH v2] arm: mx6: Change defines ENET_xxMHz to ENET_xxMHZ (no CamelCase) Stefan Roese
2014-11-27 12:53 ` Fabio Estevam
@ 2014-12-01 9:38 ` Stefano Babic
2014-12-15 22:34 ` Pavel Machek
2 siblings, 0 replies; 4+ messages in thread
From: Stefano Babic @ 2014-12-01 9:38 UTC (permalink / raw)
To: u-boot
On 27/11/2014 13:46, Stefan Roese wrote:
> As checkpatch complaines about these camel-case defines, lets change
> them to only use upper-case characters.
>
> Signed-off-by: Stefan Roese <sr@denx.de>
> Acked-by: Heiko Schocher <hs@denx.de>
> Cc: Fabio Estevam <fabio.estevam@freescale.com>
> Cc: Jon Nettleton <jon.nettleton@gmail.com>
> Cc: Stefano Babic <sbabic@denx.de>
> ---
> v2:
> - Rebased on current master
>
> arch/arm/cpu/armv7/mx6/clock.c | 2 +-
> arch/arm/include/asm/arch-mx6/clock.h | 8 ++++----
> board/aristainetos/aristainetos.c | 2 +-
> board/freescale/mx6slevk/mx6slevk.c | 2 +-
> board/freescale/mx6sxsabresd/mx6sxsabresd.c | 2 +-
> board/solidrun/hummingboard/hummingboard.c | 2 +-
> 6 files changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/arch/arm/cpu/armv7/mx6/clock.c b/arch/arm/cpu/armv7/mx6/clock.c
> index ab7ac3d..93a02ad 100644
> --- a/arch/arm/cpu/armv7/mx6/clock.c
> +++ b/arch/arm/cpu/armv7/mx6/clock.c
> @@ -443,7 +443,7 @@ int enable_fec_anatop_clock(enum enet_freq freq)
> struct anatop_regs __iomem *anatop =
> (struct anatop_regs __iomem *)ANATOP_BASE_ADDR;
>
> - if (freq < ENET_25MHz || freq > ENET_125MHz)
> + if (freq < ENET_25MHZ || freq > ENET_125MHZ)
> return -EINVAL;
>
> reg = readl(&anatop->pll_enet);
> diff --git a/arch/arm/include/asm/arch-mx6/clock.h b/arch/arm/include/asm/arch-mx6/clock.h
> index 323805c..226a4cd 100644
> --- a/arch/arm/include/asm/arch-mx6/clock.h
> +++ b/arch/arm/include/asm/arch-mx6/clock.h
> @@ -43,10 +43,10 @@ enum mxc_clock {
> };
>
> enum enet_freq {
> - ENET_25MHz,
> - ENET_50MHz,
> - ENET_100MHz,
> - ENET_125MHz,
> + ENET_25MHZ,
> + ENET_50MHZ,
> + ENET_100MHZ,
> + ENET_125MHZ,
> };
>
> u32 imx_get_uartclk(void);
> diff --git a/board/aristainetos/aristainetos.c b/board/aristainetos/aristainetos.c
> index 06922c0..67ac260 100644
> --- a/board/aristainetos/aristainetos.c
> +++ b/board/aristainetos/aristainetos.c
> @@ -301,7 +301,7 @@ int board_eth_init(bd_t *bis)
> /* clear gpr1[14], gpr1[18:17] to select anatop clock */
> clrsetbits_le32(&iomuxc_regs->gpr[1], IOMUX_GPR1_FEC_MASK, 0);
>
> - ret = enable_fec_anatop_clock(ENET_50MHz);
> + ret = enable_fec_anatop_clock(ENET_50MHZ);
> if (ret)
> return ret;
>
> diff --git a/board/freescale/mx6slevk/mx6slevk.c b/board/freescale/mx6slevk/mx6slevk.c
> index 8111edf..cac6d73 100644
> --- a/board/freescale/mx6slevk/mx6slevk.c
> +++ b/board/freescale/mx6slevk/mx6slevk.c
> @@ -234,7 +234,7 @@ static int setup_fec(void)
> /* clear gpr1[14], gpr1[18:17] to select anatop clock */
> clrsetbits_le32(&iomuxc_regs->gpr[1], IOMUX_GPR1_FEC_MASK, 0);
>
> - return enable_fec_anatop_clock(ENET_50MHz);
> + return enable_fec_anatop_clock(ENET_50MHZ);
> }
> #endif
>
> diff --git a/board/freescale/mx6sxsabresd/mx6sxsabresd.c b/board/freescale/mx6sxsabresd/mx6sxsabresd.c
> index 7aee074..8b959b9 100644
> --- a/board/freescale/mx6sxsabresd/mx6sxsabresd.c
> +++ b/board/freescale/mx6sxsabresd/mx6sxsabresd.c
> @@ -168,7 +168,7 @@ static int setup_fec(void)
> reg |= BM_ANADIG_PLL_ENET_REF_25M_ENABLE;
> writel(reg, &anatop->pll_enet);
>
> - return enable_fec_anatop_clock(ENET_125MHz);
> + return enable_fec_anatop_clock(ENET_125MHZ);
> }
>
> int board_eth_init(bd_t *bis)
> diff --git a/board/solidrun/hummingboard/hummingboard.c b/board/solidrun/hummingboard/hummingboard.c
> index 6d204b3..52c384b 100644
> --- a/board/solidrun/hummingboard/hummingboard.c
> +++ b/board/solidrun/hummingboard/hummingboard.c
> @@ -146,7 +146,7 @@ int board_eth_init(bd_t *bis)
> {
> struct iomuxc *const iomuxc_regs = (struct iomuxc *)IOMUXC_BASE_ADDR;
>
> - int ret = enable_fec_anatop_clock(ENET_25MHz);
> + int ret = enable_fec_anatop_clock(ENET_25MHZ);
> if (ret)
> return ret;
>
>
Applied to u-boot-imx, thanks !
Best regards,
Stefano Babic
--
=====================================================================
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================
^ permalink raw reply [flat|nested] 4+ messages in thread
* [U-Boot] [PATCH v2] arm: mx6: Change defines ENET_xxMHz to ENET_xxMHZ (no CamelCase)
2014-11-27 12:46 [U-Boot] [PATCH v2] arm: mx6: Change defines ENET_xxMHz to ENET_xxMHZ (no CamelCase) Stefan Roese
2014-11-27 12:53 ` Fabio Estevam
2014-12-01 9:38 ` Stefano Babic
@ 2014-12-15 22:34 ` Pavel Machek
2 siblings, 0 replies; 4+ messages in thread
From: Pavel Machek @ 2014-12-15 22:34 UTC (permalink / raw)
To: u-boot
On Thu 2014-11-27 13:46:43, Stefan Roese wrote:
> As checkpatch complaines about these camel-case defines, lets change
> them to only use upper-case characters.
Actually, it would be better to fix checkpatch. MHz is not
camelcase... Fortunately MHZ is unique, but theres real difference
between MB and Mb...
Pavel
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-12-15 22:34 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-11-27 12:46 [U-Boot] [PATCH v2] arm: mx6: Change defines ENET_xxMHz to ENET_xxMHZ (no CamelCase) Stefan Roese
2014-11-27 12:53 ` Fabio Estevam
2014-12-01 9:38 ` Stefano Babic
2014-12-15 22:34 ` Pavel Machek
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox