rockchip: dts: tinker: Add tinker-s board support

Support tinker-s board. The board is equivalent of tinker board except of emmc. TODO: - support of usb current burst when the board is powered from pc Signed-off-by: Michael Trimarchi <michael@amarulasolutions.com> Reviewed-by: Kever Yang <kever.yang@rock-chips.com>

rockchip: dts: tinker: Add tinker-s board support
Support tinker-s board. The board is equivalent of tinker board except of emmc. TODO: - support of usb current burst when the board is powered from pc Signed-off-by: Michael Trimarchi <michael@amarulasolutions.com> Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
Michael Trimarchi · Kever Yang
1 parent b40abe3369
Showing 7 changed files with 183 additions and 0 deletions Side-by-side Diff
arch/arm/dts/Makefile
arch/arm/dts/rk3288-tinker-s-u-boot.dtsi
arch/arm/dts/rk3288-tinker-s.dts
board/rockchip/tinker_rk3288/MAINTAINERS
board/rockchip/tinker_rk3288/tinker-rk3288.c
configs/tinker-s-rk3288_defconfig
include/configs/tinker_rk3288.h
@@ -90,6 +90,7 @@
 	rk3288-popmetal.dtb \
 	rk3288-rock2-square.dtb \
 	rk3288-tinker.dtb \
+	rk3288-tinker-s.dtb \
 	rk3288-veyron-jerry.dtb \
 	rk3288-veyron-mickey.dtb \
 	rk3288-veyron-minnie.dtb \
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (C) 2019 Amarula Solutions SRO
+ */
+
+#include "rk3288-u-boot.dtsi"
+#include "rk3288-tinker-u-boot.dtsi"
+
+/ {
+	chosen {
+		u-boot,spl-boot-order = \
+			"same-as-spl", &sdmmc, &emmc;
+	};
+};
+
+&emmc {
+	u-boot,dm-spl;
+};
+
+&emmc_clk {
+	u-boot,dm-spl;
+};
+
+&emmc_cmd {
+	u-boot,dm-spl;
+};
+
+&emmc_pwr {
+	u-boot,dm-spl;
+};
+
+&emmc_bus8 {
+	u-boot,dm-spl;
+};
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2017 Fuzhou Rockchip Electronics Co., Ltd.
+ */
+
+/dts-v1/;
+
+#include "rk3288-tinker.dtsi"
+
+/ {
+	model = "Rockchip RK3288 Asus Tinker Board S";
+	compatible = "asus,rk3288-tinker-s", "rockchip,rk3288";
+
+	chosen {
+		stdout-path = &uart2;
+	};
+};
+
+&emmc {
+	bus-width = <8>;
+	cap-mmc-highspeed;
+	non-removable;
+	pinctrl-names = "default";
+	pinctrl-0 = <&emmc_clk &emmc_cmd &emmc_pwr &emmc_bus8>;
+	max-frequency = <150000000>;
+	mmc-hs200-1_8v;
+	mmc-ddr-1_8v;
+	status = "okay";
+};
@@ -4,4 +4,11 @@
 F:	board/rockchip/tinker_rk3288
 F:	include/configs/tinker_rk3288.h
 F:	configs/tinker-rk3288_defconfig
+
+TINKER-S-RK3288
+M:	Michael Trimarchi <michael@amarulasolutions.com>
+S:	Maintained
+F:	board/rockchip/tinker_rk3288
+F:	include/configs/tinker_rk3288.h
+F:	configs/tinker-s-rk3288_defconfig
@@ -8,6 +8,8 @@
 #include <env.h>
 #include <i2c_eeprom.h>
 #include <netdev.h>
+#include <asm/arch-rockchip/bootrom.h>
+#include <asm/io.h>
  
 static int get_ethaddr_from_eeprom(u8 *addr)
 {
@@ -32,5 +34,15 @@
 		eth_env_set_enetaddr("ethaddr", ethaddr);
  
 	return 0;
+}
+
+int mmc_get_env_dev(void)
+{
+	u32 bootdevice_brom_id = readl(BROM_BOOTSOURCE_ID_ADDR);
+
+	if (bootdevice_brom_id == BROM_BOOTSOURCE_EMMC)
+		return 0;
+
+	return 1;
 }
