diff options
author | Tom Rini <trini@konsulko.com> | 2017-02-11 10:38:21 -0500 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2017-02-11 10:38:21 -0500 |
commit | b16f6804b4378c6d2f6b05ece0d3ae1c36ac4308 (patch) | |
tree | 741f5604aeb9edc636cdf36f62bed3d83e004f08 /arch/arm | |
parent | f1cc97764be4383d2aeb56d5ba5415439a1d5c97 (diff) | |
parent | 6f2797645562e85c407aab3e9a757bfd61a027fe (diff) | |
download | u-boot-imx-b16f6804b4378c6d2f6b05ece0d3ae1c36ac4308.zip u-boot-imx-b16f6804b4378c6d2f6b05ece0d3ae1c36ac4308.tar.gz u-boot-imx-b16f6804b4378c6d2f6b05ece0d3ae1c36ac4308.tar.bz2 |
Merge git://git.denx.de/u-boot-rockchip
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/dts/Makefile | 2 | ||||
-rw-r--r-- | arch/arm/dts/rk3288-miniarm.dts | 58 | ||||
-rw-r--r-- | arch/arm/dts/rk3288-tinker.dts | 58 | ||||
-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 |
6 files changed, 65 insertions, 65 deletions
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 2d75f64..eb68c20 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-miniarm.dts deleted file mode 100644 index 9083028..0000000 --- a/arch/arm/dts/rk3288-miniarm.dts +++ /dev/null @@ -1,58 +0,0 @@ -/* - * (C) Copyright 2016 Rockchip Electronics Co., Ltd - * - * SPDX-License-Identifier: GPL-2.0+ X11 - */ - -/dts-v1/; -#include "rk3288-miniarm.dtsi" - -/ { - model = "Miniarm-RK3288"; - compatible = "rockchip,rk3288-miniarm", "rockchip,rk3288"; - - chosen { - stdout-path = &uart2; - }; -}; - -&dmc { - rockchip,pctl-timing = <0x29a 0xc8 0x1f8 0x42 0x4e 0x4 0xea 0xa - 0x5 0x0 0xa 0x7 0x19 0x24 0xa 0x7 - 0x5 0xa 0x5 0x200 0x5 0x10 0x40 0x0 - 0x1 0x7 0x7 0x4 0xc 0x43 0x100 0x0 - 0x5 0x0>; - rockchip,phy-timing = <0x48f9aab4 0xea0910 0x1002c200 - 0xa60 0x40 0x10 0x0>; - rockchip,sdram-params = <0x30B25564 0x627 3 666000000 3 9 1>; -}; - - -&pinctrl { - u-boot,dm-pre-reloc; -}; - -&pwm1 { - status = "okay"; -}; - -&uart2 { - u-boot,dm-pre-reloc; - reg-shift = <2>; -}; - -&sdmmc { - u-boot,dm-pre-reloc; -}; - -&emmc { - u-boot,dm-pre-reloc; -}; - -&gpio3 { - u-boot,dm-pre-reloc; -}; - -&gpio8 { - u-boot,dm-pre-reloc; -}; diff --git a/arch/arm/dts/rk3288-tinker.dts b/arch/arm/dts/rk3288-tinker.dts new file mode 100644 index 0000000..c055097 --- /dev/null +++ b/arch/arm/dts/rk3288-tinker.dts @@ -0,0 +1,58 @@ +/* + * (C) Copyright 2016 Rockchip Electronics Co., Ltd + * + * SPDX-License-Identifier: GPL-2.0+ X11 + */ + +/dts-v1/; +#include "rk3288-tinker.dtsi" + +/ { + model = "Tinker-RK3288"; + compatible = "rockchip,rk3288-tinker", "rockchip,rk3288"; + + chosen { + stdout-path = &uart2; + }; +}; + +&dmc { + rockchip,pctl-timing = <0x215 0xc8 0x0 0x35 0x26 0x2 0x70 0x2000d + 0x6 0x0 0x8 0x4 0x17 0x24 0xd 0x6 + 0x4 0x8 0x4 0x76 0x4 0x0 0x30 0x0 + 0x1 0x2 0x2 0x4 0x0 0x0 0xc0 0x4 + 0x8 0x1f4>; + rockchip,phy-timing = <0x48d7dd93 0x187008d8 0x121076 + 0x0 0xc3 0x6 0x2>; + rockchip,sdram-params = <0x20d266a4 0x5b6 2 533000000 6 9 0>; +}; + + +&pinctrl { + u-boot,dm-pre-reloc; +}; + +&pwm1 { + status = "okay"; +}; + +&uart2 { + u-boot,dm-pre-reloc; + reg-shift = <2>; +}; + +&sdmmc { + u-boot,dm-pre-reloc; +}; + +&emmc { + u-boot,dm-pre-reloc; +}; + +&gpio3 { + u-boot,dm-pre-reloc; +}; + +&gpio8 { + u-boot,dm-pre-reloc; +}; diff --git a/arch/arm/dts/rk3288-miniarm.dtsi b/arch/arm/dts/rk3288-tinker.dtsi index ceb4e2b..ceb4e2b 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 8bf45f7..9894a25 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 35d8dbf..738a20d 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 |