All of lore.kernel.org
 help / color / mirror / Atom feed
* [U-Boot] [PATCH v2 1/3] mx28: Let imx_get_mac_from_fuse be common for mx28
@ 2011-12-15 16:21 Fabio Estevam
  2011-12-15 16:21 ` [U-Boot] [PATCH v2 2/3] mx28: Let dram_init " Fabio Estevam
                   ` (11 more replies)
  0 siblings, 12 replies; 35+ messages in thread
From: Fabio Estevam @ 2011-12-15 16:21 UTC (permalink / raw)
  To: u-boot

Let imx_get_mac_from_fuse function be a common function, so that other
mx28 boards can reuse it.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
 arch/arm/cpu/arm926ejs/mx28/mx28.c         |   35 ++++++++++++++++++++++++++++
 arch/arm/include/asm/arch-mx28/sys_proto.h |    2 +
 board/denx/m28evk/m28evk.c                 |   35 ----------------------------
 3 files changed, 37 insertions(+), 35 deletions(-)

diff --git a/arch/arm/cpu/arm926ejs/mx28/mx28.c b/arch/arm/cpu/arm926ejs/mx28/mx28.c
index 088c019..785978f 100644
--- a/arch/arm/cpu/arm926ejs/mx28/mx28.c
+++ b/arch/arm/cpu/arm926ejs/mx28/mx28.c
@@ -214,6 +214,41 @@ int cpu_eth_init(bd_t *bis)
 }
 #endif
 
+#ifdef	CONFIG_MX28_FEC_MAC_IN_OCOTP
+
+#define	MXS_OCOTP_MAX_TIMEOUT	1000000
+void imx_get_mac_from_fuse(char *mac)
+{
+	struct mx28_ocotp_regs *ocotp_regs =
+		(struct mx28_ocotp_regs *)MXS_OCOTP_BASE;
+	uint32_t data;
+
+	memset(mac, 0, 6);
+
+	writel(OCOTP_CTRL_RD_BANK_OPEN, &ocotp_regs->hw_ocotp_ctrl_set);
+
+	if (mx28_wait_mask_clr(&ocotp_regs->hw_ocotp_ctrl_reg, OCOTP_CTRL_BUSY,
+				MXS_OCOTP_MAX_TIMEOUT)) {
+		puts("MXS FEC: Can't get MAC from OCOTP\n");
+		return;
+	}
+
+	data = readl(&ocotp_regs->hw_ocotp_cust0);
+
+	mac[0] = 0x00;
+	mac[1] = 0x04;
+	mac[2] = (data >> 24) & 0xff;
+	mac[3] = (data >> 16) & 0xff;
+	mac[4] = (data >> 8) & 0xff;
+	mac[5] = data & 0xff;
+}
+#else
+void imx_get_mac_from_fuse(char *mac)
+{
+	memset(mac, 0, 6);
+}
+#endif
+
 U_BOOT_CMD(
 	clocks,	CONFIG_SYS_MAXARGS, 1, do_mx28_showclocks,
 	"display clocks",
diff --git a/arch/arm/include/asm/arch-mx28/sys_proto.h b/arch/arm/include/asm/arch-mx28/sys_proto.h
index be1f7db..cf5ab16 100644
--- a/arch/arm/include/asm/arch-mx28/sys_proto.h
+++ b/arch/arm/include/asm/arch-mx28/sys_proto.h
@@ -35,4 +35,6 @@ void mx28_common_spl_init(const iomux_cfg_t *iomux_setup,
 			const unsigned int iomux_size);
 #endif
 
+void imx_get_mac_from_fuse(char *mac);
+
 #endif	/* __MX28_H__ */
diff --git a/board/denx/m28evk/m28evk.c b/board/denx/m28evk/m28evk.c
index fcee046..005446a 100644
--- a/board/denx/m28evk/m28evk.c
+++ b/board/denx/m28evk/m28evk.c
@@ -178,39 +178,4 @@ int board_eth_init(bd_t *bis)
 	return ret;
 }
 
