x86: edison: Use dwc3-generic driver for Intel Edison
Subsystems (3)
PATCH v2 1/2 x86: edison: Use dwc3-generic driver for Intel Edison
Use generic Synopsys DesignWare 3 driver on Intel Edison. For now it's just a stub which allows future refactoring.
---
v2: no changes
arch/x86/cpu/tangier/Kconfig | 3 +++ arch/x86/dts/edison.dts | 4 ++++ drivers/usb/dwc3/dwc3-generic.c | 1 + 3 files changed, 8 insertions(+)
arch/x86/cpu/tangier/Kconfig +3 -0
@@ -10,8 +10,11 @@ config INTEL_TANGIER imply MMC_SDHCI imply MMC_SDHCI_SDMA imply MMC_SDHCI_TANGIER + imply MISC imply USB + imply USB_XHCI_HCD imply USB_DWC3 + imply USB_DWC3_GENERIC if INTEL_TANGIER
arch/x86/dts/edison.dts +4 -0
@@ -105,6 +105,10 @@ reg = <0xff009000 0x1000>; }; + usb: usb at f9100000 { + compatible = "intel,tangier-dwc3"; + }; + watchdog: wdt at 0 { compatible = "intel,tangier-wdt"; };
drivers/usb/dwc3/dwc3-generic.c +1 -0
@@ -449,6 +449,7 @@ static const struct udevice_id dwc3_glue_ids[] = { { .compatible = "rockchip,rk3328-dwc3" }, { .compatible = "rockchip,rk3399-dwc3" }, { .compatible = "qcom,dwc3" }, + { .compatible = "intel,tangier-dwc3" }, { } };
Signature · 1 line
2.29.2
PATCH v2 2/2 x86: edison: Switch to DM_USB_GADGET
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.
---
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(-)
arch/x86/cpu/tangier/Kconfig +0 -4
@@ -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
arch/x86/dts/edison.dts +8 -0
@@ -107,6 +107,14 @@ usb: usb at 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 at 0 {
board/intel/edison/edison.c +0 -35
@@ -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 );
configs/edison_defconfig +1 -0
@@ -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
Signature · 1 line
2.29.2
PATCH v2 2/2 x86: edison: Switch to DM_USB_GADGET
Quoted 7 lines · Andy Shevchenko
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_GADGETand drop hard coded values.Signed-off-by Andy Shevchenko <[email protected]>
Quoted 8 lines
---
v2: cleaned uparch/x86/cpu/tangier/Kconfigas wellarch/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(-)
PATCH v2 2/2 x86: edison: Switch to DM_USB_GADGET
In reply to Andy ShevchenkoQuoted 7 lines · Andy Shevchenko
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_GADGETand drop hard coded values.Signed-off-by Andy Shevchenko <[email protected]>
Quoted 9 lines
---
v2: cleaned uparch/x86/cpu/tangier/Kconfigas wellarch/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(-)
PATCH v2 2/2 x86: edison: Switch to DM_USB_GADGET
Quoted 13 lines · Bin Meng
Quoted 10 lines · Andy Shevchenko
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_GADGETand drop hard coded values.Signed-off-by Andy Shevchenko <[email protected]>---
v2: cleaned uparch/x86/cpu/tangier/Kconfigas well
Quoted 8 lines
Quoted 6 lines
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(-)Reviewed-by Bin Meng <[email protected]>
applied to u-boot-x86, thanks!
PATCH v2 1/2 x86: edison: Use dwc3-generic driver for Intel Edison
In reply to Andy ShevchenkoQuoted 4 lines · Andy Shevchenko
Use generic Synopsys DesignWare 3 driver on Intel Edison. For now it's just a stub which allows future refactoring.
Quoted 8 lines
Signed-off-by Andy Shevchenko <[email protected]>---
v2: no changesarch/x86/cpu/tangier/Kconfig | 3 +++ arch/x86/dts/edison.dts | 4 ++++ drivers/usb/dwc3/dwc3-generic.c | 1 + 3 files changed, 8 insertions(+)
PATCH v2 1/2 x86: edison: Use dwc3-generic driver for Intel Edison
In reply to Andy ShevchenkoQuoted 4 lines · Andy Shevchenko
Use generic Synopsys DesignWare 3 driver on Intel Edison. For now it's just a stub which allows future refactoring.
Quoted 8 lines
Signed-off-by Andy Shevchenko <[email protected]>---
v2: no changesarch/x86/cpu/tangier/Kconfig | 3 +++ arch/x86/dts/edison.dts | 4 ++++ drivers/usb/dwc3/dwc3-generic.c | 1 + 3 files changed, 8 insertions(+)
PATCH v2 1/2 x86: edison: Use dwc3-generic driver for Intel Edison
Quoted 16 lines · Bin Meng
Quoted 4 lines · Andy Shevchenko
Use generic Synopsys DesignWare 3 driver on Intel Edison. For now it's just a stub which allows future refactoring.
Quoted 8 lines
Signed-off-by Andy Shevchenko <[email protected]>---
v2: no changesarch/x86/cpu/tangier/Kconfig | 3 +++ arch/x86/dts/edison.dts | 4 ++++ drivers/usb/dwc3/dwc3-generic.c | 1 + 3 files changed, 8 insertions(+)
Quoted 1 line
Reviewed-by Bin Meng <[email protected]>
applied to u-boot-x86, thanks!