Commit ba1444eab6c51550b2c992fc228d5f29774366bf
Committed by
Stefano Babic
Stefano Babic
1 parent
9c2b1b0f03
Exists in
smarc_8mq_lf_v2020.04
and in
9 other branches
imx: cx9020: migrate cx9020 to CONFIG_DM_USB
Note: gpio7_8 was never used for usb power regulator so we remove it here Acked-by: Patrick Bruenn <p.bruenn@beckhoff.com> Signed-off-by: Steffen Dirkwinkel <s.dirkwinkel@beckhoff.com>
Showing 3 changed files with 16 additions and 11 deletions Side-by-side Diff
arch/arm/dts/imx53-cx9020.dts
| ... | ... | @@ -36,7 +36,6 @@ |
| 36 | 36 | MX53_PAD_GPIO_1__GPIO1_1 0x80000000 |
| 37 | 37 | MX53_PAD_GPIO_4__GPIO1_4 0x80000000 |
| 38 | 38 | MX53_PAD_PATA_DA_0__GPIO7_6 0x80000000 |
| 39 | - MX53_PAD_PATA_DA_2__GPIO7_8 0x80000000 | |
| 40 | 39 | MX53_PAD_GPIO_16__GPIO7_11 0x80000000 |
| 41 | 40 | |
| 42 | 41 | MX53_PAD_EIM_OE__EMI_WEIM_OE 0x80000000 |
| ... | ... | @@ -219,5 +218,15 @@ |
| 219 | 218 | speed = <100>; |
| 220 | 219 | full-duplex; |
| 221 | 220 | }; |
| 221 | +}; | |
| 222 | + | |
| 223 | +&usbh1 { | |
| 224 | + phy_type = "utmi"; | |
| 225 | + status = "okay"; | |
| 226 | +}; | |
| 227 | + | |
| 228 | +&usbotg { | |
| 229 | + dr_mode = "host"; | |
| 230 | + status = "okay"; | |
| 222 | 231 | }; |
board/beckhoff/mx53cx9020/mx53cx9020.c
| ... | ... | @@ -129,16 +129,6 @@ |
| 129 | 129 | gpio_direction_output(GPIO_LED_PWR_G, 0); |
| 130 | 130 | } |
| 131 | 131 | |
| 132 | -#ifdef CONFIG_USB_EHCI_MX5 | |
| 133 | -int board_ehci_hcd_init(int port) | |
| 134 | -{ | |
| 135 | - /* request VBUS power enable pin, GPIO7_8 */ | |
| 136 | - gpio_direction_output(IMX_GPIO_NR(7, 8), 1); | |
| 137 | - return 0; | |
| 138 | -} | |
| 139 | -#endif | |
| 140 | - | |
| 141 | - | |
| 142 | 132 | static int power_init(void) |
| 143 | 133 | { |
| 144 | 134 | /* nothing to do on CX9020 */ |
configs/mx53cx9020_defconfig
| ... | ... | @@ -21,7 +21,13 @@ |
| 21 | 21 | CONFIG_CMD_EXT2=y |
| 22 | 22 | CONFIG_CMD_EXT4=y |
| 23 | 23 | CONFIG_CMD_FAT=y |
| 24 | +CONFIG_CMD_USB=y | |
| 24 | 25 | CONFIG_CMD_FS_GENERIC=y |
| 26 | +CONFIG_USB=y | |
| 27 | +CONFIG_DM_USB=y | |
| 28 | +CONFIG_USB_EHCI_MX5=y | |
| 29 | +CONFIG_USB_STORAGE=y | |
| 30 | +CONFIG_DM_REGULATOR=y | |
| 25 | 31 | CONFIG_OF_CONTROL=y |
| 26 | 32 | CONFIG_DEFAULT_DEVICE_TREE="imx53-cx9020" |
| 27 | 33 | CONFIG_ENV_IS_IN_MMC=y |