imx: Remove CFG_MXC_USB_PORTSC

The definition of CFG_MXC_USB_PORTSC as (PORT_PTS_UTMI | PORT_PTS_PTW)
can be removed from mx5/mx6/mx7/mx8m board config files as it is the
default in drivers/usb/host/ehci-mx5.c and drivers/usb/host/ehci-mx6.c.

Suggested-by: Tim Harvey <tharvey@gateworks.com>
Signed-off-by: Fabio Estevam <festevam@denx.de>
Reviewed-by: Tim Harvey <tharvey@gateworks.com>

diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
index 097f819e44a453e021151754ee54c195236167d2..e5df82c68301befd2671f20f2079bf378339b7f4 100644 (file)
--- a/include/configs/apalis_imx6.h
+++ b/include/configs/apalis_imx6.h
@@ -23,10 +23,6 @@
 
 /* Network */
 
-/* USB Configs */
-/* Host */
-#define CFG_MXC_USB_PORTSC             (PORT_PTS_UTMI | PORT_PTS_PTW)
-
 /* Framebuffer and LCD */
 
 /* Command definition */

diff --git a/include/configs/aristainetos2.h b/include/configs/aristainetos2.h
index 120ff9284ef6326b68f8f3e5e010af19a3aebb3e..8a66b1275dfee0495798a42e50d022ee14640805 100644 (file)
--- a/include/configs/aristainetos2.h
+++ b/include/configs/aristainetos2.h
@@ -411,9 +411,6 @@
 
 /* DMA stuff, needed for GPMI/MXS NAND support */
 
-/* USB Configs */
-#define CFG_MXC_USB_PORTSC     (PORT_PTS_UTMI | PORT_PTS_PTW)
-
 /* UBI support */
 
 #define CFG_ENV_FLAGS_LIST_STATIC "ethaddr:mw,serial#:sw,board_type:sw," \

diff --git a/include/configs/brppt2.h b/include/configs/brppt2.h
index 38c98c5e21c4585a821302bc8a74edfeb4efcc25..d01f0d3731638753901cbb590b91989697c6e2a9 100644 (file)
--- a/include/configs/brppt2.h
+++ b/include/configs/brppt2.h
@@ -78,7 +78,4 @@ BUR_COMMON_ENV \
 #define CFG_SYS_INIT_RAM_ADDR  IRAM_BASE_ADDR
 #define CFG_SYS_INIT_RAM_SIZE  IRAM_SIZE
 
-/* USB Configs */
-#define CFG_MXC_USB_PORTSC             (PORT_PTS_UTMI | PORT_PTS_PTW)
-
 #endif /* __CONFIG_BRPP2_IMX6_H */

diff --git a/include/configs/cl-som-imx7.h b/include/configs/cl-som-imx7.h
index 96058d48148b80e8a61832cd434918ed980e78c0..8c363137b4fad964d129ec26f906ffcd7e783bbd 100644 (file)
--- a/include/configs/cl-som-imx7.h
+++ b/include/configs/cl-som-imx7.h
@@ -95,7 +95,4 @@
 #define CFG_SYS_FSL_USDHC_NUM  2
 #endif
 
-/* USB Configs */
-#define CFG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
-
 #endif /* __CONFIG_H */

diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
index fc2d59751c4270adcf971333b9f941701e239d25..f7fd4c517b4ff7c0477affd5d3d21b94f1ca20da 100644 (file)
--- a/include/configs/cm_fx6.h
+++ b/include/configs/cm_fx6.h
@@ -134,9 +134,6 @@
 /* Ethernet */
 #define CFG_FEC_MXC_PHYADDR            0
 
-/* USB */
-#define CFG_MXC_USB_PORTSC             (PORT_PTS_UTMI | PORT_PTS_PTW)
-
 /* Boot */
 #define CFG_SYS_BOOTMAPSZ              (8 << 20)
 

diff --git a/include/configs/colibri-imx6ull.h b/include/configs/colibri-imx6ull.h
index c896a897cbf469b72c3a6994537b43dc922bf90c..26b29bad6a18e059fe299e7434bec06504c5ac4d 100644 (file)
--- a/include/configs/colibri-imx6ull.h
+++ b/include/configs/colibri-imx6ull.h
@@ -117,10 +117,6 @@
 #define CFG_SYS_NAND_BASE              -1
 #endif
 
-/* USB Configs */
-
-#define CFG_MXC_USB_PORTSC             (PORT_PTS_UTMI | PORT_PTS_PTW)
-
 /* USB Device Firmware Update support */
 #define DFU_DEFAULT_POLL_TIMEOUT       300
 

diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h
index 87c973883c3385c00d29ba8edafc248efaaff799..664b7c8ce0cd0dba1b939582b0821c6adb79fd2d 100644 (file)
--- a/include/configs/colibri_imx6.h
+++ b/include/configs/colibri_imx6.h
@@ -21,10 +21,6 @@
 #define CFG_SYS_FSL_ESDHC_ADDR 0
 #define CFG_SYS_FSL_USDHC_NUM  2
 
-/* USB Configs */
-/* Host */
-#define CFG_MXC_USB_PORTSC             (PORT_PTS_UTMI | PORT_PTS_PTW)
-
 /* Command definition */
 
 #define BOOT_TARGET_DEVICES(func) \

diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h
index 0e0665038b1fa4646febdd40763c77dbcc63036f..c340dfb1189423c3d1fb20f711b55fd491af644a 100644 (file)
--- a/include/configs/colibri_imx7.h
+++ b/include/configs/colibri_imx7.h
@@ -159,8 +159,4 @@
 #define CFG_SYS_NAND_BASE              0x40000000
 #endif
 
-/* USB Configs */
-
-#define CFG_MXC_USB_PORTSC             (PORT_PTS_UTMI | PORT_PTS_PTW)
-
 #endif

diff --git a/include/configs/dart_6ul.h b/include/configs/dart_6ul.h
index 4d715d4f425ee50408e6138aa766fb26bf55b9e2..2b329b4065c3b7453600d6bc3366724bee2aaac3 100644 (file)
--- a/include/configs/dart_6ul.h
+++ b/include/configs/dart_6ul.h
@@ -46,9 +46,6 @@
 #define CFG_SYS_INIT_RAM_ADDR  IRAM_BASE_ADDR
 #define CFG_SYS_INIT_RAM_SIZE  IRAM_SIZE
 
-/* USB Configs */
-#define CFG_MXC_USB_PORTSC             (PORT_PTS_UTMI | PORT_PTS_PTW)
-
 #define ENV_MMC \
        "mmcdev=" __stringify(MMC_ROOTFS_DEV) "\0" \
        "mmcpart=" __stringify(MMC_ROOTFS_PART) "\0" \

diff --git a/include/configs/dh_imx6.h b/include/configs/dh_imx6.h
index dc5ca9fc60cdee850544b6c1818c94a6e0daf13a..9b6f03f6856338147b60eba52274686fb3580008 100644 (file)
--- a/include/configs/dh_imx6.h
+++ b/include/configs/dh_imx6.h
@@ -30,9 +30,6 @@
 /* UART */
 #define CFG_MXC_UART_BASE              UART1_BASE
 
-/* USB Configs */
-#define CFG_MXC_USB_PORTSC             (PORT_PTS_UTMI | PORT_PTS_PTW)
-
 /* USB Gadget (DFU, UMS) */
 #if defined(CONFIG_CMD_DFU) || defined(CONFIG_CMD_USB_MASS_STORAGE)
 #define DFU_DEFAULT_POLL_TIMEOUT       300

diff --git a/include/configs/display5.h b/include/configs/display5.h
index 2005a256d6e35023eebcb748d71ec68180d07f39..51fa2b03a2e64370e35de85111c8e51b928cfa14 100644 (file)
--- a/include/configs/display5.h
+++ b/include/configs/display5.h
@@ -287,5 +287,4 @@
 /* The 0x120000 value corresponds to above SPI-NOR memory MAP */
 #endif
 
-#define CFG_MXC_USB_PORTSC           (PORT_PTS_UTMI | PORT_PTS_PTW)
 #endif /* __CONFIG_H */

diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h
index e378374a004a5e2a35c982f91dd0697f11d46f14..61c0d755a8d965f50c09e5e95fc40f0bf271112b 100644 (file)
--- a/include/configs/embestmx6boards.h
+++ b/include/configs/embestmx6boards.h
@@ -17,9 +17,6 @@
 
 #define PHYS_SDRAM_SIZE                (1u * 1024 * 1024 * 1024)
 
-/* USB Configs */
-#define CFG_MXC_USB_PORTSC     (PORT_PTS_UTMI | PORT_PTS_PTW)
-
 /* MMC Configs */
 #define CFG_SYS_FSL_ESDHC_ADDR      0
 

diff --git a/include/configs/ge_b1x5v2.h b/include/configs/ge_b1x5v2.h
index 0bf31897a7446bc5a905caf1550e17e8b131d341..f3d85c9c11e84af2ff683080064cb52a09ff80d3 100644 (file)
--- a/include/configs/ge_b1x5v2.h
+++ b/include/configs/ge_b1x5v2.h
@@ -23,9 +23,6 @@
 #define CONSOLE_DEVICE "ttymxc2" /* Base board debug connector */
 #endif
 
-/* USB */
-#define CFG_MXC_USB_PORTSC             (PORT_PTS_UTMI | PORT_PTS_PTW)
-
 /* Memory */
 #define PHYS_SDRAM                    MMDC0_ARB_BASE_ADDR
 

diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h
index 8ff2d5474e1ff47202991a41c6240acd8134ac87..acfb5135dbe65717b888e7f7c5ef1cbe639a577c 100644 (file)
--- a/include/configs/gw_ventana.h
+++ b/include/configs/gw_ventana.h
@@ -18,9 +18,6 @@
 #define CFG_POWER_PFUZE100_I2C_ADDR    0x08
 #define CFG_POWER_LTC3676_I2C_ADDR  0x3c
 
-/* USB Configs */
-#define CFG_MXC_USB_PORTSC     (PORT_PTS_UTMI | PORT_PTS_PTW)
-
 /* Physical Memory Map */
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 #define CFG_SYS_SDRAM_BASE          PHYS_SDRAM

diff --git a/include/configs/imx6_logic.h b/include/configs/imx6_logic.h
index 19613e838fb389d3be44d14dfa367c02e1e3333a..75997469cd919f974d6044a916dbd40f3e151c6c 100644 (file)
--- a/include/configs/imx6_logic.h
+++ b/include/configs/imx6_logic.h
@@ -114,11 +114,6 @@
 #define CFG_SYS_NAND_BASE           0x40000000
 #define CFG_SYS_NAND_U_BOOT_START      CONFIG_TEXT_BASE
 
