mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: "Eric Bénard" <eric@eukrea.com>
To: barebox@lists.infradead.org
Subject: [PATCH v2 09/10] eukrea_cpuimx35: fix PHY address and clean code
Date: Fri, 18 May 2012 09:41:44 +0200	[thread overview]
Message-ID: <1337326905-555-9-git-send-email-eric@eukrea.com> (raw)
In-Reply-To: <1337326905-555-1-git-send-email-eric@eukrea.com>

this patch also cleans the source by putting in device_init
the code which is actually in console_init and has nothing
to see with the console.

Signed-off-by: Eric Bénard <eric@eukrea.com>
---
 arch/arm/boards/eukrea_cpuimx35/eukrea_cpuimx35.c |   90 ++++++++++----------
 1 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/arch/arm/boards/eukrea_cpuimx35/eukrea_cpuimx35.c b/arch/arm/boards/eukrea_cpuimx35/eukrea_cpuimx35.c
index bfdd9de..cc8c60d 100644
--- a/arch/arm/boards/eukrea_cpuimx35/eukrea_cpuimx35.c
+++ b/arch/arm/boards/eukrea_cpuimx35/eukrea_cpuimx35.c
@@ -58,7 +58,7 @@
 
 static struct fec_platform_data fec_info = {
 	.xcv_type	= MII100,
-	.phy_addr	= 0x1F,
+	.phy_addr	= 0,
 };
 
 struct imx_nand_platform_data nand_info = {
@@ -143,49 +143,6 @@ static int eukrea_cpuimx35_mmu_init(void)
 }
 postmmu_initcall(eukrea_cpuimx35_mmu_init);
 
