summaryrefslogtreecommitdiff
path: root/drivers/usb
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2012-09-21 09:29:38 -0700
committerTom Rini <trini@ti.com>2012-09-21 09:29:38 -0700
commit50d924b45911b24eeb7623bed11b9297d99b840a (patch)
tree5a1cb13f225250b665a6f57aa2c42052ef27f598 /drivers/usb
parent3ab270d5df7ae7bf8d7b5d225ab1abb37297d77e (diff)
parent93ad908c43ed5d8e3e546dd22fa08b668c5090d9 (diff)
downloadu-boot-imx-50d924b45911b24eeb7623bed11b9297d99b840a.zip
u-boot-imx-50d924b45911b24eeb7623bed11b9297d99b840a.tar.gz
u-boot-imx-50d924b45911b24eeb7623bed11b9297d99b840a.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-usb
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/host/ehci-hcd.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
index 18b4bc6..392e286 100644
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -22,6 +22,7 @@
*/
#include <common.h>
#include <asm/byteorder.h>
+#include <asm/unaligned.h>
#include <usb.h>
#include <asm/io.h>
#include <malloc.h>
@@ -866,10 +867,12 @@ int usb_lowlevel_init(void)
printf("Register %x NbrPorts %d\n", reg, descriptor.hub.bNbrPorts);
/* Port Indicators */
if (HCS_INDICATOR(reg))
- descriptor.hub.wHubCharacteristics |= 0x80;
+ put_unaligned(get_unaligned(&descriptor.hub.wHubCharacteristics)
+ | 0x80, &descriptor.hub.wHubCharacteristics);
/* Port Power Control */
if (HCS_PPC(reg))
- descriptor.hub.wHubCharacteristics |= 0x01;
+ put_unaligned(get_unaligned(&descriptor.hub.wHubCharacteristics)
+ | 0x01, &descriptor.hub.wHubCharacteristics);
/* Start the host controller. */
cmd = ehci_readl(&hcor->or_usbcmd);