Add board support for Spacemit K1 SoC in SPL
Subsystems (7)
cover Add board support for Spacemit K1 SoC in SPL
From: Raymond Mao <[email protected]>
This patch series introduces full support for the k1 SoC in SPL for multiple boards.
The series enables the board by:
1. Adding the base board definition with device tree.
2. Bringing up essential clock sources and tree.
3. Initializing I2C buses for peripheral communication.
4. Integrating the PMIC driver for power management.
5. Adding regulator drivers for voltage domain control.
Junhui Liu (1):
clk: spacemit: Add support for K1 SoC
Raymond Mao (16):
spacemit: k1: support multi-board infrastructure
spacemit: k1: enable SPL with debug UART
configs: k1: enable early timer support
reset: k1: add SPL support and enable TWSI8 reset
dt-bindings: clock: import k1-syscon from upstream
dts: k1: import dts file from upstream folder
dts: k1: enable clocks in SPL
board: k1: initialize clock and serial devices in SPL
configs: k1: add default option for clock driver in SPL
i2c: k1: add I2C driver support
dt-bindings: pinctrl: add k1 support
spacemit: k1: add TLV EEPROM support in SPL
spacemit: k1: Add DDR firmware support to SPL
power: pmic: add support for Spacemit P1 PMIC
power: regulator: add support for Spacemit P1 SoC
board: k1: enable pmic in spl
arch/riscv/Kconfig | 10 +-
arch/riscv/cpu/k1/Kconfig | 6 +
arch/riscv/dts/Makefile | 1 +
arch/riscv/dts/k1-spl.dts | 239 +++
arch/riscv/dts/k1.dtsi | 667 +++++-
board/spacemit/bananapi-f3/Kconfig | 25 -
board/spacemit/bananapi-f3/Makefile | 5 -
board/spacemit/k1/Kconfig | 38 +
.../spacemit/{bananapi-f3 => k1}/MAINTAINERS | 4 +-
board/spacemit/k1/Makefile | 26 +
board/spacemit/{bananapi-f3 => k1}/board.c | 0
board/spacemit/k1/spl.c | 252 +++
board/spacemit/k1/tlv_codes.h | 22 +
configs/bananapi-f3_defconfig | 24 -
configs/k1_defconfig | 77 +
drivers/clk/Kconfig | 5 +-
drivers/clk/Makefile | 1 +
drivers/clk/spacemit/Kconfig | 31 +
drivers/clk/spacemit/Makefile | 7 +
drivers/clk/spacemit/clk-k1.c | 1793 +++++++++++++++++
drivers/clk/spacemit/clk_common.h | 79 +
drivers/clk/spacemit/clk_ddn.c | 93 +
drivers/clk/spacemit/clk_ddn.h | 53 +
drivers/clk/spacemit/clk_mix.c | 403 ++++
drivers/clk/spacemit/clk_mix.h | 224 ++
drivers/clk/spacemit/clk_pll.c | 157 ++
drivers/clk/spacemit/clk_pll.h | 81 +
drivers/i2c/Kconfig | 7 +
drivers/i2c/Makefile | 1 +
drivers/i2c/k1_i2c.c | 521 +++++
drivers/i2c/k1_i2c.h | 69 +
drivers/power/pmic/Kconfig | 17 +
drivers/power/pmic/Makefile | 1 +
drivers/power/pmic/pmic_spacemit_p1.c | 94 +
drivers/power/regulator/Kconfig | 15 +
drivers/power/regulator/Makefile | 1 +
.../power/regulator/spacemit_p1_regulator.c | 460 +++++
drivers/reset/Kconfig | 7 +
drivers/reset/Makefile | 2 +-
drivers/reset/reset-spacemit-k1.c | 4 -
include/configs/{bananapi-f3.h => k1.h} | 9 +
.../dt-bindings/clock/spacemit,k1-syscon.h | 253 +++
include/dt-bindings/pinctrl/k1-pinctrl.h | 59 +
include/power/spacemit_p1.h | 163 ++
include/soc/spacemit/k1-syscon.h | 149 ++
lib/vendor/spacemit/ddr_fw.bin | Bin 0 -> 19416 bytes
46 files changed, 5985 insertions(+), 170 deletions(-)
create mode 100644 arch/riscv/dts/k1-spl.dts
delete mode 100644 board/spacemit/bananapi-f3/Kconfig
delete mode 100644 board/spacemit/bananapi-f3/Makefile
create mode 100644 board/spacemit/k1/Kconfig
rename board/spacemit/{bananapi-f3 => k1}/MAINTAINERS (61%)
create mode 100644 board/spacemit/k1/Makefile
rename board/spacemit/{bananapi-f3 => k1}/board.c (100%)
create mode 100644 board/spacemit/k1/spl.c
create mode 100644 board/spacemit/k1/tlv_codes.h
delete mode 100644 configs/bananapi-f3_defconfig
create mode 100644 configs/k1_defconfig
create mode 100644 drivers/clk/spacemit/Kconfig
create mode 100644 drivers/clk/spacemit/Makefile
create mode 100644 drivers/clk/spacemit/clk-k1.c
create mode 100644 drivers/clk/spacemit/clk_common.h
create mode 100644 drivers/clk/spacemit/clk_ddn.c
create mode 100644 drivers/clk/spacemit/clk_ddn.h
create mode 100644 drivers/clk/spacemit/clk_mix.c
create mode 100644 drivers/clk/spacemit/clk_mix.h
create mode 100644 drivers/clk/spacemit/clk_pll.c
create mode 100644 drivers/clk/spacemit/clk_pll.h
create mode 100644 drivers/i2c/k1_i2c.c
create mode 100644 drivers/i2c/k1_i2c.h
create mode 100644 drivers/power/pmic/pmic_spacemit_p1.c
create mode 100644 drivers/power/regulator/spacemit_p1_regulator.c
rename include/configs/{bananapi-f3.h => k1.h} (52%)
create mode 100644 include/dt-bindings/clock/spacemit,k1-syscon.h
create mode 100644 include/dt-bindings/pinctrl/k1-pinctrl.h
create mode 100644 include/power/spacemit_p1.h
create mode 100644 include/soc/spacemit/k1-syscon.h
create mode 100644 lib/vendor/spacemit/ddr_fw.binSignature · 1 line
2.25.1
PATCH 1/17 spacemit: k1: support multi-board infrastructure
From: Raymond Mao <[email protected]>
Restructure K1 SoC support to handle multiple boards through a single configuration:
1. Rename bananapi-f3_defconfig to k1_defconfig.
2. Move all K1 board files to k1 directory.
Eliminates the need for board-specific defconfigs while maintaining hardware compatibility.
---
arch/riscv/Kconfig | 10 ++++++----
arch/riscv/cpu/k1/Kconfig | 4 ++++
board/spacemit/{bananapi-f3 => k1}/Kconfig | 11 ++++++++---
board/spacemit/{bananapi-f3 => k1}/MAINTAINERS | 4 ++--
board/spacemit/{bananapi-f3 => k1}/Makefile | 0
board/spacemit/{bananapi-f3 => k1}/board.c | 0
configs/{bananapi-f3_defconfig => k1_defconfig} | 3 ++-
include/configs/{bananapi-f3.h => k1.h} | 0
8 files changed, 22 insertions(+), 10 deletions(-)
rename board/spacemit/{bananapi-f3 => k1}/Kconfig (63%)
rename board/spacemit/{bananapi-f3 => k1}/MAINTAINERS (61%)
rename board/spacemit/{bananapi-f3 => k1}/Makefile (100%)
rename board/spacemit/{bananapi-f3 => k1}/board.c (100%)
rename configs/{bananapi-f3_defconfig => k1_defconfig} (97%)
rename include/configs/{bananapi-f3.h => k1.h} (100%)arch/riscv/Kconfig +6 -4
@@ -8,15 +8,17 @@ choice prompt "Target select" optional +config ARCH_K1 + bool "Spacemit K1 Architecture" + help + This enables support for Spacemit K1 SoC family. + config TARGET_ANDES_AE350 bool "Support Andes ae350" config TARGET_ANDES_VOYAGER bool "Support Andes Voyager Board" -config TARGET_BANANAPI_F3 - bool "Support BananaPi F3 Board" - config TARGET_K230_CANMV bool "Support K230 CanMV Board"
@@ -115,7 +117,7 @@ source "board/sifive/unmatched/Kconfig" source "board/sipeed/maix/Kconfig" source "board/sophgo/milkv_duo/Kconfig" source "board/sophgo/licheerv_nano/Kconfig" -source "board/spacemit/bananapi-f3/Kconfig" +source "board/spacemit/k1/Kconfig" source "board/starfive/visionfive2/Kconfig" source "board/thead/th1520_lpi4a/Kconfig" source "board/xilinx/mbv/Kconfig"
arch/riscv/cpu/k1/Kconfig +4 -0
@@ -2,6 +2,8 @@ # # Copyright (C) 2024, Kongyang Liu <[email protected]> +if ARCH_K1 + config SPACEMIT_K1 bool select BINMAN
@@ -17,3 +19,5 @@ config SPACEMIT_K1 imply SPL_CPU imply SPL_OPENSBI imply SPL_LOAD_FIT + +endif
board/spacemit/k1/Kconfig renamed from board/spacemit/bananapi-f3/Kconfig +8 -3
@@ -1,7 +1,7 @@ -if TARGET_BANANAPI_F3 +if ARCH_K1 config SYS_BOARD - default "bananapi-f3" + default "k1" config SYS_VENDOR default "spacemit"
@@ -10,7 +10,7 @@ config SYS_CPU default "k1" config SYS_CONFIG_NAME - default "bananapi-f3" + default "k1" config TEXT_BASE default 0x00200000
@@ -22,4 +22,9 @@ config BOARD_SPECIFIC_OPTIONS def_bool y select SPACEMIT_K1 +config TARGET_BANANAPI_F3 + bool "Support BananaPi F3 Board" + help + BananaPi F3 board contains Spacemit K1 SoC. + endif
board/spacemit/k1/MAINTAINERS renamed from board/spacemit/bananapi-f3/MAINTAINERS +2 -2
@@ -1,6 +1,6 @@ BananaPi F3 M: Huan Zhou <pericycle.cc@@gmail.com> S: Maintained -F: board/spacemit/bananapi-f3/ -F: configs/bananapi-f3_defconfig +F: board/spacemit/k1/ +F: configs/k1_defconfig F: doc/board/spacemit/bananapi-f3.rst
board/spacemit/k1/Makefile renamed from board/spacemit/bananapi-f3/Makefile +0 -0
board/spacemit/k1/board.c renamed from board/spacemit/bananapi-f3/board.c +0 -0
configs/k1_defconfig renamed from configs/bananapi-f3_defconfig +2 -1
@@ -6,9 +6,10 @@ CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x1000000 CONFIG_DEFAULT_DEVICE_TREE="k1-bananapi-f3" CONFIG_SYS_BOOTM_LEN=0xa000000 CONFIG_SYS_LOAD_ADDR=0x200000 -CONFIG_TARGET_BANANAPI_F3=y CONFIG_ARCH_RV64I=y CONFIG_RISCV_SMODE=y +CONFIG_ARCH_K1=y +CONFIG_TARGET_BANANAPI_F3=y CONFIG_FIT=y CONFIG_SUPPORT_RAW_INITRD=y CONFIG_OF_BOARD_SETUP=y
include/configs/k1.h renamed from include/configs/bananapi-f3.h +0 -0
Signature · 1 line
2.25.1
Re: [PATCH 01/17] spacemit: k1: support multi-board infrastructure
Quoted 22 lines · Raymond Mao
From: Raymond Mao <[email protected]>
Restructure K1 SoC support to handle multiple boards through a single configuration:
1. Rename bananapi-f3_defconfig to
k1_defconfig.
2. Move all K1 board files to k1 directory.Eliminates the need for board-specific defconfigs while maintaining hardware compatibility.
Signed-off-by Raymond Mao <[email protected]>--- arch/riscv/Kconfig | 10 ++++++---- arch/riscv/cpu/k1/Kconfig | 4 ++++ board/spacemit/{bananapi-f3 => k1}/Kconfig | 11 ++++++++--- board/spacemit/{bananapi-f3 => k1}/MAINTAINERS | 4 ++-- board/spacemit/{bananapi-f3 => k1}/Makefile | 0 board/spacemit/{bananapi-f3 => k1}/board.c | 0 configs/{bananapi-f3_defconfig => k1_defconfig} | 3 ++- include/configs/{bananapi-f3.h => k1.h} | 0 8 files changed, 22 insertions(+), 10 deletions(-)
Quoted 6 lines
rename board/spacemit/{bananapi-f3 => k1}/Kconfig (63%) rename board/spacemit/{bananapi-f3 => k1}/MAINTAINERS (61%) rename board/spacemit/{bananapi-f3 => k1}/Makefile (100%) rename board/spacemit/{bananapi-f3 =>
k1}/board.c(100%) rename configs/{bananapi-f3_defconfig =>k1_defconfig} (97%) renameinclude/configs/{bananapi-f3.h=>k1.h} (100%)
This changes in this patch look ok.
But please, update doc/board/spacemit/bananapi-f3.rst to point to the new defconfig.
Best regards
Heinrich
Quoted 137 lines
arch/riscv/Kconfig +6
-4@@ -8,15 +8,17 @@ choice prompt "Target select" optional +config ARCH_K1 + bool "Spacemit K1 Architecture" + help + This enables support for Spacemit K1 SoC family. + config TARGET_ANDES_AE350 bool "Support Andes ae350" config TARGET_ANDES_VOYAGER bool "Support Andes Voyager Board" -config TARGET_BANANAPI_F3 - bool "Support BananaPi F3 Board" - config TARGET_K230_CANMV bool "Support K230 CanMV Board"@@ -115,7 +117,7 @@ source "board/sifive/unmatched/Kconfig" source "board/sipeed/maix/Kconfig" source "board/sophgo/milkv_duo/Kconfig" source "board/sophgo/licheerv_nano/Kconfig" -source "board/spacemit/bananapi-f3/Kconfig" +source "board/spacemit/k1/Kconfig" source "board/starfive/visionfive2/Kconfig" source "board/thead/th1520_lpi4a/Kconfig" source "board/xilinx/mbv/Kconfig"arch/riscv/cpu/k1/Kconfig +4
-0@@ -2,6 +2,8 @@ # # Copyright (C) 2024, Kongyang Liu <[email protected]> +if ARCH_K1 + config SPACEMIT_K1 bool select BINMAN@@ -17,3 +19,5 @@ config SPACEMIT_K1 imply SPL_CPU imply SPL_OPENSBI imply SPL_LOAD_FIT + +endifboard/spacemit/k1/Kconfig renamed from board/spacemit/bananapi-f3/Kconfig +8
-3@@ -1,7 +1,7 @@ -if TARGET_BANANAPI_F3 +if ARCH_K1 config SYS_BOARD - default "bananapi-f3" + default "k1" config SYS_VENDOR default "spacemit"@@ -10,7 +10,7 @@ config SYS_CPU default "k1" config SYS_CONFIG_NAME - default "bananapi-f3" + default "k1" config TEXT_BASE default 0x00200000@@ -22,4 +22,9 @@ config BOARD_SPECIFIC_OPTIONS def_bool y select SPACEMIT_K1 +config TARGET_BANANAPI_F3 + bool "Support BananaPi F3 Board" + help + BananaPi F3 board contains Spacemit K1 SoC. + endifboard/spacemit/k1/MAINTAINERS renamed from board/spacemit/bananapi-f3/MAINTAINERS +2
-2@@ -1,6 +1,6 @@ BananaPi F3 M: Huan Zhou <pericycle.cc@@gmail.com> S: Maintained -F: board/spacemit/bananapi-f3/ -F: configs/bananapi-f3_defconfig +F: board/spacemit/k1/ +F: configs/k1_defconfig F: doc/board/spacemit/bananapi-f3.rstboard/spacemit/k1/Makefile renamed from board/spacemit/bananapi-f3/Makefile +0
-0board/spacemit/k1/board.c renamed from board/spacemit/bananapi-f3/board.c +0
-0configs/k1_defconfig renamed from configs/bananapi-f3_defconfig +2
-1@@ -6,9 +6,10 @@ CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x1000000 CONFIG_DEFAULT_DEVICE_TREE="k1-bananapi-f3" CONFIG_SYS_BOOTM_LEN=0xa000000 CONFIG_SYS_LOAD_ADDR=0x200000 -CONFIG_TARGET_BANANAPI_F3=y CONFIG_ARCH_RV64I=y CONFIG_RISCV_SMODE=y +CONFIG_ARCH_K1=y +CONFIG_TARGET_BANANAPI_F3=y CONFIG_FIT=y CONFIG_SUPPORT_RAW_INITRD=y CONFIG_OF_BOARD_SETUP=yinclude/configs/k1.h renamed from include/configs/bananapi-f3.h +0
-0
Re: [PATCH 01/17] spacemit: k1: support multi-board infrastructure
Quoted 12 lines · Heinrich Schuchardt
Quoted 11 lines · Raymond Mao
From: Raymond Mao <[email protected]>
Restructure K1 SoC support to handle multiple boards through a single configuration:
1. Rename bananapi-f3_defconfig to
k1_defconfig.
2. Move all K1 board files to k1 directory.Eliminates the need for board-specific defconfigs while maintaining hardware compatibility.
Quoted 9 lines
Quoted 9 lines
Signed-off-by Raymond Mao <[email protected]>---
arch/riscv/Kconfig | 10 ++++++---- arch/riscv/cpu/k1/Kconfig | 4 ++++ board/spacemit/{bananapi-f3 => k1}/Kconfig | 11 ++++++++--- board/spacemit/{bananapi-f3 => k1}/MAINTAINERS | 4 ++-- board/spacemit/{bananapi-f3 => k1}/Makefile | 0 board/spacemit/{bananapi-f3 => k1}/board.c | 0 configs/{bananapi-f3_defconfig =>k1_defconfig} | 3 ++-
I would suggest add the vendor name and call this spacemit_k1_defconfig to avoid ambiguity.
Best regards
Heinrich
Quoted 145 lines
Quoted 8 lines
include/configs/{bananapi-f3.h=> k1.h} | 08 files changed, 22 insertions(+), 10 deletions(-)rename board/spacemit/{bananapi-f3 => k1}/Kconfig (63%) rename board/spacemit/{bananapi-f3 => k1}/MAINTAINERS (61%) rename board/spacemit/{bananapi-f3 => k1}/Makefile (100%) rename board/spacemit/{bananapi-f3 =>
k1}/board.c(100%) rename configs/{bananapi-f3_defconfig =>k1_defconfig} (97%) renameinclude/configs/{bananapi-f3.h=>k1.h} (100%)This changes in this patch look ok.
But please, update
doc/board/spacemit/bananapi-f3.rstto point to the new defconfig.Best regards
Heinrich
Quoted 127 lines
arch/riscv/Kconfig +0
-0@@ -8,15 +8,17 @@ choiceprompt "Target select"
optionalarch/riscv/Kconfig +5
-0+config ARCH_K1 + bool "Spacemit K1 Architecture" + help + This enables support for Spacemit K1 SoC family. +config
TARGET_ANDES_AE350
bool "Support Andes ae350"
configTARGET_ANDES_VOYAGER
bool "Support Andes Voyager Board"arch/riscv/Kconfig +0
-3-config TARGET_BANANAPI_F3 - bool "Support BananaPi F3 Board" -config
TARGET_K230_CANMV
bool "Support K230 CanMV Board"arch/riscv/Kconfig +0
-0@@ -115,7 +117,7 @@ source "board/sifive/unmatched/Kconfig"source "board/sipeed/maix/Kconfig"
source "board/sophgo/milkv_duo/Kconfig"
source "board/sophgo/licheerv_nano/Kconfig"arch/riscv/Kconfig +1
-1-source "board/spacemit/bananapi-f3/Kconfig" +source "board/spacemit/k1/Kconfig"source "board/starfive/visionfive2/Kconfig"
source "board/thead/th1520_lpi4a/Kconfig"
source "board/xilinx/mbv/Kconfig"arch/riscv/cpu/k1/Kconfig +2
-0@@ -2,6 +2,8 @@ # # Copyright (C) 2024, Kongyang Liu <[email protected]> +if ARCH_K1 +config
SPACEMIT_K1
bool
select BINMANarch/riscv/cpu/k1/Kconfig +0
-0@@ -17,3 +19,5 @@ config SPACEMIT_K1imply
SPL_CPU
implySPL_OPENSBI
implySPL_LOAD_FITarch/riscv/cpu/k1/Kconfig +2
-0+ +endifboard/spacemit/k1/Kconfig renamed from board/spacemit/bananapi-f3/Kconfig +1
-1@@ -1,7 +1,7 @@ -if TARGET_BANANAPI_F3 +if ARCH_K1config
SYS_BOARD
- default "bananapi-f3"
+ default "k1"
configSYS_VENDOR
default "spacemit"board/spacemit/k1/Kconfig renamed from board/spacemit/bananapi-f3/Kconfig +0
-0@@ -10,7 +10,7 @@ config SYS_CPUdefault "k1"
configSYS_CONFIG_NAME
- default "bananapi-f3"
+ default "k1"
configTEXT_BASE
default0x00200000board/spacemit/k1/Kconfig renamed from board/spacemit/bananapi-f3/Kconfig +0
-0@@ -22,4 +22,9 @@ config BOARD_SPECIFIC_OPTIONS
def_booly
selectSPACEMIT_K1board/spacemit/k1/Kconfig renamed from board/spacemit/bananapi-f3/Kconfig +5
-0+config TARGET_BANANAPI_F3 + bool "Support BananaPi F3 Board" + help + BananaPi F3 board contains Spacemit K1 SoC. +endif
board/spacemit/k1/MAINTAINERS renamed from board/spacemit/bananapi-f3/MAINTAINERS +0
-0@@ -1,6 +1,6 @@BananaPi F3
M: Huan Zhou <pericycle.cc@@gmail.com>
S: Maintainedboard/spacemit/k1/MAINTAINERS renamed from board/spacemit/bananapi-f3/MAINTAINERS +2
-2-F: board/spacemit/bananapi-f3/ -F: configs/bananapi-f3_defconfig +F: board/spacemit/k1/ +F: configs/k1_defconfigF:
doc/board/spacemit/bananapi-f3.rstboard/spacemit/k1/Makefile renamed from board/spacemit/bananapi-f3/Makefile +0
-0board/spacemit/k1/board.c renamed from board/spacemit/bananapi-f3/board.c +0
-0configs/k1_defconfig renamed from configs/bananapi-f3_defconfig +0
-0@@ -6,9 +6,10 @@ CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x1000000
CONFIG_DEFAULT_DEVICE_TREE="k1-bananapi-f3"
CONFIG_SYS_BOOTM_LEN=0xa000000
CONFIG_SYS_LOAD_ADDR=0x200000
-CONFIG_TARGET_BANANAPI_F3=y
CONFIG_ARCH_RV64I=y
CONFIG_RISCV_SMODE=yconfigs/k1_defconfig renamed from configs/bananapi-f3_defconfig +2
-0+CONFIG_ARCH_K1=y +CONFIG_TARGET_BANANAPI_F3=y
CONFIG_FIT=y
CONFIG_SUPPORT_RAW_INITRD=y
CONFIG_OF_BOARD_SETUP=yinclude/configs/k1.h renamed from include/configs/bananapi-f3.h +0
-0
PATCH 2/17 spacemit: k1: enable SPL with debug UART
In reply to Raymond MaoFrom: Raymond Mao <[email protected]>
Add SPL support featuring debug UART output for early boot diagnostics on K1 SoC.
--- arch/riscv/cpu/k1/Kconfig | 2 ++ arch/riscv/dts/Makefile | 1 + arch/riscv/dts/k1-spl.dts | 26 ++++++++++++++++++++++++++ arch/riscv/dts/k1.dtsi | 2 +- board/spacemit/k1/Makefile | 2 ++ board/spacemit/k1/spl.c | 24 ++++++++++++++++++++++++ configs/k1_defconfig | 21 ++++++++++++++++++++- include/configs/k1.h | 2 ++ 8 files changed, 78 insertions(+), 2 deletions(-) create mode 100644 arch/riscv/dts/k1-spl.dts create mode 100644 board/spacemit/k1/spl.c
arch/riscv/cpu/k1/Kconfig +2 -0
@@ -1,6 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2024, Kongyang Liu <[email protected]> +# Copyright (C) 2025-2026, RISCStar Ltd. if ARCH_K1
@@ -9,6 +10,7 @@ config SPACEMIT_K1 select BINMAN select ARCH_EARLY_INIT_R select SYS_CACHE_SHIFT_6 + select SUPPORT_SPL imply CPU imply CPU_RISCV imply RISCV_TIMER if (RISCV_SMODE || SPL_RISCV_SMODE)
arch/riscv/dts/Makefile +1 -0
@@ -1,5 +1,6 @@ # SPDX-License-Identifier: GPL-2.0+ +dtb-$(CONFIG_ARCH_K1) += k1-spl.dtb dtb-$(CONFIG_TARGET_ANDES_AE350) += ae350_32.dtb ae350_64.dtb dtb-$(CONFIG_TARGET_ANDES_VOYAGER) += qilai-voyager.dtb dtb-$(CONFIG_TARGET_BANANAPI_F3) += k1-bananapi-f3.dtb
arch/riscv/dts/k1-spl.dts new file +26 -0
@@ -0,0 +1,26 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/* + * Copyright (C) 2023-2026 Spacemit, Inc + * Copyright (C) 2025-2026 RISCStar Ltd. + */ + +/dts-v1/; +#include "k1.dtsi" +#include "binman.dtsi" + +/ { + model = "spacemit k1 spl"; + + chosen { + stdout-path = "serial0:115200n8"; + bootph-all; + }; +}; + +&soc { + bootph-all; + serial@d4017000 { + status = "okay"; + bootph-all; + }; +};
arch/riscv/dts/k1.dtsi +1 -1
@@ -318,7 +318,7 @@ }; }; - soc { + soc: soc { compatible = "simple-bus"; interrupt-parent = <&plic>; #address-cells = <2>;
board/spacemit/k1/Makefile +2 -0
@@ -1,5 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (c) 2024, Kongyang Liu <[email protected]> +# Copyright (c) 2025-2026, RISCStar Ltd. obj-y := board.o +obj-$(CONFIG_SPL_BUILD) += spl.o
board/spacemit/k1/spl.c new file +24 -0
@@ -0,0 +1,24 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* +* Copyright (c) 2025-2026, RISCStar Ltd. +*/ + +#include <spl.h> + +void board_init_f (ulong dummy) +{ +int ret; + + ret =spl_early_init (); +if (ret) +panic ("spl_early_init() failed:%d\n" , ret); + +riscv_cpu_setup (); + +preloader_console_init (); +} + +u32 spl_boot_device (void ) +{ +return BOOT_DEVICE_NONE ; +}
configs/k1_defconfig +20 -1
@@ -3,7 +3,19 @@ CONFIG_SYS_MALLOC_LEN=0x1000000 CONFIG_NR_DRAM_BANKS=2 CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x1000000 -CONFIG_DEFAULT_DEVICE_TREE="k1-bananapi-f3" +CONFIG_DEFAULT_DEVICE_TREE="k1-spl" +CONFIG_SPL=y +CONFIG_SPL_TEXT_BASE=0xC0801000 +CONFIG_SPL_MAX_SIZE=0x33000 +CONFIG_SPL_BSS_START_ADDR=0xC0837000 +CONFIG_SPL_BSS_MAX_SIZE=0x2000 +# CONFIG_SPL_SHARES_INIT_SP_ADDR is not set +CONFIG_SPL_HAVE_INIT_STACK=y +CONFIG_SPL_STACK=0xC0840000 +CONFIG_SPL_SIZE_LIMIT=0x31000 +CONFIG_SPL_FIT_SIGNATURE=y +CONFIG_SPL_LOAD_FIT_ADDRESS=0x08000000 +CONFIG_STACK_SIZE=0x100000 CONFIG_SYS_BOOTM_LEN=0xa000000 CONFIG_SYS_LOAD_ADDR=0x200000 CONFIG_ARCH_RV64I=y
@@ -23,3 +35,10 @@ CONFIG_PINCTRL_SINGLE=y CONFIG_RESET_SPACEMIT_K1=y CONFIG_SYS_NS16550=y CONFIG_SYS_NS16550_MEM32=y +CONFIG_DEBUG_UART=y +CONFIG_DEBUG_UART_BASE=0xD4017000 +CONFIG_DEBUG_UART_CLOCK=14700000 +CONFIG_DEBUG_UART_SHIFT=2 +CONFIG_DEBUG_UART_NS16550=y +CONFIG_DEBUG_UART_ANNOUNCE=y +# CONFIG_DEBUG_SBI_CONSOLE is not set
include/configs/k1.h +2 -0
@@ -7,6 +7,8 @@#ifndef __CONFIG_H#define __CONFIG_H +#define CFG_SYS_NS16550_CLK 14700000 +#define CFG_SYS_SDRAM_BASE 0x0#define CFG_SYS_NS16550_IER 0x40/* UART Unit Enable */
Signature · 1 line
2.25.1
Re: [PATCH 02/17] spacemit: k1: enable SPL with debug UART
Quoted 18 lines · Raymond Mao
From: Raymond Mao <[email protected]>
Add SPL support featuring debug UART output for early boot diagnostics on K1 SoC.
Signed-off-by Raymond Mao <[email protected]>--- arch/riscv/cpu/k1/Kconfig | 2 ++ arch/riscv/dts/Makefile | 1 + arch/riscv/dts/k1-spl.dts | 26 ++++++++++++++++++++++++++ arch/riscv/dts/k1.dtsi | 2 +- board/spacemit/k1/Makefile | 2 ++ board/spacemit/k1/spl.c | 24 ++++++++++++++++++++++++ configs/k1_defconfig | 21 ++++++++++++++++++++- include/configs/k1.h | 2 ++ 8 files changed, 78 insertions(+), 2 deletions(-) create mode 100644 arch/riscv/dts/k1-spl.dts create mode 100644 board/spacemit/k1/spl.c
...
configs/k1_defconfig CONFIG_SYS_MALLOC_LEN=0x1000000 · line 8
Quoted 12 lines
configs/k1_defconfig +3
-1@@ -3,7 +3,19 @@ CONFIG_SYS_MALLOC_LEN=0x1000000 CONFIG_NR_DRAM_BANKS=2 CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x1000000 -CONFIG_DEFAULT_DEVICE_TREE="k1-bananapi-f3" +CONFIG_DEFAULT_DEVICE_TREE="k1-spl" +CONFIG_SPL=y +CONFIG_SPL_TEXT_BASE=0xC0801000
Please be consistent about cases in hex. Rest of the file uses lowercases, and I think it's better to align.
Quoted 14 lines
configs/k1_defconfig +10
-0+CONFIG_SPL_MAX_SIZE=0x33000 +CONFIG_SPL_BSS_START_ADDR=0xC0837000 +CONFIG_SPL_BSS_MAX_SIZE=0x2000 +# CONFIG_SPL_SHARES_INIT_SP_ADDR is not set +CONFIG_SPL_HAVE_INIT_STACK=y +CONFIG_SPL_STACK=0xC0840000 +CONFIG_SPL_SIZE_LIMIT=0x31000 +CONFIG_SPL_FIT_SIGNATURE=y +CONFIG_SPL_LOAD_FIT_ADDRESS=0x08000000 +CONFIG_STACK_SIZE=0x100000 CONFIG_SYS_BOOTM_LEN=0xa000000 CONFIG_SYS_LOAD_ADDR=0x200000 CONFIG_ARCH_RV64I=y
configs/k1_defconfig CONFIG_PINCTRL_SINGLE=y · line 43
Quoted 9 lines
configs/k1_defconfig +6
-0@@ -23,3 +35,10 @@ CONFIG_PINCTRL_SINGLE=y CONFIG_RESET_SPACEMIT_K1=y CONFIG_SYS_NS16550=y CONFIG_SYS_NS16550_MEM32=y +CONFIG_DEBUG_UART=y +CONFIG_DEBUG_UART_BASE=0xD4017000 +CONFIG_DEBUG_UART_CLOCK=14700000 +CONFIG_DEBUG_UART_SHIFT=2 +CONFIG_DEBUG_UART_NS16550=y +CONFIG_DEBUG_UART_ANNOUNCE=y
Regards,
Yao Zi
Re: [PATCH 02/17] spacemit: k1: enable SPL with debug UART
In reply to Raymond MaoQuoted 4 lines · Raymond Mao
From: Raymond Mao <[email protected]>
Add SPL support featuring debug UART output for early boot diagnostics on K1 SoC.
Please, describe how to install the SPL binary to make this patch testable.
arch/riscv/dts/k1-spl.dts
Quoted 51 lines
Signed-off-by Raymond Mao <[email protected]>--- arch/riscv/cpu/k1/Kconfig | 2 ++ arch/riscv/dts/Makefile | 1 + arch/riscv/dts/k1-spl.dts | 26 ++++++++++++++++++++++++++ arch/riscv/dts/k1.dtsi | 2 +- board/spacemit/k1/Makefile | 2 ++ board/spacemit/k1/spl.c | 24 ++++++++++++++++++++++++ configs/k1_defconfig | 21 ++++++++++++++++++++- include/configs/k1.h | 2 ++ 8 files changed, 78 insertions(+), 2 deletions(-)create mode 100644
arch/riscv/dts/k1-spl.dts
create mode 100644board/spacemit/k1/spl.carch/riscv/cpu/k1/Kconfig +2
-0@@ -1,6 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2024, Kongyang Liu <[email protected]> +# Copyright (C) 2025-2026, RISCStar Ltd. if ARCH_K1@@ -9,6 +10,7 @@ config SPACEMIT_K1 select BINMAN select ARCH_EARLY_INIT_R select SYS_CACHE_SHIFT_6 + select SUPPORT_SPL imply CPU imply CPU_RISCV imply RISCV_TIMER if (RISCV_SMODE || SPL_RISCV_SMODE)arch/riscv/dts/Makefile +1
-0@@ -1,5 +1,6 @@ # SPDX-License-Identifier: GPL-2.0+ +dtb-$(CONFIG_ARCH_K1) += k1-spl.dtb dtb-$(CONFIG_TARGET_ANDES_AE350) += ae350_32.dtb ae350_64.dtb dtb-$(CONFIG_TARGET_ANDES_VOYAGER) += qilai-voyager.dtb dtb-$(CONFIG_TARGET_BANANAPI_F3) += k1-bananapi-f3.dtbarch/riscv/dts/k1-spl.dts new file +0
-0
Why do you introduce this file?
Can't we use dts/upstream/src/riscv/spacemit/k1-bananapi-f3.dts
Quoted 7 lines
arch/riscv/dts/k1-spl.dts new file +6
-0@@ -0,0 +1,26 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/* + * Copyright (C) 2023-2026 Spacemit, Inc + * Copyright (C) 2025-2026 RISCStar Ltd. + */ +
arch/riscv/dts/k1-spl.dts line 16
Quoted 10 lines
arch/riscv/dts/k1-spl.dts new file +10
-0+/dts-v1/; +#include "k1.dtsi" +#include "binman.dtsi" + +/ { + model = "spacemit k1 spl"; + + chosen { + stdout-path = "serial0:115200n8"; + bootph-all;
The target should be to inherit bootph-all from the Linux kernel tree.
Until you you have this upstream you could add the bootph-all properties to arch/riscv/dts/k1-bananapi-f3-u-boot.dtsi
Best regards
Heinrich
Quoted 114 lines
arch/riscv/dts/k1-spl.dts new file +10
-0+ }; +}; + +&soc { + bootph-all; + serial@d4017000 { + status = "okay"; + bootph-all; + }; +};arch/riscv/dts/k1.dtsi +1
-1@@ -318,7 +318,7 @@ }; }; - soc { + soc: soc { compatible = "simple-bus"; interrupt-parent = <&plic>; #address-cells = <2>;board/spacemit/k1/Makefile +2
-0@@ -1,5 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (c) 2024, Kongyang Liu <[email protected]> +# Copyright (c) 2025-2026, RISCStar Ltd. obj-y := board.o +obj-$(CONFIG_SPL_BUILD) += spl.oboard/spacemit/k1/spl.c new file +24
-0@@ -0,0 +1,24 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* +* Copyright (c) 2025-2026, RISCStar Ltd. +*/ + +#include <spl.h> + +void board_init_f (ulong dummy) +{ +int ret; + + ret =spl_early_init (); +if (ret) +panic ("spl_early_init() failed:%d\n" , ret); + +riscv_cpu_setup (); + +preloader_console_init (); +} + +u32 spl_boot_device (void ) +{ +return BOOT_DEVICE_NONE ; +}configs/k1_defconfig +20
-1@@ -3,7 +3,19 @@ CONFIG_SYS_MALLOC_LEN=0x1000000 CONFIG_NR_DRAM_BANKS=2 CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x1000000 -CONFIG_DEFAULT_DEVICE_TREE="k1-bananapi-f3" +CONFIG_DEFAULT_DEVICE_TREE="k1-spl" +CONFIG_SPL=y +CONFIG_SPL_TEXT_BASE=0xC0801000 +CONFIG_SPL_MAX_SIZE=0x33000 +CONFIG_SPL_BSS_START_ADDR=0xC0837000 +CONFIG_SPL_BSS_MAX_SIZE=0x2000 +# CONFIG_SPL_SHARES_INIT_SP_ADDR is not set +CONFIG_SPL_HAVE_INIT_STACK=y +CONFIG_SPL_STACK=0xC0840000 +CONFIG_SPL_SIZE_LIMIT=0x31000 +CONFIG_SPL_FIT_SIGNATURE=y +CONFIG_SPL_LOAD_FIT_ADDRESS=0x08000000 +CONFIG_STACK_SIZE=0x100000 CONFIG_SYS_BOOTM_LEN=0xa000000 CONFIG_SYS_LOAD_ADDR=0x200000 CONFIG_ARCH_RV64I=y@@ -23,3 +35,10 @@ CONFIG_PINCTRL_SINGLE=y CONFIG_RESET_SPACEMIT_K1=y CONFIG_SYS_NS16550=y CONFIG_SYS_NS16550_MEM32=y +CONFIG_DEBUG_UART=y +CONFIG_DEBUG_UART_BASE=0xD4017000 +CONFIG_DEBUG_UART_CLOCK=14700000 +CONFIG_DEBUG_UART_SHIFT=2 +CONFIG_DEBUG_UART_NS16550=y +CONFIG_DEBUG_UART_ANNOUNCE=y +# CONFIG_DEBUG_SBI_CONSOLE is not setinclude/configs/k1.h +2
-0@@ -7,6 +7,8 @@#ifndef __CONFIG_H#define __CONFIG_H +#define CFG_SYS_NS16550_CLK 14700000 +#define CFG_SYS_SDRAM_BASE 0x0#define CFG_SYS_NS16550_IER 0x40/* UART Unit Enable */
Re: [PATCH 02/17] spacemit: k1: enable SPL with debug UART
Hi Heinrich,
Quoted 9 lines · Heinrich Schuchardt
Quoted 4 lines · Raymond Mao
From: Raymond Mao <[email protected]>
Add SPL support featuring debug UART output for early boot diagnostics on K1 SoC.
Please, describe how to install the SPL binary to make this patch testable.
Currently it only supports testing via USB download through fastboot, not an installable image in flash.
Regards,
Raymond
Quoted 197 lines
arch/riscv/dts/k1-spl.dts
Quoted 51 lines
Signed-off-by Raymond Mao <[email protected]>--- arch/riscv/cpu/k1/Kconfig | 2 ++ arch/riscv/dts/Makefile | 1 + arch/riscv/dts/k1-spl.dts | 26 ++++++++++++++++++++++++++ arch/riscv/dts/k1.dtsi | 2 +- board/spacemit/k1/Makefile | 2 ++ board/spacemit/k1/spl.c | 24 ++++++++++++++++++++++++ configs/k1_defconfig | 21 ++++++++++++++++++++- include/configs/k1.h | 2 ++ 8 files changed, 78 insertions(+), 2 deletions(-)create mode 100644
arch/riscv/dts/k1-spl.dts
create mode 100644board/spacemit/k1/spl.carch/riscv/cpu/k1/Kconfig +2
-0@@ -1,6 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2024, Kongyang Liu <[email protected]> +# Copyright (C) 2025-2026, RISCStar Ltd. if ARCH_K1@@ -9,6 +10,7 @@ config SPACEMIT_K1 select BINMAN select ARCH_EARLY_INIT_R select SYS_CACHE_SHIFT_6 + select SUPPORT_SPL imply CPU imply CPU_RISCV imply RISCV_TIMER if (RISCV_SMODE || SPL_RISCV_SMODE)arch/riscv/dts/Makefile +1
-0@@ -1,5 +1,6 @@ # SPDX-License-Identifier: GPL-2.0+ +dtb-$(CONFIG_ARCH_K1) += k1-spl.dtb dtb-$(CONFIG_TARGET_ANDES_AE350) += ae350_32.dtb ae350_64.dtb dtb-$(CONFIG_TARGET_ANDES_VOYAGER) += qilai-voyager.dtb dtb-$(CONFIG_TARGET_BANANAPI_F3) += k1-bananapi-f3.dtbarch/riscv/dts/k1-spl.dts new file +0
-0Why do you introduce this file?
Can't we usedts/upstream/src/riscv/spacemit/k1-bananapi-f3.dtsQuoted 7 lines
arch/riscv/dts/k1-spl.dts new file +6
-0@@ -0,0 +1,26 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/* + * Copyright (C) 2023-2026 Spacemit, Inc + * Copyright (C) 2025-2026 RISCStar Ltd. + */ +arch/riscv/dts/k1-spl.dts line 16
Quoted 10 lines
arch/riscv/dts/k1-spl.dts new file +10
-0+/dts-v1/; +#include "k1.dtsi" +#include "binman.dtsi" + +/ { + model = "spacemit k1 spl"; + + chosen { + stdout-path = "serial0:115200n8"; + bootph-all;The target should be to inherit bootph-all from the Linux kernel tree.
Until you you have this upstream you could add the bootph-all properties to
arch/riscv/dts/k1-bananapi-f3-u-boot.dtsiBest regards
Heinrich
Quoted 114 lines
arch/riscv/dts/k1-spl.dts new file +10
-0+ }; +}; + +&soc { + bootph-all; + serial@d4017000 { + status = "okay"; + bootph-all; + }; +};arch/riscv/dts/k1.dtsi +1
-1@@ -318,7 +318,7 @@ }; }; - soc { + soc: soc { compatible = "simple-bus"; interrupt-parent = <&plic>; #address-cells = <2>;board/spacemit/k1/Makefile +2
-0@@ -1,5 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (c) 2024, Kongyang Liu <[email protected]> +# Copyright (c) 2025-2026, RISCStar Ltd. obj-y := board.o +obj-$(CONFIG_SPL_BUILD) += spl.oboard/spacemit/k1/spl.c new file +24
-0@@ -0,0 +1,24 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* +* Copyright (c) 2025-2026, RISCStar Ltd. +*/ + +#include <spl.h> + +void board_init_f (ulong dummy) +{ +int ret; + + ret =spl_early_init (); +if (ret) +panic ("spl_early_init() failed:%d\n" , ret); + +riscv_cpu_setup (); + +preloader_console_init (); +} + +u32 spl_boot_device (void ) +{ +return BOOT_DEVICE_NONE ; +}configs/k1_defconfig +20
-1@@ -3,7 +3,19 @@ CONFIG_SYS_MALLOC_LEN=0x1000000 CONFIG_NR_DRAM_BANKS=2 CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x1000000 -CONFIG_DEFAULT_DEVICE_TREE="k1-bananapi-f3" +CONFIG_DEFAULT_DEVICE_TREE="k1-spl" +CONFIG_SPL=y +CONFIG_SPL_TEXT_BASE=0xC0801000 +CONFIG_SPL_MAX_SIZE=0x33000 +CONFIG_SPL_BSS_START_ADDR=0xC0837000 +CONFIG_SPL_BSS_MAX_SIZE=0x2000 +# CONFIG_SPL_SHARES_INIT_SP_ADDR is not set +CONFIG_SPL_HAVE_INIT_STACK=y +CONFIG_SPL_STACK=0xC0840000 +CONFIG_SPL_SIZE_LIMIT=0x31000 +CONFIG_SPL_FIT_SIGNATURE=y +CONFIG_SPL_LOAD_FIT_ADDRESS=0x08000000 +CONFIG_STACK_SIZE=0x100000 CONFIG_SYS_BOOTM_LEN=0xa000000 CONFIG_SYS_LOAD_ADDR=0x200000 CONFIG_ARCH_RV64I=y@@ -23,3 +35,10 @@ CONFIG_PINCTRL_SINGLE=y CONFIG_RESET_SPACEMIT_K1=y CONFIG_SYS_NS16550=y CONFIG_SYS_NS16550_MEM32=y +CONFIG_DEBUG_UART=y +CONFIG_DEBUG_UART_BASE=0xD4017000 +CONFIG_DEBUG_UART_CLOCK=14700000 +CONFIG_DEBUG_UART_SHIFT=2 +CONFIG_DEBUG_UART_NS16550=y +CONFIG_DEBUG_UART_ANNOUNCE=y +# CONFIG_DEBUG_SBI_CONSOLE is not setinclude/configs/k1.h +2
-0@@ -7,6 +7,8 @@#ifndef __CONFIG_H#define __CONFIG_H +#define CFG_SYS_NS16550_CLK 14700000 +#define CFG_SYS_SDRAM_BASE 0x0#define CFG_SYS_NS16550_IER 0x40/* UART Unit Enable */
PATCH 3/17 configs: k1: enable early timer support
In reply to Raymond MaoFrom: Raymond Mao <[email protected]>
Enable CONFIG_TIMER_EARLY to allow udelay() calls during early initialization phases. This is required for proper timing operations before the full timer driver is available.
--- configs/k1_defconfig | 2 ++ include/configs/k1.h | 4 ++++ 2 files changed, 6 insertions(+)
configs/k1_defconfig +2 -0
@@ -20,6 +20,7 @@ CONFIG_SYS_BOOTM_LEN=0xa000000 CONFIG_SYS_LOAD_ADDR=0x200000 CONFIG_ARCH_RV64I=y CONFIG_RISCV_SMODE=y +CONFIG_SPL_RISCV_SMODE=y CONFIG_ARCH_K1=y CONFIG_TARGET_BANANAPI_F3=y CONFIG_FIT=y
@@ -42,3 +43,4 @@ CONFIG_DEBUG_UART_SHIFT=2 CONFIG_DEBUG_UART_NS16550=y CONFIG_DEBUG_UART_ANNOUNCE=y # CONFIG_DEBUG_SBI_CONSOLE is not set +CONFIG_TIMER_EARLY=y
include/configs/k1.h +4 -0
@@ -1,6 +1,7 @@/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2024, Kongyang Liu <[email protected]> +* Copyright (c) 2025-2026, RISCStar Ltd. * */
@@ -12,4 +13,7 @@#define CFG_SYS_SDRAM_BASE 0x0#define CFG_SYS_NS16550_IER 0x40/* UART Unit Enable */ +#define RISCV_MMODE_TIMER_FREQ 24000000 +#define RISCV_SMODE_TIMER_FREQ 24000000 +#endif /* __CONFIG_H */
Signature · 1 line
2.25.1
PATCH 4/17 reset: k1: add SPL support and enable TWSI8 reset
In reply to Raymond MaoFrom: Raymond Mao <[email protected]>
This commit enhances the K1 reset controller driver:
1. Enable SPL support
- Select CONFIG_SPL_RESET_SPACEMIT_K1 for SPL builds
- Reset controller is required during early boot for proper hardware initialization sequence
2. Remove TWSI8 (I2C8) reset restriction
- TWSI8 is now fully controllable by reset controller
--- drivers/reset/Kconfig | 7 +++++++ drivers/reset/Makefile | 2 +- drivers/reset/reset-spacemit-k1.c | 4 ---- 3 files changed, 8 insertions(+), 5 deletions(-)
drivers/reset/Kconfig +7 -0
@@ -252,5 +252,12 @@ config RESET_SPACEMIT_K1 Support for SPACEMIT's K1 Reset system. Basic Assert/Deassert is supported. +config SPL_RESET_SPACEMIT_K1 + bool "SPL Reset driver for Spacemit K1 SoC" + depends on SPL && RESET_SPACEMIT_K1 + default y + help + Support for reset controller on Spacemit K1 SoCs in SPL. + source "drivers/reset/stm32/Kconfig" endmenu
drivers/reset/Makefile +1 -1
@@ -33,8 +33,8 @@ obj-$(CONFIG_RESET_ZYNQMP) += reset-zynqmp.o obj-$(CONFIG_RESET_DRA7) += reset-dra7.o obj-$(CONFIG_RESET_AT91) += reset-at91.o obj-$(CONFIG_$(PHASE_)RESET_JH7110) += reset-jh7110.o +obj-$(CONFIG_$(PHASE_)RESET_SPACEMIT_K1) += reset-spacemit-k1.o obj-$(CONFIG_RESET_RZG2L_USBPHY_CTRL) += reset-rzg2l-usbphy-ctrl.o -obj-$(CONFIG_RESET_SPACEMIT_K1) += reset-spacemit-k1.o obj-$(CONFIG_ARCH_STM32) += stm32/ obj-$(CONFIG_ARCH_STM32MP) += stm32/
drivers/reset/reset-spacemit-k1.c +0 -4
@@ -452,10 +452,6 @@ static int spacemit_reset_update(struct reset_ctl *rst, bool assert)if (rst->id <RESET_UART1 || rst->id >=RESET_NUMBER )return 0 ; -/* can not write to twsi8 */ -if (rst->id ==RESET_TWSI8 ) -return 0 ; -spacemit_reset_set (rst, rst->id, assert);return 0 ; }
Signature · 1 line
2.25.1
Re: [PATCH 04/17] reset: k1: add SPL support and enable TWSI8 reset
Quoted 11 lines · Raymond Mao
From: Raymond Mao <[email protected]>
This commit enhances the K1 reset controller driver:
1. Enable SPL support
- SelectCONFIG_SPL_RESET_SPACEMIT_K1for SPL builds
- Reset controller is required during early boot for proper hardware initialization sequence2. Remove TWSI8 (I2C8) reset restriction
- TWSI8 is now fully controllable by reset controller
I don't think you change any real logics in the driver, so what fixes the function of TWSI8 reset? This deserves more explanation.
Quoted 6 lines
Signed-off-by Raymond Mao <[email protected]>--- drivers/reset/Kconfig | 7 +++++++ drivers/reset/Makefile | 2 +- drivers/reset/reset-spacemit-k1.c | 4 ---- 3 files changed, 8 insertions(+), 5 deletions(-)
Regards,
Yao Zi
Re: [PATCH 04/17] reset: k1: add SPL support and enable TWSI8 reset
Hi Yao Zi
Quoted 10 lines · Yao Zi
Quoted 9 lines · Raymond Mao
From: Raymond Mao <[email protected]>
This commit enhances the K1 reset controller driver:
1. Enable SPL support
- SelectCONFIG_SPL_RESET_SPACEMIT_K1for SPL builds
- Reset controller is required during early boot for proper hardware initialization sequence
Quoted 7 lines
Quoted 2 lines
2. Remove TWSI8 (I2C8) reset restriction
- TWSI8 is now fully controllable by reset controllerI don't think you change any real logics in the driver, so what fixes the function of TWSI8 reset? This deserves more explanation.
The TWSI8 reset could be accessed. But it's only writable. So I remove the restriction.
Regards,
Raymond
Quoted 10 lines
Quoted 6 lines
Signed-off-by Raymond Mao <[email protected]>--- drivers/reset/Kconfig | 7 +++++++ drivers/reset/Makefile | 2 +- drivers/reset/reset-spacemit-k1.c | 4 ---- 3 files changed, 8 insertions(+), 5 deletions(-)Regards,
Yao Zi
PATCH 5/17 dt-bindings: clock: import k1-syscon from upstream
In reply to Raymond MaoFrom: Raymond Mao <[email protected]>
Import spacemit,k1-syscon.h from upstream folder. And remove duplicated reset IDs in it.
--- .../dt-bindings/clock/spacemit,k1-syscon.h | 253 ++++++++++++++++++ 1 file changed, 253 insertions(+) create mode 100644 include/dt-bindings/clock/spacemit,k1-syscon.h
include/dt-bindings/clock/spacemit,k1-syscon.h new file +253 -0
@@ -0,0 +1,253 @@ +/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */ +/* +* Copyright (C) 2024-2025 Haylen Chu <[email protected]> +*/ + +#ifndef _DT_BINDINGS_SPACEMIT_CCU_H_ +#define _DT_BINDINGS_SPACEMIT_CCU_H_ + +/* APBS (PLL) clocks */ +#define CLK_PLL1 0 +#define CLK_PLL2 1 +#define CLK_PLL3 2 +#define CLK_PLL1_D2 3 +#define CLK_PLL1_D3 4 +#define CLK_PLL1_D4 5 +#define CLK_PLL1_D5 6 +#define CLK_PLL1_D6 7 +#define CLK_PLL1_D7 8 +#define CLK_PLL1_D8 9 +#define CLK_PLL1_D11 10 +#define CLK_PLL1_D13 11 +#define CLK_PLL1_D23 12 +#define CLK_PLL1_D64 13 +#define CLK_PLL1_D10_AUD 14 +#define CLK_PLL1_D100_AUD 15 +#define CLK_PLL2_D1 16 +#define CLK_PLL2_D2 17 +#define CLK_PLL2_D3 18 +#define CLK_PLL2_D4 19 +#define CLK_PLL2_D5 20 +#define CLK_PLL2_D6 21 +#define CLK_PLL2_D7 22 +#define CLK_PLL2_D8 23 +#define CLK_PLL3_D1 24 +#define CLK_PLL3_D2 25 +#define CLK_PLL3_D3 26 +#define CLK_PLL3_D4 27 +#define CLK_PLL3_D5 28 +#define CLK_PLL3_D6 29 +#define CLK_PLL3_D7 30 +#define CLK_PLL3_D8 31 +#define CLK_PLL3_80 32 +#define CLK_PLL3_40 33 +#define CLK_PLL3_20 34 + +/* MPMU clocks */ +#define CLK_PLL1_307P2 0 +#define CLK_PLL1_76P8 1 +#define CLK_PLL1_61P44 2 +#define CLK_PLL1_153P6 3 +#define CLK_PLL1_102P4 4 +#define CLK_PLL1_51P2 5 +#define CLK_PLL1_51P2_AP 6 +#define CLK_PLL1_57P6 7 +#define CLK_PLL1_25P6 8 +#define CLK_PLL1_12P8 9 +#define CLK_PLL1_12P8_WDT 10 +#define CLK_PLL1_6P4 11 +#define CLK_PLL1_3P2 12 +#define CLK_PLL1_1P6 13 +#define CLK_PLL1_0P8 14 +#define CLK_PLL1_409P6 15 +#define CLK_PLL1_204P8 16 +#define CLK_PLL1_491 17 +#define CLK_PLL1_245P76 18 +#define CLK_PLL1_614 19 +#define CLK_PLL1_47P26 20 +#define CLK_PLL1_31P5 21 +#define CLK_PLL1_819 22 +#define CLK_PLL1_1228 23 +#define CLK_SLOW_UART 24 +#define CLK_SLOW_UART1 25 +#define CLK_SLOW_UART2 26 +#define CLK_WDT 27 +#define CLK_RIPC 28 +#define CLK_I2S_SYSCLK 29 +#define CLK_I2S_BCLK 30 +#define CLK_APB 31 +#define CLK_WDT_BUS 32 +#define CLK_I2S_153P6 33 +#define CLK_I2S_153P6_BASE 34 +#define CLK_I2S_SYSCLK_SRC 35 +#define CLK_I2S_BCLK_FACTOR 36 + +/* APBC clocks */ +#define CLK_UART0 0 +#define CLK_UART2 1 +#define CLK_UART3 2 +#define CLK_UART4 3 +#define CLK_UART5 4 +#define CLK_UART6 5 +#define CLK_UART7 6 +#define CLK_UART8 7 +#define CLK_UART9 8 +#define CLK_GPIO 9 +#define CLK_PWM0 10 +#define CLK_PWM1 11 +#define CLK_PWM2 12 +#define CLK_PWM3 13 +#define CLK_PWM4 14 +#define CLK_PWM5 15 +#define CLK_PWM6 16 +#define CLK_PWM7 17 +#define CLK_PWM8 18 +#define CLK_PWM9 19 +#define CLK_PWM10 20 +#define CLK_PWM11 21 +#define CLK_PWM12 22 +#define CLK_PWM13 23 +#define CLK_PWM14 24 +#define CLK_PWM15 25 +#define CLK_PWM16 26 +#define CLK_PWM17 27 +#define CLK_PWM18 28 +#define CLK_PWM19 29 +#define CLK_SSP3 30 +#define CLK_RTC 31 +#define CLK_TWSI0 32 +#define CLK_TWSI1 33 +#define CLK_TWSI2 34 +#define CLK_TWSI4 35 +#define CLK_TWSI5 36 +#define CLK_TWSI6 37 +#define CLK_TWSI7 38 +#define CLK_TWSI8 39 +#define CLK_TIMERS1 40 +#define CLK_TIMERS2 41 +#define CLK_AIB 42 +#define CLK_ONEWIRE 43 +#define CLK_SSPA0 44 +#define CLK_SSPA1 45 +#define CLK_DRO 46 +#define CLK_IR 47 +#define CLK_TSEN 48 +#define CLK_IPC_AP2AUD 49 +#define CLK_CAN0 50 +#define CLK_CAN0_BUS 51 +#define CLK_UART0_BUS 52 +#define CLK_UART2_BUS 53 +#define CLK_UART3_BUS 54 +#define CLK_UART4_BUS 55 +#define CLK_UART5_BUS 56 +#define CLK_UART6_BUS 57 +#define CLK_UART7_BUS 58 +#define CLK_UART8_BUS 59 +#define CLK_UART9_BUS 60 +#define CLK_GPIO_BUS 61 +#define CLK_PWM0_BUS 62 +#define CLK_PWM1_BUS 63 +#define CLK_PWM2_BUS 64 +#define CLK_PWM3_BUS 65 +#define CLK_PWM4_BUS 66 +#define CLK_PWM5_BUS 67 +#define CLK_PWM6_BUS 68 +#define CLK_PWM7_BUS 69 +#define CLK_PWM8_BUS 70 +#define CLK_PWM9_BUS 71 +#define CLK_PWM10_BUS 72 +#define CLK_PWM11_BUS 73 +#define CLK_PWM12_BUS 74 +#define CLK_PWM13_BUS 75 +#define CLK_PWM14_BUS 76 +#define CLK_PWM15_BUS 77 +#define CLK_PWM16_BUS 78 +#define CLK_PWM17_BUS 79 +#define CLK_PWM18_BUS 80 +#define CLK_PWM19_BUS 81 +#define CLK_SSP3_BUS 82 +#define CLK_RTC_BUS 83 +#define CLK_TWSI0_BUS 84 +#define CLK_TWSI1_BUS 85 +#define CLK_TWSI2_BUS 86 +#define CLK_TWSI4_BUS 87 +#define CLK_TWSI5_BUS 88 +#define CLK_TWSI6_BUS 89 +#define CLK_TWSI7_BUS 90 +#define CLK_TWSI8_BUS 91 +#define CLK_TIMERS1_BUS 92 +#define CLK_TIMERS2_BUS 93 +#define CLK_AIB_BUS 94 +#define CLK_ONEWIRE_BUS 95 +#define CLK_SSPA0_BUS 96 +#define CLK_SSPA1_BUS 97 +#define CLK_TSEN_BUS 98 +#define CLK_IPC_AP2AUD_BUS 99 +#define CLK_SSPA0_I2S_BCLK 100 +#define CLK_SSPA1_I2S_BCLK 101 + +/* APMU clocks */ +#define CLK_CCI550 0 +#define CLK_CPU_C0_HI 1 +#define CLK_CPU_C0_CORE 2 +#define CLK_CPU_C0_ACE 3 +#define CLK_CPU_C0_TCM 4 +#define CLK_CPU_C1_HI 5 +#define CLK_CPU_C1_CORE 6 +#define CLK_CPU_C1_ACE 7 +#define CLK_CCIC_4X 8 +#define CLK_CCIC1PHY 9 +#define CLK_SDH_AXI 10 +#define CLK_SDH0 11 +#define CLK_SDH1 12 +#define CLK_SDH2 13 +#define CLK_USB_P1 14 +#define CLK_USB_AXI 15 +#define CLK_USB30 16 +#define CLK_QSPI 17 +#define CLK_QSPI_BUS 18 +#define CLK_DMA 19 +#define CLK_AES 20 +#define CLK_VPU 21 +#define CLK_GPU 22 +#define CLK_EMMC 23 +#define CLK_EMMC_X 24 +#define CLK_AUDIO 25 +#define CLK_HDMI 26 +#define CLK_PMUA_ACLK 27 +#define CLK_PCIE0_MASTER 28 +#define CLK_PCIE0_SLAVE 29 +#define CLK_PCIE0_DBI 30 +#define CLK_PCIE1_MASTER 31 +#define CLK_PCIE1_SLAVE 32 +#define CLK_PCIE1_DBI 33 +#define CLK_PCIE2_MASTER 34 +#define CLK_PCIE2_SLAVE 35 +#define CLK_PCIE2_DBI 36 +#define CLK_EMAC0_BUS 37 +#define CLK_EMAC0_PTP 38 +#define CLK_EMAC1_BUS 39 +#define CLK_EMAC1_PTP 40 +#define CLK_JPG 41 +#define CLK_CCIC2PHY 42 +#define CLK_CCIC3PHY 43 +#define CLK_CSI 44 +#define CLK_CAMM0 45 +#define CLK_CAMM1 46 +#define CLK_CAMM2 47 +#define CLK_ISP_CPP 48 +#define CLK_ISP_BUS 49 +#define CLK_ISP 50 +#define CLK_DPU_MCLK 51 +#define CLK_DPU_ESC 52 +#define CLK_DPU_BIT 53 +#define CLK_DPU_PXCLK 54 +#define CLK_DPU_HCLK 55 +#define CLK_DPU_SPI 56 +#define CLK_DPU_SPI_HBUS 57 +#define CLK_DPU_SPIBUS 58 +#define CLK_DPU_SPI_ACLK 59 +#define CLK_V2D 60 +#define CLK_EMMC_BUS 61 + +#endif /* _DT_BINDINGS_SPACEMIT_CCU_H_ */
Signature · 1 line
2.25.1
PATCH 6/17 dts: k1: import dts file from upstream folder
In reply to Raymond MaoFrom: Raymond Mao <[email protected]>
Import K1.dtsi from upstream folder.
--- arch/riscv/dts/k1.dtsi | 562 +++++++++++++++++++++++++++++++++-------- 1 file changed, 460 insertions(+), 102 deletions(-)
arch/riscv/dts/k1.dtsi +460 -102
@@ -1,8 +1,11 @@ -// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +// SPDX-License-Identifier: GPL-2.0 OR MIT /* * Copyright (C) 2024 Yangyu Chen <[email protected]> */ +#include <dt-bindings/clock/spacemit,k1-syscon.h> +#include <dt-bindings/reset/spacemit-k1-reset.h> + /dts-v1/; / { #address-cells = <2>;
@@ -10,18 +13,6 @@ model = "SpacemiT K1"; compatible = "spacemit,k1"; - aliases { - serial0 = &uart0; - serial1 = &uart2; - serial2 = &uart3; - serial3 = &uart4; - serial4 = &uart5; - serial5 = &uart6; - serial6 = &uart7; - serial7 = &uart8; - serial8 = &uart9; - }; - cpus { #address-cells = <1>; #size-cells = <0>;
@@ -318,6 +309,36 @@ }; }; + clocks { + vctcxo_1m: clock-1m { + compatible = "fixed-clock"; + clock-frequency = <1000000>; + clock-output-names = "vctcxo_1m"; + #clock-cells = <0>; + }; + + vctcxo_24m: clock-24m { + compatible = "fixed-clock"; + clock-frequency = <24000000>; + clock-output-names = "vctcxo_24m"; + #clock-cells = <0>; + }; + + vctcxo_3m: clock-3m { + compatible = "fixed-clock"; + clock-frequency = <3000000>; + clock-output-names = "vctcxo_3m"; + #clock-cells = <0>; + }; + + osc_32k: clock-32k { + compatible = "fixed-clock"; + clock-frequency = <32000>; + clock-output-names = "osc_32k"; + #clock-cells = <0>; + }; + }; + soc: soc { compatible = "simple-bus"; interrupt-parent = <&plic>;
@@ -326,96 +347,267 @@ dma-noncoherent; ranges; - uart0: serial@d4017000 { - compatible = "spacemit,k1-uart", "intel,xscale-uart"; - reg = <0x0 0xd4017000 0x0 0x100>; - interrupts = <42>; - clock-frequency = <14857000>; - reg-shift = <2>; - reg-io-width = <4>; + syscon_rcpu: system-controller@c0880000 { + compatible = "spacemit,k1-syscon-rcpu"; + reg = <0x0 0xc0880000 0x0 0x2048>; + #reset-cells = <1>; + }; + + syscon_rcpu2: system-controller@c0888000 { + compatible = "spacemit,k1-syscon-rcpu2"; + reg = <0x0 0xc0888000 0x0 0x28>; + #reset-cells = <1>; + }; + + syscon_apbc: system-controller@d4015000 { + compatible = "spacemit,k1-syscon-apbc"; + reg = <0x0 0xd4015000 0x0 0x1000>; + clocks = <&osc_32k>, <&vctcxo_1m>, <&vctcxo_3m>, + <&vctcxo_24m>; + clock-names = "osc", "vctcxo_1m", "vctcxo_3m", + "vctcxo_24m"; + #clock-cells = <1>; + #reset-cells = <1>; + }; + + gpio: gpio@d4019000 { + compatible = "spacemit,k1-gpio"; + reg = <0x0 0xd4019000 0x0 0x100>; + clocks = <&syscon_apbc CLK_GPIO>, + <&syscon_apbc CLK_GPIO_BUS>; + clock-names = "core", "bus"; + gpio-controller; + #gpio-cells = <3>; + interrupts = <58>; + interrupt-parent = <&plic>; + interrupt-controller; + #interrupt-cells = <3>; + gpio-ranges = <&pinctrl 0 0 0 32>, + <&pinctrl 1 0 32 32>, + <&pinctrl 2 0 64 32>, + <&pinctrl 3 0 96 32>; + }; + + pwm0: pwm@d401a000 { + compatible = "spacemit,k1-pwm", "marvell,pxa910-pwm"; + reg = <0x0 0xd401a000 0x0 0x10>; + #pwm-cells = <3>; + clocks = <&syscon_apbc CLK_PWM0>; + resets = <&syscon_apbc RESET_PWM0>; + status = "disabled"; + }; + + pwm1: pwm@d401a400 { + compatible = "spacemit,k1-pwm", "marvell,pxa910-pwm"; + reg = <0x0 0xd401a400 0x0 0x10>; + #pwm-cells = <3>; + clocks = <&syscon_apbc CLK_PWM1>; + resets = <&syscon_apbc RESET_PWM1>; + status = "disabled"; + }; + + pwm2: pwm@d401a800 { + compatible = "spacemit,k1-pwm", "marvell,pxa910-pwm"; + reg = <0x0 0xd401a800 0x0 0x10>; + #pwm-cells = <3>; + clocks = <&syscon_apbc CLK_PWM2>; + resets = <&syscon_apbc RESET_PWM2>; + status = "disabled"; + }; + + pwm3: pwm@d401ac00 { + compatible = "spacemit,k1-pwm", "marvell,pxa910-pwm"; + reg = <0x0 0xd401ac00 0x0 0x10>; + #pwm-cells = <3>; + clocks = <&syscon_apbc CLK_PWM3>; + resets = <&syscon_apbc RESET_PWM3>; + status = "disabled"; + }; + + pwm4: pwm@d401b000 { + compatible = "spacemit,k1-pwm", "marvell,pxa910-pwm"; + reg = <0x0 0xd401b000 0x0 0x10>; + #pwm-cells = <3>; + clocks = <&syscon_apbc CLK_PWM4>; + resets = <&syscon_apbc RESET_PWM4>; + status = "disabled"; + }; + + pwm5: pwm@d401b400 { + compatible = "spacemit,k1-pwm", "marvell,pxa910-pwm"; + reg = <0x0 0xd401b400 0x0 0x10>; + #pwm-cells = <3>; + clocks = <&syscon_apbc CLK_PWM5>; + resets = <&syscon_apbc RESET_PWM5>; + status = "disabled"; + }; + + pwm6: pwm@d401b800 { + compatible = "spacemit,k1-pwm", "marvell,pxa910-pwm"; + reg = <0x0 0xd401b800 0x0 0x10>; + #pwm-cells = <3>; + clocks = <&syscon_apbc CLK_PWM6>; + resets = <&syscon_apbc RESET_PWM6>; + status = "disabled"; + }; + + pwm7: pwm@d401bc00 { + compatible = "spacemit,k1-pwm", "marvell,pxa910-pwm"; + reg = <0x0 0xd401bc00 0x0 0x10>; + #pwm-cells = <3>; + clocks = <&syscon_apbc CLK_PWM7>; + resets = <&syscon_apbc RESET_PWM7>; + status = "disabled"; + }; + + pinctrl: pinctrl@d401e000 { + compatible = "spacemit,k1-pinctrl"; + reg = <0x0 0xd401e000 0x0 0x400>; + clocks = <&syscon_apbc CLK_AIB>, + <&syscon_apbc CLK_AIB_BUS>; + clock-names = "func", "bus"; + }; + + pwm8: pwm@d4020000 { + compatible = "spacemit,k1-pwm", "marvell,pxa910-pwm"; + reg = <0x0 0xd4020000 0x0 0x10>; + #pwm-cells = <3>; + clocks = <&syscon_apbc CLK_PWM8>; + resets = <&syscon_apbc RESET_PWM8>; + status = "disabled"; + }; + + pwm9: pwm@d4020400 { + compatible = "spacemit,k1-pwm", "marvell,pxa910-pwm"; + reg = <0x0 0xd4020400 0x0 0x10>; + #pwm-cells = <3>; + clocks = <&syscon_apbc CLK_PWM9>; + resets = <&syscon_apbc RESET_PWM9>; + status = "disabled"; + }; + + pwm10: pwm@d4020800 { + compatible = "spacemit,k1-pwm", "marvell,pxa910-pwm"; + reg = <0x0 0xd4020800 0x0 0x10>; + #pwm-cells = <3>; + clocks = <&syscon_apbc CLK_PWM10>; + resets = <&syscon_apbc RESET_PWM10>; status = "disabled"; }; - uart2: serial@d4017100 { - compatible = "spacemit,k1-uart", "intel,xscale-uart"; - reg = <0x0 0xd4017100 0x0 0x100>; - interrupts = <44>; - clock-frequency = <14857000>; - reg-shift = <2>; - reg-io-width = <4>; + pwm11: pwm@d4020c00 { + compatible = "spacemit,k1-pwm", "marvell,pxa910-pwm"; + reg = <0x0 0xd4020c00 0x0 0x10>; + #pwm-cells = <3>; + clocks = <&syscon_apbc CLK_PWM11>; + resets = <&syscon_apbc RESET_PWM11>; status = "disabled"; }; - uart3: serial@d4017200 { - compatible = "spacemit,k1-uart", "intel,xscale-uart"; - reg = <0x0 0xd4017200 0x0 0x100>; - interrupts = <45>; - clock-frequency = <14857000>; - reg-shift = <2>; - reg-io-width = <4>; + pwm12: pwm@d4021000 { + compatible = "spacemit,k1-pwm", "marvell,pxa910-pwm"; + reg = <0x0 0xd4021000 0x0 0x10>; + #pwm-cells = <3>; + clocks = <&syscon_apbc CLK_PWM12>; + resets = <&syscon_apbc RESET_PWM12>; status = "disabled"; }; - uart4: serial@d4017300 { - compatible = "spacemit,k1-uart", "intel,xscale-uart"; - reg = <0x0 0xd4017300 0x0 0x100>; - interrupts = <46>; - clock-frequency = <14857000>; - reg-shift = <2>; - reg-io-width = <4>; + pwm13: pwm@d4021400 { + compatible = "spacemit,k1-pwm", "marvell,pxa910-pwm"; + reg = <0x0 0xd4021400 0x0 0x10>; + #pwm-cells = <3>; + clocks = <&syscon_apbc CLK_PWM13>; + resets = <&syscon_apbc RESET_PWM13>; status = "disabled"; }; - uart5: serial@d4017400 { - compatible = "spacemit,k1-uart", "intel,xscale-uart"; - reg = <0x0 0xd4017400 0x0 0x100>; - interrupts = <47>; - clock-frequency = <14857000>; - reg-shift = <2>; - reg-io-width = <4>; + pwm14: pwm@d4021800 { + compatible = "spacemit,k1-pwm", "marvell,pxa910-pwm"; + reg = <0x0 0xd4021800 0x0 0x10>; + #pwm-cells = <3>; + clocks = <&syscon_apbc CLK_PWM14>; + resets = <&syscon_apbc RESET_PWM14>; status = "disabled"; }; - uart6: serial@d4017500 { - compatible = "spacemit,k1-uart", "intel,xscale-uart"; - reg = <0x0 0xd4017500 0x0 0x100>; - interrupts = <48>; - clock-frequency = <14857000>; - reg-shift = <2>; - reg-io-width = <4>; + pwm15: pwm@d4021c00 { + compatible = "spacemit,k1-pwm", "marvell,pxa910-pwm"; + reg = <0x0 0xd4021c00 0x0 0x10>; + #pwm-cells = <3>; + clocks = <&syscon_apbc CLK_PWM15>; + resets = <&syscon_apbc RESET_PWM15>; status = "disabled"; }; - uart7: serial@d4017600 { - compatible = "spacemit,k1-uart", "intel,xscale-uart"; - reg = <0x0 0xd4017600 0x0 0x100>; - interrupts = <49>; - clock-frequency = <14857000>; - reg-shift = <2>; - reg-io-width = <4>; + pwm16: pwm@d4022000 { + compatible = "spacemit,k1-pwm", "marvell,pxa910-pwm"; + reg = <0x0 0xd4022000 0x0 0x10>; + #pwm-cells = <3>; + clocks = <&syscon_apbc CLK_PWM16>; + resets = <&syscon_apbc RESET_PWM16>; status = "disabled"; }; - uart8: serial@d4017700 { - compatible = "spacemit,k1-uart", "intel,xscale-uart"; - reg = <0x0 0xd4017700 0x0 0x100>; - interrupts = <50>; - clock-frequency = <14857000>; - reg-shift = <2>; - reg-io-width = <4>; + pwm17: pwm@d4022400 { + compatible = "spacemit,k1-pwm", "marvell,pxa910-pwm"; + reg = <0x0 0xd4022400 0x0 0x10>; + #pwm-cells = <3>; + clocks = <&syscon_apbc CLK_PWM17>; + resets = <&syscon_apbc RESET_PWM17>; status = "disabled"; }; - uart9: serial@d4017800 { - compatible = "spacemit,k1-uart", "intel,xscale-uart"; - reg = <0x0 0xd4017800 0x0 0x100>; - interrupts = <51>; - clock-frequency = <14857000>; - reg-shift = <2>; - reg-io-width = <4>; + pwm18: pwm@d4022800 { + compatible = "spacemit,k1-pwm", "marvell,pxa910-pwm"; + reg = <0x0 0xd4022800 0x0 0x10>; + #pwm-cells = <3>; + clocks = <&syscon_apbc CLK_PWM18>; + resets = <&syscon_apbc RESET_PWM18>; status = "disabled"; }; + pwm19: pwm@d4022c00 { + compatible = "spacemit,k1-pwm", "marvell,pxa910-pwm"; + reg = <0x0 0xd4022c00 0x0 0x10>; + #pwm-cells = <3>; + clocks = <&syscon_apbc CLK_PWM19>; + resets = <&syscon_apbc RESET_PWM19>; + status = "disabled"; + }; + + syscon_mpmu: system-controller@d4050000 { + compatible = "spacemit,k1-syscon-mpmu"; + reg = <0x0 0xd4050000 0x0 0x209c>; + clocks = <&osc_32k>, <&vctcxo_1m>, <&vctcxo_3m>, + <&vctcxo_24m>; + clock-names = "osc", "vctcxo_1m", "vctcxo_3m", + "vctcxo_24m"; + #clock-cells = <1>; + #power-domain-cells = <1>; + #reset-cells = <1>; + }; + + pll: clock-controller@d4090000 { + compatible = "spacemit,k1-pll"; + reg = <0x0 0xd4090000 0x0 0x1000>; + clocks = <&vctcxo_24m>; + spacemit,mpmu = <&syscon_mpmu>; + #clock-cells = <1>; + }; + + syscon_apmu: system-controller@d4282800 { + compatible = "spacemit,k1-syscon-apmu"; + reg = <0x0 0xd4282800 0x0 0x400>; + clocks = <&osc_32k>, <&vctcxo_1m>, <&vctcxo_3m>, + <&vctcxo_24m>; + clock-names = "osc", "vctcxo_1m", "vctcxo_3m", + "vctcxo_24m"; + #clock-cells = <1>; + #power-domain-cells = <1>; + #reset-cells = <1>; + }; + plic: interrupt-controller@e0000000 { compatible = "spacemit,k1-plic", "sifive,plic-1.0.0"; reg = <0x0 0xe0000000 0x0 0x4000000>;
@@ -446,35 +638,201 @@ <&cpu7_intc 3>, <&cpu7_intc 7>; }; - sec_uart1: serial@f0612000 { - compatible = "spacemit,k1-uart", "intel,xscale-uart"; - reg = <0x0 0xf0612000 0x0 0x100>; - interrupts = <43>; - clock-frequency = <14857000>; - reg-shift = <2>; - reg-io-width = <4>; - status = "reserved"; /* for TEE usage */ - }; - - reset: reset-controller@d4050000 { - compatible = "spacemit,k1-reset"; - reg = <0x0 0xd4050000 0x0 0x209c>, - <0x0 0xd4282800 0x0 0x400>, - <0x0 0xd4015000 0x0 0x1000>, - <0x0 0xd4090000 0x0 0x1000>, - <0x0 0xd4282c00 0x0 0x400>, - <0x0 0xd8440000 0x0 0x98>, - <0x0 0xc0000000 0x0 0x4280>, - <0x0 0xf0610000 0x0 0x20>; - reg-names = "mpmu", "apmu", "apbc", "apbs", "ciu", "dciu", "ddrc", "apbc2"; + syscon_apbc2: system-controller@f0610000 { + compatible = "spacemit,k1-syscon-apbc2"; + reg = <0x0 0xf0610000 0x0 0x20>; #reset-cells = <1>; - status = "disabled"; }; - pinctrl: pinctrl@d401e000 { - compatible = "spacemit,k1-pinctrl", "pinctrl-single"; - reg = <0x0 0xd401e000 0x0 0x400>; - pinctrl-single,register-width = <32>; + camera-bus { + compatible = "simple-bus"; + ranges; + #address-cells = <2>; + #size-cells = <2>; + dma-ranges = <0x0 0x00000000 0x0 0x00000000 0x0 0x80000000>, + <0x0 0x80000000 0x1 0x00000000 0x1 0x80000000>; + }; + + dma-bus { + compatible = "simple-bus"; + ranges; + #address-cells = <2>; + #size-cells = <2>; + dma-ranges = <0x0 0x00000000 0x0 0x00000000 0x0 0x80000000>, + <0x1 0x00000000 0x1 0x80000000 0x3 0x00000000>; + + uart0: serial@d4017000 { + compatible = "spacemit,k1-uart", + "intel,xscale-uart"; + reg = <0x0 0xd4017000 0x0 0x100>; + clocks = <&syscon_apbc CLK_UART0>, + <&syscon_apbc CLK_UART0_BUS>; + clock-names = "core", "bus"; + interrupts = <42>; + reg-shift = <2>; + reg-io-width = <4>; + status = "disabled"; + }; + + uart2: serial@d4017100 { + compatible = "spacemit,k1-uart", + "intel,xscale-uart"; + reg = <0x0 0xd4017100 0x0 0x100>; + clocks = <&syscon_apbc CLK_UART2>, + <&syscon_apbc CLK_UART2_BUS>; + clock-names = "core", "bus"; + interrupts = <44>; + reg-shift = <2>; + reg-io-width = <4>; + status = "disabled"; + }; + + uart3: serial@d4017200 { + compatible = "spacemit,k1-uart", + "intel,xscale-uart"; + reg = <0x0 0xd4017200 0x0 0x100>; + clocks = <&syscon_apbc CLK_UART3>, + <&syscon_apbc CLK_UART3_BUS>; + clock-names = "core", "bus"; + interrupts = <45>; + reg-shift = <2>; + reg-io-width = <4>; + status = "disabled"; + }; + + uart4: serial@d4017300 { + compatible = "spacemit,k1-uart", + "intel,xscale-uart"; + reg = <0x0 0xd4017300 0x0 0x100>; + clocks = <&syscon_apbc CLK_UART4>, + <&syscon_apbc CLK_UART4_BUS>; + clock-names = "core", "bus"; + interrupts = <46>; + reg-shift = <2>; + reg-io-width = <4>; + status = "disabled"; + }; + + uart5: serial@d4017400 { + compatible = "spacemit,k1-uart", + "intel,xscale-uart"; + reg = <0x0 0xd4017400 0x0 0x100>; + clocks = <&syscon_apbc CLK_UART5>, + <&syscon_apbc CLK_UART5_BUS>; + clock-names = "core", "bus"; + interrupts = <47>; + reg-shift = <2>; + reg-io-width = <4>; + status = "disabled"; + }; + + uart6: serial@d4017500 { + compatible = "spacemit,k1-uart", + "intel,xscale-uart"; + reg = <0x0 0xd4017500 0x0 0x100>; + clocks = <&syscon_apbc CLK_UART6>, + <&syscon_apbc CLK_UART6_BUS>; + clock-names = "core", "bus"; + interrupts = <48>; + reg-shift = <2>; + reg-io-width = <4>; + status = "disabled"; + }; + + uart7: serial@d4017600 { + compatible = "spacemit,k1-uart", + "intel,xscale-uart"; + reg = <0x0 0xd4017600 0x0 0x100>; + clocks = <&syscon_apbc CLK_UART7>, + <&syscon_apbc CLK_UART7_BUS>; + clock-names = "core", "bus"; + interrupts = <49>; + reg-shift = <2>; + reg-io-width = <4>; + status = "disabled"; + }; + + uart8: serial@d4017700 { + compatible = "spacemit,k1-uart", + "intel,xscale-uart"; + reg = <0x0 0xd4017700 0x0 0x100>; + clocks = <&syscon_apbc CLK_UART8>, + <&syscon_apbc CLK_UART8_BUS>; + clock-names = "core", "bus"; + interrupts = <50>; + reg-shift = <2>; + reg-io-width = <4>; + status = "disabled"; + }; + + uart9: serial@d4017800 { + compatible = "spacemit,k1-uart", + "intel,xscale-uart"; + reg = <0x0 0xd4017800 0x0 0x100>; + clocks = <&syscon_apbc CLK_UART9>, + <&syscon_apbc CLK_UART9_BUS>; + clock-names = "core", "bus"; + interrupts = <51>; + reg-shift = <2>; + reg-io-width = <4>; + status = "disabled"; + }; + + sec_uart1: serial@f0612000 { + compatible = "spacemit,k1-uart", + "intel,xscale-uart"; + reg = <0x0 0xf0612000 0x0 0x100>; + interrupts = <43>; + clock-frequency = <14857000>; + reg-shift = <2>; + reg-io-width = <4>; + status = "reserved"; /* for TEE usage */ + }; + }; + + multimedia-bus { + compatible = "simple-bus"; + ranges; + #address-cells = <2>; + #size-cells = <2>; + dma-ranges = <0x0 0x00000000 0x0 0x00000000 0x0 0x80000000>, + <0x0 0x80000000 0x1 0x00000000 0x3 0x80000000>; + }; + + network-bus { + compatible = "simple-bus"; + ranges; + #address-cells = <2>; + #size-cells = <2>; + dma-ranges = <0x0 0x00000000 0x0 0x00000000 0x0 0x80000000>, + <0x0 0x80000000 0x1 0x00000000 0x0 0x80000000>; + }; + + pcie-bus { + compatible = "simple-bus"; + ranges; + #address-cells = <2>; + #size-cells = <2>; + dma-ranges = <0x0 0x00000000 0x0 0x00000000 0x0 0x80000000>, + <0x0 0xb8000000 0x1 0x38000000 0x3 0x48000000>; + }; + + storage-bus { + compatible = "simple-bus"; + ranges; + #address-cells = <2>; + #size-cells = <2>; + dma-ranges = <0x0 0x00000000 0x0 0x00000000 0x0 0x80000000>; + + emmc: mmc@d4281000 { + compatible = "spacemit,k1-sdhci"; + reg = <0x0 0xd4281000 0x0 0x200>; + clocks = <&syscon_apmu CLK_SDH_AXI>, + <&syscon_apmu CLK_SDH2>; + clock-names = "core", "io"; + interrupts = <101>; + status = "disabled"; + }; }; }; };
Signature · 1 line
2.25.1
Re: [PATCH 06/17] dts: k1: import dts file from upstream folder
Hi Raymond,
Quoted 4 lines · Raymond Mao
From: Raymond Mao <[email protected]>
Import
K1.dtsifrom upstream folder.
Can you explore the possibility of using OF_UPSTREAM? which should get rid of this copy & paste
Quoted 2 lines
Signed-off-by Raymond Mao <[email protected]>---
Signature · 1 line
Yixun Lan (dlan)
Re: [PATCH 06/17] dts: k1: import dts file from upstream folder
Quoted 9 lines · Yixun Lan
Hi Raymond,
Quoted 4 lines · Raymond Mao
From: Raymond Mao <[email protected]>
Import
K1.dtsifrom upstream folder.Can you explore the possibility of using
OF_UPSTREAM? which should get rid of this copy & paste
This is probably impossible with the current in-tree reset driver, since it follows a different devicetree ABI.
Quoted 5 lines
Quoted 2 lines
Signed-off-by Raymond Mao <[email protected]>---
Signature · 1 line
Yixun Lan (dlan)
Regards,
Yao Zi
PATCH 7/17 clk: spacemit: Add support for K1 SoC
In reply to Raymond MaoFrom: Junhui Liu <[email protected]>
Add clock support for Spacemit K1 SoC.
--- drivers/clk/Kconfig | 5 +- drivers/clk/Makefile | 1 + drivers/clk/spacemit/Kconfig | 31 + drivers/clk/spacemit/Makefile | 7 + drivers/clk/spacemit/clk-k1.c | 1793 +++++++++++++++++++++++++++++ drivers/clk/spacemit/clk_common.h | 79 ++ drivers/clk/spacemit/clk_ddn.c | 93 ++ drivers/clk/spacemit/clk_ddn.h | 53 + drivers/clk/spacemit/clk_mix.c | 403 +++++++ drivers/clk/spacemit/clk_mix.h | 224 ++++ drivers/clk/spacemit/clk_pll.c | 157 +++ drivers/clk/spacemit/clk_pll.h | 81 ++ include/soc/spacemit/k1-syscon.h | 149 +++ 13 files changed, 3074 insertions(+), 2 deletions(-) create mode 100644 drivers/clk/spacemit/Kconfig create mode 100644 drivers/clk/spacemit/Makefile create mode 100644 drivers/clk/spacemit/clk-k1.c create mode 100644 drivers/clk/spacemit/clk_common.h create mode 100644 drivers/clk/spacemit/clk_ddn.c create mode 100644 drivers/clk/spacemit/clk_ddn.h create mode 100644 drivers/clk/spacemit/clk_mix.c create mode 100644 drivers/clk/spacemit/clk_mix.h create mode 100644 drivers/clk/spacemit/clk_pll.c create mode 100644 drivers/clk/spacemit/clk_pll.h create mode 100644 include/soc/spacemit/k1-syscon.h
drivers/clk/Kconfig +3 -2
@@ -275,11 +275,12 @@ source "drivers/clk/mvebu/Kconfig" source "drivers/clk/owl/Kconfig" source "drivers/clk/qcom/Kconfig" source "drivers/clk/renesas/Kconfig" -source "drivers/clk/sophgo/Kconfig" -source "drivers/clk/sunxi/Kconfig" source "drivers/clk/sifive/Kconfig" +source "drivers/clk/sophgo/Kconfig" +source "drivers/clk/spacemit/Kconfig" source "drivers/clk/starfive/Kconfig" source "drivers/clk/stm32/Kconfig" +source "drivers/clk/sunxi/Kconfig" source "drivers/clk/tegra/Kconfig" source "drivers/clk/ti/Kconfig" source "drivers/clk/thead/Kconfig"
drivers/clk/Makefile +1 -0
@@ -48,6 +48,7 @@ obj-$(CONFIG_CLK_RENESAS) += renesas/ obj-$(CONFIG_$(PHASE_)CLK_SCMI) += clk_scmi.o obj-$(CONFIG_CLK_SIFIVE) += sifive/ obj-$(CONFIG_CLK_SOPHGO) += sophgo/ +obj-$(CONFIG_CLK_SPACEMIT) += spacemit/ obj-$(CONFIG_CLK_SUNXI) += sunxi/ obj-$(CONFIG_CLK_UNIPHIER) += uniphier/ obj-$(CONFIG_CLK_VERSACLOCK) += clk_versaclock.o
drivers/clk/spacemit/Kconfig new file +31 -0
@@ -0,0 +1,31 @@ +# SPDX-License-Identifier: GPL-2.0-or-later +# +# Copyright (c) 2025, Junhui Liu <[email protected]> + +config CLK_SPACEMIT + bool "Clock support for SpacemiT SoCs" + depends on CLK + select REGMAP + help + This enables support clock driver for Spacemit SoC + family. + +if CLK_SPACEMIT + +config CLK_SPACEMIT_K1 + bool "SpacemiT K1 clock support" + select CLK_CCF + default SPACEMIT_K1 + help + This enables support clock driver for Spacemit K1 SoC. + It's based on Common Clock Framework. + +config SPL_CLK_SPACEMIT_K1 + bool "Enable Spacemit K1 SoC clock support in SPL" + select SPL_CLK_CCF + default SPACEMIT_K1 + help + It allows to use the Spacemit K1 SoC clock driver in + SPL. + +endif
drivers/clk/spacemit/Makefile new file +7 -0
@@ -0,0 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0-or-later +# +# Copyright (C) 2025 Junhui Liu <[email protected]> + +obj-$(CONFIG_CLK_SPACEMIT) += clk_ddn.o clk_mix.o clk_pll.o + +obj-$(CONFIG_CLK_SPACEMIT_K1) += clk-k1.o
drivers/clk/spacemit/clk-k1.c new file +1793 -0
1,793 lines not on this page · raw message
drivers/clk/spacemit/clk_common.h new file +79 -0
79 lines not on this page · raw message
drivers/clk/spacemit/clk_ddn.c new file +93 -0
93 lines not on this page · raw message
drivers/clk/spacemit/clk_ddn.h new file +53 -0
53 lines not on this page · raw message
drivers/clk/spacemit/clk_mix.c new file +403 -0
403 lines not on this page · raw message
drivers/clk/spacemit/clk_mix.h new file +224 -0
224 lines not on this page · raw message
drivers/clk/spacemit/clk_pll.c new file +157 -0
157 lines not on this page · raw message
drivers/clk/spacemit/clk_pll.h new file +81 -0
81 lines not on this page · raw message
include/soc/spacemit/k1-syscon.h new file +149 -0
58 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.25.1
Part of the diff is not shown here. View the raw message.
PATCH 8/17 dts: k1: enable clocks in SPL
In reply to Raymond MaoFrom: Raymond Mao <[email protected]>
Enable clock nodes for K1 SoC in SPL.
--- arch/riscv/dts/k1-spl.dts | 51 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 49 insertions(+), 2 deletions(-)
arch/riscv/dts/k1-spl.dts +49 -2
@@ -11,16 +11,63 @@ / { model = "spacemit k1 spl"; + aliases { + console = &uart0; + serial0 = &uart0; + }; + chosen { stdout-path = "serial0:115200n8"; bootph-all; }; }; +&vctcxo_1m { + status = "okay"; + bootph-pre-ram; +}; + +&vctcxo_24m { + status = "okay"; + bootph-pre-ram; +}; + +&vctcxo_3m { + status = "okay"; + bootph-pre-ram; +}; + +&osc_32k { + status = "okay"; + bootph-pre-ram; +}; + &soc { bootph-all; - serial@d4017000 { + system-controller@d4050000 { status = "okay"; - bootph-all; + bootph-pre-ram; + }; + clock-controller@d4090000 { + status = "okay"; + bootph-pre-ram; + }; + system-controller@d4282800 { + status = "okay"; + bootph-pre-ram; }; + system-controller@d4015000 { + clocks = <&osc_32k>, <&vctcxo_1m>, <&vctcxo_3m>, + <&vctcxo_24m>, <&syscon_mpmu CLK_PLL1_31P5>, + <&pll CLK_PLL1_D4>; + clock-names = "osc", "vctcxo_1m", "vctcxo_3m", + "vctcxo_24m", "pll1_d78_31p5", "pll1_d4"; + status = "okay"; + bootph-pre-ram; + }; +}; + +&uart0 { + status = "okay"; + bootph-pre-ram; };
Signature · 1 line
2.25.1
PATCH 9/17 board: k1: initialize clock and serial devices in SPL
In reply to Raymond MaoFrom: Raymond Mao <[email protected]>
Initialize clock and serial devices in SPL. Otherwise, the device driver won't be loaded in SPL.
--- board/spacemit/k1/spl.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+)
board/spacemit/k1/spl.c +38 -0
@@ -3,8 +3,44 @@* Copyright (c) 2025-2026, RISCStar Ltd. */ +#include <dm/device.h> +#include <dm/uclass.h> #include <spl.h> +static void clk_early_init (void ) +{ +struct udevice *dev; +int ret; + + ret =uclass_get_device_by_name (UCLASS_CLK ,"clock-controller@d4090000" , &dev); +if (ret) +panic ("Fail to detect clock-controller@d4090000\n" ); + ret =uclass_get_device_by_name (UCLASS_CLK ,"system-controller@d4050000" , &dev); +if (ret) +panic ("Fail to detect system-controller@d4050000\n" ); + ret =uclass_get_device_by_name (UCLASS_CLK ,"system-controller@d4282800" , &dev); +if (ret) +panic ("Fail to detect system-controller@d4282800\n" ); + ret =uclass_get_device_by_name (UCLASS_CLK ,"system-controller@d4015000" , &dev); +if (ret) +panic ("Fail to detect system-controller@d4015000\n" ); + +if (device_active (dev)) +debug ("clk: device is active\n" ); +else +debug ("clk: device not active, probing...\n" ); +} + +void serial_early_init (void ) +{ +struct udevice *dev; +int ret; + + ret =uclass_get_device (UCLASS_SERIAL ,0 , &dev); +if (ret) +panic ("Serial uclass init failed: %d\n" , ret); +} +void board_init_f (ulong dummy) {int ret;
@@ -15,6 +51,8 @@ void board_init_f(ulong dummy)riscv_cpu_setup (); +clk_early_init (); +serial_early_init ();preloader_console_init (); }
Signature · 1 line
2.25.1
PATCH 10/17 configs: k1: add default option for clock driver in SPL
In reply to Raymond MaoFrom: Raymond Mao <[email protected]>
Add default option for enabling clock driver in SPL.
--- configs/k1_defconfig | 8 ++++++++ 1 file changed, 8 insertions(+)
configs/k1_defconfig +8 -0
@@ -44,3 +44,11 @@ CONFIG_DEBUG_UART_NS16550=y CONFIG_DEBUG_UART_ANNOUNCE=y # CONFIG_DEBUG_SBI_CONSOLE is not set CONFIG_TIMER_EARLY=y +CONFIG_REGMAP=y +CONFIG_SPL_REGMAP=y +CONFIG_LIB_RATIONAL=y +CONFIG_SPL_LIB_RATIONAL=y +CONFIG_CLK=y +CONFIG_CLK_SPACEMIT=y +CONFIG_SPL_CLK=y +CONFIG_SYS_MALLOC_F_LEN=0x5000
Signature · 1 line
2.25.1
PATCH 11/17 i2c: k1: add I2C driver support
In reply to Raymond MaoFrom: Raymond Mao <[email protected]>
Add I2C driver support on Spacemit K1 SoC using driver model.
--- drivers/i2c/Kconfig | 7 + drivers/i2c/Makefile | 1 + drivers/i2c/k1_i2c.c | 521 +++++++++++++++++++++++++++++++++++++++++++ drivers/i2c/k1_i2c.h | 69 ++++++ 4 files changed, 598 insertions(+) create mode 100644 drivers/i2c/k1_i2c.c create mode 100644 drivers/i2c/k1_i2c.h
drivers/i2c/Kconfig +7 -0
@@ -817,6 +817,13 @@ config SYS_I2C_IHS help Support for gdsys IHS I2C driver on FPGA bus. +config SYS_I2C_SPACEMIT_K1 + bool "Spacemit K1 I2C driver" + depends on DM_I2C + help + Support for Spacemit I2C controller. It's based on + Driver Model. + source "drivers/i2c/muxes/Kconfig" endif
drivers/i2c/Makefile +1 -0
@@ -57,6 +57,7 @@ obj-$(CONFIG_SYS_I2C_UNIPHIER) += i2c-uniphier.o obj-$(CONFIG_SYS_I2C_UNIPHIER_F) += i2c-uniphier-f.o obj-$(CONFIG_SYS_I2C_VERSATILE) += i2c-versatile.o obj-$(CONFIG_SYS_I2C_XILINX_XIIC) += xilinx_xiic.o +obj-$(CONFIG_SYS_I2C_SPACEMIT_K1) += k1_i2c.o obj-$(CONFIG_TEGRA186_BPMP_I2C) += tegra186_bpmp_i2c.o obj-$(CONFIG_$(PHASE_)I2C_MUX) += muxes/
drivers/i2c/k1_i2c.c new file +521 -0
521 lines not on this page · raw message
drivers/i2c/k1_i2c.h new file +69 -0
69 lines not on this page · raw message
Signature · 1 line
2.25.1
Re: [PATCH 11/17] i2c: k1: add I2C driver support
Hello Raymond,
Quoted 37 lines · Raymond Mao
From: Raymond Mao <[email protected]>
Add I2C driver support on Spacemit K1 SoC using driver model.
Signed-off-by Raymond Mao <[email protected]>--- drivers/i2c/Kconfig | 7 + drivers/i2c/Makefile | 1 + drivers/i2c/k1_i2c.c | 521 +++++++++++++++++++++++++++++++++++++++++++ drivers/i2c/k1_i2c.h | 69 ++++++ 4 files changed, 598 insertions(+)create mode 100644
drivers/i2c/k1_i2c.c
create mode 100644drivers/i2c/k1_i2c.hdrivers/i2c/Kconfig +7
-0@@ -817,6 +817,13 @@ config SYS_I2C_IHS help Support for gdsys IHS I2C driver on FPGA bus. +config SYS_I2C_SPACEMIT_K1 + bool "Spacemit K1 I2C driver" + depends on DM_I2C + help + Support for Spacemit I2C controller. It's based on + Driver Model. + source "drivers/i2c/muxes/Kconfig" endifdrivers/i2c/Makefile +0
-0
drivers/i2c/Makefile obj-$(CONFIG_SYS_I2C_UNIPHIER) += i2c-uniphier.o · line 60
Quoted 4 lines
drivers/i2c/Makefile +1
-0@@ -57,6 +57,7 @@ obj-$(CONFIG_SYS_I2C_UNIPHIER) += i2c-uniphier.o obj-$(CONFIG_SYS_I2C_UNIPHIER_F) += i2c-uniphier-f.o obj-$(CONFIG_SYS_I2C_VERSATILE) += i2c-versatile.o obj-$(CONFIG_SYS_I2C_XILINX_XIIC) += xilinx_xiic.o +obj-$(CONFIG_SYS_I2C_SPACEMIT_K1) += k1_i2c.o
Nitpick, please sort alphabetical.
Quoted 96 lines
drivers/i2c/Makefile +0
-0obj-$(CONFIG_TEGRA186_BPMP_I2C) += tegra186_bpmp_i2c.o obj-$(CONFIG_$(PHASE_)I2C_MUX) += muxes/drivers/i2c/k1_i2c.c new file +87
-0@@ -0,0 +1,521 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* +* Copyright (C) 2023-2026 Spacemit, Inc +* Copyright (C) 2025-2026 RISCStar Ltd. +*/ + +#include <asm/io.h> +#include <clk.h> +#include <dm.h> +#include <dm/device_compat.h> +#include <i2c.h> +#include <linux/delay.h> +#include <reset.h> +#include "k1_i2c.h" + +#define ICR_OFFSET 0x00 +#define ISR_OFFSET 0x04 +#define ISAR_OFFSET 0x08 +#define IDBR_OFFSET 0x0c +#define ILCR_OFFSET 0x10 +#define IWCR_OFFSET 0x14 +#define IRCR_OFFSET 0x18 +#define IBMR_OFFSET 0x1c +#define WFIFO_OFFSET 0x20 +#define WFIFO_WPTR_OFFSET 0x24 +#define WFIFO_RPTR_OFFSET 0x28 +#define RFIFO_OFFSET 0x2c +#define RFIFO_WPTR_OFFSET 0x30 +#define RFIFO_RPTR_OFFSET 0x34 + +/* All transfers are described by this data structure */ +struct k1_i2c_msg { +u8 condition; +u8 acknack; +u8 direction; +u8 data; +}; + +struct k1_i2c { +u32 icr; +u32 isr; +u32 isar; +u32 idbr; +u32 ilcr; +u32 iwcr; +u32 irst_cyc; +u32 ibmr; +}; + +struct k1_i2c_priv { +int id; +void __iomem *base; +struct reset_ctl_bulk resets; +struct clk clk; +u32 clk_rate; +}; + +/* +* i2c_reset: - reset the host controller +* +*/ +static void i2c_reset (void __iomem *base) +{ +u32 icr_mode; +u32 val; + +/* Save bus mode (standard or fast speed) for later use */ + icr_mode =readl (base +ICR_OFFSET ) &ICR_MODE_MASK ; +/* disable unit */ + val =readl (base +ICR_OFFSET ); +writel (val & ~ICR_IUE , base +ICR_OFFSET ); +udelay (10 ); +/* reset the unit */ + val =readl (base +ICR_OFFSET ); + val |=ICR_UR ; +writel (val, base +ICR_OFFSET ); +udelay (100 ); +/* disable unit */ + val =readl (base +ICR_OFFSET ); +writel (val & ~ICR_IUE , base +ICR_OFFSET ); + +/* set slave address */ +writel (0x00 , base +ISR_OFFSET ); +/* set control reg values */ +writel (I2C_ICR_INIT | icr_mode, base +ICR_OFFSET ); +writel (I2C_ISR_INIT , base +ISR_OFFSET );/* set clear interrupt bits */ + val =readl (base +ICR_OFFSET );
drivers/i2c/k1_i2c.c line 97
Quoted 10 lines
drivers/i2c/k1_i2c.c new file +10
-0+ val |=ICR_IUE ; +writel (val, base +ICR_OFFSET );/* enable unit */ +udelay (100 ); +} + +/* +* i2c_isr_set_cleared: - wait until certain bits of the I2C status register +* are set and cleared +* +* @return: 1 in case of success, 0 means timeout (no match within 10 ms).
may you can rework this to return 0 on success and on error -ETIMEDOUT ?
drivers/i2c/k1_i2c.c line 110
Quoted 13 lines
drivers/i2c/k1_i2c.c new file +13
-0+*/ +static int /(void __iomem *base, unsigned long set_mask, + unsigned long cleared_mask) +{ + int timeout = 1000, isr; + +do { + isr =readl (base +ISR_OFFSET ); +udelay (10 ); +if (timeout-- <0 ) +return 0 ; + }while (((isr & set_mask) != set_mask) || + ((isr & cleared_mask) !=0 ));
may you can use readl_poll_timeout ?
Quoted 70 lines
drivers/i2c/k1_i2c.c new file +68
-0+ +return 1 ; +} + +/* +* i2c_transfer: - Transfer one byte over the i2c bus +* +* This function can transfer a byte over the i2c bus in both directions. +* It is used by the public API functions. +* +* @return: 0: transfer successful or error code +*/ +static int i2c_transfer (void __iomem *base,struct k1_i2c_msg *msg) +{ +int ret; +u32 val; + +if (!msg) + goto transfer_error_msg_empty; + +switch (msg->direction) { +case I2C_WRITE : +/* check if bus is not busy */ +if (!i2c_isr_set_cleared (base,0 ,ISR_IBB )) + goto transfer_error_bus_busy; + +/* start transmission */ + val =readl (base +ICR_OFFSET ); + val &= ~ICR_START ; +writel (val, base +ICR_OFFSET ); + val =readl (base +ICR_OFFSET ); + val &= ~ICR_STOP ; +writel (val, base +ICR_OFFSET ); +writel (msg->data, base +IDBR_OFFSET ); +if (msg->condition ==I2C_COND_START ) { + val =readl (base +ICR_OFFSET ); + val |=ICR_START ; +writel (val, base +ICR_OFFSET ); + } +if (msg->condition ==I2C_COND_STOP ) { + val =readl (base +ICR_OFFSET ); + val |=ICR_STOP ; +writel (val, base +ICR_OFFSET ); + } +if (msg->acknack ==I2C_ACKNAK_SENDNAK ) { + val =readl (base +ICR_OFFSET ); + val |=ICR_ACKNAK ; +writel (val, base +ICR_OFFSET ); + } +if (msg->acknack ==I2C_ACKNAK_SENDACK ) { + val =readl (base +ICR_OFFSET ); + val &= ~ICR_ACKNAK ; +writel (val, base +ICR_OFFSET ); + } + val =readl (base +ICR_OFFSET ); + val &= ~ICR_ALDIE ; +writel (val, base +ICR_OFFSET ); + val =readl (base +ICR_OFFSET ); + val |=ICR_TB ; +writel (val, base +ICR_OFFSET ); + +/* transmit register empty? */ +if (!i2c_isr_set_cleared (base,ISR_ITE ,0 )) + goto transfer_error_transmit_timeout; + +/* clear 'transmit empty' state */ + val =readl (base +ISR_OFFSET ); + val |=ISR_ITE ;
drivers/i2c/k1_i2c.c line 188
Quoted 10 lines
drivers/i2c/k1_i2c.c new file +10
-0+writel (val, base +ISR_OFFSET ); + +/* wait for ACK from slave */ +if (msg->acknack ==I2C_ACKNAK_WAITACK ) +if (!i2c_isr_set_cleared (base,0 ,ISR_ACKNAK )) + goto transfer_error_ack_missing; +break ; + +case I2C_READ : +
please remove empty line
Quoted 258 lines
drivers/i2c/k1_i2c.c new file +258
-0+/* check if bus is not busy */ +if (!i2c_isr_set_cleared (base,0 ,ISR_IBB )) + goto transfer_error_bus_busy; + +/* start receive */ + val =readl (base +ICR_OFFSET ); + val &= ~ICR_START ; +writel (val, base +ICR_OFFSET ); + val =readl (base +ICR_OFFSET ); + val &= ~ICR_STOP ; +writel (val, base +ICR_OFFSET ); +if (msg->condition ==I2C_COND_START ) { + val =readl (base +ICR_OFFSET ); + val |=ICR_START ; +writel (val, base +ICR_OFFSET ); + } +if (msg->condition ==I2C_COND_STOP ) { + val =readl (base +ICR_OFFSET ); + val |=ICR_STOP ; +writel (val, base +ICR_OFFSET ); + } +if (msg->acknack ==I2C_ACKNAK_SENDNAK ) { + val =readl (base +ICR_OFFSET ); + val |=ICR_ACKNAK ; +writel (val, base +ICR_OFFSET ); + } +if (msg->acknack ==I2C_ACKNAK_SENDACK ) { + val =readl (base +ICR_OFFSET ); + val &= ~ICR_ACKNAK ; +writel (val, base +ICR_OFFSET ); + } + val =readl (base +ICR_OFFSET ); + val &= ~ICR_ALDIE ; +writel (val, base +ICR_OFFSET ); + val =readl (base +ICR_OFFSET ); + val |=ICR_TB ; +writel (val, base +ICR_OFFSET ); + +/* receive register full? */ +if (!i2c_isr_set_cleared (base,ISR_IRF ,0 )) + goto transfer_error_receive_timeout; + + msg->data =readl (base +IDBR_OFFSET ); + +/* clear 'receive empty' state */ + val =readl (base +ISR_OFFSET ); + val |=ISR_IRF ; +writel (val, base +ISR_OFFSET ); +break ; +default : + goto transfer_error_illegal_param; + } + +return 0 ; + +transfer_error_msg_empty: +debug ("%s: error: 'msg' is empty\n" , __func__); + ret = -EINVAL ; + goto i2c_transfer_finish; + +transfer_error_transmit_timeout: +debug ("%s: error: transmit timeout\n" , __func__); + ret = -ETIMEDOUT ; + goto i2c_transfer_finish; + +transfer_error_ack_missing: +debug ("%s: error: ACK missing\n" , __func__); + ret = -EREMOTEIO ; + goto i2c_transfer_finish; + +transfer_error_receive_timeout: +debug ("%s: error: receive timeout\n" , __func__); + ret = -ETIMEDOUT ; + goto i2c_transfer_finish; + +transfer_error_illegal_param: +debug ("%s: error: illegal parameters\n" , __func__); + ret = -EINVAL ; + goto i2c_transfer_finish; + +transfer_error_bus_busy: +debug ("%s: error: bus is busy\n" , __func__); + ret = -EIO ; + goto i2c_transfer_finish; + +i2c_transfer_finish: +debug ("%s: ISR: 0x%04x\n" , __func__,readl (base +ISR_OFFSET )); +i2c_reset (base); +return ret; +} + +static int __i2c_read (void __iomem *base,uchar chip,u8 *addr,int alen, +uchar *buffer,int len) +{ +struct k1_i2c_msg msg; +int ret; + +debug ("%s(chip=0x%02x, addr=0x%02x, alen=0x%02x, len=0x%02x)\n" , + __func__, chip, *addr, alen, len); + +if (len ==0 ) { +pr_err ("reading zero byte is invalid\n" ); +return -EINVAL ; + } + +i2c_reset (base); + +/* dummy chip address write */ +debug ("%s: dummy chip address write\n" , __func__); + msg.condition =I2C_COND_START ; + msg.acknack =I2C_ACKNAK_WAITACK ; + msg.direction =I2C_WRITE ; + msg.data = (chip <<1 ); + msg.data &=0xFE ; + ret =i2c_transfer (base, &msg); +if (ret) +return ret; + +/* +* send memory address bytes; +* alen defines how much bytes we have to send. +*/ +while (--alen >=0 ) { +debug ("%s: send address byte %02x (alen=%d)\n" , + __func__, *addr, alen); + msg.condition =I2C_COND_NORMAL ; + msg.acknack =I2C_ACKNAK_WAITACK ; + msg.direction =I2C_WRITE ; + msg.data = addr[alen]; + ret =i2c_transfer (base, &msg); +if (ret) +return ret; + } + +/* start read sequence */ +debug ("%s: start read sequence\n" , __func__); + msg.condition =I2C_COND_START ; + msg.acknack =I2C_ACKNAK_WAITACK ; + msg.direction =I2C_WRITE ; + msg.data = (chip <<1 ); + msg.data |=0x01 ; + ret =i2c_transfer (base, &msg); +if (ret) +return ret; + +/* read bytes; send NACK at last byte */ +while (len--) { +if (len ==0 ) { + msg.condition =I2C_COND_STOP ; + msg.acknack =I2C_ACKNAK_SENDNAK ; + }else { + msg.condition =I2C_COND_NORMAL ; + msg.acknack =I2C_ACKNAK_SENDACK ; + } + + msg.direction =I2C_READ ; + msg.data =0x00 ; + ret =i2c_transfer (base, &msg); +if (ret) +return ret; + + *buffer = msg.data; +debug ("%s: reading byte (%p)=0x%02x\n" , + __func__, buffer, *buffer); + buffer++; + } + +i2c_reset (base); + +return 0 ; +} + +static int __i2c_write (struct k1_i2c *base,uchar chip,u8 *addr,int alen, +uchar *buffer,int len) +{ +struct k1_i2c_msg msg; +int ret; + +debug ("%s(chip=0x%02x, addr=0x%02x, alen=0x%02x, len=0x%02x)\n" , + __func__, chip, *addr, alen, len); + +i2c_reset (base); + +/* chip address write */ +debug ("%s: chip address write\n" , __func__); + msg.condition =I2C_COND_START ; + msg.acknack =I2C_ACKNAK_WAITACK ; + msg.direction =I2C_WRITE ; + msg.data = (chip <<1 ); + msg.data &=0xFE ; + ret =i2c_transfer (base, &msg); +if (ret) +return ret; + +/* +* send memory address bytes; +* alen defines how much bytes we have to send. +*/ +while (--alen >=0 ) { +debug ("%s: send address byte %02x (alen=%d)\n" , + __func__, *addr, alen); + msg.condition =I2C_COND_NORMAL ; + msg.acknack =I2C_ACKNAK_WAITACK ; + msg.direction =I2C_WRITE ; + msg.data = addr[alen]; + ret =i2c_transfer (base, &msg); +if (ret) +return ret; + } + +/* write bytes; send NACK at last byte */ +while (len--) { +debug ("%s: writing byte (%p)=0x%02x\n" , + __func__, buffer, *buffer); + +if (len ==0 ) + msg.condition =I2C_COND_STOP ; +else + msg.condition =I2C_COND_NORMAL ; + + msg.acknack =I2C_ACKNAK_WAITACK ; + msg.direction =I2C_WRITE ; + msg.data = *(buffer++); + + ret =i2c_transfer (base, &msg); +if (ret) +return ret; + } + +i2c_reset (base); + +return 0 ; +} + +static int k1_i2c_xfer (struct udevice *bus,struct i2c_msg *msg,int nmsgs) +{ +struct k1_i2c_priv *i2c =dev_get_priv (bus); +struct i2c_msg *dmsg, *omsg, dummy; + +memset (&dummy,0 ,sizeof (struct i2c_msg )); + +/* +* We expect either two messages (one with an offset and one with the +* actual data) or one message (just data or offset/data combined) +*/ +if (nmsgs >2 || nmsgs ==0 ) { +debug ("%s: Only one or two messages are supported." , __func__); +return -EINVAL ; + } + + omsg = nmsgs ==1 ? &dummy : msg; + dmsg = nmsgs ==1 ? msg : msg +1 ; + +if (dmsg->flags &I2C_M_RD ) +return __i2c_read (i2c->base, dmsg->addr, omsg->buf, + omsg->len, dmsg->buf, dmsg->len); +else + return __i2c_write(i2c->base, dmsg->addr, omsg->buf,
drivers/i2c/k1_i2c.c line 456
Quoted 10 lines
drivers/i2c/k1_i2c.c new file +10
-0+ omsg->len, dmsg->buf, dmsg->len); +} + +static int k1_i2c_set_bus_speed (struct udevice *bus,unsigned int speed) +{ +struct k1_i2c_priv *priv =dev_get_priv (bus); +void __iomem *base = priv->base; +u32 val; + +if (speed >100000 )
please use I2C_SPEED_STANDARD_RATE
drivers/i2c/k1_i2c.c line 468
Quoted 12 lines
drivers/i2c/k1_i2c.c new file +12
-0+ val =ICR_FM ; + else + val =ICR_SM ; +clrsetbits_le32 (base +ICR_OFFSET ,ICR_MODE_MASK , val); + +return 0 ; +} + +static int k1_i2c_bind (struct udevice *bus) +{ +return 0 ; +}
I think you can remove this function complete (and so in U_BOOT_DRIVER(i2c_spacemit))
Quoted 119 lines
drivers/i2c/k1_i2c.c new file +53
-0+ +static int k1_i2c_probe (struct udevice *bus) +{ +struct k1_i2c_priv *priv =dev_get_priv (bus); +struct reset_ctl reset; +int ret; + + priv->id =dev_seq (bus); + ret =reset_get_by_index (bus,0 , &reset); +if (ret) { +dev_err (bus,"%s: can not get reset\n" , __func__); +return ret; + } +reset_assert (&reset); +udelay (10 ); +reset_deassert (&reset); +udelay (10 ); + + ret =clk_get_by_index (bus,0 , &priv->clk); +if (ret) +return ret; + + ret =clk_enable (&priv->clk); +if (ret && ret != -ENOSYS && ret != -EOPNOTSUPP ) { +debug ("%s: failed to enable clock\n" , __func__); +return ret; + } + priv->clk_rate =clk_get_rate (&priv->clk); + + priv->base = (void *)devfdt_get_addr_ptr (bus); +k1_i2c_set_bus_speed (bus, priv->clk_rate); +return 0 ; +} + +static const struct dm_i2c_ops k1_i2c_ops = { + .xfer = k1_i2c_xfer, + .set_bus_speed = k1_i2c_set_bus_speed, +}; + +static const struct udevice_id k1_i2c_ids[] = { + { .compatible ="spacemit,k1-i2c" }, + { } +}; + +U_BOOT_DRIVER (i2c_spacemit) = { + .name ="i2c_spacemit" , + .id =UCLASS_I2C , + .of_match = k1_i2c_ids, + .bind = k1_i2c_bind, + .probe = k1_i2c_probe, + .priv_auto =sizeof (struct k1_i2c_priv ), + .ops = &k1_i2c_ops, +};drivers/i2c/k1_i2c.h new file +59
-0@@ -0,0 +1,69 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* +* Copyright (C) 2023-2026 Spacemit Ltd. +* Copyright (C) 2025-2026 RISCStar Ltd. +*/ + +#ifndef __SPACEMIT_I2C_H +#define __SPACEMIT_I2C_H + +/* Shall the current transfer have a start/stop condition? */ +#define I2C_COND_NORMAL 0 +#define I2C_COND_START 1 +#define I2C_COND_STOP 2 + +/* Shall the current transfer be ack/nacked or being waited for it? */ +#define I2C_ACKNAK_WAITACK 1 +#define I2C_ACKNAK_SENDACK 2 +#define I2C_ACKNAK_SENDNAK 4 + +/* Specify who shall transfer the data (master or slave) */ +#define I2C_READ 0 +#define I2C_WRITE 1 + +#if (CONFIG_SYS_I2C_SPEED ==400000 ) +#define I2C_ICR_INIT (ICR_FM | ICR_BEIE | ICR_IRFIE | ICR_ITEIE | \ + ICR_GCD | ICR_SCLE) +#else +#define I2C_ICR_INIT (ICR_BEIE | ICR_IRFIE | ICR_ITEIE | ICR_GCD | \ + ICR_SCLE) +#endif + +/* ----- Control register bits ---------------------------------------- */ + +#define ICR_START 0x1/* start bit */ +#define ICR_STOP 0x2/* stop bit */ +#define ICR_ACKNAK 0x4/* send ACK(0) or NAK(1) */ +#define ICR_TB 0x8/* transfer byte bit */ +#define ICR_MA BIT(12)/* master abort */ +#define ICR_SCLE BIT(13)/* master clock enable, mona SCLEA */ +#define ICR_IUE BIT(14)/* unit enable */ +#define ICR_GCD BIT(21)/* general call disable */ +#define ICR_ITEIE BIT(19)/* enable tx interrupts */ +#define ICR_IRFIE BIT(20)/* enable rx interrupts, mona: DRFIE */ +#define ICR_BEIE BIT(22)/* enable bus error ints */ +#define ICR_SSDIE BIT(24)/* slave STOP detected int enable */ +#define ICR_ALDIE BIT(18)/* enable arbitration interrupt */ +#define ICR_SADIE BIT(23)/* slave address detected int enable */ +#define ICR_UR BIT(10)/* unit reset */ +#define ICR_SM (0x0)/* Standard Mode */ +#define ICR_FM BIT(8)/* Fast Mode */ +#define ICR_MODE_MASK (0x300)/* Mode mask */ + +/* ----- Status register bits ----------------------------------------- */ + +#define ISR_RWM BIT(13)/* read/write mode */ +#define ISR_ACKNAK BIT(14)/* ack/nak status */ +#define ISR_UB BIT(15)/* unit busy */ +#define ISR_IBB BIT(16)/* bus busy */ +#define ISR_SSD BIT(24)/* slave stop detected */
drivers/i2c/k1_i2c.h line 69
Quoted 10 lines
drivers/i2c/k1_i2c.h new file +10
-0+#define ISR_ALD BIT(18)/* arbitration loss detected */ +#define ISR_ITE BIT(19)/* tx buffer empty */ +#define ISR_IRF BIT(20)/* rx buffer full */ +#define ISR_GCAD BIT(21)/* general call address detected */ +#define ISR_SAD BIT(23)/* slave address detected */ +#define ISR_BED BIT(22)/* bus error no ACK/NAK */ + +#define I2C_ISR_INIT 0x1FDE000 + +#endif
Thanks!
bye,
Heiko
Signature · 5 lines
Nabla Software Engineering HRB 40522 Augsburg Phone: +49 821 45592596 E-Mail: [email protected] Geschäftsführer : Stefano Babic
PATCH 12/17 dt-bindings: pinctrl: add k1 support
In reply to Raymond MaoFrom: Raymond Mao <[email protected]>
Add dt-binding file of pinctrl driver for Spacemit K1 SoC.
--- include/dt-bindings/pinctrl/k1-pinctrl.h | 59 ++++++++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 include/dt-bindings/pinctrl/k1-pinctrl.h
include/dt-bindings/pinctrl/k1-pinctrl.h new file +59 -0
@@ -0,0 +1,59 @@ +/* SPDX-License-Identifier: (GPL-2.0 OR MIT) */ +/* +* Copyright (C) 2025-2026 RISCStar Ltd. +*/ + +#ifndef __DT_BINDINGS_K1_PINCTRL_H +#define __DT_BINDINGS_K1_PINCTRL_H + +/* pin mux */ +#define MUX_MODE0 0 +#define MUX_MODE1 1 +#define MUX_MODE2 2 +#define MUX_MODE3 3 +#define MUX_MODE4 4 +#define MUX_MODE5 5 +#define MUX_MODE6 6 +#define MUX_MODE7 7 + +/* strong pull resistor */ +#define SPU_EN BIT(3) + +/* edge detect */ +#define EDGE_NONE BIT(6) +#define EDGE_RISE BIT(4) +#define EDGE_FALL BIT(5) +#define EDGE_BOTH (EDGE_RISE | EDGE_FALL) + +/* slew rate output control */ +#define SLE_EN BIT(7) + +/* schmitter trigger input threshold */ +#define ST00 (0 << 8) +#define ST01 BIT(8) +#define ST02 BIT(9) +#define ST03 (BIT(8) | BIT(9)) + +/* driver strength*/ +#define PAD_DS_3V BIT(10) +#define PAD_DS_SLOW0 (0 << 11) +#define PAD_DS_SLOW1 BIT(11) +#define PAD_DS_MEDIUM BIT(12) +#define PAD_DS_FAST (BIT(11) | BIT(12)) + +#define PAD_1V8_DS0 PAD_DS_SLOW0 +#define PAD_1V8_DS1 PAD_DS_SLOW1 +#define PAD_1V8_DS2 PAD_DS_MEDIUM +#define PAD_1V8_DS3 PAD_DS_FAST + +#define PAD_3V_DS0 (PAD_DS_SLOW0 | PAD_DS_3V) +#define PAD_3V_DS1 (PAD_DS_SLOW1 | PAD_DS_3V) +#define PAD_3V_DS2 (PAD_DS_MEDIUM | PAD_DS_3V) +#define PAD_3V_DS3 (PAD_DS_FAST | PAD_DS_3V) + +/* pull up/down */ +#define PULL_DIS (0 << 13)/* bit[15:13] 000 */ +#define PULL_UP (6 << 13)/* bit[15:13] 110 */ +#define PULL_DOWN (5 << 13)/* bit[15:13] 101 */ + +#endif /* __DT_BINDINGS_K1_PINCTRL_H */
Signature · 1 line
2.25.1
Re: [PATCH 12/17] dt-bindings: pinctrl: add k1 support
Quoted 65 lines · Raymond Mao
From: Raymond Mao <[email protected]>
Add dt-binding file of pinctrl driver for Spacemit K1 SoC.
Signed-off-by Raymond Mao <[email protected]>--- include/dt-bindings/pinctrl/k1-pinctrl.h | 59 ++++++++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 include/dt-bindings/pinctrl/k1-pinctrl.hinclude/dt-bindings/pinctrl/k1-pinctrl.h new file +49
-0@@ -0,0 +1,59 @@ +/* SPDX-License-Identifier: (GPL-2.0 OR MIT) */ +/* +* Copyright (C) 2025-2026 RISCStar Ltd. +*/ + +#ifndef __DT_BINDINGS_K1_PINCTRL_H +#define __DT_BINDINGS_K1_PINCTRL_H + +/* pin mux */ +#define MUX_MODE0 0 +#define MUX_MODE1 1 +#define MUX_MODE2 2 +#define MUX_MODE3 3 +#define MUX_MODE4 4 +#define MUX_MODE5 5 +#define MUX_MODE6 6 +#define MUX_MODE7 7 + +/* strong pull resistor */ +#define SPU_EN BIT(3) + +/* edge detect */ +#define EDGE_NONE BIT(6) +#define EDGE_RISE BIT(4) +#define EDGE_FALL BIT(5) +#define EDGE_BOTH (EDGE_RISE | EDGE_FALL) + +/* slew rate output control */ +#define SLE_EN BIT(7) + +/* schmitter trigger input threshold */ +#define ST00 (0 << 8) +#define ST01 BIT(8) +#define ST02 BIT(9) +#define ST03 (BIT(8) | BIT(9)) + +/* driver strength*/ +#define PAD_DS_3V BIT(10) +#define PAD_DS_SLOW0 (0 << 11) +#define PAD_DS_SLOW1 BIT(11) +#define PAD_DS_MEDIUM BIT(12) +#define PAD_DS_FAST (BIT(11) | BIT(12)) + +#define PAD_1V8_DS0 PAD_DS_SLOW0 +#define PAD_1V8_DS1 PAD_DS_SLOW1 +#define PAD_1V8_DS2 PAD_DS_MEDIUM +#define PAD_1V8_DS3 PAD_DS_FAST + +#define PAD_3V_DS0 (PAD_DS_SLOW0 | PAD_DS_3V)
include/dt-bindings/pinctrl/k1-pinctrl.h line 59
Quoted 10 lines
include/dt-bindings/pinctrl/k1-pinctrl.h new file +10
-0+#define PAD_3V_DS1 (PAD_DS_SLOW1 | PAD_DS_3V) +#define PAD_3V_DS2 (PAD_DS_MEDIUM | PAD_DS_3V) +#define PAD_3V_DS3 (PAD_DS_FAST | PAD_DS_3V) + +/* pull up/down */ +#define PULL_DIS (0 << 13)/* bit[15:13] 000 */ +#define PULL_UP (6 << 13)/* bit[15:13] 110 */ +#define PULL_DOWN (5 << 13)/* bit[15:13] 101 */ + +#endif /* __DT_BINDINGS_K1_PINCTRL_H */
These definitions look like hardware bits instead of dt-bindings, and I don't see a binding file for the pinctrl driver of SpacemiT K1 in Linux upstream. If it's the case, please keep the definitions inside your driver, correct the commit description, and probably squash it into the driver patch.
Thanks,
Yao Zi
Re: [PATCH 12/17] dt-bindings: pinctrl: add k1 support
Hi Yao Zi,
Quoted 84 lines · Yao Zi
Review
Quoted 11 lines · Raymond Mao
From: Raymond Mao <[email protected]>
Add dt-binding file of pinctrl driver for Spacemit K1 SoC.
Signed-off-by Raymond Mao <[email protected]>--- include/dt-bindings/pinctrl/k1-pinctrl.h | 59 ++++++++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 include/dt-bindings/pinctrl/k1-pinctrl.h(quoted diff) +0
-0
b/include/dt-bindings/pinctrl/k1-pinctrl.hQuoted 54 lines
new file mode 100644
index 00000000000..6c6b223c969include/dt-bindings/pinctrl/k1-pinctrl.h new file +49
-0@@ -0,0 +1,59 @@ +/* SPDX-License-Identifier: (GPL-2.0 OR MIT) */ +/* +* Copyright (C) 2025-2026 RISCStar Ltd. +*/ + +#ifndef __DT_BINDINGS_K1_PINCTRL_H +#define __DT_BINDINGS_K1_PINCTRL_H + +/* pin mux */ +#define MUX_MODE0 0 +#define MUX_MODE1 1 +#define MUX_MODE2 2 +#define MUX_MODE3 3 +#define MUX_MODE4 4 +#define MUX_MODE5 5 +#define MUX_MODE6 6 +#define MUX_MODE7 7 + +/* strong pull resistor */ +#define SPU_EN BIT(3) + +/* edge detect */ +#define EDGE_NONE BIT(6) +#define EDGE_RISE BIT(4) +#define EDGE_FALL BIT(5) +#define EDGE_BOTH (EDGE_RISE | EDGE_FALL) + +/* slew rate output control */ +#define SLE_EN BIT(7) + +/* schmitter trigger input threshold */ +#define ST00 (0 << 8) +#define ST01 BIT(8) +#define ST02 BIT(9) +#define ST03 (BIT(8) | BIT(9)) + +/* driver strength*/ +#define PAD_DS_3V BIT(10) +#define PAD_DS_SLOW0 (0 << 11) +#define PAD_DS_SLOW1 BIT(11) +#define PAD_DS_MEDIUM BIT(12) +#define PAD_DS_FAST (BIT(11) | BIT(12)) + +#define PAD_1V8_DS0 PAD_DS_SLOW0 +#define PAD_1V8_DS1 PAD_DS_SLOW1 +#define PAD_1V8_DS2 PAD_DS_MEDIUM +#define PAD_1V8_DS3 PAD_DS_FAST + +#define PAD_3V_DS0 (PAD_DS_SLOW0 | PAD_DS_3V)include/dt-bindings/pinctrl/k1-pinctrl.h line 59
Quoted 10 lines
include/dt-bindings/pinctrl/k1-pinctrl.h new file +10
-0+#define PAD_3V_DS1 (PAD_DS_SLOW1 | PAD_DS_3V) +#define PAD_3V_DS2 (PAD_DS_MEDIUM | PAD_DS_3V) +#define PAD_3V_DS3 (PAD_DS_FAST | PAD_DS_3V) + +/* pull up/down */ +#define PULL_DIS (0 << 13)/* bit[15:13] 000 */ +#define PULL_UP (6 << 13)/* bit[15:13] 110 */ +#define PULL_DOWN (5 << 13)/* bit[15:13] 101 */ + +#endif /* __DT_BINDINGS_K1_PINCTRL_H */ These definitions look like hardware bits instead of dt-bindings, and I don't see a binding file for the pinctrl driver of SpacemiT K1 in Linux upstream. If it's the case, please keep the definitions inside your driver, correct the commit description, and probably squash it into the driver patch.
Quoted 1 line
We'll use the pinctrl-single driver. So all pin configurations could be
filled in the DTS file, not in the dt-binding file.
But the pinmux configurations should be included in the dt-binding file.
Regards,
Raymond
Quoted 3 lines
Thanks,
Yao Zi
Re: [PATCH 12/17] dt-bindings: pinctrl: add k1 support
Quoted 89 lines · Raymond Mao
Hi Yao Zi,
Quoted 85 lines · Yao Zi
Review
Quoted 11 lines · Raymond Mao
From: Raymond Mao <[email protected]>
Add dt-binding file of pinctrl driver for Spacemit K1 SoC.
Signed-off-by Raymond Mao <[email protected]>--- include/dt-bindings/pinctrl/k1-pinctrl.h | 59 ++++++++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 include/dt-bindings/pinctrl/k1-pinctrl.h(quoted diff) +0
-0
b/include/dt-bindings/pinctrl/k1-pinctrl.hQuoted 54 lines
new file mode 100644
index 00000000000..6c6b223c969include/dt-bindings/pinctrl/k1-pinctrl.h new file +49
-0@@ -0,0 +1,59 @@ +/* SPDX-License-Identifier: (GPL-2.0 OR MIT) */ +/* +* Copyright (C) 2025-2026 RISCStar Ltd. +*/ + +#ifndef __DT_BINDINGS_K1_PINCTRL_H +#define __DT_BINDINGS_K1_PINCTRL_H + +/* pin mux */ +#define MUX_MODE0 0 +#define MUX_MODE1 1 +#define MUX_MODE2 2 +#define MUX_MODE3 3 +#define MUX_MODE4 4 +#define MUX_MODE5 5 +#define MUX_MODE6 6 +#define MUX_MODE7 7 + +/* strong pull resistor */ +#define SPU_EN BIT(3) + +/* edge detect */ +#define EDGE_NONE BIT(6) +#define EDGE_RISE BIT(4) +#define EDGE_FALL BIT(5) +#define EDGE_BOTH (EDGE_RISE | EDGE_FALL) + +/* slew rate output control */ +#define SLE_EN BIT(7) + +/* schmitter trigger input threshold */ +#define ST00 (0 << 8) +#define ST01 BIT(8) +#define ST02 BIT(9) +#define ST03 (BIT(8) | BIT(9)) + +/* driver strength*/ +#define PAD_DS_3V BIT(10) +#define PAD_DS_SLOW0 (0 << 11) +#define PAD_DS_SLOW1 BIT(11) +#define PAD_DS_MEDIUM BIT(12) +#define PAD_DS_FAST (BIT(11) | BIT(12)) + +#define PAD_1V8_DS0 PAD_DS_SLOW0 +#define PAD_1V8_DS1 PAD_DS_SLOW1 +#define PAD_1V8_DS2 PAD_DS_MEDIUM +#define PAD_1V8_DS3 PAD_DS_FAST + +#define PAD_3V_DS0 (PAD_DS_SLOW0 | PAD_DS_3V)include/dt-bindings/pinctrl/k1-pinctrl.h line 59
Quoted 10 lines
include/dt-bindings/pinctrl/k1-pinctrl.h new file +10
-0+#define PAD_3V_DS1 (PAD_DS_SLOW1 | PAD_DS_3V) +#define PAD_3V_DS2 (PAD_DS_MEDIUM | PAD_DS_3V) +#define PAD_3V_DS3 (PAD_DS_FAST | PAD_DS_3V) + +/* pull up/down */ +#define PULL_DIS (0 << 13)/* bit[15:13] 000 */ +#define PULL_UP (6 << 13)/* bit[15:13] 110 */ +#define PULL_DOWN (5 << 13)/* bit[15:13] 101 */ + +#endif /* __DT_BINDINGS_K1_PINCTRL_H */ These definitions look like hardware bits instead of dt-bindings, and I don't see a binding file for the pinctrl driver of SpacemiT K1 in Linux upstream. If it's the case, please keep the definitions inside your driver, correct the commit description, and probably squash it into the driver patch.
We'll use the pinctrl-single driver. So all pin configurations could be
But you removed the pinctrl-single node in PATCH 6, didn't you? And I don't think this "binding" file gets used in any devicetree after applying the series.
And I suggest aligning with the upstream pinctrl binding. It eases migration to upstream device-tree, and makes it possible to share a single dtb between Linux and U-Boot, which is a nice feature.
Quoted 10 lines
filled in the DTS file, not in the dt-binding file.
But the pinmux configurations should be included in the dt-binding file.Regards,
RaymondQuoted 3 lines
Thanks,
Yao Zi
Best regards,
Yao Zi
PATCH 13/17 spacemit: k1: add TLV EEPROM support in SPL
In reply to Raymond MaoFrom: Raymond Mao <[email protected]>
And support for required components including clock, I2C controller, and I2C EEPROM.
--- arch/riscv/dts/k1-spl.dts | 28 +++++++++ arch/riscv/dts/k1.dtsi | 105 +++++++++++++++++++++++++++++++++- board/spacemit/k1/spl.c | 101 +++++++++++++++++++++++++++++++- board/spacemit/k1/tlv_codes.h | 22 +++++++ configs/k1_defconfig | 14 +++++ 5 files changed, 268 insertions(+), 2 deletions(-) create mode 100644 board/spacemit/k1/tlv_codes.h
arch/riscv/dts/k1-spl.dts +28 -0
@@ -5,6 +5,7 @@ */ /dts-v1/; + #include "k1.dtsi" #include "binman.dtsi"
@@ -65,6 +66,33 @@ status = "okay"; bootph-pre-ram; }; + + i2c@d4012000 { /* i2c2 */ + status = "okay"; + bootph-pre-ram; + eeprom: eeprom { + compatible = "atmel,24c02"; + reg = <0x50>; + status = "okay"; + bootph-pre-ram; + }; + }; + + i2c@d401d800 { /* i2c8 */ + status = "okay"; + bootph-pre-ram; + pmic@41 { + compatible = "pmic"; + reg = <0x41>; + status = "okay"; + bootph-pre-ram; + }; + }; + + reset-controller@d4050000 { + status = "okay"; + bootph-pre-ram; + }; }; &uart0 {
arch/riscv/dts/k1.dtsi +104 -1
122 lines not on this page · raw message
board/spacemit/k1/spl.c +100 -1
127 lines not on this page · raw message
board/spacemit/k1/tlv_codes.h new file +22 -0
@@ -0,0 +1,22 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* +* Copyright (C) 2025-2026 RISCStar Ltd. +*/ + +#ifndef __TLV_CODES_H +#define __TLV_CODES_H + +#define TLV_CODE_SDK_VERSION 0x40 +#define TLV_CODE_DDR_CSNUM 0x41 +#define TLV_CODE_DDR_TYPE 0x42 +#define TLV_CODE_DDR_DATARATE 0x43 +#define TLV_CODE_DDR_TX_ODT 0x44 + +#define TLV_CODE_WIFI_MAC_ADDR 0x60 +#define TLV_CODE_BLUETOOTH_ADDR 0x61 + +#define TLV_CODE_PMIC_TYPE 0x80 +#define TLV_CODE_EEPROM_I2C_INDEX 0x81 +#define TLV_CODE_EEPROM_PIN_GROUP 0x82 + +#endif /* __TLV_CODES_H */
configs/k1_defconfig +14 -0
@@ -34,6 +34,7 @@ CONFIG_ENV_OVERWRITE=y CONFIG_PINCTRL=y CONFIG_PINCTRL_SINGLE=y CONFIG_RESET_SPACEMIT_K1=y +CONFIG_SPL_RESET_SPACEMIT_K1=y CONFIG_SYS_NS16550=y CONFIG_SYS_NS16550_MEM32=y CONFIG_DEBUG_UART=y
@@ -52,3 +53,16 @@ CONFIG_CLK=y CONFIG_CLK_SPACEMIT=y CONFIG_SPL_CLK=y CONFIG_SYS_MALLOC_F_LEN=0x5000 +CONFIG_SPL_LOG_LEVEL=7 +CONFIG_SPL_DM_RESET=y +CONFIG_DM_I2C=y +CONFIG_SPL_I2C=y +CONFIG_SYS_I2C_SPACEMIT_K1=y +CONFIG_MISC=y +CONFIG_SPL_MISC=y +CONFIG_SPL_DRIVERS_MISC=y +CONFIG_I2C_EEPROM=y +CONFIG_SPL_I2C_EEPROM=y +CONFIG_CMD_TLV_EEPROM=y +CONFIG_SPL_CMD_TLV_EEPROM=y +CONFIG_LOG=y
Signature · 1 line
2.25.1
PATCH 14/17 spacemit: k1: Add DDR firmware support to SPL
In reply to Raymond MaoFrom: Raymond Mao <[email protected]>
Include DDR initialization firmware in the SPL image. The firmware path can be specified via the DDR_FW_FILE environment variable. If the firmware is not found, an empty placeholder file is created to allow the build to proceed without DDR initialization support.
--- arch/riscv/dts/k1-spl.dts | 34 ++++++++++++++++++++++++++++++++- board/spacemit/k1/Kconfig | 8 ++++++++ board/spacemit/k1/Makefile | 19 ++++++++++++++++++ board/spacemit/k1/spl.c | 30 +++++++++++++++++++++++++++++ include/configs/k1.h | 3 +++ lib/vendor/spacemit/ddr_fw.bin | Bin 0 -> 19416 bytes 6 files changed, 93 insertions(+), 1 deletion(-) create mode 100644 lib/vendor/spacemit/ddr_fw.bin
arch/riscv/dts/k1-spl.dts +33 -1
@@ -7,7 +7,6 @@ /dts-v1/; #include "k1.dtsi" -#include "binman.dtsi" / { model = "spacemit k1 spl";
@@ -21,6 +20,39 @@ stdout-path = "serial0:115200n8"; bootph-all; }; + + binman { + section { + filename = "u-boot-spl-ddr.bin"; + pad-byte = <0xff>; + align-size = <4>; + align = <4>; + + spl_section: section { + type = "section"; + size = <CONFIG_SPL_DDR_FIRMWARE_OFFSET>; + + u-boot-spl-nodtb { + type = "blob"; + filename = "spl/u-boot-spl.bin"; + align-end = <4>; + }; + + u-boot-spl-dtb { + type = "blob"; + filename = "spl/u-boot-spl.dtb"; + align-end = <4>; + }; + }; + + ddr_fw: ddr-firmware { + type = "blob"; + offset = <CONFIG_SPL_DDR_FIRMWARE_OFFSET>; + filename = "lib/vendor/spacemit/ddr_fw.bin"; + align-end = <4>; + }; + }; + }; }; &vctcxo_1m {
board/spacemit/k1/Kconfig +8 -0
@@ -15,6 +15,14 @@ config SYS_CONFIG_NAME config TEXT_BASE default 0x00200000 +config SPL_DDR_FIRMWARE_OFFSET + hex "DDR firmware offset in SPL image" + depends on SPL + default 0x20000 + help + Offset where DDR firmware should be placed in the SPL + image. + config SPL_OPENSBI_LOAD_ADDR default 0x00000000
board/spacemit/k1/Makefile +19 -0
@@ -5,3 +5,22 @@ obj-y := board.o obj-$(CONFIG_SPL_BUILD) += spl.o + +DDR_FW_SRC ?= $(DDR_FW_FILE) +FW_TARGET = $(srctree)/lib/vendor/spacemit/ddr_fw.bin + +DDR_FW_HEADER = $(objtree)/include/generated/ddr_fw_info.h + +$(obj)/spl.o: $(DDR_FW_HEADER) + +$(DDR_FW_HEADER): $(FW_TARGET) + @echo "/* DDR firmware info - $$(date) */" > $@ + @if [ -f "$(FW_TARGET)" ]; then \ + SIZE=$$(stat -c%s "$(FW_TARGET)" 2>/dev/null || echo 0); \ + else \ + SIZE=0; \ + fi; \ + echo "#define DDR_FW_FILE_SIZE $$SIZE" >> $@ + @echo "/* Note: Update ADDR if binman layout changes */" >> $@ + +clean-files += $(FW_TARGET) $(DDR_FW_HEADER)
board/spacemit/k1/spl.c +30 -0
@@ -6,10 +6,12 @@#include <asm/io.h> #include <clk.h> #include <clk-uclass.h> +#include <cpu_func.h> #include <configs/k1.h> #include <dm/device.h> #include <dm/uclass.h> #include <dt-bindings/pinctrl/k1-pinctrl.h> +#include <generated/ddr_fw_info.h> #include <i2c.h> #include <linux/delay.h> #include <log.h>
@@ -115,6 +117,33 @@ void serial_early_init(void)panic ("Serial uclass init failed: %d\n" , ret); } +/* Load DDR training firmware */ +int init_ddr_firmware (void ) +{ +void __iomem *src, *dst; +unsigned long size; + + src = (void __iomem *)(CONFIG_SPL_TEXT_BASE + +CONFIG_SPL_DDR_FIRMWARE_OFFSET ); + dst = (void __iomem *)(DDR_TRAINING_DATA_BASE ); +memcpy (dst, src,DDR_FW_FILE_SIZE ); + size =round_up (DDR_FW_FILE_SIZE ,64 ); +flush_dcache_range ((u32 )(u64 )dst, (u32 )(u64 )dst + size); +return 0 ; +} + +void ddr_early_init (void ) +{ +void __iomem *addr; + +init_ddr_firmware (); + addr = (void __iomem *)(CONFIG_SPL_TEXT_BASE + +CONFIG_SPL_DDR_FIRMWARE_OFFSET ); +// verify DDR firmware header +log_info ("[0x%x]:0x%x, firmware size:%d\n" , + (uint )(u64 )addr,readl (addr),DDR_FW_FILE_SIZE ); +} +void board_init_f (ulong dummy) {u8 i2c_buf[I2C_BUF_SIZE ];
@@ -138,6 +167,7 @@ void board_init_f(ulong dummy)log_info ("Fail to detect board:%d\n" , ret); else log_info("Get board name:%s\n", (char *)i2c_buf); +ddr_early_init (); }u32 spl_boot_device (void )
include/configs/k1.h +3 -0
@@ -16,4 +16,7 @@#define RISCV_MMODE_TIMER_FREQ 24000000#define RISCV_SMODE_TIMER_FREQ 24000000 +#define DDR_TRAINING_DATA_BASE 0xC0832000 +#define DDR_TRAINING_INFO_BUFF 0xC0800000 +#endif /* __CONFIG_H */
lib/vendor/spacemit/ddr_fw.bin new file binary +0 -0
Signature · 1 line
2.25.1
Re: [PATCH 14/17] spacemit: k1: Add DDR firmware support to SPL
(My mail provider complains about the huge list of recipients, so I reduced it a little.)
Quoted 7 lines · Raymond Mao
From: Raymond Mao <[email protected]>
Include DDR initialization firmware in the SPL image. The firmware path can be specified via the
DDR_FW_FILEenvironment variable. If the firmware is not found, an empty placeholder file is created to allow the build to proceed without DDR initialization support.
Quoted 8 lines
Signed-off-by Raymond Mao <[email protected]>--- arch/riscv/dts/k1-spl.dts | 34 ++++++++++++++++++++++++++++++++- board/spacemit/k1/Kconfig | 8 ++++++++ board/spacemit/k1/Makefile | 19 ++++++++++++++++++ board/spacemit/k1/spl.c | 30 +++++++++++++++++++++++++++++ include/configs/k1.h | 3 +++ lib/vendor/spacemit/ddr_fw.bin | Bin 0 -> 19416 bytes
It's unusual to ship binary firmware in U-Boot repository. Please place the firmware somewhere else, and give a clear instruction in the board/architecture documentation explaining how to obtain/build it.
Quoted 2 lines
6 files changed, 93 insertions(+), 1 deletion(-) create mode 100644 lib/vendor/spacemit/ddr_fw.bin
...
Quoted 36 lines
board/spacemit/k1/Kconfig +8
-0@@ -15,6 +15,14 @@ config SYS_CONFIG_NAME config TEXT_BASE default 0x00200000 +config SPL_DDR_FIRMWARE_OFFSET + hex "DDR firmware offset in SPL image" + depends on SPL + default 0x20000 + help + Offset where DDR firmware should be placed in the SPL + image. + config SPL_OPENSBI_LOAD_ADDR default 0x00000000board/spacemit/k1/Makefile +9
-0@@ -5,3 +5,22 @@ obj-y := board.o obj-$(CONFIG_SPL_BUILD) += spl.o + +DDR_FW_SRC ?= $(DDR_FW_FILE) +FW_TARGET = $(srctree)/lib/vendor/spacemit/ddr_fw.bin + +DDR_FW_HEADER = $(objtree)/include/generated/ddr_fw_info.h + +$(obj)/spl.o: $(DDR_FW_HEADER) + +$(DDR_FW_HEADER): $(FW_TARGET)
board/spacemit/k1/Makefile line 26
Quoted 10 lines
board/spacemit/k1/Makefile +10
-0+ @echo "/* DDR firmware info - $$(date) */" > $@ + @if [ -f "$(FW_TARGET)" ]; then \ + SIZE=$$(stat -c%s "$(FW_TARGET)" 2>/dev/null || echo 0); \ + else \ + SIZE=0; \ + fi; \ + echo "#define DDR_FW_FILE_SIZE $$SIZE" >> $@ + @echo "/* Note: Update ADDR if binman layout changes */" >> $@ + +clean-files += $(FW_TARGET) $(DDR_FW_HEADER)
Please make use of existing binman[1] facibilities to avoid the extra Kconfig and Makefile pieces. binman_sym() could be used for obtaining both size and offset of a binman entry.
Quoted 34 lines
board/spacemit/k1/spl.c +15
-0@@ -6,10 +6,12 @@#include <asm/io.h> #include <clk.h> #include <clk-uclass.h> +#include <cpu_func.h> #include <configs/k1.h> #include <dm/device.h> #include <dm/uclass.h> #include <dt-bindings/pinctrl/k1-pinctrl.h> +#include <generated/ddr_fw_info.h> #include <i2c.h> #include <linux/delay.h> #include <log.h> @@ -115,6 +117,33 @@ void serial_early_init(void)panic ("Serial uclass init failed: %d\n" , ret); } +/* Load DDR training firmware */ +int init_ddr_firmware (void ) +{ +void __iomem *src, *dst; +unsigned long size; + + src = (void __iomem *)(CONFIG_SPL_TEXT_BASE + +CONFIG_SPL_DDR_FIRMWARE_OFFSET ); + dst = (void __iomem *)(DDR_TRAINING_DATA_BASE ); +memcpy (dst, src,DDR_FW_FILE_SIZE ); + size =round_up (DDR_FW_FILE_SIZE ,64 ); +flush_dcache_range ((u32 )(u64 )dst, (u32 )(u64 )dst + size); +return 0 ;
board/spacemit/k1/spl.c void serial_early_init(void) · line 142
Quoted 10 lines
board/spacemit/k1/spl.c +10
-0+} + +void ddr_early_init (void ) +{ +void __iomem *addr; + +init_ddr_firmware (); + addr = (void __iomem *)(CONFIG_SPL_TEXT_BASE + +CONFIG_SPL_DDR_FIRMWARE_OFFSET ); +// verify DDR firmware header
However, you don't verify it, but only print some of the information. The comment seems misleading and extra.
board/spacemit/k1/spl.c void serial_early_init(void) · line 144
Quoted 2 lines
board/spacemit/k1/spl.c +2
-0+log_info ("[0x%x]:0x%x, firmware size:%d\n" , + (uint )(u64 )addr,readl (addr),DDR_FW_FILE_SIZE );
Regards,
Yao Zi
Re: [PATCH 14/17] spacemit: k1: Add DDR firmware support to SPL
Hi Yao Zi,
Quoted 80 lines · Yao Zi
(My mail provider complains about the huge list of recipients, so I reduced it a little.)
Quoted 7 lines · Raymond Mao
From: Raymond Mao <[email protected]>
Include DDR initialization firmware in the SPL image. The firmware path can be specified via the
DDR_FW_FILEenvironment variable. If the firmware is not found, an empty placeholder file is created to allow the build to proceed without DDR initialization support.Quoted 8 lines
Signed-off-by Raymond Mao <[email protected]>--- arch/riscv/dts/k1-spl.dts | 34 ++++++++++++++++++++++++++++++++- board/spacemit/k1/Kconfig | 8 ++++++++ board/spacemit/k1/Makefile | 19 ++++++++++++++++++ board/spacemit/k1/spl.c | 30 +++++++++++++++++++++++++++++ include/configs/k1.h | 3 +++ lib/vendor/spacemit/ddr_fw.bin | Bin 0 -> 19416 bytesIt's unusual to ship binary firmware in U-Boot repository. Please place the firmware somewhere else, and give a clear instruction in the board/architecture documentation explaining how to obtain/build it.
Quoted 2 lines
6 files changed, 93 insertions(+), 1 deletion(-) create mode 100644 lib/vendor/spacemit/ddr_fw.bin...
Quoted 36 lines
board/spacemit/k1/Kconfig +8
-0@@ -15,6 +15,14 @@ config SYS_CONFIG_NAME config TEXT_BASE default 0x00200000 +config SPL_DDR_FIRMWARE_OFFSET + hex "DDR firmware offset in SPL image" + depends on SPL + default 0x20000 + help + Offset where DDR firmware should be placed in the SPL + image. + config SPL_OPENSBI_LOAD_ADDR default 0x00000000board/spacemit/k1/Makefile +9
-0@@ -5,3 +5,22 @@ obj-y := board.o obj-$(CONFIG_SPL_BUILD) += spl.o + +DDR_FW_SRC ?= $(DDR_FW_FILE) +FW_TARGET = $(srctree)/lib/vendor/spacemit/ddr_fw.bin + +DDR_FW_HEADER = $(objtree)/include/generated/ddr_fw_info.h + +$(obj)/spl.o: $(DDR_FW_HEADER) + +$(DDR_FW_HEADER): $(FW_TARGET)board/spacemit/k1/Makefile line 26
Quoted 10 lines
board/spacemit/k1/Makefile +10
-0+ @echo "/* DDR firmware info - $$(date) */" > $@ + @if [ -f "$(FW_TARGET)" ]; then \ + SIZE=$$(stat -c%s "$(FW_TARGET)" 2>/dev/null || echo 0); \ + else \ + SIZE=0; \ + fi; \ + echo "#define DDR_FW_FILE_SIZE $$SIZE" >> $@ + @echo "/* Note: Update ADDR if binman layout changes */" >> $@ + +clean-files += $(FW_TARGET) $(DDR_FW_HEADER)Please make use of existing binman[1] facibilities to avoid the extra
KconfigandMakefilepieces.binman_sym()could be used for obtaining both size and offset of a binman entry.
Quoted 1 line
It doesn't work at all in SPL. I checked the binman symbol table
that was totally empty.
Quoted 48 lines
Quoted 34 lines
board/spacemit/k1/spl.c +15
-0@@ -6,10 +6,12 @@#include <asm/io.h> #include <clk.h> #include <clk-uclass.h> +#include <cpu_func.h> #include <configs/k1.h> #include <dm/device.h> #include <dm/uclass.h> #include <dt-bindings/pinctrl/k1-pinctrl.h> +#include <generated/ddr_fw_info.h> #include <i2c.h> #include <linux/delay.h> #include <log.h> @@ -115,6 +117,33 @@ void serial_early_init(void)panic ("Serial uclass init failed: %d\n" , ret); } +/* Load DDR training firmware */ +int init_ddr_firmware (void ) +{ +void __iomem *src, *dst; +unsigned long size; + + src = (void __iomem *)(CONFIG_SPL_TEXT_BASE + +CONFIG_SPL_DDR_FIRMWARE_OFFSET ); + dst = (void __iomem *)(DDR_TRAINING_DATA_BASE ); +memcpy (dst, src,DDR_FW_FILE_SIZE ); + size =round_up (DDR_FW_FILE_SIZE ,64 ); +flush_dcache_range ((u32 )(u64 )dst, (u32 )(u64 )dst + size); +return 0 ;board/spacemit/k1/spl.c void serial_early_init(void) · line 142
Quoted 10 lines
board/spacemit/k1/spl.c +10
-0+} + +void ddr_early_init (void ) +{ +void __iomem *addr; + +init_ddr_firmware (); + addr = (void __iomem *)(CONFIG_SPL_TEXT_BASE + +CONFIG_SPL_DDR_FIRMWARE_OFFSET ); +// verify DDR firmware header However, you don't verify it, but only print some of the information. The comment seems misleading and extra.
Quoted 1 line
OK. I could remove the print and use checking instead.
Raymond
Quoted 6 lines
board/spacemit/k1/spl.c void serial_early_init(void) · line 144
Quoted 2 lines
board/spacemit/k1/spl.c +2
-0+log_info ("[0x%x]:0x%x, firmware size:%d\n" , + (uint )(u64 )addr,readl (addr),DDR_FW_FILE_SIZE );Regards,
Yao Zi
Re: [PATCH 14/17] spacemit: k1: Add DDR firmware support to SPL
Quoted 84 lines · Raymond Mao
Hi Yao Zi,
Quoted 80 lines · Yao Zi
(My mail provider complains about the huge list of recipients, so I reduced it a little.)
Quoted 7 lines · Raymond Mao
From: Raymond Mao <[email protected]>
Include DDR initialization firmware in the SPL image. The firmware path can be specified via the
DDR_FW_FILEenvironment variable. If the firmware is not found, an empty placeholder file is created to allow the build to proceed without DDR initialization support.Quoted 8 lines
Signed-off-by Raymond Mao <[email protected]>--- arch/riscv/dts/k1-spl.dts | 34 ++++++++++++++++++++++++++++++++- board/spacemit/k1/Kconfig | 8 ++++++++ board/spacemit/k1/Makefile | 19 ++++++++++++++++++ board/spacemit/k1/spl.c | 30 +++++++++++++++++++++++++++++ include/configs/k1.h | 3 +++ lib/vendor/spacemit/ddr_fw.bin | Bin 0 -> 19416 bytesIt's unusual to ship binary firmware in U-Boot repository. Please place the firmware somewhere else, and give a clear instruction in the board/architecture documentation explaining how to obtain/build it.
Quoted 2 lines
6 files changed, 93 insertions(+), 1 deletion(-) create mode 100644 lib/vendor/spacemit/ddr_fw.bin...
Quoted 36 lines
board/spacemit/k1/Kconfig +8
-0@@ -15,6 +15,14 @@ config SYS_CONFIG_NAME config TEXT_BASE default 0x00200000 +config SPL_DDR_FIRMWARE_OFFSET + hex "DDR firmware offset in SPL image" + depends on SPL + default 0x20000 + help + Offset where DDR firmware should be placed in the SPL + image. + config SPL_OPENSBI_LOAD_ADDR default 0x00000000board/spacemit/k1/Makefile +9
-0@@ -5,3 +5,22 @@ obj-y := board.o obj-$(CONFIG_SPL_BUILD) += spl.o + +DDR_FW_SRC ?= $(DDR_FW_FILE) +FW_TARGET = $(srctree)/lib/vendor/spacemit/ddr_fw.bin + +DDR_FW_HEADER = $(objtree)/include/generated/ddr_fw_info.h + +$(obj)/spl.o: $(DDR_FW_HEADER) + +$(DDR_FW_HEADER): $(FW_TARGET)board/spacemit/k1/Makefile line 26
Quoted 10 lines
board/spacemit/k1/Makefile +10
-0+ @echo "/* DDR firmware info - $$(date) */" > $@ + @if [ -f "$(FW_TARGET)" ]; then \ + SIZE=$$(stat -c%s "$(FW_TARGET)" 2>/dev/null || echo 0); \ + else \ + SIZE=0; \ + fi; \ + echo "#define DDR_FW_FILE_SIZE $$SIZE" >> $@ + @echo "/* Note: Update ADDR if binman layout changes */" >> $@ + +clean-files += $(FW_TARGET) $(DDR_FW_HEADER)Please make use of existing binman[1] facibilities to avoid the extra
KconfigandMakefilepieces.binman_sym()could be used for obtaining both size and offset of a binman entry.
Quoted 2 lines
Quoted 1 line
It doesn't work at all in SPL. I checked the binman symbol table
that was totally empty.
I've tried commit fd871fc6bb49 ("pinctrl: mediatek: mt8365: add PUPD registers") with th1520_lpi4a_defconfig, and drivers/ram/thead/th1520_ddr.c, which makes use of binman_sym(), does work.
This suggests binman facilities do work on RISC-V, at least after the last time when I fixed it[1]. Are you testing on a U-Boot version earlier than v2025.07? Otherwise there's likely something (configuration or code) wrong on your side.
btw, every first line of your replied paragraphs has the wrong level of quotes, which is a little confusing.
Best regards,
Yao Zi
PATCH 15/17 power: pmic: add support for Spacemit P1 PMIC
In reply to Raymond MaoFrom: Raymond Mao <[email protected]>
Spacemit's PMIC is used by Spacemit K1 SoC. It contains voltage regulators, GPIOs and Watchdog.
--- drivers/power/pmic/Kconfig | 17 +++ drivers/power/pmic/Makefile | 1 + drivers/power/pmic/pmic_spacemit_p1.c | 95 +++++++++++++++ include/power/spacemit_p1.h | 162 ++++++++++++++++++++++++++ 4 files changed, 275 insertions(+) create mode 100644 drivers/power/pmic/pmic_spacemit_p1.c create mode 100644 include/power/spacemit_p1.h
drivers/power/pmic/Kconfig +17 -0
@@ -433,6 +433,23 @@ config PMIC_RAA215300 support and several voltage regulators. For now, this driver simply allows register access and will bind the sysreset driver (CONFIG_SYSRESET_RAA215300) if it is enabled. + +config PMIC_SPACEMIT_P1 + bool "Enable driver for Spacemit P1 power management chip" + depends on DM_PMIC + help + The P1 PMIC integrates multiple functions including + voltage regulators, a watchdog timer, GPIO interfaces, and a + real-time clock. + +config SPL_PMIC_SPACEMIT_P1 + bool "Enable driver for Spacemit P1 power management chip in SPL" + depends on SPL_DM_PMIC + help + The P1 PMIC integrates multiple functions including + voltage regulators, a watchdog timer, GPIO interfaces, and a + real-time clock. + endif config PMIC_TPS65217
drivers/power/pmic/Makefile +1 -0
@@ -39,6 +39,7 @@ obj-$(CONFIG_PMIC_TPS65941) += tps65941.o obj-$(CONFIG_PMIC_RAA215300) += raa215300.o obj-$(CONFIG_POWER_TPS65218) += pmic_tps65218.o obj-$(CONFIG_$(PHASE_)DM_PMIC_CPCAP) += cpcap.o +obj-$(CONFIG_$(PHASE_)PMIC_SPACEMIT_P1) += pmic_spacemit_p1.o ifeq ($(CONFIG_$(PHASE_)POWER_LEGACY),y) obj-$(CONFIG_POWER_LTC3676) += pmic_ltc3676.o
drivers/power/pmic/pmic_spacemit_p1.c new file +95 -0
95 lines not on this page · raw message
include/power/spacemit_p1.h new file +162 -0
162 lines not on this page · raw message
Signature · 1 line
2.25.1
PATCH 16/17 power: regulator: add support for Spacemit P1 SoC
In reply to Raymond MaoFrom: Raymond Mao <[email protected]>
Support voltage regulator for Spacemit P1 SoC. It contains 6 BUCKs and 11 LDOs.
--- drivers/power/pmic/pmic_spacemit_p1.c | 5 +- drivers/power/regulator/Kconfig | 15 + drivers/power/regulator/Makefile | 1 + .../power/regulator/spacemit_p1_regulator.c | 460 ++++++++++++++++++ include/power/spacemit_p1.h | 3 +- 5 files changed, 480 insertions(+), 4 deletions(-) create mode 100644 drivers/power/regulator/spacemit_p1_regulator.c
drivers/power/pmic/pmic_spacemit_p1.c +2 -3
@@ -38,8 +38,8 @@ static int pmic_p1_read(struct udevice *dev, uint reg, u8 *buffer,static const struct pmic_child_info p1_children_info[] = { { .prefix ="buck" , .driver =P1_BUCK_DRIVER }, - { .prefix ="aldo" , .driver =P1_LDO_DRIVER }, - { .prefix ="dldo" , .driver =P1_LDO_DRIVER }, + { .prefix ="aldo" , .driver =P1_ALDO_DRIVER }, + { .prefix ="dldo" , .driver =P1_DLDO_DRIVER }, { }, };
@@ -91,5 +91,4 @@ U_BOOT_DRIVER(pmic_p1) = { .bind = pmic_p1_bind, .probe = pmic_p1_probe, .ops = &pmic_p1_ops, -//.priv_auto = sizeof(struct p1_pdata), };
drivers/power/regulator/Kconfig +15 -0
@@ -520,3 +520,18 @@ config DM_REGULATOR_CPCAP REGULATOR CPCAP. The driver supports both DC-to-DC Step-Down Switching (SW) Regulators and Low-Dropout Linear (LDO) Regulators found in CPCAP PMIC and implements get/set api for voltage and state. + +config DM_REGULATOR_SPACEMIT_P1 + bool "Enable driver for Spacemit P1 PMIC regulators" + depends on DM_REGULATOR && PMIC_SPACEMIT_P1 + help + Enable implementation of driver-model regulator uclass features + for regulator P1. The driver supports BUCKs, LDOs and SWITCHes. + +config SPL_DM_REGULATOR_SPACEMIT_P1 + bool "Enable driver for Spacemit P1 PMIC regulators in SPL" + depends on SPL_DM_REGULATOR && SPL_PMIC_SPACEMIT_P1 + help + Enable implementation of driver-model regulator uclass features + for regulator P1 in SPL. The driver supports BUCKs, LDOs and + SWITCHes.
drivers/power/regulator/Makefile +1 -0
@@ -47,3 +47,4 @@ obj-$(CONFIG_$(PHASE_)DM_REGULATOR_ANATOP) += anatop_regulator.o obj-$(CONFIG_DM_REGULATOR_TPS65219) += tps65219_regulator.o obj-$(CONFIG_REGULATOR_RZG2L_USBPHY) += rzg2l-usbphy-regulator.o obj-$(CONFIG_$(PHASE_)DM_REGULATOR_CPCAP) += cpcap_regulator.o +obj-$(CONFIG_$(PHASE_)DM_REGULATOR_SPACEMIT_P1) += spacemit_p1_regulator.o
drivers/power/regulator/spacemit_p1_regulator.c new file +460 -0
460 lines not on this page · raw message
include/power/spacemit_p1.h +2 -1
@@ -155,7 +155,8 @@ enum { };#define P1_BUCK_DRIVER "p1_buck" -#define P1_LDO_DRIVER "p1_ldo" +#define P1_ALDO_DRIVER "p1_aldo" +#define P1_DLDO_DRIVER "p1_dldo"#define P1_SWITCH_DRIVER "p1_switch"#define P1_WDT_DRIVER "p1_wdt"
Signature · 1 line
2.25.1
PATCH 17/17 board: k1: enable pmic in spl
In reply to Raymond MaoFrom: Raymond Mao <[email protected]>
Add Spacemit P1 SoC support in SPL. And set the default voltage for BUCKs and LDOs.
--- arch/riscv/dts/k1-spl.dts | 128 ++++++++++++++++++++++++++++++++++---- board/spacemit/k1/spl.c | 83 ++++++++++++++++++++---- configs/k1_defconfig | 9 +++ 3 files changed, 198 insertions(+), 22 deletions(-)
arch/riscv/dts/k1-spl.dts +117 -11
@@ -110,17 +110,6 @@ }; }; - i2c@d401d800 { /* i2c8 */ - status = "okay"; - bootph-pre-ram; - pmic@41 { - compatible = "pmic"; - reg = <0x41>; - status = "okay"; - bootph-pre-ram; - }; - }; - reset-controller@d4050000 { status = "okay"; bootph-pre-ram;
@@ -131,3 +120,120 @@ status = "okay"; bootph-pre-ram; }; + +&i2c8 { + status = "okay"; + bootph-pre-ram; + pmic@41 { + compatible = "spacemit,p1"; + reg = <0x41>; + status = "okay"; + bootph-pre-ram; + + regulators { + buck1 { + regulator-name = "vdd_core"; + regulator-min-microvolt = <500000>; + regulator-max-microvolt = <3450000>; + regulator-ramp-delay = <5000>; + regulator-always-on; + bootph-pre-ram; + }; + + buck2 { + regulator-min-microvolt = <500000>; + regulator-max-microvolt = <3450000>; + regulator-ramp-delay = <5000>; + regulator-always-on; + }; + + buck3_1v8: buck3 { + regulator-name = "vdd_1v8"; + regulator-min-microvolt = <500000>; + regulator-max-microvolt = <1800000>; + regulator-ramp-delay = <5000>; + regulator-always-on; + bootph-pre-ram; + }; + + buck4 { + regulator-min-microvolt = <500000>; + regulator-max-microvolt = <3300000>; + regulator-ramp-delay = <5000>; + regulator-always-on; + }; + + buck5 { + regulator-min-microvolt = <500000>; + regulator-max-microvolt = <3450000>; + regulator-ramp-delay = <5000>; + regulator-always-on; + }; + + buck6 { + regulator-min-microvolt = <500000>; + regulator-max-microvolt = <3450000>; + regulator-ramp-delay = <5000>; + regulator-always-on; + }; + + aldo1 { + regulator-name = "vdd_1v8_mmc"; + regulator-min-microvolt = <500000>; + regulator-max-microvolt = <3400000>; + regulator-boot-on; + bootph-pre-ram; + }; + + aldo2 { + regulator-min-microvolt = <500000>; + regulator-max-microvolt = <3400000>; + }; + + aldo3 { + regulator-min-microvolt = <500000>; + regulator-max-microvolt = <3400000>; + }; + + aldo4 { + regulator-min-microvolt = <500000>; + regulator-max-microvolt = <3400000>; + }; + + dldo1 { + regulator-min-microvolt = <500000>; + regulator-max-microvolt = <3400000>; + }; + + dldo2 { + regulator-min-microvolt = <500000>; + regulator-max-microvolt = <3400000>; + }; + + dldo3 { + regulator-min-microvolt = <500000>; + regulator-max-microvolt = <3400000>; + }; + + dldo4 { + regulator-min-microvolt = <500000>; + regulator-max-microvolt = <3400000>; + }; + + dldo5 { + regulator-min-microvolt = <500000>; + regulator-max-microvolt = <3400000>; + }; + + dldo6 { + regulator-min-microvolt = <500000>; + regulator-max-microvolt = <3400000>; + }; + + dldo7 { + regulator-min-microvolt = <500000>; + regulator-max-microvolt = <3400000>; + }; + }; + }; +};
board/spacemit/k1/spl.c +72 -11
115 lines not on this page · raw message
configs/k1_defconfig +9 -0
@@ -66,3 +66,12 @@ CONFIG_SPL_I2C_EEPROM=y CONFIG_CMD_TLV_EEPROM=y CONFIG_SPL_CMD_TLV_EEPROM=y CONFIG_LOG=y +CONFIG_SPL_POWER=y +CONFIG_DM_PMIC=y +CONFIG_SPL_DM_PMIC=y +CONFIG_PMIC_SPACEMIT_P1=y +CONFIG_SPL_PMIC_SPACEMIT_P1=y +CONFIG_DM_REGULATOR=y +CONFIG_SPL_DM_REGULATOR=y +CONFIG_DM_REGULATOR_SPACEMIT_P1=y +CONFIG_SPL_DM_REGULATOR_SPACEMIT_P1=y
Signature · 1 line
2.25.1
Hi Raymond,
please Cc to [email protected] for more wide audience
Quoted 7 lines · Raymond Mao
From: Raymond Mao <[email protected]>
This patch series introduces full support for the k1 SoC in SPL for multiple boards.
The series enables the board by:
1. Adding the base board definition with device tree.
this is rather huge patchset.. please order and list index of patches for people easy to review..
some patches touch dts and driver code, please submit in separate patch
Quoted 108 lines
2. Bringing up essential clock sources and tree.
3. Initializing I2C buses for peripheral communication.
4. Integrating the PMIC driver for power management.
5. Adding regulator drivers for voltage domain control.Junhui Liu (1):
clk: spacemit: Add support for K1 SoCRaymond Mao (16):
spacemit: k1: support multi-board infrastructure
spacemit: k1: enable SPL with debug UART
configs: k1: enable early timer support
reset: k1: add SPL support and enable TWSI8 reset
dt-bindings: clock: import k1-syscon from upstream
dts: k1: import dts file from upstream folder
dts: k1: enable clocks in SPL
board: k1: initialize clock and serial devices in SPL
configs: k1: add default option for clock driver in SPL
i2c: k1: add I2C driver support
dt-bindings: pinctrl: add k1 support
spacemit: k1: add TLV EEPROM support in SPL
spacemit: k1: Add DDR firmware support to SPL
power: pmic: add support for Spacemit P1 PMIC
power: regulator: add support for Spacemit P1 SoC
board: k1: enable pmic in splarch/riscv/Kconfig | 10 +- arch/riscv/cpu/k1/Kconfig | 6 + arch/riscv/dts/Makefile | 1 + arch/riscv/dts/k1-spl.dts | 239 +++ arch/riscv/dts/k1.dtsi | 667 +++++- board/spacemit/bananapi-f3/Kconfig | 25 - board/spacemit/bananapi-f3/Makefile | 5 - board/spacemit/k1/Kconfig | 38 + .../spacemit/{bananapi-f3 => k1}/MAINTAINERS | 4 +- board/spacemit/k1/Makefile | 26 + board/spacemit/{bananapi-f3 => k1}/board.c | 0 board/spacemit/k1/spl.c | 252 +++ board/spacemit/k1/tlv_codes.h | 22 + configs/bananapi-f3_defconfig | 24 - configs/k1_defconfig | 77 + drivers/clk/Kconfig | 5 +- drivers/clk/Makefile | 1 + drivers/clk/spacemit/Kconfig | 31 + drivers/clk/spacemit/Makefile | 7 + drivers/clk/spacemit/clk-k1.c | 1793 +++++++++++++++++ drivers/clk/spacemit/clk_common.h | 79 + drivers/clk/spacemit/clk_ddn.c | 93 + drivers/clk/spacemit/clk_ddn.h | 53 + drivers/clk/spacemit/clk_mix.c | 403 ++++ drivers/clk/spacemit/clk_mix.h | 224 ++ drivers/clk/spacemit/clk_pll.c | 157 ++ drivers/clk/spacemit/clk_pll.h | 81 + drivers/i2c/Kconfig | 7 + drivers/i2c/Makefile | 1 + drivers/i2c/k1_i2c.c | 521 +++++ drivers/i2c/k1_i2c.h | 69 + drivers/power/pmic/Kconfig | 17 + drivers/power/pmic/Makefile | 1 + drivers/power/pmic/pmic_spacemit_p1.c | 94 + drivers/power/regulator/Kconfig | 15 + drivers/power/regulator/Makefile | 1 + .../power/regulator/spacemit_p1_regulator.c | 460 +++++ drivers/reset/Kconfig | 7 + drivers/reset/Makefile | 2 +- drivers/reset/reset-spacemit-k1.c | 4 - include/configs/{bananapi-f3.h => k1.h} | 9 + .../dt-bindings/clock/spacemit,k1-syscon.h | 253 +++ include/dt-bindings/pinctrl/k1-pinctrl.h | 59 + include/power/spacemit_p1.h | 163 ++ include/soc/spacemit/k1-syscon.h | 149 ++ lib/vendor/spacemit/ddr_fw.bin | Bin 0 -> 19416 bytes 46 files changed, 5985 insertions(+), 170 deletions(-) create mode 100644 arch/riscv/dts/k1-spl.dts delete mode 100644 board/spacemit/bananapi-f3/Kconfig delete mode 100644 board/spacemit/bananapi-f3/Makefile create mode 100644 board/spacemit/k1/Kconfig rename board/spacemit/{bananapi-f3 => k1}/MAINTAINERS (61%) create mode 100644 board/spacemit/k1/Makefile rename board/spacemit/{bananapi-f3 => k1}/board.c (100%) create mode 100644 board/spacemit/k1/spl.c create mode 100644 board/spacemit/k1/tlv_codes.h delete mode 100644 configs/bananapi-f3_defconfig create mode 100644 configs/k1_defconfig create mode 100644 drivers/clk/spacemit/Kconfig create mode 100644 drivers/clk/spacemit/Makefile create mode 100644 drivers/clk/spacemit/clk-k1.c create mode 100644 drivers/clk/spacemit/clk_common.h create mode 100644 drivers/clk/spacemit/clk_ddn.c create mode 100644 drivers/clk/spacemit/clk_ddn.h create mode 100644 drivers/clk/spacemit/clk_mix.c create mode 100644 drivers/clk/spacemit/clk_mix.h create mode 100644 drivers/clk/spacemit/clk_pll.c create mode 100644 drivers/clk/spacemit/clk_pll.h create mode 100644 drivers/i2c/k1_i2c.c create mode 100644 drivers/i2c/k1_i2c.h create mode 100644 drivers/power/pmic/pmic_spacemit_p1.c create mode 100644 drivers/power/regulator/spacemit_p1_regulator.c rename include/configs/{bananapi-f3.h => k1.h} (52%) create mode 100644 include/dt-bindings/clock/spacemit,k1-syscon.h create mode 100644 include/dt-bindings/pinctrl/k1-pinctrl.h create mode 100644 include/power/spacemit_p1.h create mode 100644 include/soc/spacemit/k1-syscon.h create mode 100644 lib/vendor/spacemit/ddr_fw.binSignature · 1 line
2.25.1
Signature · 1 line
Yixun Lan (dlan)
Quoted 12 lines · Raymond Mao
From: Raymond Mao<[email protected]>
This patch series introduces full support for the k1 SoC in SPL for multiple boards.
The series enables the board by:
1. Adding the base board definition with device tree.
2. Bringing up essential clock sources and tree.
3. Initializing I2C buses for peripheral communication.
4. Integrating the PMIC driver for power management.
5. Adding regulator drivers for voltage domain control.
Quoted 2 lines
Junhui Liu (1):
clk: spacemit: Add support for K1 SoC
Hello Raymond,
Is a downstream OpenSBI still needed for testing this? The documentation in doc/board/spacemit/bananapi-f3.rst refers to
git clone https://github.com/cyyself/opensbi -b k1-opensbi
which is based on OpenSBI v1.6-32-g02c7a9bb.
Or is the necessary code already upstream? Upstream OpenSBI seems to have some support in platform/generic/spacemit/k1.c.
Should doc/board/spacemit/bananapi-f3.rst be renamed or do you plan on different docs for different boards?
Best regards
Heinrich
Hi Heinrich,
Quoted 24 lines · Heinrich Schuchardt
Quoted 12 lines · Raymond Mao
From: Raymond Mao<[email protected]>
This patch series introduces full support for the k1 SoC in SPL for multiple boards.
The series enables the board by:
1. Adding the base board definition with device tree.
2. Bringing up essential clock sources and tree.
3. Initializing I2C buses for peripheral communication.
4. Integrating the PMIC driver for power management.
5. Adding regulator drivers for voltage domain control.Quoted 2 lines
Junhui Liu (1):
clk: spacemit: Add support for K1 SoCHello Raymond,
Is a downstream OpenSBI still needed for testing this? The documentation in
doc/board/spacemit/bananapi-f3.rstrefers togit clone https://github.com/cyyself/opensbi -b k1-opensbi
Quoted 9 lines
which is based on OpenSBI v1.6-32-g02c7a9bb.
Or is the necessary code already upstream? Upstream OpenSBI seems to have some support in
platform/generic/spacemit/k1.c.Should
doc/board/spacemit/bananapi-f3.rstbe renamed or do you plan on different docs for different boards?
This series is for SPL, but there is a plan to update the document later when I prepare next patches for the u-boot proper.
Raymond
Quoted 4 lines
Best regards
Heinrich