-#ifdef	CONFIG_M28_FEC_MAC_IN_OCOTP
-
-#define	MXS_OCOTP_MAX_TIMEOUT	1000000
-void imx_get_mac_from_fuse(char *mac)
-{
-	struct mx28_ocotp_regs *ocotp_regs =
-		(struct mx28_ocotp_regs *)MXS_OCOTP_BASE;
-	uint32_t data;
-
-	memset(mac, 0, 6);
-
-	writel(OCOTP_CTRL_RD_BANK_OPEN, &ocotp_regs->hw_ocotp_ctrl_set);
-
-	if (mx28_wait_mask_clr(&ocotp_regs->hw_ocotp_ctrl_reg, OCOTP_CTRL_BUSY,
-				MXS_OCOTP_MAX_TIMEOUT)) {
-		printf("MXS FEC: Can't get MAC from OCOTP\n");
-		return;
-	}
-
-	data = readl(&ocotp_regs->hw_ocotp_cust0);
-
-	mac[0] = 0x00;
-	mac[1] = 0x04;
-	mac[2] = (data >> 24) & 0xff;
-	mac[3] = (data >> 16) & 0xff;
-	mac[4] = (data >> 8) & 0xff;
-	mac[5] = data & 0xff;
-}
-#else
-void imx_get_mac_from_fuse(char *mac)
-{
-	memset(mac, 0, 6);
-}
-#endif
-
 #endif
-- 
1.7.1

^ permalink raw reply related	[flat|nested] 35+ messages in thread

end of thread, other threads:[~2011-12-19 14:10 UTC | newest]

Thread overview: 35+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-12-15 16:21 [U-Boot] [PATCH v2 1/3] mx28: Let imx_get_mac_from_fuse be common for mx28 Fabio Estevam
2011-12-15 16:21 ` [U-Boot] [PATCH v2 2/3] mx28: Let dram_init " Fabio Estevam
2011-12-15 17:23   ` Marek Vasut
2011-12-15 16:21 ` [U-Boot] [PATCH v2 3/3] mx28evk: Add initial support for MX28EVK board Fabio Estevam
2011-12-15 16:42   ` Stefano Babic
2011-12-15 16:49     ` Fabio Estevam
2011-12-15 16:34 ` [U-Boot] [PATCH v3 1/3] mx28: Let imx_get_mac_from_fuse be common for mx28 Fabio Estevam
2011-12-15 17:24   ` Marek Vasut
2011-12-15 17:53   ` Stefano Babic
2011-12-17 19:57     ` Wolfgang Denk
2011-12-15 16:34 ` [U-Boot] [PATCH v3 2/3] mx28: Let dram_init " Fabio Estevam
2011-12-15 16:34 ` [U-Boot] [PATCH v3 3/3] mx28evk: Add initial support for MX28EVK board Fabio Estevam
2011-12-15 17:25   ` Marek Vasut
2011-12-15 20:42     ` Fabio Estevam
2011-12-15 17:22 ` [U-Boot] [PATCH v2 1/3] mx28: Let imx_get_mac_from_fuse be common for mx28 Marek Vasut
2011-12-16  8:55   ` Stefano Babic
2011-12-16  9:53     ` Marek Vasut
2011-12-16 10:04       ` Stefano Babic
2011-12-16 10:39         ` Marek Vasut
2011-12-16 10:55           ` Stefano Babic
2011-12-16 10:56             ` Marek Vasut
2011-12-15 20:38 ` [U-Boot] [PATCH v4 " Fabio Estevam
2011-12-15 20:38 ` [U-Boot] [PATCH v4 2/3] mx28: Let dram_init " Fabio Estevam
2011-12-15 20:38 ` [U-Boot] [PATCH v4 3/3] mx28evk: Add initial support for MX28EVK board Fabio Estevam
2011-12-15 22:07 ` [U-Boot] [PATCH v5 1/3] mx28: Let imx_get_mac_from_fuse be common for mx28 Fabio Estevam
2011-12-16  9:49   ` Marek Vasut
2011-12-15 22:07 ` [U-Boot] [PATCH v5 2/3] mx28: Let dram_init " Fabio Estevam
2011-12-16  8:57   ` Stefano Babic
2011-12-15 22:07 ` [U-Boot] [PATCH v5 3/3] mx28evk: Add initial support for MX28EVK board Fabio Estevam
2011-12-16  9:02   ` Stefano Babic
2011-12-16  9:51   ` Marek Vasut
2011-12-16 14:55   ` Veli-Pekka Peltola
2011-12-17  2:13     ` Fabio Estevam
2011-12-17  3:17     ` Marek Vasut
2011-12-19 14:10       ` Veli-Pekka Peltola

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.