powerpc/85xx: Add default usb mode and phy type to hwconfig

Move to use hwconfig for usb mode & phy type instead of magic
'usb_phy_type' environment variable on the following platforms:

MPC8536DS, P1020RDB, P1020RDB-PC, P1010RDB, P2020RDB, P2020RDB-PC,
P2020RDB, P3041DS, P4080DS, & P5020DS.

Signed-off-by: Ramneek Mehresh <ramneek.mehresh@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h
index 7f7ff9f4e1f42e03406a1eb51183c441bc0c99e2..783ed518e5813d8d7d7253ef7edabee7ba4c3e9b 100644 (file)
--- a/include/configs/MPC8536DS.h
+++ b/include/configs/MPC8536DS.h
@@ -262,6 +262,7 @@
 
 #define CONFIG_BOARD_EARLY_INIT_R      /* call board_early_init_r function */
 
+#define CONFIG_HWCONFIG                        /* enable hwconfig */
 #define CONFIG_FSL_PIXIS       1       /* use common PIXIS code */
 #define PIXIS_BASE     0xffdf0000      /* PIXIS registers */
 #ifdef CONFIG_PHYS_64BIT
@@ -782,7 +783,7 @@
  "fdtaddr=c00000\0"                            \
  "fdtfile=8536ds/mpc8536ds.dtb\0"              \
  "bdev=sda3\0"                                 \
- "usb_phy_type=ulpi\0"
+ "hwconfig=usb1:dr_mode=host,phy_type=ulpi\0"
 
 #define CONFIG_HDBOOT                          \
  "setenv bootargs root=/dev/$bdev rw "         \

diff --git a/include/configs/P1_P2_RDB.h b/include/configs/P1_P2_RDB.h
index 4f1bdfe629a19fd6616a6577fa0a2fdfc31b4929..df88b79bbefb7a48a5b9ee869d794269bcf36d32 100644 (file)
--- a/include/configs/P1_P2_RDB.h
+++ b/include/configs/P1_P2_RDB.h
@@ -689,7 +689,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
        "nandfdtaddr=80000\0"           \
        "nandimgsize=400000\0"          \
        "nandfdtsize=80000\0"           \
-       "usb_phy_type=ulpi\0"           \
+       "hwconfig=usb1:dr_mode=host,phy_type=ulpi\0"    \
        "vscfw_addr=ef000000\0" \
        "othbootargs=ramdisk_size=600000\0" \
        "usbfatboot=setenv bootargs root=/dev/ram rw "  \

diff --git a/include/configs/P2020DS.h b/include/configs/P2020DS.h
index b5db0b3c24b3b9c20f047e860a389b98ac51f995..90fe7c4047764a1e81303c23562973746b345806 100644 (file)
--- a/include/configs/P2020DS.h
+++ b/include/configs/P2020DS.h
@@ -752,7 +752,8 @@
 
 #define        CONFIG_EXTRA_ENV_SETTINGS                               \
  "perf_mode=performance\0"                     \
- "hwconfig=fsl_ddr:ctlr_intlv=bank,bank_intlv=cs0_cs1\0"       \
+       "hwconfig=fsl_ddr:ctlr_intlv=bank,bank_intlv=cs0_cs1;"  \
+       "usb1:dr_mode=host,phy_type=ulpi\0"                     \
  "netdev=eth0\0"                                               \
  "uboot=" MK_STR(CONFIG_UBOOTPATH) "\0"                                \
  "tftpflash=tftpboot $loadaddr $uboot; "                       \

diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h
index 52ef06e9426693e73a4e0246938a06db185de884..c9cc22af3b0337b93aed35c8b5a634a22b417aeb 100644 (file)
--- a/include/configs/corenet_ds.h
+++ b/include/configs/corenet_ds.h
@@ -639,9 +639,16 @@
 
 #define CONFIG_BAUDRATE        115200
 
+#if defined(CONFIG_P4080DS)
+#define __USB_PHY_TYPE ulpi
+#else
+#define __USB_PHY_TYPE utmi
+#endif
+
 #define        CONFIG_EXTRA_ENV_SETTINGS                               \
        "hwconfig=fsl_ddr:ctlr_intlv=cacheline,"                \
-       "bank_intlv=cs0_cs1\0"                                  \
+       "bank_intlv=cs0_cs1;"                                   \
+       "usb1:dr_mode=host,phy_type=" MK_STR(__USB_PHY_TYPE) "\0"\
        "netdev=eth0\0"                                         \
        "uboot=" MK_STR(CONFIG_UBOOTPATH) "\0"                  \
        "ubootaddr=" MK_STR(CONFIG_SYS_TEXT_BASE) "\0"                  \