Skip to contentSkip to conversation

Add Tinker Board support

PATCH New Eddie Cai 3 participants 7 messages Jan 18, 2017 – Feb 8, 2017

Subsystems (3)
Arm (32-bit) Arm sub-architectures Arm Rockchip
lore
Share & tools
lore

Eddie Cai

author
#0 lore raw

cover Add Tinker Board support

This patch set add support for Asus Tinker board.

Eddie Cai (2):
rockchip: rename miniarm to tinker board
dts: rk3288: change the dmc configuration to LPDDR3

 arch/arm/dts/Makefile                              |  2 +-
 arch/arm/dts/rk3288-miniarm.dts                    | 58 ----------------------
 arch/arm/dts/rk3288-tinker.dts                     | 57 +++++++++++++++++++++
 .../{rk3288-miniarm.dtsi => rk3288-tinker.dtsi}    |  0
 arch/arm/mach-rockchip/rk3288-board.c              |  2 +-
 arch/arm/mach-rockchip/rk3288/Kconfig              |  8 +--
 board/rockchip/miniarm_rk3288/MAINTAINERS          |  6 ---
 .../{miniarm_rk3288 => tinker_rk3288}/Kconfig      |  6 +--
 board/rockchip/tinker_rk3288/MAINTAINERS           |  6 +++
 .../{miniarm_rk3288 => tinker_rk3288}/Makefile     |  2 +-
 .../tinker-rk3288.c}                               |  0
 ...rm-rk3288_defconfig => tinker-rk3288_defconfig} |  4 +-
 doc/README.rockchip                                |  2 +-
 .../configs/{miniarm_rk3288.h => tinker_rk3288.h}  |  0
 14 files changed, 76 insertions(+), 77 deletions(-)
 delete mode 100644 arch/arm/dts/rk3288-miniarm.dts
 create mode 100644 arch/arm/dts/rk3288-tinker.dts
 rename arch/arm/dts/{rk3288-miniarm.dtsi => rk3288-tinker.dtsi} (100%)
 delete mode 100644 board/rockchip/miniarm_rk3288/MAINTAINERS
 rename board/rockchip/{miniarm_rk3288 => tinker_rk3288}/Kconfig (64%)
 create mode 100644 board/rockchip/tinker_rk3288/MAINTAINERS
 rename board/rockchip/{miniarm_rk3288 => tinker_rk3288}/Makefile (79%)
 rename board/rockchip/{miniarm_rk3288/miniarm-rk3288.c => tinker_rk3288/tinker-rk3288.c} (100%)
 rename configs/{miniarm-rk3288_defconfig => tinker-rk3288_defconfig} (95%)
 rename include/configs/{miniarm_rk3288.h => tinker_rk3288.h} (100%)
Signature · 1 line
2.7.4
author
#1 lore raw

PATCH 1/2 rockchip: rename miniarm to tinker board

Miniarm is the internal project code. Now it is officially named Tinker board. So rename it.

