From fd426b31066ba61ee1ff96a2b56c919251ffdd9e Mon Sep 17 00:00:00 2001 From: Damien Le Moal Date: Tue, 1 Mar 2022 10:35:39 +0000 Subject: k210: use the board vendor name rather than the marketing name "kendryte" is the marketing name for the K210 RISC-V SoC produced by Canaan Inc. Rather than "kendryte,k210", use the usual "canaan,k210" vendor,SoC compatibility string format in the device tree files and use the SoC name for file names. With these changes, the device tree files are more in sync with the Linux kernel DTS and drivers, making uboot device tree usable by the kernel. Signed-off-by: Damien Le Moal Signed-off-by: Niklas Cassel Reviewed-by: Leo Yu-Chi Liang --- include/configs/sipeed-maix.h | 2 +- include/k210/pll.h | 24 ++++++++++++++++++++++++ include/kendryte/pll.h | 24 ------------------------ 3 files changed, 25 insertions(+), 25 deletions(-) create mode 100644 include/k210/pll.h delete mode 100644 include/kendryte/pll.h (limited to 'include') diff --git a/include/configs/sipeed-maix.h b/include/configs/sipeed-maix.h index 1f74702ea7f..1cc2992c804 100644 --- a/include/configs/sipeed-maix.h +++ b/include/configs/sipeed-maix.h @@ -20,7 +20,7 @@ "fdt_addr_r=0x80400000\0" \ "scriptaddr=0x80020000\0" \ "kernel_addr_r=0x80060000\0" \ - "fdtfile=kendryte/" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \ + "fdtfile=k210/" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \ "k210_bootcmd=load mmc 0:1 $loadaddr /uImage && " \ "load mmc 0:1 $fdt_addr_r /k210.dtb && " \ "bootm $loadaddr - $fdt_addr_r\0" diff --git a/include/k210/pll.h b/include/k210/pll.h new file mode 100644 index 00000000000..fd16a89cb20 --- /dev/null +++ b/include/k210/pll.h @@ -0,0 +1,24 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Copyright (C) 2019-20 Sean Anderson + */ +#ifndef K210_PLL_H +#define K210_PLL_H + +#include + +struct k210_pll_config { + u8 r; + u8 f; + u8 od; +}; + +#ifdef CONFIG_UNIT_TEST +TEST_STATIC int k210_pll_calc_config(u32 rate, u32 rate_in, + struct k210_pll_config *best); +#ifndef nop +#define nop() +#endif + +#endif +#endif /* K210_PLL_H */ diff --git a/include/kendryte/pll.h b/include/kendryte/pll.h deleted file mode 100644 index fd16a89cb20..00000000000 --- a/include/kendryte/pll.h +++ /dev/null @@ -1,24 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * Copyright (C) 2019-20 Sean Anderson - */ -#ifndef K210_PLL_H -#define K210_PLL_H - -#include - -struct k210_pll_config { - u8 r; - u8 f; - u8 od; -}; - -#ifdef CONFIG_UNIT_TEST -TEST_STATIC int k210_pll_calc_config(u32 rate, u32 rate_in, - struct k210_pll_config *best); -#ifndef nop -#define nop() -#endif - -#endif -#endif /* K210_PLL_H */ -- cgit v1.3.1