Merge commit 'origin/master' into juha-devel

Conflicts:
	hw/beagle.c
	hw/omap3.c
	hw/usb-musb.c

diff --cc hw/beagle.c
index 2622674,ddceefd..e9b3a7f
--- 1/hw/beagle.c
--- 2/hw/beagle.c
+++ b/hw/beagle.c
@@@ -55,8 -55,11 +55,8 @@@ static void beagle_init(ram_addr_t ram_
          fprintf(stderr, "%s: missing SecureDigital device\n", __FUNCTION__);
          exit(1);
      }
 -      s->cpu = omap3530_mpu_init(ram_size, NULL);
 -    
 -    if (serial_hds[0])
 -        omap_uart_attach(s->cpu->uart[2], serial_hds[0]);
 +      s->cpu = omap3530_mpu_init(ram_size, NULL, NULL, serial_hds[0]);
-     
+ 
        s->nand = nand_init(NAND_MFR_MICRON, 0xba); /* MT29F2G16ABC */
        nand_setpins(s->nand, 0, 0, 0, 1, 0); /* no write-protect */
      omap_gpmc_attach(s->cpu->gpmc, BEAGLE_NAND_CS, 0, NULL, NULL, s, s->nand);

diff --cc hw/usb-musb.c
index 788b5ee,bb36be7..7c06b9e
--- 1/hw/usb-musb.c
--- 2/hw/usb-musb.c
+++ b/hw/usb-musb.c
@@@ -1378,7 -1398,6 +1398,7 @@@ static void musb_writeh(void *opaque, t
  {
      struct musb_s *s = (struct musb_s *) opaque;
      int ep;
-     TRACE("ADDR = 0x%08x = %08x", addr, value);
++    //TRACE("ADDR = 0x%08x = %08x", addr, value);
  
      switch (addr) {
      case MUSB_HDRC_INTRTXE:
@@@ -1397,12 -1416,14 +1417,14 @@@
      case MUSB_HDRC_TXFIFOADDR:
          s->ep[s->idx].fifoaddr[0] = value;
          s->ep[s->idx].buf[0] =
-                 s->buf + ((value << 1) & (sizeof(s->buf) / 4 - 1));
+                 s->buf + ((value << 3) & 0x7ff );
 -      TRACE("TXFIFOADDR = 0x%08x, BUF %08x", value, s->ep[s->idx].buf[0]);
++      //TRACE("TXFIFOADDR = 0x%08x, BUF %08x", value, s->ep[s->idx].buf[0]);
          break;
      case MUSB_HDRC_RXFIFOADDR:
          s->ep[s->idx].fifoaddr[1] = value;
          s->ep[s->idx].buf[1] =
-                 s->buf + ((value << 1) & (sizeof(s->buf) / 4 - 1));
+                 s->buf + ((value << 3) & 0x7ff);
 -      TRACE("RXFIFOADDR = 0x%08x, BUF %08x", value, s->ep[s->idx].buf[1]);
++      //TRACE("RXFIFOADDR = 0x%08x, BUF %08x", value, s->ep[s->idx].buf[1]);
          break;
  
      case MUSB_HDRC_EP_IDX ... (MUSB_HDRC_EP_IDX + 0xf):