Signed-off-by Eddie Cai <[email protected]>
---
 arch/arm/dts/Makefile                                             | 2 +-
 arch/arm/dts/{rk3288-miniarm.dts => rk3288-tinker.dts}            | 6 +++---
 arch/arm/dts/{rk3288-miniarm.dtsi => rk3288-tinker.dtsi}          | 0
 arch/arm/mach-rockchip/rk3288-board.c                             | 2 +-
 arch/arm/mach-rockchip/rk3288/Kconfig                             | 8 ++++----
 board/rockchip/miniarm_rk3288/MAINTAINERS                         | 6 ------
 board/rockchip/{miniarm_rk3288 => tinker_rk3288}/Kconfig          | 6 +++---
 board/rockchip/tinker_rk3288/MAINTAINERS                          | 6 ++++++
 board/rockchip/{miniarm_rk3288 => tinker_rk3288}/Makefile         | 2 +-
 .../miniarm-rk3288.c => tinker_rk3288/tinker-rk3288.c}            | 0
 configs/{miniarm-rk3288_defconfig => tinker-rk3288_defconfig}     | 4 ++--
 doc/README.rockchip                                               | 2 +-
 include/configs/{miniarm_rk3288.h => tinker_rk3288.h}             | 0
 13 files changed, 22 insertions(+), 22 deletions(-)
 rename arch/arm/dts/{rk3288-miniarm.dts => rk3288-tinker.dts} (86%)
 rename arch/arm/dts/{rk3288-miniarm.dtsi => rk3288-tinker.dtsi} (100%)
 delete mode 100644 board/rockchip/miniarm_rk3288/MAINTAINERS
 rename board/rockchip/{miniarm_rk3288 => tinker_rk3288}/Kconfig (64%)
 create mode 100644 board/rockchip/tinker_rk3288/MAINTAINERS
 rename board/rockchip/{miniarm_rk3288 => tinker_rk3288}/Makefile (79%)
 rename board/rockchip/{miniarm_rk3288/miniarm-rk3288.c => tinker_rk3288/tinker-rk3288.c} (100%)
 rename configs/{miniarm-rk3288_defconfig => tinker-rk3288_defconfig} (95%)
 rename include/configs/{miniarm_rk3288.h => tinker_rk3288.h} (100%)
arch/arm/dts/Makefile +1 -1
index 66ea0b3..b117b51 100644
@@ -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) += \
arch/arm/dts/rk3288-tinker.dts renamed from arch/arm/dts/rk3288-miniarm.dts +3 -3
similarity index 86%
rename from arch/arm/dts/rk3288-miniarm.dts
rename to arch/arm/dts/rk3288-tinker.dts
index 9083028..4dacc76 100644
@@ -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;
arch/arm/dts/rk3288-tinker.dtsi renamed from arch/arm/dts/rk3288-miniarm.dtsi +0 -0
similarity index 100%
rename from arch/arm/dts/rk3288-miniarm.dtsi
rename to arch/arm/dts/rk3288-tinker.dtsi
arch/arm/mach-rockchip/rk3288-board.c +1 -1
index 8bf45f7..9894a25 100644
@@ -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);
arch/arm/mach-rockchip/rk3288/Kconfig +4 -4
index 54545f3..c94df4e 100644
@@ -33,10 +33,10 @@ 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"
+config TARGET_TINKER_RK3288
+	bool "Tinker-RK3288"
 	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.

@@ -115,6 +115,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
board/rockchip/miniarm_rk3288/MAINTAINERS deleted +0 -6
deleted file mode 100644
index 7537b8f..0000000
@@ -1,6 +0,0 @@
-MINIARM-RK3288
-M:	Lin Huang <[email protected]>
-S:	Maintained
-F:	board/rockchip/miniarm_rk3288
-F:	include/configs/miniarm_rk3288.h
-F:	configs/miniarm-rk3288_defconfig
board/rockchip/tinker_rk3288/Kconfig renamed from board/rockchip/miniarm_rk3288/Kconfig +3 -3
similarity index 64%
rename from board/rockchip/miniarm_rk3288/Kconfig
rename to board/rockchip/tinker_rk3288/Kconfig
index 529c09f..bca6c37 100644
@@ -1,13 +1,13 @@
-if TARGET_MINIARM_RK3288
+if TARGET_TINKER_RK3288
 
 config SYS_BOARD
-	default "miniarm_rk3288"
+	default "tinker_rk3288"
 
 config SYS_VENDOR
 	default "rockchip"
 
 config SYS_CONFIG_NAME
-	default "miniarm_rk3288"
+	default "tinker_rk3288"
 
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
board/rockchip/tinker_rk3288/MAINTAINERS new file +6 -0
new file mode 100644
index 0000000..cddceaf
@@ -0,0 +1,6 @@
+TINKER-RK3288
+M:	Lin Huang <[email protected]>
+S:	Maintained
+F:	board/rockchip/tinker_rk3288
+F:	include/configs/tinker_rk3288.h
+F:	configs/tinker-rk3288_defconfig
board/rockchip/tinker_rk3288/Makefile renamed from board/rockchip/miniarm_rk3288/Makefile +1 -1
similarity index 79%
rename from board/rockchip/miniarm_rk3288/Makefile
rename to board/rockchip/tinker_rk3288/Makefile
index 9419b91..432367f 100644
@@ -4,4 +4,4 @@
 # SPDX-License-Identifier:     GPL-2.0+
 #
 