+CONFIG_ARM=y
+CONFIG_ARCH_ROCKCHIP=y
+CONFIG_SYS_TEXT_BASE=0x01000000
+CONFIG_SPL_GPIO_SUPPORT=y
+CONFIG_ROCKCHIP_RK3288=y
+CONFIG_TARGET_TINKER_RK3288=y
+CONFIG_NR_DRAM_BANKS=1
+CONFIG_SPL_SIZE_LIMIT=307200
+CONFIG_SPL_STACK_R_ADDR=0x800000
+CONFIG_DEBUG_UART_BASE=0xff690000
+CONFIG_DEBUG_UART_CLOCK=24000000
+CONFIG_DEBUG_UART=y
+CONFIG_TPL_SYS_MALLOC_F_LEN=0x4000
+CONFIG_SPL_SYS_MALLOC_F_LEN=0x4000
+CONFIG_SYS_MALLOC_F_LEN=0x4000
+# CONFIG_ANDROID_BOOT_IMAGE is not set
+CONFIG_USE_PREBOOT=y
+CONFIG_SILENT_CONSOLE=y
+CONFIG_CONSOLE_MUX=y
+CONFIG_DEFAULT_FDT_FILE="rk3288-tinker-s.dtb"
+# CONFIG_DISPLAY_CPUINFO is not set
+CONFIG_DISPLAY_BOARDINFO_LATE=y
+CONFIG_SPL_STACK_R=y
+CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x300000
+CONFIG_SPL_I2C_SUPPORT=y
+CONFIG_SPL_POWER_SUPPORT=y
+CONFIG_CMD_GPIO=y
+CONFIG_CMD_GPT=y
+CONFIG_CMD_I2C=y
+CONFIG_CMD_MMC=y
+CONFIG_CMD_SF=y
+CONFIG_CMD_SPI=y
+CONFIG_CMD_USB=y
+CONFIG_CMD_USB_MASS_STORAGE=y
+# CONFIG_CMD_SETEXPR is not set
+CONFIG_CMD_BMP=y
+CONFIG_CMD_CACHE=y
+CONFIG_CMD_TIME=y
+CONFIG_CMD_PMIC=y
+CONFIG_CMD_REGULATOR=y
+# CONFIG_SPL_DOS_PARTITION is not set
+# CONFIG_SPL_EFI_PARTITION is not set
+CONFIG_SPL_PARTITION_UUIDS=y
+CONFIG_SPL_OF_CONTROL=y
+CONFIG_DEFAULT_DEVICE_TREE="rk3288-tinker-s"
+CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
+CONFIG_ENV_IS_IN_MMC=y
+CONFIG_REGMAP=y
+CONFIG_SPL_REGMAP=y
+CONFIG_SYSCON=y
+CONFIG_SPL_SYSCON=y
+# CONFIG_SPL_SIMPLE_BUS is not set
+CONFIG_CLK=y
+CONFIG_SPL_CLK=y
+CONFIG_FASTBOOT_FLASH=y
+CONFIG_FASTBOOT_FLASH_MMC_DEV=0
+CONFIG_FASTBOOT_CMD_OEM_FORMAT=y
+CONFIG_ROCKCHIP_GPIO=y
+CONFIG_SYS_I2C_ROCKCHIP=y
+CONFIG_MISC=y
+CONFIG_I2C_EEPROM=y
+CONFIG_MMC_DW=y
+CONFIG_MMC_DW_ROCKCHIP=y
+CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_SPEED=20000000
+CONFIG_DM_ETH=y
+CONFIG_ETH_DESIGNWARE=y
+CONFIG_GMAC_ROCKCHIP=y
+CONFIG_PINCTRL=y
+CONFIG_SPL_PINCTRL=y
+CONFIG_DM_PMIC=y
+CONFIG_PMIC_RK8XX=y
+CONFIG_SPL_DM_REGULATOR=y
+CONFIG_DM_REGULATOR_FIXED=y
+CONFIG_SPL_DM_REGULATOR_FIXED=y
+CONFIG_REGULATOR_RK8XX=y
+CONFIG_PWM_ROCKCHIP=y
+CONFIG_RAM=y
+CONFIG_SPL_RAM=y
+CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYSRESET=y
+CONFIG_USB=y
+CONFIG_USB_DWC2=y
+CONFIG_ROCKCHIP_USB2_PHY=y
+CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Rockchip"
+CONFIG_USB_GADGET_VENDOR_NUM=0x2207
+CONFIG_USB_GADGET_PRODUCT_NUM=0x320a
+CONFIG_USB_GADGET_DWC2_OTG=y
+CONFIG_USB_HOST_ETHER=y
+CONFIG_USB_ETHER_ASIX=y
+CONFIG_USB_ETHER_SMSC95XX=y
+CONFIG_CMD_DHRYSTONE=y
+CONFIG_ERRNO_STR=y
+CONFIG_DM_VIDEO=y
+CONFIG_DISPLAY=y
+CONFIG_VIDEO_ROCKCHIP=y
+CONFIG_DISPLAY_ROCKCHIP_HDMI=y
+CONFIG_CONSOLE_SCROLL_LINES=10
@@ -12,6 +12,7 @@
 #undef BOOT_TARGET_DEVICES
  
 #define BOOT_TARGET_DEVICES(func) \
