Skip to contentSkip to conversation

imx: imx7d: remove CamelCase from ENET_xMHz macros

PATCH Superseded Eric Nelson 2 participants 4 messages Aug 30, 2017 – Sep 20, 2017

Subsystems (3)
Arm (32-bit) Arm sub-architectures Arm i.MX and Layerscape
lore
Share & tools
lore

Eric Nelson

author
#0 lore raw

PATCH 1/1 imx: imx7d: remove CamelCase from ENET_xMHz macros

Update these macros to use all upper-case to avoid checkpatch warnings:

	ENET_25MHz,
	ENET_50MHz,
	ENET_125MHz,
Signed-off-by Eric Nelson <[email protected]>
---
 arch/arm/include/asm/arch-mx7/clock.h     | 6 +++---
 arch/arm/mach-imx/mx7/clock.c             | 2 +-
 board/freescale/mx7dsabresd/mx7dsabresd.c | 2 +-
 board/technexion/pico-imx7d/pico-imx7d.c  | 2 +-
 board/toradex/colibri_imx7/colibri_imx7.c | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)
arch/arm/include/asm/arch-mx7/clock.h +3 -3
index 688d236..3b115ad 100644
@@ -318,9 +318,9 @@ struct clk_root_map {
 };
 
 enum enet_freq {
-	ENET_25MHz,
-	ENET_50MHz,
-	ENET_125MHz,
+	ENET_25MHZ,
+	ENET_50MHZ,
+	ENET_125MHZ,
 };
 
 u32 get_root_clk(enum clk_root_index clock_id);
arch/arm/mach-imx/mx7/clock.c +1 -1
index 2cfde46..423d697 100644
@@ -970,7 +970,7 @@ int set_clk_enet(enum enet_freq type)
 		enet1_ref = ENET1_REF_CLK_ROOT_FROM_PLL_ENET_MAIN_125M_CLK;
 		enet2_ref = ENET2_REF_CLK_ROOT_FROM_PLL_ENET_MAIN_125M_CLK;
 		break;
-	case ENET_50MHz:
+	case ENET_50MHZ:
 		enet1_ref = ENET1_REF_CLK_ROOT_FROM_PLL_ENET_MAIN_50M_CLK;
 		enet2_ref = ENET2_REF_CLK_ROOT_FROM_PLL_ENET_MAIN_50M_CLK;
 		break;
board/freescale/mx7dsabresd/mx7dsabresd.c +1 -1
index a681ece..5819b18 100644
@@ -260,7 +260,7 @@ static int setup_fec(void)
 		(IOMUXC_GPR_GPR1_GPR_ENET1_TX_CLK_SEL_MASK |
 		 IOMUXC_GPR_GPR1_GPR_ENET1_CLK_DIR_MASK), 0);
 
-	return set_clk_enet(ENET_125MHz);
+	return set_clk_enet(ENET_125MHZ);
 }
board/technexion/pico-imx7d/pico-imx7d.c +1 -1
index b4c9be7..67bab51 100644
@@ -182,7 +182,7 @@ static int setup_fec(void)
 			(IOMUXC_GPR_GPR1_GPR_ENET1_TX_CLK_SEL_MASK |
 			IOMUXC_GPR_GPR1_GPR_ENET1_CLK_DIR_MASK), 0);
 
-	return set_clk_enet(ENET_125MHz);
+	return set_clk_enet(ENET_125MHZ);
 }
 
 int board_phy_config(struct phy_device *phydev)
board/toradex/colibri_imx7/colibri_imx7.c +1 -1
index 5cb14b4..13b2b57 100644
@@ -280,7 +280,7 @@ static int setup_fec(void)
 			IOMUXC_GPR_GPR1_GPR_ENET1_TX_CLK_SEL_MASK);
 #endif
 
-	return set_clk_enet(ENET_50MHz);
+	return set_clk_enet(ENET_50MHZ);
 }
 
 int board_phy_config(struct phy_device *phydev)
Signature · 1 line
2.7.4
author
#1 lore raw

PATCH v2 1/1 imx: imx7d: remove CamelCase from ENET_xMHz macros

Update these macros to use all upper-case to avoid checkpatch warnings:

	ENET_25MHz,
	ENET_50MHz,
	ENET_125MHz,
Signed-off-by Eric Nelson <[email protected]>

