diff options
author | Kever Yang <kever.yang@rock-chips.com> | 2019-07-22 20:02:00 +0800 |
---|---|---|
committer | Kever Yang <kever.yang@rock-chips.com> | 2019-07-29 10:25:27 +0800 |
commit | 6c9a9df9f507986bdcd4cd518f4022c7373292f8 (patch) | |
tree | 84f1863a53af62390e684949d17a82896623d758 /arch/arm/mach-rockchip/rk3288-board.c | |
parent | 283e61a6615b66f2539ebecafe274d9608911be1 (diff) | |
download | u-boot-6c9a9df9f507986bdcd4cd518f4022c7373292f8.tar.gz |
rockchip: clean up board_usb_init() for all SoCs
Use "snps,dwc2" for compatible name and and common variable
names so that we can share the common code for all SoCs.
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
Diffstat (limited to 'arch/arm/mach-rockchip/rk3288-board.c')
-rw-r--r-- | arch/arm/mach-rockchip/rk3288-board.c | 38 |
1 files changed, 6 insertions, 32 deletions
diff --git a/arch/arm/mach-rockchip/rk3288-board.c b/arch/arm/mach-rockchip/rk3288-board.c index a250d50387..23c5343eb8 100644 --- a/arch/arm/mach-rockchip/rk3288-board.c +++ b/arch/arm/mach-rockchip/rk3288-board.c @@ -171,7 +171,7 @@ void enable_caches(void) #include <usb.h> #include <usb/dwc2_udc.h> -static struct dwc2_plat_otg_data rk3288_otg_data = { +static struct dwc2_plat_otg_data otg_data = { .rx_fifo_sz = 512, .np_tx_fifo_sz = 16, .tx_fifo_sz = 128, @@ -179,15 +179,14 @@ static struct dwc2_plat_otg_data rk3288_otg_data = { int board_usb_init(int index, enum usb_init_type init) { - int node, phy_node; + int node; const char *mode; bool matched = false; const void *blob = gd->fdt_blob; - u32 grf_phy_offset; /* find the usb_otg node */ node = fdt_node_offset_by_compatible(blob, -1, - "rockchip,rk3288-usb"); + "snps,dwc2"); while (node > 0) { mode = fdt_getprop(blob, node, "dr_mode", NULL); @@ -197,40 +196,15 @@ int board_usb_init(int index, enum usb_init_type init) } node = fdt_node_offset_by_compatible(blob, node, - "rockchip,rk3288-usb"); + "snps,dwc2"); } if (!matched) { debug("Not found usb_otg device\n"); return -ENODEV; } - rk3288_otg_data.regs_otg = fdtdec_get_addr(blob, node, "reg"); + otg_data.regs_otg = fdtdec_get_addr(blob, node, "reg"); - node = fdtdec_lookup_phandle(blob, node, "phys"); - if (node <= 0) { - debug("Not found usb phy device\n"); - return -ENODEV; - } - - phy_node = fdt_parent_offset(blob, node); - if (phy_node <= 0) { - debug("Not found usb phy device\n"); - return -ENODEV; - } - - rk3288_otg_data.phy_of_node = phy_node; - grf_phy_offset = fdtdec_get_addr(blob, node, "reg"); - - /* find the grf node */ - node = fdt_node_offset_by_compatible(blob, -1, - "rockchip,rk3288-grf"); - if (node <= 0) { - debug("Not found grf device\n"); - return -ENODEV; - } - rk3288_otg_data.regs_phy = grf_phy_offset + - fdtdec_get_addr(blob, node, "reg"); - - return dwc2_udc_probe(&rk3288_otg_data); + return dwc2_udc_probe(&otg_data); } int board_usb_cleanup(int index, enum usb_init_type init) |