Merge branch 'master' of git://www.denx.de/git/u-boot-imx

diff --combined board/freescale/mx7dsabresd/mx7dsabresd.c
index fee24e2b5f571023df87b046934c494a63ab7807,782acc6713727b7729594b5e73d898174e95e70d..4d0b195798ba089a281992d147d8be13973adadd
--- 1/board/freescale/mx7dsabresd/mx7dsabresd.c
--- 2/board/freescale/mx7dsabresd/mx7dsabresd.c
+++ b/board/freescale/mx7dsabresd/mx7dsabresd.c
@@@ -23,6 -23,7 +23,7 @@@
  #include <i2c.h>
  #include <asm/imx-common/mxc_i2c.h>
  #include <asm/arch/crm_regs.h>
+ #include <usb.h>
  #include <usb/ehci-fsl.h>
  
  DECLARE_GLOBAL_DATA_PTR;
@@@ -111,6 -112,14 +112,14 @@@ static iomux_v3_cfg_t const usdhc3_emmc
        MX7D_PAD_SD3_RESET_B__GPIO6_IO11 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
  };
  
+ static iomux_v3_cfg_t const usb_otg1_pads[] = {
+       MX7D_PAD_GPIO1_IO05__USB_OTG1_PWR | MUX_PAD_CTRL(NO_PAD_CTRL),
+ };
+ 
+ static iomux_v3_cfg_t const usb_otg2_pads[] = {
+       MX7D_PAD_UART3_CTS_B__USB_OTG2_PWR | MUX_PAD_CTRL(NO_PAD_CTRL),
+ };
+ 
  #define IOX_SDI IMX_GPIO_NR(1, 9)
  #define IOX_STCP IMX_GPIO_NR(1, 12)
  #define IOX_SHCP IMX_GPIO_NR(1, 13)
