| Message ID | 1522142971-20739-22-git-send-email-kever.yang@rock-chips.com |
|---|---|
| State | Changes Requested |
| Delegated to: | Philipp Tomsich |
| Headers | show |
| Series | rockchip: clean up board file for rockchip SoCs | expand |
> remoe rk3128 board file and move SoC spec setting into rk3128.c > > Signed-off-by: Kever Yang <kever.yang@rock-chips.com> > --- > > arch/arm/mach-rockchip/rk3128-board.c | 127 ---------------------------------- > 1 file changed, 127 deletions(-) > delete mode 100644 arch/arm/mach-rockchip/rk3128-board.c > Acked-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
On Tue, 27 Mar 2018, Kever Yang wrote: > remoe rk3128 board file and move SoC spec setting into rk3128.c 'Remove'? Also: please elaborate on what this patch is doing. > > Signed-off-by: Kever Yang <kever.yang@rock-chips.com> Many comments agains the similar changes also apply here. > --- > > arch/arm/mach-rockchip/rk3128-board.c | 127 ---------------------------------- > 1 file changed, 127 deletions(-) > delete mode 100644 arch/arm/mach-rockchip/rk3128-board.c > > diff --git a/arch/arm/mach-rockchip/rk3128-board.c b/arch/arm/mach-rockchip/rk3128-board.c > deleted file mode 100644 > index 2e8393d..0000000 > --- a/arch/arm/mach-rockchip/rk3128-board.c > +++ /dev/null > @@ -1,127 +0,0 @@ > -/* > - * (C) Copyright 2017 Rockchip Electronics Co., Ltd. > - * > - * SPDX-License-Identifier: GPL-2.0+ > - */ > -#include <common.h> > -#include <clk.h> > -#include <dm.h> > -#include <ram.h> > -#include <syscon.h> > -#include <asm/io.h> > -#include <asm/arch/clock.h> > -#include <asm/arch/periph.h> > -#include <asm/arch/grf_rk3128.h> > -#include <asm/arch/boot_mode.h> > -#include <asm/arch/timer.h> > -#include <power/regulator.h> > - > -DECLARE_GLOBAL_DATA_PTR; > - > -__weak int rk_board_late_init(void) > -{ > - return 0; > -} > - > -int board_late_init(void) > -{ > - setup_boot_mode(); > - > - return rk_board_late_init(); > -} > - > -int board_init(void) > -{ > - int ret = 0; > - > - rockchip_timer_init(); > - > - ret = regulators_enable_boot_on(false); > - if (ret) { > - debug("%s: Cannot enable boot on regulator\n", __func__); > - return ret; > - } > - > - return 0; > -} > - > -int dram_init_banksize(void) > -{ > - gd->bd->bi_dram[0].start = CONFIG_SYS_SDRAM_BASE; > - gd->bd->bi_dram[0].size = 0x8400000; > - /* Reserve 0xe00000(14MB) for OPTEE with TA enabled, otherwise 2MB */ > - gd->bd->bi_dram[1].start = CONFIG_SYS_SDRAM_BASE > - + gd->bd->bi_dram[0].size + 0xe00000; > - gd->bd->bi_dram[1].size = gd->bd->bi_dram[0].start > - + gd->ram_size - gd->bd->bi_dram[1].start; > - > - return 0; > -} > - > -#ifndef CONFIG_SYS_DCACHE_OFF > -void enable_caches(void) > -{ > - /* Enable D-cache. I-cache is already enabled in start.S */ > - dcache_enable(); > -} > -#endif > - > -#if defined(CONFIG_USB_GADGET) && defined(CONFIG_USB_GADGET_DWC2_OTG) > -#include <usb.h> > -#include <usb/dwc2_udc.h> > - > -static struct dwc2_plat_otg_data rk3128_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,rk3128-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,rk3128-usb"); > - } > - if (!matched) { > - debug("Not found usb_otg device\n"); > - return -ENODEV; > - } > - rk3128_otg_data.regs_otg = fdtdec_get_addr(blob, node, "reg"); > - > - return dwc2_udc_probe(&rk3128_otg_data); > -} > - > -int board_usb_cleanup(int index, enum usb_init_type init) > -{ > - return 0; > -} > -#endif > - > -#if defined(CONFIG_USB_FUNCTION_FASTBOOT) > -int fb_set_reboot_flag(void) > -{ > - struct rk3128_grf *grf; > - > - printf("Setting reboot to fastboot flag ...\n"); > - grf = syscon_get_first_range(ROCKCHIP_SYSCON_GRF); > - /* Set boot mode to fastboot */ > - writel(BOOT_FASTBOOT, &grf->os_reg[0]); > - > - return 0; > -} > -#endif >
diff --git a/arch/arm/mach-rockchip/rk3128-board.c b/arch/arm/mach-rockchip/rk3128-board.c deleted file mode 100644 index 2e8393d..0000000 --- a/arch/arm/mach-rockchip/rk3128-board.c +++ /dev/null @@ -1,127 +0,0 @@ -/* - * (C) Copyright 2017 Rockchip Electronics Co., Ltd. - * - * SPDX-License-Identifier: GPL-2.0+ - */ -#include <common.h> -#include <clk.h> -#include <dm.h> -#include <ram.h> -#include <syscon.h> -#include <asm/io.h> -#include <asm/arch/clock.h> -#include <asm/arch/periph.h> -#include <asm/arch/grf_rk3128.h> -#include <asm/arch/boot_mode.h> -#include <asm/arch/timer.h> -#include <power/regulator.h> - -DECLARE_GLOBAL_DATA_PTR; - -__weak int rk_board_late_init(void) -{ - return 0; -} - -int board_late_init(void) -{ - setup_boot_mode(); - - return rk_board_late_init(); -} - -int board_init(void) -{ - int ret = 0; - - rockchip_timer_init(); - - ret = regulators_enable_boot_on(false); - if (ret) { - debug("%s: Cannot enable boot on regulator\n", __func__); - return ret; - } - - return 0; -} - -int dram_init_banksize(void) -{ - gd->bd->bi_dram[0].start = CONFIG_SYS_SDRAM_BASE; - gd->bd->bi_dram[0].size = 0x8400000; - /* Reserve 0xe00000(14MB) for OPTEE with TA enabled, otherwise 2MB */ - gd->bd->bi_dram[1].start = CONFIG_SYS_SDRAM_BASE - + gd->bd->bi_dram[0].size + 0xe00000; - gd->bd->bi_dram[1].size = gd->bd->bi_dram[0].start - + gd->ram_size - gd->bd->bi_dram[1].start; - - return 0; -} - -#ifndef CONFIG_SYS_DCACHE_OFF -void enable_caches(void) -{ - /* Enable D-cache. I-cache is already enabled in start.S */ - dcache_enable(); -} -#endif - -#if defined(CONFIG_USB_GADGET) && defined(CONFIG_USB_GADGET_DWC2_OTG) -#include <usb.h> -#include <usb/dwc2_udc.h> - -static struct dwc2_plat_otg_data rk3128_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,rk3128-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,rk3128-usb"); - } - if (!matched) { - debug("Not found usb_otg device\n"); - return -ENODEV; - } - rk3128_otg_data.regs_otg = fdtdec_get_addr(blob, node, "reg"); - - return dwc2_udc_probe(&rk3128_otg_data); -} - -int board_usb_cleanup(int index, enum usb_init_type init) -{ - return 0; -} -#endif - -#if defined(CONFIG_USB_FUNCTION_FASTBOOT) -int fb_set_reboot_flag(void) -{ - struct rk3128_grf *grf; - - printf("Setting reboot to fastboot flag ...\n"); - grf = syscon_get_first_range(ROCKCHIP_SYSCON_GRF); - /* Set boot mode to fastboot */ - writel(BOOT_FASTBOOT, &grf->os_reg[0]); - - return 0; -} -#endif
remoe rk3128 board file and move SoC spec setting into rk3128.c Signed-off-by: Kever Yang <kever.yang@rock-chips.com> --- arch/arm/mach-rockchip/rk3128-board.c | 127 ---------------------------------- 1 file changed, 127 deletions(-) delete mode 100644 arch/arm/mach-rockchip/rk3128-board.c