From: "Andreas Färber" <afaerber@suse.de>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH] am33xx: board: Refactor USB initialization into separate function
Date: Sun, 12 Feb 2017 14:55:06 +0100 [thread overview]
Message-ID: <0342fab5-5cfb-203d-00bd-bc72c87ab396@suse.de> (raw)
In-Reply-To: <20170206223013.28668-1-alex.g@adaptrum.com>
Am 06.02.2017 um 23:30 schrieb Alexandru Gagniuc:
> diff --git a/arch/arm/mach-omap2/am33xx/board.c b/arch/arm/mach-omap2/am33xx/board.c
> index 190310f..f19e919 100644
> --- a/arch/arm/mach-omap2/am33xx/board.c
> +++ b/arch/arm/mach-omap2/am33xx/board.c
> @@ -190,11 +190,9 @@ static struct musb_hdrc_platform_data otg1_plat = {
> .board_data = &otg1_board_data,
> };
> #endif
> -#endif
>
> -int arch_misc_init(void)
> +static int arch_usb_init(void)
> {
> -#ifndef CONFIG_DM_USB
> #ifdef CONFIG_AM335X_USB0
> musb_register(&otg0_plat, &otg0_board_data,
> (void *)USB0_OTG_BASE);
> @@ -203,7 +201,13 @@ int arch_misc_init(void)
> musb_register(&otg1_plat, &otg1_board_data,
> (void *)USB1_OTG_BASE);
> #endif
> -#else
> + return 0;
> +}
> +
> +#else /* CONFIG_USB_MUSB_* && CONFIG_AM335X_USB* && !CONFIG_DM_USB */
> +
> +int static int arch_usb_init(void)(void)
This looks like a copy&paste gone wrong.
Regards,
Andreas
> +{
> struct udevice *dev;
> int ret;
>
> @@ -211,6 +215,19 @@ int arch_misc_init(void)
> if (ret || !dev)
> return ret;
>
> + return 0;
> +}
> +
> +#endif /* CONFIG_USB_MUSB_* && CONFIG_AM335X_USB* && !CONFIG_DM_USB */
[snip]
--
SUSE Linux GmbH, Maxfeldstr. 5, 90409 N?rnberg, Germany
GF: Felix Imend?rffer, Jane Smithard, Graham Norton
HRB 21284 (AG N?rnberg)
next prev parent reply other threads:[~2017-02-12 13:55 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-03 23:42 [U-Boot] [PATCH 0/5] Add support for Adaptrum ACRS2 mainboard Alexandru Gagniuc
2017-02-03 23:42 ` [U-Boot] [PATCH 1/5] configs: am335x_evm: Enable FASTBOOT based on kconfig Alexandru Gagniuc
2017-02-06 15:15 ` Andrew F. Davis
2017-02-06 18:32 ` Alex
2017-02-03 23:42 ` [U-Boot] [PATCH 2/5] Revert "configs: am335x: usb: do not define CONFIG_DM_USB for spl" Alexandru Gagniuc
2017-02-06 15:52 ` Andrew F. Davis
2017-02-06 18:47 ` Alex
2017-02-06 19:43 ` Andrew F. Davis
2017-02-06 21:30 ` Grygorii Strashko
2017-02-06 22:02 ` Alexandru Gagniuc
2017-02-06 22:30 ` [U-Boot] [PATCH] am33xx: board: Refactor USB initialization into separate function Alexandru Gagniuc
2017-02-12 13:55 ` Andreas Färber [this message]
2017-02-13 17:18 ` Alex
2017-02-03 23:42 ` [U-Boot] [PATCH 3/5] ARM: DTS: Add devicetree for Adaptrum ACRS2 mainboard Alexandru Gagniuc
2017-02-03 23:42 ` [U-Boot] [PATCH 4/5] configs: am335x: Enable PHY_VITESSE Alexandru Gagniuc
2017-02-06 15:56 ` Andrew F. Davis
2017-02-06 19:02 ` Alex G.
2017-02-06 19:47 ` Andrew F. Davis
2017-02-06 20:30 ` Alex G.
2017-02-06 20:38 ` Andrew F. Davis
2017-02-06 20:54 ` Alex G.
2017-02-06 21:03 ` Andrew F. Davis
2017-02-06 21:05 ` [U-Boot] [PATCH] drivers: net: Provide Kconfig menu for PHYLIB Alexandru Gagniuc
2017-02-06 21:45 ` [U-Boot] [PATCH] drivers: net: Move PHYLIB to Kconfig Andrew F. Davis
2017-02-07 16:28 ` Joe Hershberger
2017-02-03 23:42 ` [U-Boot] [PATCH 5/5] configs: Add defconfig for Adaptrum ACRS2 Alexandru Gagniuc
2017-02-07 3:17 ` [U-Boot] [PATCH v2 0/6] Add support for Adaptrum ACRS2 board Alexandru Gagniuc
2017-02-07 3:17 ` [U-Boot] [PATCH v2 1/6] configs: am335x_evm: Enable FASTBOOT based on kconfig Alexandru Gagniuc
2017-02-07 18:23 ` Tom Rini
2017-07-12 12:14 ` [U-Boot] [U-Boot, v2, " Tom Rini
2017-02-07 3:17 ` [U-Boot] [PATCH v2 2/6] am33xx: board: Refactor USB initialization into separate function Alexandru Gagniuc
2017-02-07 18:23 ` Tom Rini
2017-07-12 12:14 ` [U-Boot] [U-Boot, v2, " Tom Rini
2017-02-07 3:17 ` [U-Boot] [PATCH v2 3/6] drivers: net: Provide Kconfig menu for PHYLIB Alexandru Gagniuc
2017-02-07 16:28 ` Joe Hershberger
2017-02-07 18:23 ` Tom Rini
2017-02-09 16:28 ` [U-Boot] " Joe Hershberger
2017-02-09 18:18 ` Alexandru Gagniuc
2017-02-09 22:19 ` Joe Hershberger
2017-02-09 22:45 ` Tom Rini
2017-02-07 3:17 ` [U-Boot] [PATCH v2 4/6] drivers: net: Move PHYLIB to Kconfig Alexandru Gagniuc
2017-02-07 16:55 ` Andrew F. Davis
2017-02-07 17:15 ` Joe Hershberger
2017-02-07 17:49 ` Tom Rini
2017-02-07 17:52 ` Tom Rini
2017-02-08 22:45 ` Joe Hershberger
2017-02-07 3:17 ` [U-Boot] [PATCH v2 5/6] ARM: DTS: Add devicetree for Adaptrum ACRS2 mainboard Alexandru Gagniuc
2017-02-07 3:17 ` [U-Boot] [PATCH v2 6/6] configs: Add defconfig for Adaptrum ACRS2 Alexandru Gagniuc
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=0342fab5-5cfb-203d-00bd-bc72c87ab396@suse.de \
--to=afaerber@suse.de \
--cc=u-boot@lists.denx.de \
/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