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>

diff --git a/arch/arm/mach-rockchip/rk3036-board.c b/arch/arm/mach-rockchip/rk3036-board.c
index c594c4d61cdfb248da00f0e18ba1ed9286ef3a76..b7967b8577836f00e37328467219bd8183e75d1c 100644 (file)
--- a/arch/arm/mach-rockchip/rk3036-board.c
+++ b/arch/arm/mach-rockchip/rk3036-board.c
@@ -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)

diff --git a/arch/arm/mach-rockchip/rk3128-board.c b/arch/arm/mach-rockchip/rk3128-board.c
index 636ee65feeb0bf180dbd2fbc9c8f1033b22fc1e9..cfc41286e74149d2449bfa6190891eed13b820c0 100644 (file)
--- a/arch/arm/mach-rockchip/rk3128-board.c
+++ b/arch/arm/mach-rockchip/rk3128-board.c
@@ -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)

diff --git a/arch/arm/mach-rockchip/rk322x-board.c b/arch/arm/mach-rockchip/rk322x-board.c
index c0a537616c813d6cc56dee178361323bdad3f64c..5103ad4ccc7096b57be4c60f935ae9a04816e939 100644 (file)
--- a/arch/arm/mach-rockchip/rk322x-board.c
+++ b/arch/arm/mach-rockchip/rk322x-board.c
@@ -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)

diff --git a/arch/arm/mach-rockchip/rk3288-board.c b/arch/arm/mach-rockchip/rk3288-board.c
index a250d503876da4521e9348a3592795f59dd873e7..23c5343eb83ec2ac47fd1754c5a06476282d1909 100644 (file)
--- 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)

diff --git a/arch/arm/mach-rockchip/rv1108-board.c b/arch/arm/mach-rockchip/rv1108-board.c
index 3412f2c063abade5cff3e7f4b3b97f748a15af1e..3c683cb8acb000c184ed5983b895a72820954da5 100644 (file)
--- a/arch/arm/mach-rockchip/rv1108-board.c
+++ b/arch/arm/mach-rockchip/rv1108-board.c
@@ -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");
-               return -ENODEV;
-       }
-
-       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");
+               debug("Not found usb_otg device\n");
                return -ENODEV;
        }
+       otg_data.regs_otg = fdtdec_get_addr(blob, node, "reg");
 
-       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)

diff --git a/board/rockchip/evb_rk3328/evb-rk3328.c b/board/rockchip/evb_rk3328/evb-rk3328.c
index bc9ef5e98b4f495fd4773e6f0b4bf75113f7c95e..64595c783dd4abfa135ef381b8eb8fcb9437a25b 100644 (file)
--- a/board/rockchip/evb_rk3328/evb-rk3328.c
+++ b/board/rockchip/evb_rk3328/evb-rk3328.c
@@ -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)