---
V2 fixes a couple of references in mx7/clock.c

 arch/arm/include/asm/arch-mx7/clock.h     | 6 +++---
 arch/arm/mach-imx/mx7/clock.c             | 6 +++---
 board/freescale/mx7dsabresd/mx7dsabresd.c | 2 +-
 board/technexion/pico-imx7d/pico-imx7d.c  | 2 +-
 board/toradex/colibri_imx7/colibri_imx7.c | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)
arch/arm/include/asm/arch-mx7/clock.h +3 -3
index 688d236..3b115ad 100644
@@ -318,9 +318,9 @@ struct clk_root_map {
 };
 
 enum enet_freq {
-	ENET_25MHz,
-	ENET_50MHz,
-	ENET_125MHz,
+	ENET_25MHZ,
+	ENET_50MHZ,
+	ENET_125MHZ,
 };
 
 u32 get_root_clk(enum clk_root_index clock_id);
arch/arm/mach-imx/mx7/clock.c +3 -3
index 2cfde46..8150faa 100644
@@ -966,15 +966,15 @@ int set_clk_enet(enum enet_freq type)
 	clock_enable(CCGR_ENET2, 0);
 
 	switch (type) {
-	case ENET_125MHz:
+	case ENET_125MHZ:
 		enet1_ref = ENET1_REF_CLK_ROOT_FROM_PLL_ENET_MAIN_125M_CLK;
 		enet2_ref = ENET2_REF_CLK_ROOT_FROM_PLL_ENET_MAIN_125M_CLK;
 		break;
-	case ENET_50MHz:
+	case ENET_50MHZ:
 		enet1_ref = ENET1_REF_CLK_ROOT_FROM_PLL_ENET_MAIN_50M_CLK;
 		enet2_ref = ENET2_REF_CLK_ROOT_FROM_PLL_ENET_MAIN_50M_CLK;
 		break;
-	case ENET_25MHz:
+	case ENET_25MHZ:
 		enet1_ref = ENET1_REF_CLK_ROOT_FROM_PLL_ENET_MAIN_25M_CLK;
 		enet2_ref = ENET2_REF_CLK_ROOT_FROM_PLL_ENET_MAIN_25M_CLK;
 		break;
board/freescale/mx7dsabresd/mx7dsabresd.c +1 -1
index a681ece..5819b18 100644
@@ -260,7 +260,7 @@ static int setup_fec(void)
 		(IOMUXC_GPR_GPR1_GPR_ENET1_TX_CLK_SEL_MASK |
 		 IOMUXC_GPR_GPR1_GPR_ENET1_CLK_DIR_MASK), 0);
 
-	return set_clk_enet(ENET_125MHz);
+	return set_clk_enet(ENET_125MHZ);
 }
board/technexion/pico-imx7d/pico-imx7d.c +1 -1
index b4c9be7..67bab51 100644
@@ -182,7 +182,7 @@ static int setup_fec(void)
 			(IOMUXC_GPR_GPR1_GPR_ENET1_TX_CLK_SEL_MASK |
 			IOMUXC_GPR_GPR1_GPR_ENET1_CLK_DIR_MASK), 0);
 
-	return set_clk_enet(ENET_125MHz);
+	return set_clk_enet(ENET_125MHZ);
 }
 
 int board_phy_config(struct phy_device *phydev)
board/toradex/colibri_imx7/colibri_imx7.c +1 -1
index 5cb14b4..13b2b57 100644
@@ -280,7 +280,7 @@ static int setup_fec(void)
 			IOMUXC_GPR_GPR1_GPR_ENET1_TX_CLK_SEL_MASK);
 #endif
 
-	return set_clk_enet(ENET_50MHz);
+	return set_clk_enet(ENET_50MHZ);
 }
 
 int board_phy_config(struct phy_device *phydev)
Signature · 1 line
2.7.4
#2 lore raw

PATCH v2 1/1 imx: imx7d: remove CamelCase from ENET_xMHz macros

Hi Eric,

Quoted 89 lines · Eric Nelson

Update these macros to use all upper-case to avoid checkpatch warnings:

	ENET_25MHz,
	ENET_50MHz,
	ENET_125MHz,
Signed-off-by Eric Nelson <[email protected]>