-obj-y	+= miniarm-rk3288.o
+obj-y	+= tinker-rk3288.o
board/rockchip/tinker_rk3288/tinker-rk3288.c renamed from board/rockchip/miniarm_rk3288/miniarm-rk3288.c +0 -0
similarity index 100%
rename from board/rockchip/miniarm_rk3288/miniarm-rk3288.c
rename to board/rockchip/tinker_rk3288/tinker-rk3288.c
configs/tinker-rk3288_defconfig renamed from configs/miniarm-rk3288_defconfig +2 -2
similarity index 95%
rename from configs/miniarm-rk3288_defconfig
rename to configs/tinker-rk3288_defconfig
index 2b6bd0b..bf7fec8 100644
@@ -3,9 +3,9 @@ CONFIG_ARCH_ROCKCHIP=y
 CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_ROCKCHIP_RK3288=y
 CONFIG_ROCKCHIP_SPL_BACK_TO_BROM=y
-CONFIG_TARGET_MINIARM_RK3288=y
+CONFIG_TARGET_TINKER_RK3288=y
 CONFIG_SPL_STACK_R_ADDR=0x80000
-CONFIG_DEFAULT_DEVICE_TREE="rk3288-miniarm"
+CONFIG_DEFAULT_DEVICE_TREE="rk3288-tinker"
 CONFIG_SILENT_CONSOLE=y
 CONFIG_CONSOLE_MUX=y
 # CONFIG_DISPLAY_CPUINFO is not set
doc/README.rockchip +1 -1
index 43cafc7..186a1a0 100644
@@ -42,7 +42,7 @@ At present seven RK3288 boards are supported:
    - Fennec RK3288 - use fennec-rk3288 configuration
    - Firefly RK3288 - use firefly-rk3288 configuration
    - Hisense Chromebook - use chromebook_jerry configuration
-   - Miniarm RK3288 - use miniarm-rk3288 configuration
+   - Tinker RK3288 - use tinker-rk3288 configuration
    - PopMetal RK3288 - use popmetal-rk3288 configuration
    - Radxa Rock 2 - use rock2 configuration
include/configs/tinker_rk3288.h renamed from include/configs/miniarm_rk3288.h +0 -0
similarity index 100%
rename from include/configs/miniarm_rk3288.h
rename to include/configs/tinker_rk3288.h
Signature · 1 line
2.7.4
#2 lore raw

PATCH 1/2 rockchip: rename miniarm to tinker board

Quoted 20 lines · Eddie Cai

Miniarm is the internal project code. Now it is officially named Tinker board. So rename it.

Signed-off-by Eddie Cai <[email protected]>
---
 arch/arm/dts/Makefile                                             | 2 +-
 arch/arm/dts/{rk3288-miniarm.dts => rk3288-tinker.dts}            | 6 +++---
 arch/arm/dts/{rk3288-miniarm.dtsi => rk3288-tinker.dtsi}          | 0
 arch/arm/mach-rockchip/rk3288-board.c                             | 2 +-
 arch/arm/mach-rockchip/rk3288/Kconfig                             | 8 ++++----
 board/rockchip/miniarm_rk3288/MAINTAINERS                         | 6 ------
 board/rockchip/{miniarm_rk3288 => tinker_rk3288}/Kconfig          | 6 +++---
 board/rockchip/tinker_rk3288/MAINTAINERS                          | 6 ++++++
 board/rockchip/{miniarm_rk3288 => tinker_rk3288}/Makefile         | 2 +-
 .../miniarm-rk3288.c => tinker_rk3288/tinker-rk3288.c}            | 0
 configs/{miniarm-rk3288_defconfig => tinker-rk3288_defconfig}     | 4 ++--
 doc/README.rockchip                                               | 2 +-
 include/configs/{miniarm_rk3288.h => tinker_rk3288.h}             | 0
 13 files changed, 22 insertions(+), 22 deletions(-)
 rename arch/arm/dts/{rk3288-miniarm.dts => rk3288-tinker.dts} (86%)
