diff options
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/dts/Makefile | 2 | ||||
| -rw-r--r-- | arch/arm/dts/rk3288-tinker.dts (renamed from arch/arm/dts/rk3288-miniarm.dts) | 6 | ||||
| -rw-r--r-- | arch/arm/dts/rk3288-tinker.dtsi (renamed from arch/arm/dts/rk3288-miniarm.dtsi) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-rockchip/rk3288-board.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-rockchip/rk3288/Kconfig | 10 |
5 files changed, 10 insertions, 10 deletions
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 2d75f64269..eb68c204bb 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -36,7 +36,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += \ rk3288-rock2-square.dtb \ rk3288-evb.dtb \ rk3288-fennec.dtb \ - rk3288-miniarm.dtb \ + rk3288-tinker.dtb \ rk3288-popmetal.dtb \ rk3399-evb.dtb dtb-$(CONFIG_ARCH_MESON) += \ diff --git a/arch/arm/dts/rk3288-miniarm.dts b/arch/arm/dts/rk3288-tinker.dts index 3dd40e6f0e..c0550970ea 100644 --- a/arch/arm/dts/rk3288-miniarm.dts +++ b/arch/arm/dts/rk3288-tinker.dts @@ -5,11 +5,11 @@ */ /dts-v1/; -#include "rk3288-miniarm.dtsi" +#include "rk3288-tinker.dtsi" / { - model = "Miniarm-RK3288"; - compatible = "rockchip,rk3288-miniarm", "rockchip,rk3288"; + model = "Tinker-RK3288"; + compatible = "rockchip,rk3288-tinker", "rockchip,rk3288"; chosen { stdout-path = &uart2; diff --git a/arch/arm/dts/rk3288-miniarm.dtsi b/arch/arm/dts/rk3288-tinker.dtsi index ceb4e2bdb1..ceb4e2bdb1 100644 --- a/arch/arm/dts/rk3288-miniarm.dtsi +++ b/arch/arm/dts/rk3288-tinker.dtsi diff --git a/arch/arm/mach-rockchip/rk3288-board.c b/arch/arm/mach-rockchip/rk3288-board.c index 8bf45f7fc7..9894a25e08 100644 --- a/arch/arm/mach-rockchip/rk3288-board.c +++ b/arch/arm/mach-rockchip/rk3288-board.c @@ -60,7 +60,7 @@ int rk3288_qos_init(void) writel(val, CPU_AXI_QOS_PRIORITY + VIO1_VOP_QOS); if (!fdt_node_check_compatible(gd->fdt_blob, 0, - "rockchip,rk3288-miniarm")) + "rockchip,rk3288-tinker")) { /* set isp qos to higher priority */ writel(val, CPU_AXI_QOS_PRIORITY + VIO1_ISP_R_QOS); diff --git a/arch/arm/mach-rockchip/rk3288/Kconfig b/arch/arm/mach-rockchip/rk3288/Kconfig index 35d8dbfc7e..738a20d07c 100644 --- a/arch/arm/mach-rockchip/rk3288/Kconfig +++ b/arch/arm/mach-rockchip/rk3288/Kconfig @@ -37,11 +37,11 @@ config TARGET_POPMETAL_RK3288 2GB DDR3. Expansion connectors provide access to I2C, SPI, UART, GPIOs and display interface. -config TARGET_MINIARM_RK3288 - bool "miniarm-RK3288" - select BOARD_LATE_INIT +config TARGET_TINKER_RK3288 + bool "Tinker-RK3288" + select BOARD_LATE_INIT help - Miniarm is a RK3288-based development board with 2 USB ports, HDMI, + Tinker is a RK3288-based development board with 2 USB ports, HDMI, micro-SD card, audio, Gigabit Ethernet. It also includes on-board 8GB eMMC and 2GB of SDRAM. Expansion connectors provide access to I2C, SPI, UART, GPIOs. @@ -124,6 +124,6 @@ source "board/rockchip/evb_rk3288/Kconfig" source "board/rockchip/fennec_rk3288/Kconfig" -source "board/rockchip/miniarm_rk3288/Kconfig" +source "board/rockchip/tinker_rk3288/Kconfig" endif |