DM is the modern default approach for the drivers in U-Boot. It also allows to configure code via Device Tree.
Move Intel Edison to use DM_USB_GADGET and drop hard coded values.
Signed-off-by: Andy Shevchenko andriy.shevchenko@linux.intel.com --- v2: cleaned up arch/x86/cpu/tangier/Kconfig as well
arch/x86/cpu/tangier/Kconfig | 4 ---- arch/x86/dts/edison.dts | 8 ++++++++ board/intel/edison/edison.c | 35 ----------------------------------- configs/edison_defconfig | 1 + 4 files changed, 9 insertions(+), 39 deletions(-)
diff --git a/arch/x86/cpu/tangier/Kconfig b/arch/x86/cpu/tangier/Kconfig index 94d9d74a325c..19aaf165d6a3 100644 --- a/arch/x86/cpu/tangier/Kconfig +++ b/arch/x86/cpu/tangier/Kconfig @@ -29,8 +29,4 @@ config SYS_CAR_SIZE Space in bytes in eSRAM used as Cache-As-RAM (CAR). Note this size must not exceed eSRAM's total size.
-config SYS_USB_OTG_BASE - hex - default 0xf9100000 - endif diff --git a/arch/x86/dts/edison.dts b/arch/x86/dts/edison.dts index 600d6d256246..8d245bffc2f3 100644 --- a/arch/x86/dts/edison.dts +++ b/arch/x86/dts/edison.dts @@ -107,6 +107,14 @@
usb: usb@f9100000 { compatible = "intel,tangier-dwc3"; + #address-cells = <1>; + #size-cells = <1>; + + dwc3: dwc3 { + reg = <0xf9100000 0x100000>; + maximum-speed = "high-speed"; + dr_mode = "peripheral"; + }; };
watchdog: wdt@0 { diff --git a/board/intel/edison/edison.c b/board/intel/edison/edison.c index 652f9755155f..11e7f74e47cc 100644 --- a/board/intel/edison/edison.c +++ b/board/intel/edison/edison.c @@ -3,15 +3,10 @@ * Copyright (c) 2017 Intel Corporation */ #include <common.h> -#include <dwc3-uboot.h> #include <env.h> #include <init.h> #include <mmc.h> #include <u-boot/md5.h> -#include <usb.h> -#include <watchdog.h> - -#include <linux/usb/gadget.h>
#include <asm/cache.h> #include <asm/pmu.h> @@ -27,36 +22,6 @@ int board_early_init_r(void) return 0; }
-static struct dwc3_device dwc3_device_data = { - .maximum_speed = USB_SPEED_HIGH, - .base = CONFIG_SYS_USB_OTG_BASE, - .dr_mode = USB_DR_MODE_PERIPHERAL, - .index = 0, -}; - -int usb_gadget_handle_interrupts(int controller_index) -{ - dwc3_uboot_handle_interrupt(controller_index); - WATCHDOG_RESET(); - return 0; -} - -int board_usb_init(int index, enum usb_init_type init) -{ - if (index == 0 && init == USB_INIT_DEVICE) - return dwc3_uboot_init(&dwc3_device_data); - return -EINVAL; -} - -int board_usb_cleanup(int index, enum usb_init_type init) -{ - if (index == 0 && init == USB_INIT_DEVICE) { - dwc3_uboot_exit(index); - return 0; - } - return -EINVAL; -} - static void assign_serial(void) { struct mmc *mmc = find_mmc_device(0); diff --git a/configs/edison_defconfig b/configs/edison_defconfig index ab2811eca9dc..304a172a1b9f 100644 --- a/configs/edison_defconfig +++ b/configs/edison_defconfig @@ -37,6 +37,7 @@ CONFIG_DFU_TIMEOUT=y CONFIG_DFU_MMC=y CONFIG_DFU_RAM=y CONFIG_SUPPORT_EMMC_BOOT=y +CONFIG_DM_USB_GADGET=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_MANUFACTURER="Intel" CONFIG_USB_GADGET_VENDOR_NUM=0x8087