From: Vicente Bergas <vicencb@gmail.com>
To: barebox@lists.infradead.org
Cc: Vicente Bergas <vicencb@gmail.com>
Subject: [PATCH 6/9] omap4_romusb: allow adding usb-serial when not booting from usb
Date: Sun, 10 Mar 2013 00:19:39 +0100 [thread overview]
Message-ID: <1362871182-25726-7-git-send-email-vicencb@gmail.com> (raw)
In-Reply-To: <1362871182-25726-1-git-send-email-vicencb@gmail.com>
Signed-off-by: Vicente Bergas <vicencb@gmail.com>
---
arch/arm/mach-omap/include/mach/omap4_rom_usb.h | 3 +++
arch/arm/mach-omap/omap4_rom_usb.c | 23 +++++++++++------------
drivers/serial/serial_omap4_usbboot.c | 2 ++
3 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/arch/arm/mach-omap/include/mach/omap4_rom_usb.h b/arch/arm/mach-omap/include/mach/omap4_rom_usb.h
index 50c359f..bf8bd15 100644
--- a/arch/arm/mach-omap/include/mach/omap4_rom_usb.h
+++ b/arch/arm/mach-omap/include/mach/omap4_rom_usb.h
@@ -122,8 +122,11 @@ struct omap4_usbboot {
struct per_handle dread;
struct per_handle dwrite;
struct per_driver *io;
+ int ready;
};
+int omap4_usbboot_open(void);
+int omap4_usbboot_ready(void);
void omap4_usbboot_close(void);
void omap4_usbboot_queue_read(void *data, unsigned len);
diff --git a/arch/arm/mach-omap/omap4_rom_usb.c b/arch/arm/mach-omap/omap4_rom_usb.c
index 38f886b..de35d61 100644
--- a/arch/arm/mach-omap/omap4_rom_usb.c
+++ b/arch/arm/mach-omap/omap4_rom_usb.c
@@ -38,7 +38,7 @@
static struct omap4_usbboot omap4_usbboot_data;
-static int omap4_usbboot_open(void)
+int omap4_usbboot_open(void)
{
int (*rom_get_per_driver)(struct per_driver **io, u32 device_type);
int (*rom_get_per_device)(struct per_handle **rh);
@@ -60,7 +60,7 @@ static int omap4_usbboot_open(void)
if ((boot->device_type != DEVICE_USB) &&
(boot->device_type != DEVICE_USBEXT))
- return -1;
+ return 0;
memset(&omap4_usbboot_data, 0, sizeof(omap4_usbboot_data));
n = rom_get_per_driver(&omap4_usbboot_data.io, boot->device_type);
@@ -77,9 +77,16 @@ static int omap4_usbboot_open(void)
omap4_usbboot_data.dwrite.options = boot->options;
omap4_usbboot_data.dwrite.device_type = boot->device_type;
__asm__ __volatile__ ("cpsie i\n");
+ omap4_usbboot_data.ready = 1;
+
+ omap4_usbboot_puts("USB communications initialized\n");
return 0;
}
+core_initcall(omap4_usbboot_open);
+int omap4_usbboot_ready(void){
+ return omap4_usbboot_data.ready;
+}
static void rom_read_callback(struct per_handle *rh)
{
@@ -110,11 +117,13 @@ int omap4_usbboot_wait_read(void)
omap4_usbboot_data.dread.status = -1;
return ret;
}
+
int omap4_usbboot_is_read_waiting(void)
{
barrier();
return omap4_usbboot_data.dread.status == STATUS_WAITING;
}
+
int omap4_usbboot_is_read_ok(void)
{
barrier();
@@ -186,13 +195,3 @@ void omap4_usbboot_puts(const char *s)
while ((c = *s++))
omap4_usbboot_write(&c, 4);
}
-
-static int omap4_usbboot_init(void)
-{
- if (omap4_bootsrc() == OMAP_BOOTSRC_USB1) {
- omap4_usbboot_open();
- omap4_usbboot_puts("USB communications initialized\n");
- }
- return 0;
-}
-core_initcall(omap4_usbboot_init);
diff --git a/drivers/serial/serial_omap4_usbboot.c b/drivers/serial/serial_omap4_usbboot.c
index f0a2fd1..ee5b19a 100644
--- a/drivers/serial/serial_omap4_usbboot.c
+++ b/drivers/serial/serial_omap4_usbboot.c
@@ -78,6 +78,8 @@ static struct driver_d serial_omap4_usbboot_driver = {
static int serial_omap4_usbboot_init(void)
{
+ if (!omap4_usbboot_ready())
+ return 0;
return platform_driver_register(&serial_omap4_usbboot_driver);
}
console_initcall(serial_omap4_usbboot_init);
--
1.8.1.5
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2013-03-09 23:20 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-09 23:19 [PATCH 0/9] Add support for booting ArchosG9 from sd-card Vicente Bergas
2013-03-09 23:19 ` [PATCH 1/9] defaultenv-2: don't load nonexistent file Vicente Bergas
2013-03-09 23:19 ` [PATCH 2/9] omap4_romusb: rename omap4_usbboot_pdata to omap4_usbboot_data Vicente Bergas
2013-03-09 23:19 ` [PATCH 3/9] omap_uart: rename OMAP3EVM_UARTx to OMAP_UARTx Vicente Bergas
2013-03-09 23:19 ` [PATCH 4/9] omap_uart: add low level port serial initialization Vicente Bergas
2013-03-10 13:16 ` Jean-Christophe PLAGNIOL-VILLARD
2013-03-10 22:16 ` vj
2013-03-10 22:35 ` Sascha Hauer
2013-03-10 22:44 ` vj
2013-03-10 23:01 ` Sascha Hauer
2013-03-10 23:09 ` vj
2013-03-09 23:19 ` [PATCH 5/9] panda: remove unused configuration items Vicente Bergas
2013-03-09 23:19 ` Vicente Bergas [this message]
2013-03-14 7:50 ` [PATCH 6/9] omap4_romusb: allow adding usb-serial when not booting from usb Sascha Hauer
2013-03-09 23:19 ` [PATCH 7/9] menu: avoid errors when building submenus Vicente Bergas
2013-03-10 13:16 ` Jean-Christophe PLAGNIOL-VILLARD
2013-03-10 22:29 ` vj
2013-03-11 8:50 ` Sascha Hauer
2013-03-09 23:19 ` [PATCH 8/9] archos: add atag appender for all features Vicente Bergas
2013-03-11 8:36 ` Sascha Hauer
2013-03-09 23:19 ` [PATCH 9/9] archosg9: enable booting from sd-card Vicente Bergas
2013-03-11 21:25 ` [PATCH 0/9] Add support for booting ArchosG9 " Sascha Hauer
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=1362871182-25726-7-git-send-email-vicencb@gmail.com \
--to=vicencb@gmail.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