Merge git://www.denx.de/git/u-boot-marvell

diff --git a/board/intel/minnowmax/minnowmax.c b/board/intel/minnowmax/minnowmax.c
index 94b22edd57fd10b6466b7849fc1f839001c3d233..99aed5310063bb22a76ea98928032b946f5eefe7 100644 (file)
--- a/board/intel/minnowmax/minnowmax.c
+++ b/board/intel/minnowmax/minnowmax.c
@@ -5,9 +5,62 @@
  */
 
 #include <common.h>
+#include <dm.h>
 #include <asm/gpio.h>
+#include <dm/device-internal.h>
+#include <dm/uclass-internal.h>
+
+#define GPIO_BANKE_NAME                "gpioe"
 
 int arch_early_init_r(void)
 {
        return 0;
 }
+
+int misc_init_r(void)
+{
+       struct udevice *dev;
+       struct gpio_desc desc;
+       int ret;
+
+       /*
+        * Turn on USB VBUS for the two USB ports on the board.
+        * Each port's VBUS is controlled by a GPIO pin.
+        */
+
+       ret = uclass_find_device_by_name(UCLASS_GPIO, GPIO_BANKE_NAME, &dev);
+       if (ret) {
+               debug("%s: GPIO %s device cannot be not found (ret=%d)\n",
+                     __func__, GPIO_BANKE_NAME, ret);
+               return ret;
+       }
+
+       ret = device_probe(dev);
+       if (ret) {
+               debug("%s: GPIO %s device probe failed (ret=%d)\n",
+                     __func__, GPIO_BANKE_NAME, ret);
+               return ret;
+       }
+
+       desc.dev = dev;
+       desc.flags = GPIOD_IS_OUT;
+
+       /* GPIO E8 controls the bottom port */
+       desc.offset = 8;
+
+       ret = dm_gpio_request(&desc, "usb_host_en0");
+       if (ret)
+               return ret;
+       dm_gpio_set_value(&desc, 1);
+
+       /* GPIO E9 controls the upper port */
+       desc.offset = 9;
+
+       ret = dm_gpio_request(&desc, "usb_host_en1");
+       if (ret)
+               return ret;
+
+       dm_gpio_set_value(&desc, 1);
+
+       return 0;
+}

diff --git a/include/configs/conga-qeval20-qa3-e3845.h b/include/configs/conga-qeval20-qa3-e3845.h
index 231e5990ec1fcfb7e01b357716cd521a7c806dd2..b4ea184bcbd325dd75377c639b696e336d8c06b7 100644 (file)
--- a/include/configs/conga-qeval20-qa3-e3845.h
+++ b/include/configs/conga-qeval20-qa3-e3845.h
@@ -23,9 +23,6 @@
        {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VALLEYVIEW_SATA}, \
        {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VALLEYVIEW_SATA_ALT}
 
-#undef CONFIG_USB_MAX_CONTROLLER_COUNT
-#define CONFIG_USB_MAX_CONTROLLER_COUNT                1
-
 #define VIDEO_IO_OFFSET                                0
 #define CONFIG_X86EMU_RAW_IO
 

diff --git a/include/configs/dfi-bt700.h b/include/configs/dfi-bt700.h
index 1cb4b5ee8121ae803a5de1e564fd076e40aa5e6d..6748b9cb35e5f778d8e5c5b1dfae6d93ffd6938f 100644 (file)
--- a/include/configs/dfi-bt700.h
+++ b/include/configs/dfi-bt700.h
@@ -28,9 +28,6 @@
        {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VALLEYVIEW_SATA}, \
        {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VALLEYVIEW_SATA_ALT}
 
-#undef CONFIG_USB_MAX_CONTROLLER_COUNT
-#define CONFIG_USB_MAX_CONTROLLER_COUNT                1
-
 #define CONFIG_USB_HOST_ETHER
 #define CONFIG_USB_ETHER_ASIX
 #define CONFIG_USB_ETHER_SMSC95XX

diff --git a/include/configs/minnowmax.h b/include/configs/minnowmax.h
index 7b9f90c08d832f715477fd4e33d8c8224e0a62e1..ae9548599305523b97d296585cd7cd6587f8f260 100644 (file)
--- a/include/configs/minnowmax.h
+++ b/include/configs/minnowmax.h
@@ -16,6 +16,7 @@
 #define CONFIG_SYS_MONITOR_LEN         (1 << 20)
 
 #define CONFIG_SMSC_LPC47M
+#define CONFIG_MISC_INIT_R
 
 #define CONFIG_STD_DEVICES_SETTINGS    "stdin=usbkbd,serial\0" \
                                        "stdout=vidconsole,serial\0" \
@@ -25,9 +26,6 @@
        {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VALLEYVIEW_SATA}, \
        {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VALLEYVIEW_SATA_ALT}
 
-#undef CONFIG_USB_MAX_CONTROLLER_COUNT
-#define CONFIG_USB_MAX_CONTROLLER_COUNT                1
-
 #define VIDEO_IO_OFFSET                                0
 #define CONFIG_X86EMU_RAW_IO
 

diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h
index b5ef8b5c56fd7d9c7280def7f8a4536ad4fd01b4..a5ed85236e872514247c73df4e1eed7f1c376611 100644 (file)
--- a/include/configs/x86-common.h
+++ b/include/configs/x86-common.h
@@ -132,7 +132,6 @@
  */
 #define CONFIG_USB_EHCI_PCI
 #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS     12
-#define CONFIG_USB_MAX_CONTROLLER_COUNT        2
 #define CONFIG_SYS_USB_EVENT_POLL
 
 #define CONFIG_USB_HOST_ETHER