-/* USB Configs */
-#ifdef CONFIG_CMD_USB
-#define CFG_MXC_USB_PORTSC             (PORT_PTS_UTMI | PORT_PTS_PTW)
-#endif
-
 /* Falcon Mode */
 
 /* Falcon Mode - MMC support: args@1MB kernel@2MB */

diff --git a/include/configs/imx6dl-mamoj.h b/include/configs/imx6dl-mamoj.h
index 6651653d5e9c58de47f08e1828e9fdfbd64990aa..8abb58b069186f22d88c4aff79c54ea25ab6cd76 100644 (file)
--- a/include/configs/imx6dl-mamoj.h
+++ b/include/configs/imx6dl-mamoj.h
@@ -42,9 +42,6 @@
 /* Ethernet */
 #define CFG_FEC_MXC_PHYADDR            1
 
-/* USB */
-#define CFG_MXC_USB_PORTSC                     (PORT_PTS_UTMI | PORT_PTS_PTW)
-
 /* Falcon */
 
 /* MMC support: args@1MB kernel@2MB */

diff --git a/include/configs/imx6q-bosch-acc.h b/include/configs/imx6q-bosch-acc.h
index aa365dc9a795d97f2cf8b08da7e9b0a35342b95c..fab5063b73f41e8aa08eb8ad674ca4d002d9dae5 100644 (file)
--- a/include/configs/imx6q-bosch-acc.h
+++ b/include/configs/imx6q-bosch-acc.h
@@ -110,6 +110,5 @@
 #endif
 #endif
 
-#define CFG_MXC_USB_PORTSC            (PORT_PTS_UTMI | PORT_PTS_PTW)
 
 #endif /* __IMX6Q_ACC_H */

diff --git a/include/configs/imx7-cm.h b/include/configs/imx7-cm.h
index 131f18290b900204eb23069cb4be696eb46267c8..36c4c5b8b50a97722c8765dd99b49424fc9ae9dd 100644 (file)
--- a/include/configs/imx7-cm.h
+++ b/include/configs/imx7-cm.h
@@ -77,7 +77,4 @@
 #define CFG_SYS_FSL_ESDHC_ADDR       USDHC1_BASE_ADDR
 #define CFG_SYS_FSL_USDHC_NUM          2
 
-/* USB Configs */
-#define CFG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
-
 #endif /* __CONFIG_H */

diff --git a/include/configs/imx8mm-cl-iot-gate.h b/include/configs/imx8mm-cl-iot-gate.h
index 6442e3d570f4a1740645f5d9b0393d6d026e1896..146f7945719f428dfc00555444bd3dce7e2da126 100644 (file)
--- a/include/configs/imx8mm-cl-iot-gate.h
+++ b/include/configs/imx8mm-cl-iot-gate.h
@@ -137,7 +137,4 @@
 
 #define CFG_FEC_MXC_PHYADDR            -1 /* Auto search of PHY on MII */
 
-/* USB Configs */
-#define CFG_MXC_USB_PORTSC     (PORT_PTS_UTMI | PORT_PTS_PTW)
-
 #endif /*__IMX8MM_CL_IOT_GATE_H*/

diff --git a/include/configs/kontron-sl-mx6ul.h b/include/configs/kontron-sl-mx6ul.h
index e68c667c5057141a1376db90eb9b5df638971ecd..015df01db4e6c46dfd2d5d91ce40c9d6270b95f9 100644 (file)
--- a/include/configs/kontron-sl-mx6ul.h
+++ b/include/configs/kontron-sl-mx6ul.h
@@ -24,10 +24,6 @@
 /* Board and environment settings */
 #define CFG_MXC_UART_BASE              UART4_BASE
 
-#ifdef CONFIG_USB_EHCI_HCD
-#define CFG_MXC_USB_PORTSC             (PORT_PTS_UTMI | PORT_PTS_PTW)
-#endif
-
 /* Boot order for distro boot */
 #define BOOT_TARGET_DEVICES(func) \
        func(MMC, mmc, 1) \

diff --git a/include/configs/kontron-sl-mx8mm.h b/include/configs/kontron-sl-mx8mm.h
index be1f70a9a5984f62f4aad566f8c850260d45c685..3a129c5cce77c6f6780ccc91e4d767336efa711c 100644 (file)
--- a/include/configs/kontron-sl-mx8mm.h
+++ b/include/configs/kontron-sl-mx8mm.h
@@ -24,10 +24,6 @@
 
 /* Board and environment settings */
 