---
V2 fixes a couple of references in mx7/clock.c

 arch/arm/include/asm/arch-mx7/clock.h     | 6 +++---
 arch/arm/mach-imx/mx7/clock.c             | 6 +++---
 board/freescale/mx7dsabresd/mx7dsabresd.c | 2 +-
 board/technexion/pico-imx7d/pico-imx7d.c  | 2 +-
 board/toradex/colibri_imx7/colibri_imx7.c | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)
arch/arm/include/asm/arch-mx7/clock.h +3 -3
index 688d236..3b115ad 100644
@@ -318,9 +318,9 @@ struct clk_root_map {
 };
 
 enum enet_freq {
-	ENET_25MHz,
-	ENET_50MHz,
-	ENET_125MHz,
+	ENET_25MHZ,
+	ENET_50MHZ,
+	ENET_125MHZ,
 };
 
 u32 get_root_clk(enum clk_root_index clock_id);
arch/arm/mach-imx/mx7/clock.c +3 -3
index 2cfde46..8150faa 100644
@@ -966,15 +966,15 @@ int set_clk_enet(enum enet_freq type)
 	clock_enable(CCGR_ENET2, 0);
 
 	switch (type) {
-	case ENET_125MHz:
+	case ENET_125MHZ:
 		enet1_ref = ENET1_REF_CLK_ROOT_FROM_PLL_ENET_MAIN_125M_CLK;
 		enet2_ref = ENET2_REF_CLK_ROOT_FROM_PLL_ENET_MAIN_125M_CLK;
 		break;
-	case ENET_50MHz:
+	case ENET_50MHZ:
 		enet1_ref = ENET1_REF_CLK_ROOT_FROM_PLL_ENET_MAIN_50M_CLK;
 		enet2_ref = ENET2_REF_CLK_ROOT_FROM_PLL_ENET_MAIN_50M_CLK;
 		break;
-	case ENET_25MHz:
+	case ENET_25MHZ:
 		enet1_ref = ENET1_REF_CLK_ROOT_FROM_PLL_ENET_MAIN_25M_CLK;
 		enet2_ref = ENET2_REF_CLK_ROOT_FROM_PLL_ENET_MAIN_25M_CLK;
 		break;
board/freescale/mx7dsabresd/mx7dsabresd.c +1 -1
index a681ece..5819b18 100644
@@ -260,7 +260,7 @@ static int setup_fec(void)
 		(IOMUXC_GPR_GPR1_GPR_ENET1_TX_CLK_SEL_MASK |
 		 IOMUXC_GPR_GPR1_GPR_ENET1_CLK_DIR_MASK), 0);
 
-	return set_clk_enet(ENET_125MHz);
+	return set_clk_enet(ENET_125MHZ);
 }
board/technexion/pico-imx7d/pico-imx7d.c +1 -1
index b4c9be7..67bab51 100644
@@ -182,7 +182,7 @@ static int setup_fec(void)
 			(IOMUXC_GPR_GPR1_GPR_ENET1_TX_CLK_SEL_MASK |
 			IOMUXC_GPR_GPR1_GPR_ENET1_CLK_DIR_MASK), 0);
 
-	return set_clk_enet(ENET_125MHz);
+	return set_clk_enet(ENET_125MHZ);
 }
 
 int board_phy_config(struct phy_device *phydev)
board/toradex/colibri_imx7/colibri_imx7.c +0 -0
index 5cb14b4..13b2b57 100644

board/toradex/colibri_imx7/colibri_imx7.c static int setup_fec(void) · line 286

Quoted 8 lines
board/toradex/colibri_imx7/colibri_imx7.c +1 -1
@@ -280,7 +280,7 @@ static int setup_fec(void)
 			IOMUXC_GPR_GPR1_GPR_ENET1_TX_CLK_SEL_MASK);
 #endif
 
-	return set_clk_enet(ENET_50MHz);
+	return set_clk_enet(ENET_50MHZ);
 }
 
 int board_phy_config(struct phy_device *phydev)
Reviewed-by Stefano Babic <[email protected]>

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
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
=====================================================================
#3 lore raw

PATCH v2 1/1 imx: imx7d: remove CamelCase from ENET_xMHz macros

In reply to Eric Nelson
Quoted 9 lines · Eric Nelson

Update these macros to use all upper-case to avoid checkpatch warnings:

	ENET_25MHz,
	ENET_50MHz,
	ENET_125MHz,
Signed-off-by Eric Nelson <[email protected]>

---

Applied to u-boot-imx, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
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
=====================================================================