@@@ -366,7 -375,7 +375,7 @@@ int board_mmc_init(bd_t *bis
        int i, ret;
        /*
         * According to the board_mmc_init() the following map is done:
 -       * (U-boot device node)    (Physical Port)
 +       * (U-Boot device node)    (Physical Port)
         * mmc0                    USDHC1
         * mmc2                    USDHC3 (eMMC)
         */
@@@ -511,6 -520,10 +520,10 @@@ int board_early_init_f(void
        setup_iomux_uart();
  
        setup_i2c(0, CONFIG_SYS_I2C_SPEED, 0x7f, &i2c_pad_info1);
+       imx_iomux_v3_setup_multiple_pads(usb_otg1_pads,
+                                        ARRAY_SIZE(usb_otg1_pads));
+       imx_iomux_v3_setup_multiple_pads(usb_otg2_pads,
+                                        ARRAY_SIZE(usb_otg2_pads));
  
        return 0;
  }
@@@ -602,29 -615,11 +615,11 @@@ int checkboard(void
  }
  
  #ifdef CONFIG_USB_EHCI_MX7
- static iomux_v3_cfg_t const usb_otg1_pads[] = {
-       MX7D_PAD_GPIO1_IO05__USB_OTG1_PWR | MUX_PAD_CTRL(NO_PAD_CTRL),
- };
- 
- static iomux_v3_cfg_t const usb_otg2_pads[] = {
-       MX7D_PAD_UART3_CTS_B__USB_OTG2_PWR | MUX_PAD_CTRL(NO_PAD_CTRL),
- };
- 
- int board_ehci_hcd_init(int port)
+ int board_usb_phy_mode(int port)
  {
-       switch (port) {
-       case 0:
-               imx_iomux_v3_setup_multiple_pads(usb_otg1_pads,
-                                                ARRAY_SIZE(usb_otg1_pads));
-               break;
-       case 1:
-               imx_iomux_v3_setup_multiple_pads(usb_otg2_pads,
-                                                ARRAY_SIZE(usb_otg2_pads));
-               break;
-       default:
-               printf("MXC USB port %d not yet supported\n", port);
-               return -EINVAL;
-       }
-       return 0;
+       if (port == 0)
+               return USB_INIT_DEVICE;
+       else
+               return USB_INIT_HOST;
  }
  #endif

diff --combined board/seco/mx6quq7/mx6quq7.c
index e7523f168b82724830fa086c648f28e287a1d7aa,6be0b987ca6b6968b147d5a377770ac6be6adeb6..08566fcb8d485acf550cfdce5bcbffe652300a38
--- 1/board/seco/mx6quq7/mx6quq7.c
--- 2/board/seco/mx6quq7/mx6quq7.c
+++ b/board/seco/mx6quq7/mx6quq7.c
@@@ -91,11 -91,30 +91,30 @@@ int board_eth_init(bd_t *bis
        return ret;
  }
  
+ #define USDHC4_CD_GPIO                IMX_GPIO_NR(2, 6)
+ 
  static struct fsl_esdhc_cfg usdhc_cfg[2] = {
-       {USDHC3_BASE_ADDR},
-       {USDHC2_BASE_ADDR},
+       {USDHC3_BASE_ADDR, 0, 4},
+       {USDHC4_BASE_ADDR, 0, 4},
  };
  
+ int board_mmc_getcd(struct mmc *mmc)
+ {
+       struct fsl_esdhc_cfg *cfg = (struct fsl_esdhc_cfg *)mmc->priv;
+       int ret = 0;
+ 
+       switch (cfg->esdhc_base) {
+       case USDHC3_BASE_ADDR:
+               ret = 1; /* Assume eMMC is always present */
+               break;
+       case USDHC4_BASE_ADDR:
+               ret = !gpio_get_value(USDHC4_CD_GPIO);
+               break;
+       }
+ 
+       return ret;
+ }
+ 
  int board_mmc_init(bd_t *bis)
  {
        u32 index = 0;
@@@ -103,7 -122,7 +122,7 @@@
  
        /*
         * Following map is done:
 -       * (U-boot device node)    (Physical Port)
 +       * (U-Boot device node)    (Physical Port)
         * mmc0                    eMMC on Board
         * mmc1                    Ext SD
         */
@@@ -112,12 -131,10 +131,10 @@@
                case 0:
                        seco_mx6_setup_usdhc_iomux(3);
                        usdhc_cfg[0].sdhc_clk = mxc_get_clock(MXC_ESDHC3_CLK);
-                       usdhc_cfg[0].max_bus_width = 4;
                        break;
                case 1:
                        seco_mx6_setup_usdhc_iomux(4);
                        usdhc_cfg[1].sdhc_clk = mxc_get_clock(MXC_ESDHC4_CLK);
-                       usdhc_cfg[1].max_bus_width = 4;
                        break;
  
                default:

diff --combined board/tbs/tbs2910/tbs2910.c
index 7707cf5595c0741633015076d264d9f58c0c839b,d302fc23b6ced58a18560cf524e7cfb2338568d1..f159af9fbe2c8fbb8d145ca0db499b145b6ee79f
--- 1/board/tbs/tbs2910/tbs2910.c
--- 2/board/tbs/tbs2910/tbs2910.c
+++ b/board/tbs/tbs2910/tbs2910.c
@@@ -220,7 -220,7 +220,7 @@@ int board_mmc_getcd(struct mmc *mmc
  int board_mmc_init(bd_t *bis)
  {
        /*
 -       * (U-boot device node)    (Physical Port)
 +       * (U-Boot device node)    (Physical Port)
         * mmc0                    SD2
         * mmc1                    SD3
         * mmc2                    eMMC
@@@ -257,6 -257,17 +257,17 @@@
        }
        return 0;
  }
+ 
+ /* set environment device to boot device when booting from SD */
+ int board_mmc_get_env_dev(int devno)
+ {
+       return devno - 1;
+ }
+ 
+ int board_mmc_get_env_part(int devno)
+ {
+       return (devno == 3) ? 1 : 0; /* part 0 for SD2 / SD3, part 1 for eMMC */
+ }
  #endif /* CONFIG_FSL_ESDHC */
  
  #ifdef CONFIG_VIDEO_IPUV3