+	func(MMC, mmc, 0) \
 	func(MMC, mmc, 1) \
 	func(USB, usb, 0) \
 	func(PXE, pxe, na) \
...	...	@@ -90,6 +90,7 @@
90	90	rk3288-popmetal.dtb \
91	91	rk3288-rock2-square.dtb \
92	92	rk3288-tinker.dtb \
	93	+ rk3288-tinker-s.dtb \
93	94	rk3288-veyron-jerry.dtb \
94	95	rk3288-veyron-mickey.dtb \
95	96	rk3288-veyron-minnie.dtb \
	1	+// SPDX-License-Identifier: GPL-2.0+
	2	+/*
	3	+ * Copyright (C) 2019 Amarula Solutions SRO
	4	+ */
	5	+
	6	+#include "rk3288-u-boot.dtsi"
	7	+#include "rk3288-tinker-u-boot.dtsi"
	8	+
	9	+/ {
	10	+ chosen {
	11	+ u-boot,spl-boot-order = \
	12	+ "same-as-spl", &sdmmc, &emmc;
	13	+ };
	14	+};
	15	+
	16	+&emmc {
	17	+ u-boot,dm-spl;
	18	+};
	19	+
	20	+&emmc_clk {
	21	+ u-boot,dm-spl;
	22	+};
	23	+
	24	+&emmc_cmd {
	25	+ u-boot,dm-spl;
	26	+};
	27	+
	28	+&emmc_pwr {
	29	+ u-boot,dm-spl;
	30	+};
	31	+
	32	+&emmc_bus8 {
	33	+ u-boot,dm-spl;
	34	+};
	1	+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
	2	+/*
	3	+ * Copyright (c) 2017 Fuzhou Rockchip Electronics Co., Ltd.
	4	+ */
	5	+
	6	+/dts-v1/;
	7	+
	8	+#include "rk3288-tinker.dtsi"
	9	+
	10	+/ {
	11	+ model = "Rockchip RK3288 Asus Tinker Board S";
	12	+ compatible = "asus,rk3288-tinker-s", "rockchip,rk3288";
	13	+
	14	+ chosen {
	15	+ stdout-path = &uart2;
	16	+ };
	17	+};
	18	+
	19	+&emmc {
	20	+ bus-width = <8>;
	21	+ cap-mmc-highspeed;
	22	+ non-removable;
	23	+ pinctrl-names = "default";
	24	+ pinctrl-0 = <&emmc_clk &emmc_cmd &emmc_pwr &emmc_bus8>;
	25	+ max-frequency = <150000000>;
	26	+ mmc-hs200-1_8v;
	27	+ mmc-ddr-1_8v;
	28	+ status = "okay";
	29	+};