-#ifdef CONFIG_USB_EHCI_HCD
-#define CFG_MXC_USB_PORTSC             (PORT_PTS_UTMI | PORT_PTS_PTW)
-#endif
-
 /* GUID for capsule updatable firmware image */
 #define KONTRON_SL_MX8MM_FIT_IMAGE_GUID \
        EFI_GUID(0xd488e45a, 0x4929, 0x4b55, 0x8c, 0x14, \

diff --git a/include/configs/kp_imx53.h b/include/configs/kp_imx53.h
index 6e383cbe75f78faa3f86bd44a5eb4194f97f4dd1..78c6c67ab99f030af5ea9df3b1cab69c637b035f 100644 (file)
--- a/include/configs/kp_imx53.h
+++ b/include/configs/kp_imx53.h
@@ -11,7 +11,6 @@
 #include <linux/sizes.h>
 
 /* USB Configs */
-#define CFG_MXC_USB_PORTSC     (PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CFG_MXC_USB_FLAGS      0
 
 /* Command definition */

diff --git a/include/configs/kp_imx6q_tpc.h b/include/configs/kp_imx6q_tpc.h
index 74f6e4e9f96384fbb2fcf3522c29f85b3307fc7f..c0cb3db23e7a7013fcb31df29058490ecece89de 100644 (file)
--- a/include/configs/kp_imx6q_tpc.h
+++ b/include/configs/kp_imx6q_tpc.h
@@ -16,11 +16,6 @@
 
 /* FEC ethernet */
 
-/* USB Configs */
-#ifdef CONFIG_CMD_USB
-#define CFG_MXC_USB_PORTSC             (PORT_PTS_UTMI | PORT_PTS_PTW)
-#endif
-
 #define CFG_EXTRA_ENV_SETTINGS \
        "console=ttymxc0,115200\0"      \
        "fdt_addr=0x18000000\0"         \

diff --git a/include/configs/liteboard.h b/include/configs/liteboard.h
index 25c30e6c6a5dd75896eecbc982d6ae347e52c598..fc6bc6b28baaee3479ff58f20cec840115e6a518 100644 (file)
--- a/include/configs/liteboard.h
+++ b/include/configs/liteboard.h
@@ -93,11 +93,6 @@
 
 /* FLASH and environment organization */
 
-/* USB Configs */
-#ifdef CONFIG_CMD_USB
-#define CFG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
-#endif
-
 #ifdef CONFIG_CMD_NET
 #define CFG_FEC_ENET_DEV               0
 

diff --git a/include/configs/m53menlo.h b/include/configs/m53menlo.h
index 89c867f9dfabbd1192ce892a6110f62ee1692e27..1ea4fa59fd53d7623a87571e26247f9143a9e459 100644 (file)
--- a/include/configs/m53menlo.h
+++ b/include/configs/m53menlo.h
@@ -68,7 +68,6 @@
  * USB
  */
 #ifdef CONFIG_CMD_USB
-#define CFG_MXC_USB_PORTSC             (PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CFG_MXC_USB_FLAGS              0
 #endif
 

diff --git a/include/configs/meerkat96.h b/include/configs/meerkat96.h
index 6ffc1282411aaffb3d38210139552e5e4cc038ad..8e248177b1ca366e4114ca3ce0c6a8856dde1536 100644 (file)
--- a/include/configs/meerkat96.h
+++ b/include/configs/meerkat96.h
@@ -23,7 +23,4 @@
 
 /* Environment configs */
 
-/* USB configs */
-#define CFG_MXC_USB_PORTSC             (PORT_PTS_UTMI | PORT_PTS_PTW)
-
 #endif

diff --git a/include/configs/mx53cx9020.h b/include/configs/mx53cx9020.h
index 970b5d2ce5d4145da03fdf8bdea3f72947a50f3d..70aa140036f9352288f1a9fde5e8297e9a78848b 100644 (file)
--- a/include/configs/mx53cx9020.h
+++ b/include/configs/mx53cx9020.h
@@ -22,7 +22,6 @@
 /* bootz: zImage/initrd.img support */
 
 /* USB Configs */
-#define CFG_MXC_USB_PORTSC     (PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CFG_MXC_USB_FLAGS      0
 
 /* Command definition */

diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h
index d0e00b39f85bb1f82b1341d2088fa5c4f0506b32..14095b99f0344d728fa77d0a737012953ac00847 100644 (file)
--- a/include/configs/mx53loco.h
+++ b/include/configs/mx53loco.h
@@ -17,7 +17,6 @@
 #define CFG_SYS_FSL_ESDHC_ADDR 0
 
 /* USB Configs */
-#define CFG_MXC_USB_PORTSC     (PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CFG_MXC_USB_FLAGS      0
 
 /* PMIC Controller */

diff --git a/include/configs/mx53ppd.h b/include/configs/mx53ppd.h
index 91d915b289f953a89e95fcf5fae747638d4b6cfe..6d1f669de5012c35e0d2e960a5291a2b0c73b87d 100644 (file)
--- a/include/configs/mx53ppd.h
+++ b/include/configs/mx53ppd.h
@@ -12,7 +12,6 @@
 #include <asm/arch/imx-regs.h>
 
 /* USB Configs */
-#define CFG_MXC_USB_PORTSC     (PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CFG_MXC_USB_FLAGS      0
 
 /* Command definition */

diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h
index f0d6405d3012394c4c6fdcae398505a1481f07b6..068b9e4d25f18e3954ef2a8e373e0582e1e0aa06 100644 (file)
--- a/include/configs/mx6cuboxi.h
+++ b/include/configs/mx6cuboxi.h
@@ -14,9 +14,6 @@
 /* MMC Configs */
 #define CFG_SYS_FSL_ESDHC_ADDR USDHC2_BASE_ADDR
 
-/* USB */
-#define CFG_MXC_USB_PORTSC             (PORT_PTS_UTMI | PORT_PTS_PTW)
-
 /* Command definition */
 
 #define CFG_MXC_UART_BASE      UART1_BASE

diff --git a/include/configs/mx6memcal.h b/include/configs/mx6memcal.h
index f2edd13eb8816a3341df6990a6d4939b03e8d489..a966c8b2a446a7461e6360aeab9a0aac409a8c3a 100644 (file)
--- a/include/configs/mx6memcal.h
+++ b/include/configs/mx6memcal.h
@@ -31,6 +31,5 @@
 #define CFG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
 #define CFG_SYS_INIT_RAM_SIZE       IRAM_SIZE
 
-#define CFG_MXC_USB_PORTSC     PORT_PTS_UTMI
 
 #endif        /* __CONFIG_H */

diff --git a/include/configs/mx6sabreauto.h b/include/configs/mx6sabreauto.h
index eb963cbb0b3b4a8d7157385dc8403470e707c194..e491af3e927854c83d878b668c387bf7aaf1c8a2 100644 (file)
--- a/include/configs/mx6sabreauto.h
+++ b/include/configs/mx6sabreauto.h
@@ -11,9 +11,6 @@
 #define CFG_MXC_UART_BASE      UART4_BASE
 #define CONSOLE_DEV            "ttymxc3"
 
-/* USB Configs */
-#define CFG_MXC_USB_PORTSC     (PORT_PTS_UTMI | PORT_PTS_PTW)
-
 #define CFG_SYS_I2C_PCA953X_WIDTH      { {0x30, 8}, {0x32, 8}, {0x34, 8} }
 
 #include "mx6sabre_common.h"

diff --git a/include/configs/mx6sabresd.h b/include/configs/mx6sabresd.h
index 9160f878f4b3e72c603659fbe792bb8ab6bbad2c..e34947c94d000387456e48971e615143c0320793 100644 (file)
--- a/include/configs/mx6sabresd.h
+++ b/include/configs/mx6sabresd.h
@@ -24,9 +24,4 @@
 #define CFG_PCIE_IMX_POWER_GPIO        IMX_GPIO_NR(3, 19)
 #endif
 
-/* USB Configs */
-#ifdef CONFIG_CMD_USB
-#define CFG_MXC_USB_PORTSC             (PORT_PTS_UTMI | PORT_PTS_PTW)
-#endif
-
 #endif                         /* __MX6SABRESD_CONFIG_H */

diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h
index 65c6cdd4b87bfcb1bc84d19e6d2c40fba8e63dc2..d4e66a39882c07bfd9a1b77a51ed913937a80955 100644 (file)
--- a/include/configs/mx6slevk.h
+++ b/include/configs/mx6slevk.h
@@ -88,11 +88,6 @@
 
 /* Environment organization */
 
-/* USB Configs */
-#ifdef CONFIG_CMD_USB
-#define CFG_MXC_USB_PORTSC             (PORT_PTS_UTMI | PORT_PTS_PTW)
-#endif
-
 #define CFG_SYS_FSL_USDHC_NUM  3
 
 #endif                         /* __CONFIG_H */

diff --git a/include/configs/mx6sllevk.h b/include/configs/mx6sllevk.h
index 290996b51bc75394a5ab71b9f15fd25370e7ba54..0ba4054bbe4a48d65251ac1abe64d854371ffd54 100644 (file)
--- a/include/configs/mx6sllevk.h
+++ b/include/configs/mx6sllevk.h
@@ -92,10 +92,5 @@
 #define CFG_SYS_FSL_ESDHC_ADDR USDHC1_BASE_ADDR
 #define CFG_SYS_FSL_USDHC_NUM  3
 
-/* USB Configs */
-#ifdef CONFIG_CMD_USB
-#define CFG_MXC_USB_PORTSC             (PORT_PTS_UTMI | PORT_PTS_PTW)
-#endif
-
 #include <linux/stringify.h>
 #endif                         /* __CONFIG_H */

diff --git a/include/configs/mx6sxsabreauto.h b/include/configs/mx6sxsabreauto.h
index 4e163d28e63dde4fa3e0bfbd3f8d437594510c03..36d82e81d5dd01dc15df2b1c3427f1042ab26551 100644 (file)
--- a/include/configs/mx6sxsabreauto.h
+++ b/include/configs/mx6sxsabreauto.h
@@ -95,10 +95,6 @@
 #define IMX_FEC_BASE                   ENET2_BASE_ADDR
 #define CFG_FEC_MXC_PHYADDR          0x0
 
-#ifdef CONFIG_CMD_USB
-#define CFG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
-#endif
-
 #define CFG_SYS_FSL_USDHC_NUM  2
 
 #endif                         /* __CONFIG_H */

diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h
index b43a1d81315115aacc3805ca630413cc5314a8ec..844becbfd2ce0d7929ff848e52dfa7b5e59f51ff 100644 (file)
--- a/include/configs/mx6sxsabresd.h
+++ b/include/configs/mx6sxsabresd.h
@@ -117,10 +117,6 @@
 
 #define CFG_FEC_MXC_PHYADDR          0x1
 
-#ifdef CONFIG_CMD_USB
-#define CFG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
-#endif
-
 #ifdef CONFIG_CMD_PCI
 #define CFG_PCIE_IMX_PERST_GPIO        IMX_GPIO_NR(2, 0)
 #define CFG_PCIE_IMX_POWER_GPIO        IMX_GPIO_NR(2, 1)

diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h
index fd0c87ffb0128b1057e634b88521827f60129467..3716dc75b966409286ad626713c8aa17eb9e5dde 100644 (file)
--- a/include/configs/mx6ul_14x14_evk.h
+++ b/include/configs/mx6ul_14x14_evk.h
@@ -114,11 +114,6 @@
 
 /* environment organization */
 
-/* USB Configs */
-#ifdef CONFIG_CMD_USB
-#define CFG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
-#endif
-
 #ifdef CONFIG_CMD_NET
 #define CFG_FEC_ENET_DEV               1
 

diff --git a/include/configs/mx7dsabresd.h b/include/configs/mx7dsabresd.h
index 94bee75fdea5a9fb8b580be9d1ffea57f0f18de2..f5ab47207504692b3814929f2e1490111a8a1472 100644 (file)
--- a/include/configs/mx7dsabresd.h
+++ b/include/configs/mx7dsabresd.h
@@ -98,7 +98,4 @@
 /* DMA stuff, needed for GPMI/MXS NAND support */
 #endif
 
-/* USB Configs */
-#define CFG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
-
 #endif /* __CONFIG_H */

diff --git a/include/configs/mx7ulp_com.h b/include/configs/mx7ulp_com.h
index a310c64e794864f7b73ac012da3af89d6a534b4d..f8e3950fa32133007a622a3d896d6505764fcea0 100644 (file)
--- a/include/configs/mx7ulp_com.h
+++ b/include/configs/mx7ulp_com.h
@@ -51,5 +51,4 @@
 #define CFG_SYS_INIT_RAM_ADDR  IRAM_BASE_ADDR
 #define CFG_SYS_INIT_RAM_SIZE  SZ_256K
 
-#define CFG_MXC_USB_PORTSC             (PORT_PTS_UTMI | PORT_PTS_PTW)
 #endif /* __CONFIG_H */

diff --git a/include/configs/mys_6ulx.h b/include/configs/mys_6ulx.h
index 8defdfc4fda626d4e23bf58dd8adee5eaa6809f4..ddd46c8f945b0fff3dba7dfa78dfabd089eea3a4 100644 (file)
--- a/include/configs/mys_6ulx.h
+++ b/include/configs/mys_6ulx.h
@@ -29,9 +29,6 @@
 /* NAND */
 #define CFG_SYS_NAND_BASE              0x40000000
 
-/* USB Configs */
-#define CFG_MXC_USB_PORTSC             (PORT_PTS_UTMI | PORT_PTS_PTW)
-
 #define CFG_EXTRA_ENV_SETTINGS \
        "console=ttymxc0,115200n8\0" \
        "fdt_addr_r=0x82000000\0" \

diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h
index a8ad85050f795f8d734bde27af1e112ca68bd006..23eefaffc721dbb5e2727fa3dff4820f3151e249 100644 (file)
--- a/include/configs/nitrogen6x.h
+++ b/include/configs/nitrogen6x.h
@@ -18,9 +18,6 @@
 #define IMX_FEC_BASE                   ENET_BASE_ADDR
 #define CFG_FEC_MXC_PHYADDR            6
 
-/* USB Configs */
-#define CFG_MXC_USB_PORTSC     (PORT_PTS_UTMI | PORT_PTS_PTW)
-
 #ifdef CONFIG_CMD_MMC
 #define DISTRO_BOOT_DEV_MMC(func) func(MMC, mmc, 0) func(MMC, mmc, 1)
 #else

diff --git a/include/configs/novena.h b/include/configs/novena.h
index 144cf1b4a4b8c2f915c2ca129c82e9781556dbf1..059b8104e4b4953438fbb8a00b2f5625f92ffcf5 100644 (file)
--- a/include/configs/novena.h
+++ b/include/configs/novena.h
@@ -51,11 +51,6 @@
 /* UART */
 #define CFG_MXC_UART_BASE              UART2_BASE
 
-/* USB Configs */
-#ifdef CONFIG_CMD_USB
-#define CFG_MXC_USB_PORTSC             (PORT_PTS_UTMI | PORT_PTS_PTW)
-#endif
-
 /* Extra U-Boot environment. */
 #define CFG_EXTRA_ENV_SETTINGS                                 \
        "fdt_high=0xffffffff\0"                                         \

diff --git a/include/configs/npi_imx6ull.h b/include/configs/npi_imx6ull.h
index f71e2657076b798443665467b2abd56100b2ca00..1caa63f0227bcc59d3db1e6d24b158ff6a76edc5 100644 (file)
--- a/include/configs/npi_imx6ull.h
+++ b/include/configs/npi_imx6ull.h
@@ -28,9 +28,6 @@
 /* NAND */
 #define CFG_SYS_NAND_BASE              0x40000000
 
-/* USB Configs */
-#define CFG_MXC_USB_PORTSC             (PORT_PTS_UTMI | PORT_PTS_PTW)
-
 #ifdef CONFIG_CMD_NET
 #define CFG_FEC_MXC_PHYADDR            0x1
 #endif

diff --git a/include/configs/o4-imx6ull-nano.h b/include/configs/o4-imx6ull-nano.h
index 9050da8738b17d188930bb50c4be1b0638d8cf40..f5a4898f90e640d30a64e657664fe95fc612f4aa 100644 (file)
--- a/include/configs/o4-imx6ull-nano.h
+++ b/include/configs/o4-imx6ull-nano.h
@@ -11,10 +11,6 @@
 #define CFG_SYS_INIT_RAM_ADDR  IRAM_BASE_ADDR
 #define CFG_SYS_INIT_RAM_SIZE  IRAM_SIZE
 
-#if IS_ENABLED(CONFIG_CMD_USB)
-#      define CFG_MXC_USB_PORTSC               (PORT_PTS_UTMI | PORT_PTS_PTW)
-#endif /* CONFIG_CMD_USB */
-
 #define CFG_EXTRA_ENV_SETTINGS \
        "mmcdev=0\0" \
        "mmcpart=2\0" \

diff --git a/include/configs/opos6uldev.h b/include/configs/opos6uldev.h
index 12020d31e1c7f83048989a4e983408cac424752a..fd945235af370bf9e518ad0f2abd71123bcdf0ca 100644 (file)
--- a/include/configs/opos6uldev.h
+++ b/include/configs/opos6uldev.h
@@ -17,11 +17,6 @@
 #define CFG_SYS_INIT_RAM_ADDR  IRAM_BASE_ADDR
 #define CFG_SYS_INIT_RAM_SIZE  IRAM_SIZE
 
-/* USB */
-#ifdef CONFIG_USB_EHCI_MX6
-#define CFG_MXC_USB_PORTSC             (PORT_PTS_UTMI | PORT_PTS_PTW)
-#endif
-
 /* LCD */
 #define MXS_LCDIF_BASE MX6UL_LCDIF1_BASE_ADDR
 

diff --git a/include/configs/pcl063.h b/include/configs/pcl063.h
index 2a729c3e4544c70ed0211679862583ba50c1104c..0c96506b5fbeb0316cd02f16c09d456b2170f73f 100644 (file)
--- a/include/configs/pcl063.h
+++ b/include/configs/pcl063.h
@@ -41,9 +41,6 @@
 /* NAND */
 #define CFG_SYS_NAND_BASE              0x40000000
 
-/* USB Configs */
-#define CFG_MXC_USB_PORTSC             (PORT_PTS_UTMI | PORT_PTS_PTW)
-
 #define CFG_EXTRA_ENV_SETTINGS \
        "console=ttymxc0,115200n8\0" \
        "fdt_addr_r=0x82000000\0" \

diff --git a/include/configs/pcl063_ull.h b/include/configs/pcl063_ull.h
index afa8e7aeb716bb36edf94cdf163a5113cc95a22a..0f265adc5dcad06ec6cfc1159f4d67395fba1859 100644 (file)
--- a/include/configs/pcl063_ull.h
+++ b/include/configs/pcl063_ull.h
@@ -43,9 +43,6 @@
 /* NAND */
 #define CFG_SYS_NAND_BASE              0x40000000
 
-/* USB Configs */
-#define CFG_MXC_USB_PORTSC             (PORT_PTS_UTMI | PORT_PTS_PTW)
-
 #define ENV_MMC \
        "mmcdev=" __stringify(MMC_ROOTFS_DEV) "\0" \
        "mmcpart=" __stringify(MMC_ROOTFS_PART) "\0" \

diff --git a/include/configs/pico-imx6.h b/include/configs/pico-imx6.h
index 6ccb3dc19021658b02fd44c66c18c18535ba23c9..500dd8c069aea41ed1ff7cfb62c2e24f9602d583 100644 (file)
--- a/include/configs/pico-imx6.h
+++ b/include/configs/pico-imx6.h
@@ -15,9 +15,6 @@
 /* MMC Configuration */
 #define CFG_SYS_FSL_ESDHC_ADDR USDHC3_BASE_ADDR
 
-/* USB Configs */
-#define CFG_MXC_USB_PORTSC             (PORT_PTS_UTMI | PORT_PTS_PTW)
-
 #define DFU_DEFAULT_POLL_TIMEOUT 300
 
 #define CFG_DFU_ENV_SETTINGS \

diff --git a/include/configs/pico-imx6ul.h b/include/configs/pico-imx6ul.h
index ef8281440e5df69387d8f3dfe8b1041454decde5..37f4c7d8a098f3b7c5f9bbbffe7f8f51e2b76b97 100644 (file)
--- a/include/configs/pico-imx6ul.h
+++ b/include/configs/pico-imx6ul.h
@@ -21,9 +21,6 @@
 /* MMC Configs */
 #define CFG_SYS_FSL_ESDHC_ADDR USDHC1_BASE_ADDR
 
-/* USB Configs */
-#define CFG_MXC_USB_PORTSC             (PORT_PTS_UTMI | PORT_PTS_PTW)
-
 #define DFU_DEFAULT_POLL_TIMEOUT 300
 
 #define CFG_DFU_ENV_SETTINGS \

diff --git a/include/configs/pico-imx7d.h b/include/configs/pico-imx7d.h
index 21ec7fd3362c1b9d057600952b86cb21ac6e94ed..89850d8e4a7ec984f2138808cdd20c4388b45119 100644 (file)
--- a/include/configs/pico-imx7d.h
+++ b/include/configs/pico-imx7d.h
@@ -105,7 +105,4 @@
 
 #define CFG_SYS_FSL_USDHC_NUM          2
 
-/* USB Configs */
-#define CFG_MXC_USB_PORTSC                     (PORT_PTS_UTMI | PORT_PTS_PTW)
-
 #endif

diff --git a/include/configs/somlabs_visionsom_6ull.h b/include/configs/somlabs_visionsom_6ull.h
index aa09528acd9761a018ad844f940e201955789f1c..c8fdb40d011bf61da35ca2bfabd2fee206828153 100644 (file)
--- a/include/configs/somlabs_visionsom_6ull.h
+++ b/include/configs/somlabs_visionsom_6ull.h
@@ -59,11 +59,6 @@
 
 /* environment organization */
 
-/* USB Configs */
-#ifdef CONFIG_CMD_USB
-#define CFG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
-#endif
-
 #ifdef CONFIG_CMD_NET
 #define CFG_FEC_MXC_PHYADDR            0x1
 #endif

diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h
index 256331ae1733e176b298ad561badc2ed408e19fa..9ef774afd0f9ec6388288aab9c692bcb07e34f39 100644 (file)
--- a/include/configs/tbs2910.h
+++ b/include/configs/tbs2910.h
@@ -25,11 +25,6 @@
 #define CFG_PCIE_IMX_PERST_GPIO        IMX_GPIO_NR(7, 12)
 #endif
 
-/* USB */
-#ifdef CONFIG_CMD_USB
-#define CFG_MXC_USB_PORTSC             (PORT_PTS_UTMI | PORT_PTS_PTW)
-#endif /* CONFIG_CMD_USB      */
-
 #define CFG_EXTRA_ENV_SETTINGS \
        BOOTENV \
        "bootargs_mmc1=console=ttymxc0,115200 di0_primary console=tty1\0" \

diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h
index ceeed174ec543d4e4613d81c74b61bc258d3bceb..fd4d170456a4842e738afe8ef5e5da70312f4a1d 100644 (file)
--- a/include/configs/tqma6.h
+++ b/include/configs/tqma6.h
@@ -34,9 +34,6 @@
 /* MMC Configs */
 #define CFG_SYS_FSL_ESDHC_ADDR 0
 
-/* USB Configs */
-#define CFG_MXC_USB_PORTSC     (PORT_PTS_UTMI | PORT_PTS_PTW)
-
 #if defined(CONFIG_TQMA6X_MMC_BOOT)
 
 #define TQMA6_UBOOT_OFFSET             SZ_1K

diff --git a/include/configs/usbarmory.h b/include/configs/usbarmory.h
index 6c518b539d023f8b41235384ea818d009bd0974d..5bdd124be65f74baaad7d2f5a48e9f22bb67230f 100644 (file)
--- a/include/configs/usbarmory.h
+++ b/include/configs/usbarmory.h
@@ -23,7 +23,6 @@
 #define CFG_SYS_FSL_ESDHC_ADDR 0
 
 /* USB */
-#define CFG_MXC_USB_PORTSC     (PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CFG_MXC_USB_FLAGS      0
 
 /* Linux boot */

diff --git a/include/configs/verdin-imx8mm.h b/include/configs/verdin-imx8mm.h
index 12d2b6823058cefc4fdf77cf8fd37f1847e5005e..b018bbe29dd16196bb8803ad9fd6b7d76fe3ed89 100644 (file)
--- a/include/configs/verdin-imx8mm.h
+++ b/include/configs/verdin-imx8mm.h
@@ -63,7 +63,4 @@
 #define PHYS_SDRAM_2                 0x100000000
 #define PHYS_SDRAM_2_SIZE            (long)(SZ_1G)
 
-/* USB Configs */
-#define CFG_MXC_USB_PORTSC     (PORT_PTS_UTMI | PORT_PTS_PTW)
-
 #endif /* __VERDIN_IMX8MM_H */

diff --git a/include/configs/vining_2000.h b/include/configs/vining_2000.h
index 3c2d7e6689175adbf5e56a0f2d3705f9e31a059d..2cf7bc70d8dec19d1524e67ea2e311c7532cd3f6 100644 (file)
--- a/include/configs/vining_2000.h
+++ b/include/configs/vining_2000.h
@@ -36,7 +36,6 @@
 /* Network */
 #define CFG_FEC_MXC_PHYADDR          0x0
 
-#define CFG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
 
 #ifdef CONFIG_CMD_PCI
 #define CFG_PCIE_IMX_PERST_GPIO        IMX_GPIO_NR(4, 6)

diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h
index d64c4262bd69b8b57f888f9a5cdb3f49f291c75e..b5b342b3538361cfcc3dbd71ef5275e1b604a70a 100644 (file)
--- a/include/configs/wandboard.h
+++ b/include/configs/wandboard.h
@@ -16,9 +16,6 @@
 #define CFG_SYS_FSL_USDHC_NUM  2
 #define CFG_SYS_FSL_ESDHC_ADDR 0
 
-/* USB Configs */
-#define CFG_MXC_USB_PORTSC             (PORT_PTS_UTMI | PORT_PTS_PTW)
-
 #define CFG_EXTRA_ENV_SETTINGS \
        "console=ttymxc0\0" \
        "splashpos=m,m\0" \

diff --git a/include/configs/warp7.h b/include/configs/warp7.h
index 0da9250c3b7899f0c3f5c3bedc9f0a0df7f5c010..a5278d1cb9b8e0af45fc28141c7c854ab98b7d56 100644 (file)
--- a/include/configs/warp7.h
+++ b/include/configs/warp7.h
@@ -92,7 +92,6 @@
 
 #define CFG_SYS_FSL_USDHC_NUM  1
 
-#define CFG_MXC_USB_PORTSC             (PORT_PTS_UTMI | PORT_PTS_PTW)
 
 /* USB Device Firmware Update support */
 #define DFU_DEFAULT_POLL_TIMEOUT       300

diff --git a/include/configs/xpress.h b/include/configs/xpress.h
index bb0a30c4344f5954d82d25543fcdc50f1d2d527d..8efebf77c3d6801e1c85d584e53b1242fe74129e 100644 (file)
--- a/include/configs/xpress.h
+++ b/include/configs/xpress.h
@@ -27,9 +27,6 @@
 
 /* Environment is in stored in the eMMC boot partition */
 
-/* USB Configs */
-#define CFG_MXC_USB_PORTSC             (PORT_PTS_UTMI | PORT_PTS_PTW)
-
 #define CFG_FEC_ENET_DEV               0
 #define CFG_FEC_MXC_PHYADDR          0x0