diff --git a/arch/arm/mach-rockchip/rk3328/rk3328.c b/arch/arm/mach-rockchip/rk3328/rk3328.c index f1db5bf..3678f8c 100644 --- a/arch/arm/mach-rockchip/rk3328/rk3328.c +++ b/arch/arm/mach-rockchip/rk3328/rk3328.c @@ -90,7 +90,7 @@ int board_late_init(void) return rk_board_late_init(); } -int board_init(void) +__weak int board_init(void) { int ret; #define GRF_BASE 0xff100000 diff --git a/board/rockchip/roc_rk3328_cc/roc-rk3328-cc.c b/board/rockchip/roc_rk3328_cc/roc-rk3328-cc.c index 3ff1230..b4cc372 100644 --- a/board/rockchip/roc_rk3328_cc/roc-rk3328-cc.c +++ b/board/rockchip/roc_rk3328_cc/roc-rk3328-cc.c @@ -15,71 +15,3 @@ DECLARE_GLOBAL_DATA_PTR; -int board_init(void) -{ - int ret; -#define GRF_BASE 0xff100000 - struct rk3328_grf_regs * const grf = (void *)GRF_BASE; - - /* uart2 select m1, sdcard select m1*/ - rk_clrsetreg(&grf->com_iomux, - IOMUX_SEL_UART2_MASK | IOMUX_SEL_SDMMC_MASK, - IOMUX_SEL_UART2_M1 << IOMUX_SEL_UART2_SHIFT | - IOMUX_SEL_SDMMC_M1 << IOMUX_SEL_SDMMC_SHIFT); - - ret = regulators_enable_boot_on(false); - if (ret) - debug("%s: Cannot enable boot on regulator\n", __func__); - -#define GRF_SOC_CON10 0xff100428 - rk_setreg(GRF_SOC_CON10, (BIT(1) << 16) | (0 << 1)); - - return ret; -} - -#if defined(CONFIG_USB_GADGET) && defined(CONFIG_USB_GADGET_DWC2_OTG) -#include -#include - -static struct dwc2_plat_otg_data rk3328_otg_data = { - .rx_fifo_sz = 512, - .np_tx_fifo_sz = 16, - .tx_fifo_sz = 128, -}; - -int board_usb_init(int index, enum usb_init_type init) -{ - 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,rk3328-usb"); - - while (node > 0) { - mode = fdt_getprop(blob, node, "dr_mode", NULL); - if (mode && strcmp(mode, "otg") == 0) { - matched = true; - break; - } - - node = fdt_node_offset_by_compatible(blob, node, - "rockchip,rk3328-usb"); - } - if (!matched) { - debug("Not found usb_otg device\n"); - return -ENODEV; - } - - rk3328_otg_data.regs_otg = fdtdec_get_addr(blob, node, "reg"); - - return dwc2_udc_probe(&rk3328_otg_data); -} - -int board_usb_cleanup(int index, enum usb_init_type init) -{ - return 0; -} -#endif