From: Sascha Hauer <s.hauer@pengutronix.de>
To: "Eric Bénard" <eric@eukrea.com>
Cc: barebox@lists.infradead.org
Subject: Re: [PATCH 14/16] eukrea_cpuimx35: fix PHY address
Date: Thu, 17 May 2012 19:42:53 +0200 [thread overview]
Message-ID: <20120517174253.GF30400@pengutronix.de> (raw)
In-Reply-To: <1337269578-20570-14-git-send-email-eric@eukrea.com>
On Thu, May 17, 2012 at 05:46:16PM +0200, Eric Bénard wrote:
> 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..1869e9d 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,
> };
This patch seems to do more than what the subject suggests. What's the
stuff below?
Sascha
>
> 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,11 +187,54 @@ 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);
> +
> +#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)
> +{
> /* screen default on to prevent flicker */
> gpio_direction_output(4, 0);
> /* backlight default off */
> --
> 1.7.7.6
>
>
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2012-05-17 17:42 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-17 15:46 [PATCH 01/16] eukrea_cpuimx25: workaround ENGcm09152 Eric Bénard
2012-05-17 15:46 ` [PATCH 02/16] eukrea_cpuimx25: add display choice in environment Eric Bénard
2012-05-17 15:46 ` [PATCH 03/16] eukrea_cpuimx25: update defconfig Eric Bénard
2012-05-17 15:46 ` [PATCH 04/16] eukrea_cpuimx35: add display choice in environment Eric Bénard
2012-05-17 15:46 ` [PATCH 05/16] eukrea_cpuimx35: update defconfig Eric Bénard
2012-05-17 15:46 ` [PATCH 06/16] eukrea_cpuimx51: updated env Eric Bénard
2012-05-17 15:46 ` [PATCH 07/16] eukrea_cpuimx51: update defconfig Eric Bénard
2012-05-17 15:46 ` [PATCH 08/16] eukrea_cpuimx25: use switch action to launch usbserial or dfu Eric Bénard
2012-05-17 15:46 ` [PATCH 09/16] eukrea_cpuimx35: " Eric Bénard
2012-05-17 15:46 ` [PATCH 10/16] fs/tftp: depend on NET_TFTP Eric Bénard
2012-05-17 17:54 ` Sascha Hauer
2012-05-26 9:43 ` Jean-Christophe PLAGNIOL-VILLARD
2012-05-31 18:24 ` Sascha Hauer
2012-05-17 15:46 ` [PATCH 11/16] iim: don't try to set ethaddr when NET is not selected Eric Bénard
2012-05-17 17:40 ` Sascha Hauer
2012-05-17 15:46 ` [PATCH 12/16] fec_imx: restart aneg at open and not at init Eric Bénard
2012-05-17 17:36 ` Sascha Hauer
2012-05-17 19:32 ` Eric Bénard
2012-05-18 8:40 ` Sascha Hauer
2012-05-17 15:46 ` [PATCH 13/16] eukrea_cpuimx25: fix PHY address Eric Bénard
2012-05-17 15:46 ` [PATCH 14/16] eukrea_cpuimx35: " Eric Bénard
2012-05-17 17:42 ` Sascha Hauer [this message]
2012-05-17 19:33 ` Eric Bénard
2012-05-17 15:46 ` [PATCH 15/16] eukrea_cpuimx25&35: update init_board Eric Bénard
2012-05-17 15:46 ` [PATCH 16/16] eukrea_cpuimx25&35: update defconfig Eric Bénard
2012-05-17 17:45 ` Sascha Hauer
2012-05-17 19:34 ` 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=20120517174253.GF30400@pengutronix.de \
--to=s.hauer@pengutronix.de \
--cc=barebox@lists.infradead.org \
--cc=eric@eukrea.com \
/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 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.