powerpc/85xx: enable USB2 gadget mode for corenet ds board

to make USB2 worked in gadget mode, we need to set it's 'dr_mode' to
'peripheral' in hwconfig, but driver starts scan from 'usb1', it'll break
out if it cannot find 'usb1', so drop the 'else' clause to make driver scan
all the 'usbx'.

Signed-off-by: Shaohui Xie <Shaohui.Xie@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

diff --git a/arch/powerpc/cpu/mpc8xxx/fdt.c b/arch/powerpc/cpu/mpc8xxx/fdt.c
index d9e3e7ee10d941616aff1b4beb36127e4c40c89b..6c757f829229f70a5daf1d70bb330823f2225762 100644 (file)
--- a/arch/powerpc/cpu/mpc8xxx/fdt.c
+++ b/arch/powerpc/cpu/mpc8xxx/fdt.c
@@ -163,8 +163,6 @@ void fdt_fixup_dr_usb(void *blob, bd_t *bd)
                                usb1_defined = 1;
                        if (mode_idx < 0 && phy_idx < 0)
                                printf("WARNING: invalid phy or mode\n");
-               } else {
-                       break;
                }
        }
        if (!usb1_defined) {

diff --git a/board/freescale/corenet_ds/corenet_ds.c b/board/freescale/corenet_ds/corenet_ds.c
index cf9b7b8390db924e50a66722bd1cf7a827519707..b1e7823185afb4905452cc1555460b2ce3143b92 100644 (file)
--- a/board/freescale/corenet_ds/corenet_ds.c
+++ b/board/freescale/corenet_ds/corenet_ds.c
@@ -236,6 +236,7 @@ void ft_board_setup(void *blob, bd_t *bd)
 #endif
 
        fdt_fixup_liodn(blob);
+       fdt_fixup_dr_usb(blob, bd);
 }
 
 int board_eth_init(bd_t *bis)

diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h
index 0b7becb12eb78f36f3a8f3df9f129fa30f1da7cf..adf9906bce9f3e18c8989db8267e100d9c4a7d7b 100644 (file)
--- a/include/configs/corenet_ds.h
+++ b/include/configs/corenet_ds.h
@@ -595,6 +595,7 @@
 #define CONFIG_USB_EHCI_FSL
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 #define CONFIG_CMD_EXT2
+#define CONFIG_HAS_FSL_DR_USB
 
 #define CONFIG_MMC