arm: MediaTek: add basic support for MT7629 boards
authorRyder Lee <ryder.lee@mediatek.com>
Thu, 15 Nov 2018 02:07:52 +0000 (10:07 +0800)
committerTom Rini <trini@konsulko.com>
Thu, 29 Nov 2018 04:04:50 +0000 (23:04 -0500)
This adds a general board file based on MT7629 SoCs from MediaTek.

Apart from the generic parts (cpu) we add some low level init codes
and initialize the early clocks.

Signed-off-by: Ryder Lee <ryder.lee@mediatek.com>
Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
17 files changed:
arch/arm/Kconfig
arch/arm/Makefile
arch/arm/include/asm/arch-mediatek/misc.h [new file with mode: 0644]
arch/arm/mach-mediatek/Kconfig [new file with mode: 0644]
arch/arm/mach-mediatek/Makefile [new file with mode: 0644]
arch/arm/mach-mediatek/cpu.c [new file with mode: 0644]
arch/arm/mach-mediatek/init.h [new file with mode: 0644]
arch/arm/mach-mediatek/mt7629/Makefile [new file with mode: 0644]
arch/arm/mach-mediatek/mt7629/init.c [new file with mode: 0644]
arch/arm/mach-mediatek/mt7629/lowlevel_init.S [new file with mode: 0644]
arch/arm/mach-mediatek/spl.c [new file with mode: 0644]
board/mediatek/mt7629/Kconfig [new file with mode: 0644]
board/mediatek/mt7629/MAINTAINERS [new file with mode: 0644]
board/mediatek/mt7629/Makefile [new file with mode: 0644]
board/mediatek/mt7629/mt7629_rfb.c [new file with mode: 0644]
configs/mt7629_rfb_defconfig [new file with mode: 0644]
include/configs/mt7629.h [new file with mode: 0644]

index f5d4d3968383c7df41ad7936e5ad501b7814ce9c..96eadb6fd698311e5f4895f62140f621a1cbdbe3 100644 (file)
@@ -664,6 +664,20 @@ config ARCH_MESON
          targeted at media players and tablet computers. We currently
          support the S905 (GXBaby) 64-bit SoC.
 
+config ARCH_MEDIATEK
+       bool "MediaTek SoCs"
+       select BINMAN
+       select DM
+       select OF_CONTROL
+       select SPL_DM if SPL
+       select SPL_LIBCOMMON_SUPPORT if SPL
+       select SPL_LIBGENERIC_SUPPORT if SPL
+       select SPL_OF_CONTROL if SPL
+       select SUPPORT_SPL
+       help
+         Support for the MediaTek SoCs family developed by MediaTek Inc.
+         Please refer to doc/README.mediatek for more information.
+
 config ARCH_LPC32XX
        bool "NXP LPC32xx platform"
        select CPU_ARM926EJS
@@ -1449,6 +1463,8 @@ source "arch/arm/mach-rmobile/Kconfig"
 
 source "arch/arm/mach-meson/Kconfig"
 
+source "arch/arm/mach-mediatek/Kconfig"
+
 source "arch/arm/mach-qemu/Kconfig"
 
 source "arch/arm/mach-rockchip/Kconfig"
index 4b6c5e19356f2c0bef3aff685c736097937455de..c38ef3cb698850197b04adc6a28521b0aee88f7d 100644 (file)
@@ -62,6 +62,7 @@ machine-$(CONFIG_ARCH_K3)             += k3
 machine-$(CONFIG_ARCH_KEYSTONE)                += keystone
 # TODO: rename CONFIG_KIRKWOOD -> CONFIG_ARCH_KIRKWOOD
 machine-$(CONFIG_KIRKWOOD)             += kirkwood
+machine-$(CONFIG_ARCH_MEDIATEK)                += mediatek
 machine-$(CONFIG_ARCH_MESON)           += meson
 machine-$(CONFIG_ARCH_MVEBU)           += mvebu
 # TODO: rename CONFIG_TEGRA -> CONFIG_ARCH_TEGRA
