arm: mx6: Change defines ENET_xxMHz to ENET_xxMHZ (no CamelCase)

PATCH New Stefan Roese 4 participants 4 messages Nov 27, 2014 – Dec 15, 2014 Arm (32-bit)

lore

Share & tools

lore

Stefan Roese

author

2014-11-27 12:46 UTC #0 lore raw

PATCH v2 1/1 arm: mx6: Change defines ENET_xxMHz to ENET_xxMHZ (no CamelCase)

As checkpatch complaines about these camel-case defines, lets change them to only use upper-case characters.

Signed-off-by Stefan Roese <[email protected]>

Acked-by Heiko Schocher <[email protected]>

Cc Fabio Estevam <[email protected]>

Cc Jon Nettleton <[email protected]>

Cc Stefano Babic <[email protected]>

---
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(-)

arch/arm/cpu/armv7/mx6/clock.c +1 -1

index ab7ac3d..93a02ad 100644
@@ -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);

arch/arm/include/asm/arch-mx6/clock.h +4 -4

index 323805c..226a4cd 100644
@@ -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);

board/aristainetos/aristainetos.c +1 -1

index 06922c0..67ac260 100644
@@ -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;

board/freescale/mx6slevk/mx6slevk.c +1 -1

index 8111edf..cac6d73 100644
@@ -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

board/freescale/mx6sxsabresd/mx6sxsabresd.c +1 -1

index 7aee074..8b959b9 100644
@@ -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)

board/solidrun/hummingboard/hummingboard.c +1 -1

index 6d204b3..52c384b 100644
@@ -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;

Signature · 1 line

2.1.3

Fabio Estevam

2014-11-27 12:53 UTC #1 lore raw

PATCH v2 1/1 arm: mx6: Change defines ENET_xxMHz to ENET_xxMHZ (no CamelCase)

Quoted 8 lines · Stefan Roese

As checkpatch complaines about these camel-case defines, lets change them to only use upper-case characters.
Signed-off-by Stefan Roese <[email protected]>
Acked-by Heiko Schocher <[email protected]>
Cc Fabio Estevam <[email protected]>
Cc Jon Nettleton <[email protected]>
Cc Stefano Babic <[email protected]>

Reviewed-by Fabio Estevam <[email protected]>

Stefano Babic

2014-12-01 09:38 UTC #2 lore raw

PATCH v2 1/1 arm: mx6: Change defines ENET_xxMHz to ENET_xxMHZ (no CamelCase)

In reply to Stefan Roese

Quoted 97 lines · Stefan Roese

As checkpatch complaines about these camel-case defines, lets change them to only use upper-case characters.

Signed-off-by Stefan Roese <[email protected]>

Acked-by Heiko Schocher <[email protected]>

Cc Fabio Estevam <[email protected]>

Cc Jon Nettleton <[email protected]>

Cc Stefano Babic <[email protected]>

---
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(-)

arch/arm/cpu/armv7/mx6/clock.c +1 -1

index ab7ac3d..93a02ad 100644
@@ -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);

arch/arm/include/asm/arch-mx6/clock.h +4 -4

index 323805c..226a4cd 100644
@@ -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);

board/aristainetos/aristainetos.c +1 -1

index 06922c0..67ac260 100644
@@ -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;

board/freescale/mx6slevk/mx6slevk.c +1 -1

index 8111edf..cac6d73 100644
@@ -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

board/freescale/mx6sxsabresd/mx6sxsabresd.c +1 -1

index 7aee074..8b959b9 100644
@@ -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)

board/solidrun/hummingboard/hummingboard.c +0 -0

index 6d204b3..52c384b 100644

board/solidrun/hummingboard/hummingboard.c int board_eth_init(bd_t *bis) · line 152

Quoted 8 lines

board/solidrun/hummingboard/hummingboard.c +1 -1

@@ -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

Signature · 5 lines

=====================================================================
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
=====================================================================

Pavel Machek

2014-12-15 22:34 UTC #3 lore raw

PATCH v2 1/1 arm: mx6: Change defines ENET_xxMHz to ENET_xxMHZ (no CamelCase)

In reply to Stefan Roese

Quoted 2 lines · Stefan Roese

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

Signature · 2 lines

(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html