-static int eukrea_cpuimx35_devices_init(void)
-{
-#ifdef CONFIG_USB_GADGET
-	unsigned int tmp;
-#endif
-	imx35_add_nand(&nand_info);
-
-	devfs_add_partition("nand0", 0x00000, 0x40000, PARTITION_FIXED, "self_raw");
-	dev_add_bb_dev("self_raw", "self0");
-	devfs_add_partition("nand0", 0x40000, 0x20000, PARTITION_FIXED, "env_raw");
-	dev_add_bb_dev("env_raw", "env0");
-
-	imx35_add_fec(&fec_info);
-	imx35_add_fb(&ipu_fb_data);
-
-	imx35_add_i2c0(NULL);
-	imx35_add_mmc0(NULL);
-
-	/* led default off */
-	gpio_direction_output(32 * 2 + 29, 1);
-
-	/* Switch : input */
-	gpio_direction_input(32 * 2 + 25);
-
-#ifdef CONFIG_USB
-	imx35_usb_init();
-	add_generic_usb_ehci_device(-1, IMX_OTG_BASE + 0x400, NULL);
-#endif
-#ifdef CONFIG_USB_GADGET
-	/* Workaround ENGcm09152 */
-	tmp = readl(IMX_OTG_BASE + 0x608);
-	writel(tmp | (1 << 23), IMX_OTG_BASE + 0x608);
-	add_generic_device("fsl-udc", -1, NULL, IMX_OTG_BASE, 0x200,
-			   IORESOURCE_MEM, &usb_pdata);
-#endif
-	armlinux_set_bootparams((void *)0x80000100);
-	armlinux_set_architecture(MACH_TYPE_EUKREA_CPUIMX35SD);
-
-	return 0;
-}
-
-device_initcall(eukrea_cpuimx35_devices_init);
-
 static struct pad_desc eukrea_cpuimx35_pads[] = {
 	MX35_PAD_FEC_TX_CLK__FEC_TX_CLK,
 	MX35_PAD_FEC_RX_CLK__FEC_RX_CLK,
@@ -230,16 +187,59 @@ static struct pad_desc eukrea_cpuimx35_pads[] = {
 	MX35_PAD_LD19__GPIO3_25,
 };
 
-static int eukrea_cpuimx35_console_init(void)
+static int eukrea_cpuimx35_devices_init(void)
 {
+#ifdef CONFIG_USB_GADGET
+	unsigned int tmp;
+#endif
 	mxc_iomux_v3_setup_multiple_pads(eukrea_cpuimx35_pads,
 		ARRAY_SIZE(eukrea_cpuimx35_pads));
 
+	imx35_add_nand(&nand_info);
+
+	devfs_add_partition("nand0", 0x00000, 0x40000, PARTITION_FIXED, "self_raw");
+	dev_add_bb_dev("self_raw", "self0");
+	devfs_add_partition("nand0", 0x40000, 0x20000, PARTITION_FIXED, "env_raw");
+	dev_add_bb_dev("env_raw", "env0");
+
+	imx35_add_fec(&fec_info);
+	imx35_add_fb(&ipu_fb_data);
+
+	imx35_add_i2c0(NULL);
+	imx35_add_mmc0(NULL);
+
+	/* led default off */
+	gpio_direction_output(32 * 2 + 29, 1);
+
+	/* Switch : input */
+	gpio_direction_input(32 * 2 + 25);
+
 	/* screen default on to prevent flicker */
 	gpio_direction_output(4, 0);
 	/* backlight default off */
 	gpio_direction_output(1, 0);
 
+#ifdef CONFIG_USB
+	imx35_usb_init();
+	add_generic_usb_ehci_device(-1, IMX_OTG_BASE + 0x400, NULL);
+#endif
+#ifdef CONFIG_USB_GADGET
+	/* Workaround ENGcm09152 */
+	tmp = readl(IMX_OTG_BASE + 0x608);
+	writel(tmp | (1 << 23), IMX_OTG_BASE + 0x608);
+	add_generic_device("fsl-udc", -1, NULL, IMX_OTG_BASE, 0x200,
+			   IORESOURCE_MEM, &usb_pdata);
+#endif
+	armlinux_set_bootparams((void *)0x80000100);
+	armlinux_set_architecture(MACH_TYPE_EUKREA_CPUIMX35SD);
+
+	return 0;
+}
+
+device_initcall(eukrea_cpuimx35_devices_init);
+
+static int eukrea_cpuimx35_console_init(void)
+{
 	imx35_add_uart0();
 	return 0;
 }
-- 
1.7.7.6


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

  parent reply	other threads:[~2012-05-18  7:42 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-05-18  7:41 [PATCH v2 01/10] eukrea_cpuimx25: workaround ENGcm09152 Eric Bénard
2012-05-18  7:41 ` [PATCH v2 02/10] eukrea_cpuimx25: add display choice in environment Eric Bénard
2012-05-18  7:41 ` [PATCH v2 03/10] eukrea_cpuimx35: " Eric Bénard
2012-05-18  7:41 ` [PATCH v2 04/10] eukrea_cpuimx51: updated env Eric Bénard
2012-05-18  7:41 ` [PATCH v2 05/10] eukrea_cpuimx25/35/51: update defconfig Eric Bénard
2012-05-18  7:41 ` [PATCH v2 06/10] eukrea_cpuimx25&35: use switch action to launch usbserial or dfu Eric Bénard
2012-05-18  7:41 ` [PATCH v2 07/10] iim: fix compilation when NET is not selected Eric Bénard
2012-05-18  7:41 ` [PATCH v2 08/10] eukrea_cpuimx25: fix PHY address Eric Bénard
2012-05-18  7:41 ` Eric Bénard [this message]
2012-05-18  7:41 ` [PATCH v2 10/10] fec_imx: restart aneg at open and not at init Eric Bénard
2012-05-18  7:52 ` [PATCH v2 xx/10] Eric Bénard
2012-05-18  9:43 ` [PATCH v2 01/10] eukrea_cpuimx25: workaround ENGcm09152 Sascha Hauer
2012-05-18  9:58   ` Eric Bénard

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=1337326905-555-9-git-send-email-eric@eukrea.com \
    --to=eric@eukrea.com \
    --cc=barebox@lists.infradead.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