Quoted 8 lines
 rename arch/arm/dts/{rk3288-miniarm.dtsi => rk3288-tinker.dtsi} (100%)
 delete mode 100644 board/rockchip/miniarm_rk3288/MAINTAINERS
 rename board/rockchip/{miniarm_rk3288 => tinker_rk3288}/Kconfig (64%)
 create mode 100644 board/rockchip/tinker_rk3288/MAINTAINERS
 rename board/rockchip/{miniarm_rk3288 => tinker_rk3288}/Makefile (79%)
 rename board/rockchip/{miniarm_rk3288/miniarm-rk3288.c => tinker_rk3288/tinker-rk3288.c} (100%)
 rename configs/{miniarm-rk3288_defconfig => tinker-rk3288_defconfig} (95%)
 rename include/configs/{miniarm_rk3288.h => tinker_rk3288.h} (100%)
Reviewed-by Simon Glass <[email protected]>
author
#3 lore raw

PATCH 2/2 dts: rk3288: change the dmc configuration to LPDDR3

In reply to Eddie Cai

The final version of Tinker board is using two channel LPDDR3. So modify dmc configuration to meet it.

Signed-off-by Eddie Cai <[email protected]>
---
 arch/arm/dts/rk3288-tinker.dts | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)
arch/arm/dts/rk3288-tinker.dts +8 -9
index 4dacc76..090c100 100644
@@ -17,17 +17,16 @@
 };
 
 &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>;
+	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;
 };
Signature · 1 line
2.7.4
#4 lore raw

PATCH 2/2 dts: rk3288: change the dmc configuration to LPDDR3

Hi Eddie,

This patch is no need. Jacob Chen has already send patch to update
the sdram params
for rk3288 miniarm, and that patch has acked by Simon.

Thanks,
- Kever

Quoted 38 lines · Eddie Cai

The final version of Tinker board is using two channel LPDDR3. So modify dmc configuration to meet it.

Signed-off-by Eddie Cai <[email protected]>
---
  arch/arm/dts/rk3288-tinker.dts | 17 ++++++++---------
  1 file changed, 8 insertions(+), 9 deletions(-)
arch/arm/dts/rk3288-tinker.dts +8 -9
index 4dacc76..090c100 100644
@@ -17,17 +17,16 @@
  };
 
  &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>;
+	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;
  };
author
#5 lore raw

PATCH 2/2 dts: rk3288: change the dmc configuration to LPDDR3

Thanks Kever
Hi Simon

I did some search and found you acked the Jacob's patch, see [0]. But didn't apply it. Did you lost this patch?

[0]https://patchwork.ozlabs.org/patch/694820/

2017-01-18 11:43 GMT+08:00 Kever Yang <[email protected]>:

Quoted 52 lines

Hi Eddie,

This patch is no need. Jacob Chen has already send patch to update the
sdram params
for rk3288 miniarm, and that patch has acked by Simon.

Thanks,
- Kever

Quoted 38 lines · Eddie Cai

The final version of Tinker board is using two channel LPDDR3. So modify dmc configuration to meet it.

Signed-off-by Eddie Cai <[email protected]>
---
  arch/arm/dts/rk3288-tinker.dts | 17 ++++++++---------
  1 file changed, 8 insertions(+), 9 deletions(-)
arch/arm/dts/rk3288-tinker.dts +8 -8
index 4dacc76..090c100 100644
@@ -17,17 +17,16 @@
  };
    &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>;
+       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;
  };
#6 lore raw

PATCH 2/2 dts: rk3288: change the dmc configuration to LPDDR3

Hi Eddie,

Quoted 7 lines · Eddie Cai

Thanks Kever
Hi Simon

I did some search and found you acked the Jacob's patch, see [0]. But didn't apply it. Did you lost this patch?

[0]https://patchwork.ozlabs.org/patch/694820/

Yes I did - will reply on that thread.

Regards,
Simon