...	...	@@ -4,4 +4,11 @@
4	4	F: board/rockchip/tinker_rk3288
5	5	F: include/configs/tinker_rk3288.h
6	6	F: configs/tinker-rk3288_defconfig
	7	+
	8	+TINKER-S-RK3288
	9	+M: Michael Trimarchi <michael@amarulasolutions.com>
	10	+S: Maintained
	11	+F: board/rockchip/tinker_rk3288
	12	+F: include/configs/tinker_rk3288.h
	13	+F: configs/tinker-s-rk3288_defconfig
...	...	@@ -8,6 +8,8 @@
8	8	#include <env.h>
9	9	#include <i2c_eeprom.h>
10	10	#include <netdev.h>
	11	+#include <asm/arch-rockchip/bootrom.h>
	12	+#include <asm/io.h>
11	13
12	14	static int get_ethaddr_from_eeprom(u8 *addr)
13	15	{
...	...	@@ -32,5 +34,15 @@
32	34	eth_env_set_enetaddr("ethaddr", ethaddr);
33	35
34	36	return 0;
	37	+}
	38	+
	39	+int mmc_get_env_dev(void)
	40	+{
	41	+ u32 bootdevice_brom_id = readl(BROM_BOOTSOURCE_ID_ADDR);
	42	+
	43	+ if (bootdevice_brom_id == BROM_BOOTSOURCE_EMMC)
	44	+ return 0;
	45	+
	46	+ return 1;
35	47	}
	1	+CONFIG_ARM=y
	2	+CONFIG_ARCH_ROCKCHIP=y
	3	+CONFIG_SYS_TEXT_BASE=0x01000000
	4	+CONFIG_SPL_GPIO_SUPPORT=y
	5	+CONFIG_ROCKCHIP_RK3288=y
	6	+CONFIG_TARGET_TINKER_RK3288=y
	7	+CONFIG_NR_DRAM_BANKS=1
	8	+CONFIG_SPL_SIZE_LIMIT=307200
	9	+CONFIG_SPL_STACK_R_ADDR=0x800000
	10	+CONFIG_DEBUG_UART_BASE=0xff690000
	11	+CONFIG_DEBUG_UART_CLOCK=24000000
	12	+CONFIG_DEBUG_UART=y
	13	+CONFIG_TPL_SYS_MALLOC_F_LEN=0x4000
	14	+CONFIG_SPL_SYS_MALLOC_F_LEN=0x4000
	15	+CONFIG_SYS_MALLOC_F_LEN=0x4000
	16	+# CONFIG_ANDROID_BOOT_IMAGE is not set
	17	+CONFIG_USE_PREBOOT=y
	18	+CONFIG_SILENT_CONSOLE=y
	19	+CONFIG_CONSOLE_MUX=y
	20	+CONFIG_DEFAULT_FDT_FILE="rk3288-tinker-s.dtb"
	21	+# CONFIG_DISPLAY_CPUINFO is not set
	22	+CONFIG_DISPLAY_BOARDINFO_LATE=y
	23	+CONFIG_SPL_STACK_R=y
	24	+CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x300000
	25	+CONFIG_SPL_I2C_SUPPORT=y
	26	+CONFIG_SPL_POWER_SUPPORT=y
	27	+CONFIG_CMD_GPIO=y
	28	+CONFIG_CMD_GPT=y
	29	+CONFIG_CMD_I2C=y
	30	+CONFIG_CMD_MMC=y
	31	+CONFIG_CMD_SF=y
	32	+CONFIG_CMD_SPI=y
	33	+CONFIG_CMD_USB=y
	34	+CONFIG_CMD_USB_MASS_STORAGE=y
	35	+# CONFIG_CMD_SETEXPR is not set
	36	+CONFIG_CMD_BMP=y
	37	+CONFIG_CMD_CACHE=y
	38	+CONFIG_CMD_TIME=y
	39	+CONFIG_CMD_PMIC=y
	40	+CONFIG_CMD_REGULATOR=y
	41	+# CONFIG_SPL_DOS_PARTITION is not set
	42	+# CONFIG_SPL_EFI_PARTITION is not set
	43	+CONFIG_SPL_PARTITION_UUIDS=y
	44	+CONFIG_SPL_OF_CONTROL=y
	45	+CONFIG_DEFAULT_DEVICE_TREE="rk3288-tinker-s"
	46	+CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
	47	+CONFIG_ENV_IS_IN_MMC=y
	48	+CONFIG_REGMAP=y
	49	+CONFIG_SPL_REGMAP=y
	50	+CONFIG_SYSCON=y
	51	+CONFIG_SPL_SYSCON=y
	52	+# CONFIG_SPL_SIMPLE_BUS is not set
	53	+CONFIG_CLK=y
	54	+CONFIG_SPL_CLK=y
	55	+CONFIG_FASTBOOT_FLASH=y
	56	+CONFIG_FASTBOOT_FLASH_MMC_DEV=0
	57	+CONFIG_FASTBOOT_CMD_OEM_FORMAT=y
	58	+CONFIG_ROCKCHIP_GPIO=y
	59	+CONFIG_SYS_I2C_ROCKCHIP=y
	60	+CONFIG_MISC=y
	61	+CONFIG_I2C_EEPROM=y
	62	+CONFIG_MMC_DW=y
	63	+CONFIG_MMC_DW_ROCKCHIP=y
	64	+CONFIG_SPI_FLASH=y
	65	+CONFIG_SF_DEFAULT_SPEED=20000000
	66	+CONFIG_DM_ETH=y
	67	+CONFIG_ETH_DESIGNWARE=y
	68	+CONFIG_GMAC_ROCKCHIP=y
	69	+CONFIG_PINCTRL=y
	70	+CONFIG_SPL_PINCTRL=y
	71	+CONFIG_DM_PMIC=y
	72	+CONFIG_PMIC_RK8XX=y
	73	+CONFIG_SPL_DM_REGULATOR=y
	74	+CONFIG_DM_REGULATOR_FIXED=y
	75	+CONFIG_SPL_DM_REGULATOR_FIXED=y
	76	+CONFIG_REGULATOR_RK8XX=y
	77	+CONFIG_PWM_ROCKCHIP=y
	78	+CONFIG_RAM=y
	79	+CONFIG_SPL_RAM=y
	80	+CONFIG_DEBUG_UART_SHIFT=2
	81	+CONFIG_SYSRESET=y
	82	+CONFIG_USB=y
	83	+CONFIG_USB_DWC2=y
	84	+CONFIG_ROCKCHIP_USB2_PHY=y
	85	+CONFIG_USB_GADGET=y
	86	+CONFIG_USB_GADGET_MANUFACTURER="Rockchip"
	87	+CONFIG_USB_GADGET_VENDOR_NUM=0x2207
	88	+CONFIG_USB_GADGET_PRODUCT_NUM=0x320a
	89	+CONFIG_USB_GADGET_DWC2_OTG=y
	90	+CONFIG_USB_HOST_ETHER=y
	91	+CONFIG_USB_ETHER_ASIX=y
	92	+CONFIG_USB_ETHER_SMSC95XX=y
	93	+CONFIG_CMD_DHRYSTONE=y
	94	+CONFIG_ERRNO_STR=y
	95	+CONFIG_DM_VIDEO=y
	96	+CONFIG_DISPLAY=y
	97	+CONFIG_VIDEO_ROCKCHIP=y
	98	+CONFIG_DISPLAY_ROCKCHIP_HDMI=y
	99	+CONFIG_CONSOLE_SCROLL_LINES=10
...	...	@@ -12,6 +12,7 @@
12	12	#undef BOOT_TARGET_DEVICES
13	13
14	14	#define BOOT_TARGET_DEVICES(func) \
	15	+ func(MMC, mmc, 0) \
15	16	func(MMC, mmc, 1) \
16	17	func(USB, usb, 0) \
17	18	func(PXE, pxe, na) \