Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-28 15:41:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

rockchip: clean up board_usb_init() for all SoCs

Browse source 
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>
This commit is contained in:
Kever Yang 2019-07-22 20:02:00 +08:00
parent 283e61a661
commit 6c9a9df9f5
6 changed files with 36 additions and 92 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
arch/arm/mach-rockchip/rk3036-board.c
View file

@ -59,7 +59,7 @@ void enable_caches(void)
#include <usb.h>
#include <usb/dwc2_udc.h>
static struct dwc2_plat_otg_data rk3036_otg_data = {
static struct dwc2_plat_otg_data otg_data = {
.rx_fifo_sz = 512,
.np_tx_fifo_sz = 16,
.tx_fifo_sz = 128,
@ -74,7 +74,7 @@ int board_usb_init(int index, enum usb_init_type init)
/* 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);
@ -84,15 +84,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;
}
rk3036_otg_data.regs_otg = fdtdec_get_addr(blob, node, "reg");
otg_data.regs_otg = fdtdec_get_addr(blob, node, "reg");
return dwc2_udc_probe(&rk3036_otg_data);
return dwc2_udc_probe(&otg_data);
}
int board_usb_cleanup(int index, enum usb_init_type init)

10
arch/arm/mach-rockchip/rk3128-board.c
View file

@ -66,7 +66,7 @@ void enable_caches(void)
#include <usb.h>
#include <usb/dwc2_udc.h>
static struct dwc2_plat_otg_data rk3128_otg_data = {
static struct dwc2_plat_otg_data otg_data = {
.rx_fifo_sz = 512,
.np_tx_fifo_sz = 16,
.tx_fifo_sz = 128,
@ -81,7 +81,7 @@ int board_usb_init(int index, enum usb_init_type init)
/* find the usb_otg node */
node = fdt_node_offset_by_compatible(blob, -1,
"rockchip,rk3128-usb");
"snps,dwc2");
while (node > 0) {
mode = fdt_getprop(blob, node, "dr_mode", NULL);
@ -91,15 +91,15 @@ int board_usb_init(int index, enum usb_init_type init)
}
node = fdt_node_offset_by_compatible(blob, node,
"rockchip,rk3128-usb");
"snps,dwc2");
}
if (!matched) {
debug("Not found usb_otg device\n");
return -ENODEV;
}
rk3128_otg_data.regs_otg = fdtdec_get_addr(blob, node, "reg");
otg_data.regs_otg = fdtdec_get_addr(blob, node, "reg");
return dwc2_udc_probe(&rk3128_otg_data);
return dwc2_udc_probe(&otg_data);
}
int board_usb_cleanup(int index, enum usb_init_type init)

10
arch/arm/mach-rockchip/rk322x-board.c
View file

@ -70,7 +70,7 @@ void enable_caches(void)
#include <usb.h>
#include <usb/dwc2_udc.h>
static struct dwc2_plat_otg_data rk322x_otg_data = {
static struct dwc2_plat_otg_data otg_data = {
.rx_fifo_sz = 512,
.np_tx_fifo_sz = 16,
.tx_fifo_sz = 128,
@ -85,7 +85,7 @@ int board_usb_init(int index, enum usb_init_type init)
/* 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);
@ -95,15 +95,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;
}
rk322x_otg_data.regs_otg = fdtdec_get_addr(blob, node, "reg");
otg_data.regs_otg = fdtdec_get_addr(blob, node, "reg");
return dwc2_udc_probe(&rk322x_otg_data);
return dwc2_udc_probe(&otg_data);
}
int board_usb_cleanup(int index, enum usb_init_type init)

38
arch/arm/mach-rockchip/rk3288-board.c
View file

@ -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)

49
arch/arm/mach-rockchip/rv1108-board.c
View file

@ -11,7 +11,7 @@ DECLARE_GLOBAL_DATA_PTR;
#include <usb.h>
#include <usb/dwc2_udc.h>
static struct dwc2_plat_otg_data rv1108_otg_data = {
static struct dwc2_plat_otg_data otg_data = {
.rx_fifo_sz = 512,
.np_tx_fifo_sz = 16,
.tx_fifo_sz = 128,
@ -19,14 +19,14 @@ static struct dwc2_plat_otg_data rv1108_otg_data = {
int board_usb_init(int index, enum usb_init_type init)
{
const void *blob = gd->fdt_blob;
bool matched = false;
int node, phy_node;
u32 grf_phy_offset;
int node;
const char *mode;
bool matched = false;
const void *blob = gd->fdt_blob;
/* find the usb_otg node */
node = fdt_node_offset_by_compatible(blob, -1, "rockchip,rk3066-usb");
node = fdt_node_offset_by_compatible(blob, -1, "snps,dwc2");
while (node > 0) {
mode = fdt_getprop(blob, node, "dr_mode", NULL);
if (mode && strcmp(mode, "otg") == 0) {
@ -34,44 +34,15 @@ int board_usb_init(int index, enum usb_init_type init)
break;
}
node = fdt_node_offset_by_compatible(blob, node,
"rockchip,rk3066-usb");
node = fdt_node_offset_by_compatible(blob, node, "snps,dwc2");
}
if (!matched) {
debug("usb_otg device not found\n");
debug("Not found usb_otg device\n");
return -ENODEV;
}
otg_data.regs_otg = fdtdec_get_addr(blob, node, "reg");
rv1108_otg_data.regs_otg = fdtdec_get_addr(blob, node, "reg");
node = fdtdec_lookup_phandle(blob, node, "phys");
if (node <= 0) {
debug("phys node not found\n");
return -ENODEV;
}
phy_node = fdt_parent_offset(blob, node);
if (phy_node <= 0) {
debug("usb phy node not found\n");
return -ENODEV;
}
rv1108_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,rv1108-grf");
if (node <= 0) {
debug("grf node not found\n");
return -ENODEV;
}
rv1108_otg_data.regs_phy = grf_phy_offset + fdtdec_get_addr(blob, node,
"reg");
return dwc2_udc_probe(&rv1108_otg_data);
return dwc2_udc_probe(&otg_data);
}
int board_usb_cleanup(int index, enum usb_init_type init)

11
board/rockchip/evb_rk3328/evb-rk3328.c
View file

@ -26,7 +26,7 @@ int board_init(void)
#include <usb.h>
#include <usb/dwc2_udc.h>
static struct dwc2_plat_otg_data rk3328_otg_data = {
static struct dwc2_plat_otg_data otg_data = {
.rx_fifo_sz = 512,
.np_tx_fifo_sz = 16,
.tx_fifo_sz = 128,
@ -41,7 +41,7 @@ int board_usb_init(int index, enum usb_init_type init)
/* find the usb_otg node */
node = fdt_node_offset_by_compatible(blob, -1,
"rockchip,rk3328-usb");
"snps,dwc2");
while (node > 0) {
mode = fdt_getprop(blob, node, "dr_mode", NULL);
@ -51,16 +51,15 @@ int board_usb_init(int index, enum usb_init_type init)
}
node = fdt_node_offset_by_compatible(blob, node,
"rockchip,rk3328-usb");
"snps,dwc2");
}
if (!matched) {
debug("Not found usb_otg device\n");
return -ENODEV;
}
otg_data.regs_otg = fdtdec_get_addr(blob, node, "reg");
rk3328_otg_data.regs_otg = fdtdec_get_addr(blob, node, "reg");
return dwc2_udc_probe(&rk3328_otg_data);
return dwc2_udc_probe(&otg_data);
}
int board_usb_cleanup(int index, enum usb_init_type init)