From patchwork Thu Oct 10 22:27:55 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Troy Kisky X-Patchwork-Id: 282487 X-Patchwork-Delegate: marek.vasut@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id E47B42C00A6 for ; Fri, 11 Oct 2013 09:30:09 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 3AB6A4A0F1; Fri, 11 Oct 2013 00:29:50 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id B55-xNVmVvrH; Fri, 11 Oct 2013 00:29:50 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 41B294A0EE; Fri, 11 Oct 2013 00:29:15 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id B13FC4A0E4 for ; Fri, 11 Oct 2013 00:29:07 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id XSbInPlYEx9W for ; Fri, 11 Oct 2013 00:29:02 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-pb0-f49.google.com (mail-pb0-f49.google.com [209.85.160.49]) by theia.denx.de (Postfix) with ESMTPS id 127C74A0B8 for ; Fri, 11 Oct 2013 00:28:33 +0200 (CEST) Received: by mail-pb0-f49.google.com with SMTP id xb4so3238499pbc.36 for ; Thu, 10 Oct 2013 15:28:32 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=zlRZVKCagRiKZTqkcasZKsfNJhBWxBb1h+1aSOMsLIA=; b=D6fy8gRrFMlhOkGO9eXcQw85eBqpysUk3Z3Py6kF5cmpfIvgx2DyPBhCbihDrs924q cXvKChjjE4Mz/qnZpMWy6Mm0reELPhi38BDFDX0OlxrCcXblVYqUZtTrza4p2LIDpBEG gJgnV6e3h9TWwhsaqZzTXYxoBXfhoGYnL4KMHlvcn2loTL+5gl0qo7pxgI7JV5CJ0RDK bg1aQ9gJ3OePwgvYcB17IDMuK4vr1479iMknk+7pvQXurx4sfxg6r7XfQ/mVlO4OelYQ EqYnUu9EzbeQnWPTsytpV9FKvhy85QLrLkbrZ7cvPUQ70lu647rTK7XEna5JG2PfOTiW ym7w== X-Gm-Message-State: ALoCoQkpxxgg+IUdntlOU0tFS7QhmPcrjFE5c1YbVR4o4jStyYlazKm77hh+XGKwqGAgxc/hyDrB X-Received: by 10.68.196.227 with SMTP id ip3mr16234979pbc.163.1381444112537; Thu, 10 Oct 2013 15:28:32 -0700 (PDT) Received: from officeserver-2 ([70.96.116.236]) by mx.google.com with ESMTPSA id fi4sm55427541pbc.28.1969.12.31.16.00.00 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 10 Oct 2013 15:28:32 -0700 (PDT) Received: from tkisky by officeserver-2 with local (Exim 4.80) (envelope-from ) id 1VUOiY-0006Kg-5n; Thu, 10 Oct 2013 15:28:26 -0700 From: Troy Kisky To: marek.vasut@gmail.com Date: Thu, 10 Oct 2013 15:27:55 -0700 Message-Id: <1381444084-24296-2-git-send-email-troy.kisky@boundarydevices.com> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1381444084-24296-1-git-send-email-troy.kisky@boundarydevices.com> References: <1381444084-24296-1-git-send-email-troy.kisky@boundarydevices.com> Cc: leiwen@marvell.com, fabio.estevam@freescale.com, otavio@ossystems.com.br, u-boot@lists.denx.de Subject: [U-Boot] [PATCH V6 01/10] usb: rename board_usb_init_type to usb_init_type X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de This will be used by usb_lowlevel_init so it will no longer be used by only board specific functions. Move definition of enum usb_init_type higher in file so that it will be available for usb_low_level_init. Signed-off-by: Troy Kisky --- v6: new patch --- board/amcc/canyonlands/canyonlands.c | 4 ++-- board/balloon3/balloon3.c | 4 ++-- board/esd/apc405/apc405.c | 4 ++-- board/esd/pmc440/pmc440.c | 4 ++-- board/icpdas/lp8x4x/lp8x4x.c | 4 ++-- board/samsung/trats/trats.c | 2 +- board/toradex/colibri_pxa270/colibri_pxa270.c | 4 ++-- board/trizepsiv/conxs.c | 4 ++-- board/vpac270/vpac270.c | 4 ++-- common/usb.c | 2 +- include/usb.h | 26 +++++++++++++------------- 11 files changed, 31 insertions(+), 31 deletions(-) diff --git a/board/amcc/canyonlands/canyonlands.c b/board/amcc/canyonlands/canyonlands.c index 395095e..2b5f1a6 100644 --- a/board/amcc/canyonlands/canyonlands.c +++ b/board/amcc/canyonlands/canyonlands.c @@ -189,7 +189,7 @@ int board_early_init_f(void) } #if defined(CONFIG_USB_OHCI_NEW) && defined(CONFIG_SYS_USB_OHCI_BOARD_INIT) -int board_usb_init(int index, enum board_usb_init_type init) +int board_usb_init(int index, enum usb_init_type init) { struct board_bcsr *bcsr_data = (struct board_bcsr *)CONFIG_SYS_BCSR_BASE; @@ -230,7 +230,7 @@ int usb_board_stop(void) return 0; } -int board_usb_cleanup(int index, enum board_usb_init_type init) +int board_usb_cleanup(int index, enum usb_init_type init) { return usb_board_stop(); } diff --git a/board/balloon3/balloon3.c b/board/balloon3/balloon3.c index 19c0e02..04e0574 100644 --- a/board/balloon3/balloon3.c +++ b/board/balloon3/balloon3.c @@ -60,7 +60,7 @@ void dram_init_banksize(void) } #ifdef CONFIG_CMD_USB -int board_usb_init(int index, enum board_usb_init_type init) +int board_usb_init(int index, enum usb_init_type init) { writel((readl(UHCHR) | UHCHR_PCPL | UHCHR_PSPL) & ~(UHCHR_SSEP0 | UHCHR_SSEP1 | UHCHR_SSEP2 | UHCHR_SSE), @@ -91,7 +91,7 @@ int board_usb_init(int index, enum board_usb_init_type init) return 0; } -int board_usb_cleanup(int index, enum board_usb_init_type init) +int board_usb_cleanup(int index, enum usb_init_type init) { return 0; } diff --git a/board/esd/apc405/apc405.c b/board/esd/apc405/apc405.c index 79341f5..5cc1d0d 100644 --- a/board/esd/apc405/apc405.c +++ b/board/esd/apc405/apc405.c @@ -429,7 +429,7 @@ void reset_phy(void) } #if defined(CONFIG_USB_OHCI_NEW) && defined(CONFIG_SYS_USB_OHCI_BOARD_INIT) -int board_usb_init(int index, enum board_usb_init_type init) +int board_usb_init(int index, enum usb_init_type init) { return 0; } @@ -454,7 +454,7 @@ int usb_board_stop(void) return 0; } -int board_usb_cleanup(int index, enum board_usb_init_type init) +int board_usb_cleanup(int index, enum usb_init_type init) { return usb_board_stop(); } diff --git a/board/esd/pmc440/pmc440.c b/board/esd/pmc440/pmc440.c index 44b86da..88fc5f7 100644 --- a/board/esd/pmc440/pmc440.c +++ b/board/esd/pmc440/pmc440.c @@ -822,7 +822,7 @@ int bootstrap_eeprom_read (unsigned dev_addr, unsigned offset, } #if defined(CONFIG_USB_OHCI_NEW) && defined(CONFIG_SYS_USB_OHCI_BOARD_INIT) -int board_usb_init(int index, enum board_usb_init_type init) +int board_usb_init(int index, enum usb_init_type init) { char *act = getenv("usbact"); int i; @@ -846,7 +846,7 @@ int usb_board_stop(void) return 0; } -int board_usb_cleanup(int index, enum board_usb_init_type init) +int board_usb_cleanup(int index, enum usb_init_type init) { return usb_board_stop(); } diff --git a/board/icpdas/lp8x4x/lp8x4x.c b/board/icpdas/lp8x4x/lp8x4x.c index a96bed6..92dd4ff 100644 --- a/board/icpdas/lp8x4x/lp8x4x.c +++ b/board/icpdas/lp8x4x/lp8x4x.c @@ -59,7 +59,7 @@ int board_mmc_init(bd_t *bis) #endif #ifdef CONFIG_CMD_USB -int board_usb_init(int index, enum board_usb_init_type init) +int board_usb_init(int index, enum usb_init_type init) { writel((UHCHR | UHCHR_PCPL | UHCHR_PSPL) & ~(UHCHR_SSEP0 | UHCHR_SSEP1 | UHCHR_SSEP2 | UHCHR_SSE), @@ -90,7 +90,7 @@ int board_usb_init(int index, enum board_usb_init_type init) return 0; } -int board_usb_cleanup(int index, enum board_usb_init_type init) +int board_usb_cleanup(int index, enum usb_init_type init) { return 0; } diff --git a/board/samsung/trats/trats.c b/board/samsung/trats/trats.c index 58d925f..d31d511 100644 --- a/board/samsung/trats/trats.c +++ b/board/samsung/trats/trats.c @@ -496,7 +496,7 @@ struct s3c_plat_otg_data s5pc210_otg_data = { .usb_flags = PHY0_SLEEP, }; -int board_usb_init(int index, enum board_usb_init_type init) +int board_usb_init(int index, enum usb_init_type init) { debug("USB_udc_probe\n"); return s3c_udc_probe(&s5pc210_otg_data); diff --git a/board/toradex/colibri_pxa270/colibri_pxa270.c b/board/toradex/colibri_pxa270/colibri_pxa270.c index b70c1e3..8d95e4d 100644 --- a/board/toradex/colibri_pxa270/colibri_pxa270.c +++ b/board/toradex/colibri_pxa270/colibri_pxa270.c @@ -40,7 +40,7 @@ int dram_init(void) } #ifdef CONFIG_CMD_USB -int board_usb_init(int index, enum board_usb_init_type init) +int board_usb_init(int index, enum usb_init_type init) { writel((readl(UHCHR) | UHCHR_PCPL | UHCHR_PSPL) & ~(UHCHR_SSEP0 | UHCHR_SSEP1 | UHCHR_SSEP2 | UHCHR_SSE), @@ -71,7 +71,7 @@ int board_usb_init(int index, enum board_usb_init_type init) return 0; } -int board_usb_cleanup(int index, enum board_usb_init_type init) +int board_usb_cleanup(int index, enum usb_init_type init) { return 0; } diff --git a/board/trizepsiv/conxs.c b/board/trizepsiv/conxs.c index 830d5a8..1ddf05d 100644 --- a/board/trizepsiv/conxs.c +++ b/board/trizepsiv/conxs.c @@ -43,7 +43,7 @@ extern struct serial_device serial_stuart_device; * Miscelaneous platform dependent initialisations */ -int board_usb_init(int index, enum board_usb_init_type init) +int board_usb_init(int index, enum usb_init_type init) { writel((readl(UHCHR) | UHCHR_PCPL | UHCHR_PSPL) & ~(UHCHR_SSEP0 | UHCHR_SSEP1 | UHCHR_SSEP2 | UHCHR_SSE), @@ -70,7 +70,7 @@ int board_usb_init(int index, enum board_usb_init_type init) return 0; } -int board_usb_cleanup(int index, enum board_usb_init_type init) +int board_usb_cleanup(int index, enum usb_init_type init) { return 0; } diff --git a/board/vpac270/vpac270.c b/board/vpac270/vpac270.c index fab4636..8d777df 100644 --- a/board/vpac270/vpac270.c +++ b/board/vpac270/vpac270.c @@ -67,7 +67,7 @@ int board_mmc_init(bd_t *bis) #endif #ifdef CONFIG_CMD_USB -int board_usb_init(int index, enum board_usb_init_type init) +int board_usb_init(int index, enum usb_init_type init) { writel((UHCHR | UHCHR_PCPL | UHCHR_PSPL) & ~(UHCHR_SSEP0 | UHCHR_SSEP1 | UHCHR_SSEP2 | UHCHR_SSE), @@ -98,7 +98,7 @@ int board_usb_init(int index, enum board_usb_init_type init) return 0; } -int board_usb_cleanup(int index, enum board_usb_init_type init) +int board_usb_cleanup(int index, enum usb_init_type init) { return 0; } diff --git a/common/usb.c b/common/usb.c index a61fcac..414f9c2 100644 --- a/common/usb.c +++ b/common/usb.c @@ -1068,7 +1068,7 @@ int usb_new_device(struct usb_device *dev) } __weak -int board_usb_init(int index, enum board_usb_init_type init) +int board_usb_init(int index, enum usb_init_type init) { return 0; } diff --git a/include/usb.h b/include/usb.h index 17fb68c..b4fea52 100644 --- a/include/usb.h +++ b/include/usb.h @@ -129,6 +129,16 @@ struct usb_device { unsigned int slot_id; }; +/* + * You can initialize platform's USB host or device + * ports by passing this enum as an argument to + * board_usb_init(). + */ +enum usb_init_type { + USB_INIT_HOST, + USB_INIT_DEVICE +}; + /********************************************************************** * this is how the lowlevel part communicate with the outer world */ @@ -170,32 +180,22 @@ extern void udc_disconnect(void); #endif /* - * You can initialize platform's USB host or device - * ports by passing this enum as an argument to - * board_usb_init(). - */ -enum board_usb_init_type { - USB_INIT_HOST, - USB_INIT_DEVICE -}; - -/* * board-specific hardware initialization, called by * usb drivers and u-boot commands * * @param index USB controller number * @param init initializes controller as USB host or device */ -int board_usb_init(int index, enum board_usb_init_type init); +int board_usb_init(int index, enum usb_init_type init); /* * can be used to clean up after failed USB initialization attempt * vide: board_usb_init() * * @param index USB controller number for selective cleanup - * @param init board_usb_init_type passed to board_usb_init() + * @param init usb_init_type passed to board_usb_init() */ -int board_usb_cleanup(int index, enum board_usb_init_type init); +int board_usb_cleanup(int index, enum usb_init_type init); #ifdef CONFIG_USB_STORAGE