diff --git a/arch/arm/include/asm/arch-mediatek/misc.h b/arch/arm/include/asm/arch-mediatek/misc.h
new file mode 100644 (file)
index 0000000..2530e78
--- /dev/null
@@ -0,0 +1,17 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * Copyright (C) 2018 MediaTek Inc.
+ */
+
+#ifndef __MEDIATEK_MISC_H_
+#define __MEDIATEK_MISC_H_
+
+#define VER_BASE               0x08000000
+#define VER_SIZE               0x10
+
+#define APHW_CODE              0x00
+#define APHW_SUBCODE           0x04
+#define APHW_VER               0x08
+#define APSW_VER               0x0c
+
+#endif /* __MEDIATEK_MISC_H_ */
diff --git a/arch/arm/mach-mediatek/Kconfig b/arch/arm/mach-mediatek/Kconfig
new file mode 100644 (file)
index 0000000..d2ada97
--- /dev/null
@@ -0,0 +1,26 @@
+if ARCH_MEDIATEK
+
+config SYS_SOC
+       default "mediatek"
+
+config SYS_VENDOR
+       default "mediatek"
+
+choice
+       prompt "MediaTek board select"
+
+config TARGET_MT7629
+       bool "MediaTek MT7629 SoC"
+       select CPU_V7A
+       select SPL
+       select ARCH_MISC_INIT
+       help
+         The MediaTek MT7629 is a ARM-based SoC with a dual-core Cortex-A7
+         including DDR3, crypto engine, 3x3 11n/ac Wi-Fi, Gigabit Ethernet,
+         switch, USB3.0, PCIe, UART, SPI, I2C and PWM.
+
+endchoice
+
+source "board/mediatek/mt7629/Kconfig"
+
+endif
diff --git a/arch/arm/mach-mediatek/Makefile b/arch/arm/mach-mediatek/Makefile
new file mode 100644 (file)
index 0000000..852d330
--- /dev/null
@@ -0,0 +1,6 @@
+# SPDX-License-Identifier:     GPL-2.0
+
+obj-y  += cpu.o
+obj-$(CONFIG_SPL_BUILD)        += spl.o
+
+obj-$(CONFIG_TARGET_MT7629) += mt7629/
diff --git a/arch/arm/mach-mediatek/cpu.c b/arch/arm/mach-mediatek/cpu.c
new file mode 100644 (file)
index 0000000..b37e299
--- /dev/null
@@ -0,0 +1,34 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (C) 2018 MediaTek Inc.
+ */
+
+#include <common.h>
+#include <dm.h>
+#include <wdt.h>
+#include <dm/uclass-internal.h>
+
+int arch_misc_init(void)
+{
+       struct udevice *wdt;
+       int ret;
+
+       ret = uclass_first_device_err(UCLASS_WDT, &wdt);
+       if (!ret)
+               wdt_stop(wdt);
+
+       return 0;
+}
+
+int arch_cpu_init(void)
+{
+       icache_enable();
+
+       return 0;
+}
+
+void enable_caches(void)
+{
+       /* Enable D-cache. I-cache is already enabled in start.S */
+       dcache_enable();
+}
diff --git a/arch/arm/mach-mediatek/init.h b/arch/arm/mach-mediatek/init.h
new file mode 100644 (file)
index 0000000..1d896fb
--- /dev/null
@@ -0,0 +1,11 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * Copyright (C) 2018 MediaTek Inc.
+ */
+
+#ifndef __MEDIATEK_INIT_H_
+#define __MEDIATEK_INIT_H_
+
+extern int mtk_soc_early_init(void);
+
+#endif /* __MEDIATEK_INIT_H_ */
diff --git a/arch/arm/mach-mediatek/mt7629/Makefile b/arch/arm/mach-mediatek/mt7629/Makefile
new file mode 100644 (file)
index 0000000..007eb4a
--- /dev/null
@@ -0,0 +1,4 @@
+# SPDX-License-Identifier:     GPL-2.0
+
+obj-y += init.o
+obj-y += lowlevel_init.o
diff --git a/arch/arm/mach-mediatek/mt7629/init.c b/arch/arm/mach-mediatek/mt7629/init.c
new file mode 100644 (file)
index 0000000..ba91a6e
--- /dev/null
@@ -0,0 +1,128 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (C) 2018 MediaTek Inc.
+ * Author: Ryder Lee <ryder.lee@mediatek.com>
+ */
+
+#include <clk.h>
+#include <common.h>
+#include <dm.h>
+#include <fdtdec.h>
+#include <ram.h>
+#include <asm/arch/misc.h>
+#include <asm/sections.h>
+#include <dm/uclass.h>
+#include <linux/io.h>
+
+#include <dt-bindings/clock/mt7629-clk.h>
+
+#define L2_CFG_BASE            0x10200000
+#define L2_CFG_SIZE            0x1000
+#define L2_SHARE_CFG_MP0       0x7f0
+#define L2_SHARE_MODE_OFF      BIT(8)
+
+DECLARE_GLOBAL_DATA_PTR;
+
+int mtk_pll_early_init(void)
+{
+       unsigned long pll_rates[] = {
+               [CLK_APMIXED_ARMPLL] = 1250000000,
+               [CLK_APMIXED_MAINPLL] = 1120000000,
+               [CLK_APMIXED_UNIV2PLL] = 1200000000,
+               [CLK_APMIXED_ETH1PLL] = 500000000,
+               [CLK_APMIXED_ETH2PLL] = 700000000,
+               [CLK_APMIXED_SGMIPLL] = 650000000,
+       };
+       struct udevice *dev;
+       int ret, i;
+
+       ret = uclass_get_device_by_driver(UCLASS_CLK,
+                       DM_GET_DRIVER(mtk_clk_apmixedsys), &dev);
+       if (ret)
+               return ret;
+
+       /* configure default rate then enable apmixedsys */
+       for (i = 0; i < ARRAY_SIZE(pll_rates); i++) {
+               struct clk clk = { .id = i, .dev = dev };
+
+               ret = clk_set_rate(&clk, pll_rates[i]);
+               if (ret)
+                       return ret;
+
+               ret = clk_enable(&clk);
+               if (ret)
+                       return ret;
+       }
+
+       /* setup mcu bus */
+       ret = uclass_get_device_by_driver(UCLASS_SYSCON,
+                       DM_GET_DRIVER(mtk_mcucfg), &dev);
+       if (ret)
+               return ret;
+
+       return 0;
+}
+
+int mtk_soc_early_init(void)
+{
+       struct udevice *dev;
+       int ret;
+
+       /* initialize early clocks */
+       ret = mtk_pll_early_init();
+       if (ret)
+               return ret;
+
+       ret = uclass_first_device_err(UCLASS_RAM, &dev);
+       if (ret)
+               return ret;
+
+       return 0;
+}
+
+int mach_cpu_init(void)
+{
+       void __iomem *base;
+
+       base = ioremap(L2_CFG_BASE, L2_CFG_SIZE);
+
+       /* disable L2C shared mode */
+       writel(L2_SHARE_MODE_OFF, base + L2_SHARE_CFG_MP0);
+
+       return 0;
+}
+
+int dram_init(void)
+{
+       struct ram_info ram;
+       struct udevice *dev;
+       int ret;
+
+       ret = uclass_first_device_err(UCLASS_RAM, &dev);
+       if (ret)
+               return ret;
+
+       ret = ram_get_info(dev, &ram);
+       if (ret)
+               return ret;
+
+       debug("RAM init base=%lx, size=%x\n", ram.base, ram.size);
+
+       gd->ram_size = ram.size;
+
+       return 0;
+}
+
+int print_cpuinfo(void)
+{
+       void __iomem *chipid;
+       u32 hwcode, swver;
+
+       chipid = ioremap(VER_BASE, VER_SIZE);
+       hwcode = readl(chipid + APHW_CODE);
+       swver = readl(chipid + APSW_VER);
+
+       printf("CPU:   MediaTek MT%04x E%d\n", hwcode, (swver & 0xf) + 1);
+
+       return 0;
+}
diff --git a/arch/arm/mach-mediatek/mt7629/lowlevel_init.S b/arch/arm/mach-mediatek/mt7629/lowlevel_init.S
new file mode 100644 (file)
index 0000000..90dd4ea
--- /dev/null
@@ -0,0 +1,50 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * Copyright (C) 2018 MediaTek Inc.
+ */
+
+#include <linux/linkage.h>
+
+ENTRY(lowlevel_init)
+
+#ifndef CONFIG_SPL_BUILD
+       /* Return to U-Boot via saved link register */
+       mov     pc, lr
+#else
+       /*
+        * Arch timer :
+        * set CNTFRQ = 20Mhz, set CNTVOFF = 0
+        */
+       movw    r0, #0x2d00
+       movt    r0, #0x131
+       mcr     p15, 0, r0, c14, c0, 0
+
+       /* enable SMP bit */
+       mrc     p15, 0, r0, c1, c0, 1
+       orr     r0, r0, #0x40
+       mcr     p15, 0, r0, c1, c0, 1
+
+       /* if MP core, handle secondary cores */
+       mrc     p15, 0, r0, c0, c0, 5
+       ands    r1, r0, #0x40000000
+       bne     go                      @ Go if UP
+       ands    r0, r0, #0x0f
+       beq     go                      @ Go if core0 on primary core tile
+       b       secondary
+
+go:
+       /* master CPU */
+       mov     pc, lr
+
+secondary:
+       /* read slave CPU number into r0 firstly */
+       mrc     p15, 0, r0, c0, c0, 5
+       and     r0, r0, #0x0f
+
+loop:
+       dsb
+       isb
+       wfi                             @Zzz...
+       b       loop
+#endif
+ENDPROC(lowlevel_init)
diff --git a/arch/arm/mach-mediatek/spl.c b/arch/arm/mach-mediatek/spl.c
new file mode 100644 (file)
index 0000000..9b3590f
--- /dev/null
@@ -0,0 +1,43 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (C) 2018 MediaTek Inc.
+ * Author: Ryder Lee <ryder.lee@mediatek.com>
+ */
+
+#include <clk.h>
+#include <common.h>
+#include <spl.h>
+
+#include "init.h"
+
+void board_init_f(ulong dummy)
+{
+       int ret;
+
+       ret = spl_early_init();
+       if (ret)
+               hang();
+
+       /* enable console uart printing */
+       preloader_console_init();
+
+       /* soc early initialization */
+       ret = mtk_soc_early_init();
+       if (ret)
+               hang();
+}
+
+u32 spl_boot_device(void)
+{
+#if defined(CONFIG_SPL_SPI_SUPPORT)
+       return BOOT_DEVICE_SPI;
+#elif defined(CONFIG_SPL_MMC_SUPPORT)
+       return BOOT_DEVICE_MMC1;
+#elif defined(CONFIG_SPL_NAND_SUPPORT)
+       return BOOT_DEVICE_NAND;
+#elif defined(CONFIG_SPL_NOR_SUPPORT)
+       return BOOT_DEVICE_NOR;
+#else
+       return BOOT_DEVICE_NONE;
+#endif
+}
diff --git a/board/mediatek/mt7629/Kconfig b/board/mediatek/mt7629/Kconfig
new file mode 100644 (file)
index 0000000..6055164
--- /dev/null
@@ -0,0 +1,17 @@
+if TARGET_MT7629
+
+config SYS_BOARD
+       default "mt7629"
+
+config SYS_CONFIG_NAME
+       default "mt7629"
+
+config MTK_SPL_PAD_SIZE
+       hex
+       default 0x10000
+
+config MTK_BROM_HEADER_INFO
+       string
+       default "media=nor"
+
+endif
diff --git a/board/mediatek/mt7629/MAINTAINERS b/board/mediatek/mt7629/MAINTAINERS
new file mode 100644 (file)
index 0000000..424f115
--- /dev/null
@@ -0,0 +1,7 @@
+MT7629
+M:     Ryder Lee <ryder.lee@mediatek.com>
+M:     Weijie Gao <weijie.gao@mediatek.com>
+S:     Maintained
+F:     board/mediatek/mt7629
+F:     include/configs/mt7629.h
+F:     configs/mt7629_rfb_defconfig
diff --git a/board/mediatek/mt7629/Makefile b/board/mediatek/mt7629/Makefile
new file mode 100644 (file)
index 0000000..83ccbba
--- /dev/null
@@ -0,0 +1,3 @@
+# SPDX-License-Identifier:     GPL-2.0
+
+obj-y += mt7629_rfb.o
diff --git a/board/mediatek/mt7629/mt7629_rfb.c b/board/mediatek/mt7629/mt7629_rfb.c
new file mode 100644 (file)
index 0000000..08468b5
--- /dev/null
@@ -0,0 +1,16 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (C) 2018 MediaTek Inc.
+ */
+
+#include <common.h>
+
+DECLARE_GLOBAL_DATA_PTR;
+
+int board_init(void)
+{
+       /* address of boot parameters */
+       gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
+
+       return 0;
+}
diff --git a/configs/mt7629_rfb_defconfig b/configs/mt7629_rfb_defconfig
new file mode 100644 (file)
index 0000000..1729d13
--- /dev/null
@@ -0,0 +1,73 @@
+CONFIG_ARM=y
+CONFIG_SYS_THUMB_BUILD=y
+CONFIG_ARCH_MEDIATEK=y
+CONFIG_SYS_TEXT_BASE=0x41e00000
+CONFIG_SYS_MALLOC_F_LEN=0x4000
+CONFIG_TARGET_MT7629=y
+CONFIG_SPL_SERIAL_SUPPORT=y
+CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
+CONFIG_NR_DRAM_BANKS=1
+CONFIG_FIT=y
+CONFIG_FIT_VERBOSE=y
+CONFIG_BOOTDELAY=3
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_DEFAULT_FDT_FILE="mt7629-rfb"
+# CONFIG_DISPLAY_BOARDINFO is not set
+CONFIG_SPL_SYS_MALLOC_SIMPLE=y
+CONFIG_SPL_NOR_SUPPORT=y
+CONFIG_SPL_WATCHDOG_SUPPORT=y
+CONFIG_HUSH_PARSER=y
+CONFIG_SYS_PROMPT="U-Boot> "
+CONFIG_CMD_BOOTMENU=y
+# CONFIG_CMD_ELF is not set
+# CONFIG_CMD_XIMG is not set
+# CONFIG_CMD_FLASH is not set
+CONFIG_CMD_GPIO=y
+CONFIG_CMD_SF=y
+CONFIG_CMD_SF_TEST=y
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NFS is not set
+CONFIG_CMD_PING=y
+# CONFIG_PARTITIONS is not set
+CONFIG_OF_EMBED=y
+CONFIG_DEFAULT_DEVICE_TREE="mt7629-rfb"
+CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-parents"
+CONFIG_SPL_DM_SEQ_ALIAS=y
+CONFIG_REGMAP=y
+CONFIG_SPL_REGMAP=y
+CONFIG_SYSCON=y
+CONFIG_SPL_SYSCON=y
+CONFIG_CLK=y
+CONFIG_SPL_CLK=y
+CONFIG_DM_GPIO=y
+# CONFIG_MMC is not set
+CONFIG_DM_SPI_FLASH=y
+CONFIG_SPI_FLASH=y
+CONFIG_SPI_FLASH_BAR=y
+CONFIG_SPI_FLASH_EON=y
+CONFIG_SPI_FLASH_GIGADEVICE=y
+CONFIG_SPI_FLASH_ISSI=y
+CONFIG_SPI_FLASH_MACRONIX=y
+CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_PINCTRL=y
+CONFIG_PINCONF=y
+CONFIG_PINCTRL_MT7629=y
+CONFIG_POWER_DOMAIN=y
+CONFIG_MTK_POWER_DOMAIN=y
+CONFIG_RAM=y
+CONFIG_SPL_RAM=y
+CONFIG_DM_SERIAL=y
+CONFIG_MTK_SERIAL=y
+CONFIG_SPI=y
+CONFIG_DM_SPI=y
+CONFIG_MTK_QSPI=y
+CONFIG_SYSRESET=y
+CONFIG_SYSRESET_WATCHDOG=y
+CONFIG_TIMER=y
+CONFIG_SPL_TIMER=y
+CONFIG_MTK_TIMER=y
+CONFIG_WDT_MTK=y
+CONFIG_LZMA=y
+# CONFIG_EFI_LOADER is not set
diff --git a/include/configs/mt7629.h b/include/configs/mt7629.h
new file mode 100644 (file)
index 0000000..a665a5e
--- /dev/null
@@ -0,0 +1,57 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * Configuration for MediaTek MT7629 SoC
+ *
+ * Copyright (C) 2018 MediaTek Inc.
+ * Author: Ryder Lee <ryder.lee@mediatek.com>
+ */
+
+#ifndef __MT7629_H
+#define __MT7629_H
+
+#include <linux/sizes.h>
+
+/* Miscellaneous configurable options */
+#define CONFIG_SETUP_MEMORY_TAGS
+#define CONFIG_INITRD_TAG
+#define CONFIG_CMDLINE_TAG
+
+#define CONFIG_SYS_MAXARGS             8
+#define CONFIG_SYS_BOOTM_LEN           SZ_64M
+#define CONFIG_SYS_CBSIZE              SZ_1K
+#define CONFIG_SYS_PBSIZE              (CONFIG_SYS_CBSIZE +    \
+                                       sizeof(CONFIG_SYS_PROMPT) + 16)
+
+/* Size of malloc() pool */
+#define CONFIG_SYS_MALLOC_LEN          SZ_4M
+
+/* Environment */
+#define CONFIG_ENV_SIZE                        SZ_4K
+/* Allow to overwrite serial and ethaddr */
+#define CONFIG_ENV_OVERWRITE
+
+/* Defines for SPL */
+#define CONFIG_SPL_STACK               0x106000
+#define CONFIG_SPL_TEXT_BASE           0x201000
+#define CONFIG_SPL_MAX_SIZE            SZ_64K
+#define CONFIG_SPL_MAX_FOOTPRINT       SZ_64K
+#define CONFIG_SPL_PAD_TO              0x10000
+
+#define CONFIG_SPI_ADDR                        0x30000000
+#define CONFIG_SYS_SPI_U_BOOT_OFFS     CONFIG_SPL_PAD_TO
+#define CONFIG_SYS_UBOOT_BASE          (CONFIG_SPI_ADDR + CONFIG_SPL_PAD_TO)
+
+/* SPL -> Uboot */
+#define CONFIG_SYS_UBOOT_START         CONFIG_SYS_TEXT_BASE
+#define CONFIG_SYS_INIT_SP_ADDR                (CONFIG_SYS_TEXT_BASE + SZ_2M - \
+                                        GENERATED_GBL_DATA_SIZE)
+
+/* UBoot -> Kernel */
+#define CONFIG_SYS_SPL_ARGS_ADDR       0x40000000
+#define CONFIG_LOADADDR                        0x42007f1c
+#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
+
+/* DRAM */
+#define CONFIG_SYS_SDRAM_BASE          0x40000000
+
+#endif