Add support for SUNIV and F1C100s.
Subsystems (6)
v2 cover Add support for SUNIV and F1C100s.
This patch set aims to add support for the SUNIV and F1C100s. Support has been in linux for a while now, but not in u-boot.
This patchset contains:
- CPU specific initialization code
- SUNIV dram driver
- SUNIV clock driver adaption
- SUNIV gpio driver adaption
- SUNIV uart driver adaption
- F1C100s basic support
The SUNIV seems to be similar to sun6i and sun4i, so we use code from both platforms. We also add suniv to the cpu dircetory as it uses arm926ejs.
NOTE: To work this will need patchset "sunxi: remove lowlevel_init".
Icenowy Zheng (11):
arm: arm926ej-s: start.S: port save_boot_params support from armv7
code
arm: arm926ej-s: Add sunxi code
dt-bindings: clock: Add initial suniv headers
dt-bindings: reset: Add initial suniv headers
ARM: sunxi: Add clock and uart to sunxi headers
sunxi: Add F1C100s DRAM initial support
sunxi: board: Add support for SUNIV
configs: sunxi: Add common SUNIV header
mach-sunxi: Add support for SUNIV architecture
ARM: dts: suniv: Add device tree files for F1C100s
configs: sunxi: Add support for Lichee Pi Nano
Jesse Taube (1):
mach-sunxi: Move timer code to mach folder
arch/arm/cpu/arm926ejs/Makefile | 1 +
arch/arm/cpu/arm926ejs/start.S | 19 +
arch/arm/cpu/arm926ejs/sunxi/Makefile | 5 +
arch/arm/cpu/arm926ejs/sunxi/config.mk | 6 +
arch/arm/cpu/arm926ejs/sunxi/fel_utils.S | 33 ++
arch/arm/cpu/arm926ejs/sunxi/u-boot-spl.lds | 48 ++
arch/arm/dts/Makefile | 2 +
arch/arm/dts/suniv-f1c100s-licheepi-nano.dts | 29 ++
arch/arm/dts/suniv-f1c100s.dtsi | 6 +
arch/arm/dts/suniv.dtsi | 160 +++++++
arch/arm/include/asm/arch-sunxi/clock.h | 2 +-
arch/arm/include/asm/arch-sunxi/clock_sun6i.h | 13 +
arch/arm/include/asm/arch-sunxi/cpu_sun4i.h | 6 +
arch/arm/include/asm/arch-sunxi/dram.h | 2 +
arch/arm/include/asm/arch-sunxi/dram_suniv.h | 46 ++
arch/arm/include/asm/arch-sunxi/gpio.h | 1 +
arch/arm/mach-sunxi/Kconfig | 16 +-
arch/arm/mach-sunxi/Makefile | 5 +
arch/arm/mach-sunxi/board.c | 28 +-
arch/arm/mach-sunxi/clock.c | 3 +-
arch/arm/mach-sunxi/clock_sun6i.c | 46 +-
arch/arm/mach-sunxi/cpu_info.c | 2 +
arch/arm/mach-sunxi/dram_helpers.c | 4 +
arch/arm/mach-sunxi/dram_suniv.c | 420 ++++++++++++++++++
.../{cpu/armv7/sunxi => mach-sunxi}/timer.c | 7 +-
board/sunxi/board.c | 4 +-
configs/licheepi_nano_defconfig | 15 +
include/configs/suniv.h | 14 +
include/configs/sunxi-common.h | 59 ++-
include/dt-bindings/clock/suniv-ccu.h | 69 +++
include/dt-bindings/reset/suniv-ccu.h | 37 ++
31 files changed, 1080 insertions(+), 28 deletions(-)
create mode 100644 arch/arm/cpu/arm926ejs/sunxi/Makefile
create mode 100644 arch/arm/cpu/arm926ejs/sunxi/config.mk
create mode 100644 arch/arm/cpu/arm926ejs/sunxi/fel_utils.S
create mode 100644 arch/arm/cpu/arm926ejs/sunxi/u-boot-spl.lds
create mode 100644 arch/arm/dts/suniv-f1c100s-licheepi-nano.dts
create mode 100644 arch/arm/dts/suniv-f1c100s.dtsi
create mode 100644 arch/arm/dts/suniv.dtsi
create mode 100644 arch/arm/include/asm/arch-sunxi/dram_suniv.h
create mode 100644 arch/arm/mach-sunxi/dram_suniv.c
rename arch/arm/{cpu/armv7/sunxi => mach-sunxi}/timer.c (97%)
create mode 100644 configs/licheepi_nano_defconfig
create mode 100644 include/configs/suniv.h
create mode 100644 include/dt-bindings/clock/suniv-ccu.h
create mode 100644 include/dt-bindings/reset/suniv-ccu.hSignature · 1 line
2.34.1
PATCH v2 1/12 arm: arm926ej-s: start.S: port save_boot_params support from armv7 code
From: Icenowy Zheng <[email protected]>
The ARMv7 start code has support for saving some boot params at the entry point, which is used by some SoCs to return to BROM.
Port this to ARM926EJ-S start code.
---V1->V2:
* Nothing done
--- arch/arm/cpu/arm926ejs/start.S | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)
arch/arm/cpu/arm926ejs/start.S +19 -0
@@ -17,6 +17,7 @@ #include <asm-offsets.h> #include <config.h> #include <common.h> +#include <linux/linkage.h> /* *************************************************************************
@@ -32,8 +33,13 @@ */ .globl reset + .globl save_boot_params_ret + .type save_boot_params_ret,%function reset: + /* Allow the board to save important registers */ + b save_boot_params +save_boot_params_ret: /* * set the cpu to SVC32 mode */
@@ -110,3 +116,16 @@ flush_dcache: #endif mov pc, lr /* back to my caller */ #endif /* CONFIG_IS_ENABLED(SKIP_LOWLEVEL_INIT) */ + +/************************************************************************* + * + * void save_boot_params(u32 r0, u32 r1, u32 r2, u32 r3) + * __attribute__((weak)); + * + * Stack pointer is not yet initialized at this moment + * Don't save anything to stack even if compiled with -O0 + * + *************************************************************************/ +WEAK(save_boot_params) + b save_boot_params_ret /* back to my caller */ +ENDPROC(save_boot_params)
Signature · 1 line
2.34.1
PATCH v2 2/12 mach-sunxi: Move timer code to mach folder
In reply to Jesse TaubeBoth armv7 and arm926ejs use this timer code so move it to mach-sunxi.
---V1->V2:
* New commit
---
arch/arm/mach-sunxi/Makefile | 3 +++
arch/arm/{cpu/armv7/sunxi => mach-sunxi}/timer.c | 7 ++++---
2 files changed, 7 insertions(+), 3 deletions(-)
rename arch/arm/{cpu/armv7/sunxi => mach-sunxi}/timer.c (97%)arch/arm/mach-sunxi/Makefile +3 -0
@@ -25,6 +25,9 @@ obj-$(CONFIG_MACH_SUN8I) += clock_sun6i.o endif obj-$(CONFIG_MACH_SUN9I) += clock_sun9i.o gtbus_sun9i.o obj-$(CONFIG_SUN50I_GEN_H6) += clock_sun50i_h6.o +ifndef CONFIG_ARM64 +obj-y += timer.o +endif ifdef CONFIG_SPL_BUILD obj-$(CONFIG_DRAM_SUN4I) += dram_sun4i.o
arch/arm/mach-sunxi/timer.c renamed from arch/arm/cpu/armv7/sunxi/timer.c +4 -3
@@ -51,6 +51,7 @@ int timer_init(void)struct sunxi_timer_reg *timers = (struct sunxi_timer_reg *)SUNXI_TIMER_BASE ;struct sunxi_timer *timer = &timers->timer[TIMER_NUM ]; +writel (TIMER_LOAD_VAL , &timer->inter);writel (TIMER_MODE |TIMER_DIV |TIMER_SRC |TIMER_RELOAD |TIMER_EN , &timer->ctl);
@@ -58,15 +59,14 @@ int timer_init(void)return 0 ; } -/* timer without interrupts */ static ulong get_timer_masked (void ) {/* current tick value */ ulong now =TICKS_TO_HZ (read_timer ()); -if (now >= gd->arch.lastinc)/* normal (non rollover) */ +if (now >= gd->arch.lastinc) {/* normal (non rollover) */ gd->arch.tbl += (now - gd->arch.lastinc); -else { + }else {/* rollover */ gd->arch.tbl += (TICKS_TO_HZ (TIMER_LOAD_VAL ) - gd->arch.lastinc) + now;
@@ -76,6 +76,7 @@ static ulong get_timer_masked(void)return gd->arch.tbl; } +/* timer without interrupts */ ulong get_timer (ulong base) {return get_timer_masked () - base;
Signature · 1 line
2.34.1
Re: [PATCH v2 02/12] mach-sunxi: Move timer code to mach folder
Quoted 1 line · On Wed, 26 Jan 2022 08:53:19 -0500 Jesse Taube <[email protected]> wrote:
Both armv7 and arm926ejs use this timer code so move it to mach-sunxi.
Very nice, thanks for cleaning this up.
But please remove the respective line from the Makefile in arch/arm/cpu/armv7/sunxi/, otherwise 32-bit board builds fail:
make[2]: *** No rule to make target 'arch/arm/cpu/armv7/sunxi/timer.o' ...
Cheers,
Andre
Quoted 65 lines
Signed-off-by Jesse Taube <[email protected]>---
V1->V2:
* New commit--- arch/arm/mach-sunxi/Makefile | 3 +++ arch/arm/{cpu/armv7/sunxi => mach-sunxi}/timer.c | 7 ++++--- 2 files changed, 7 insertions(+), 3 deletions(-) rename arch/arm/{cpu/armv7/sunxi => mach-sunxi}/timer.c (97%)arch/arm/mach-sunxi/Makefile +3
-0@@ -25,6 +25,9 @@ obj-$(CONFIG_MACH_SUN8I) += clock_sun6i.o endif obj-$(CONFIG_MACH_SUN9I) += clock_sun9i.o gtbus_sun9i.o obj-$(CONFIG_SUN50I_GEN_H6) += clock_sun50i_h6.o +ifndef CONFIG_ARM64 +obj-y += timer.o +endif ifdef CONFIG_SPL_BUILD obj-$(CONFIG_DRAM_SUN4I) += dram_sun4i.oarch/arm/mach-sunxi/timer.c renamed from arch/arm/cpu/armv7/sunxi/timer.c +4
-3@@ -51,6 +51,7 @@ int timer_init(void)struct sunxi_timer_reg *timers = (struct sunxi_timer_reg *)SUNXI_TIMER_BASE ;struct sunxi_timer *timer = &timers->timer[TIMER_NUM ]; +writel (TIMER_LOAD_VAL , &timer->inter);writel (TIMER_MODE |TIMER_DIV |TIMER_SRC |TIMER_RELOAD |TIMER_EN , &timer->ctl);@@ -58,15 +59,14 @@ int timer_init(void)return 0 ; } -/* timer without interrupts */ static ulong get_timer_masked (void ) {/* current tick value */ ulong now =TICKS_TO_HZ (read_timer ()); -if (now >= gd->arch.lastinc)/* normal (non rollover) */ +if (now >= gd->arch.lastinc) {/* normal (non rollover) */ gd->arch.tbl += (now - gd->arch.lastinc); -else { + }else {/* rollover */ gd->arch.tbl += (TICKS_TO_HZ (TIMER_LOAD_VAL ) - gd->arch.lastinc) + now;@@ -76,6 +76,7 @@ static ulong get_timer_masked(void)return gd->arch.tbl; } +/* timer without interrupts */ ulong get_timer (ulong base) {return get_timer_masked () - base;
Re: [PATCH v2 02/12] mach-sunxi: Move timer code to mach folder
Quoted 10 lines · Andre Przywara
Quoted 1 line · On Wed, 26 Jan 2022 08:53:19 -0500 Jesse Taube <[email protected]> wrote:
Both armv7 and arm926ejs use this timer code so move it to mach-sunxi.
Very nice, thanks for cleaning this up.
But please remove the respective line from the
Makefileinarch/arm/cpu/armv7/sunxi/, otherwise 32-bit board builds fail:
make[2]: *** No rule to make target 'arch/arm/cpu/armv7/sunxi/timer.o' ...
Oh my I'm very sorry about this. There is one thing though arch/arm/cpu/armv7/sunxi/ needs to have one .o file in there to compile. If I remove ifdef CONFIG_SPL_BUILD for fel_utils it will work but its not used in u-boot proper.
Quoted 69 lines
Cheers,
AndreQuoted 65 lines
Signed-off-by Jesse Taube <[email protected]>---
V1->V2:
* New commit--- arch/arm/mach-sunxi/Makefile | 3 +++ arch/arm/{cpu/armv7/sunxi => mach-sunxi}/timer.c | 7 ++++--- 2 files changed, 7 insertions(+), 3 deletions(-)rename
arch/arm/{cpu/armv7/sunxi=>mach-sunxi}/timer.c(97%)arch/arm/mach-sunxi/Makefile +3
-0@@ -25,6 +25,9 @@ obj-$(CONFIG_MACH_SUN8I) += clock_sun6i.o endif obj-$(CONFIG_MACH_SUN9I) += clock_sun9i.o gtbus_sun9i.o obj-$(CONFIG_SUN50I_GEN_H6) += clock_sun50i_h6.o +ifndef CONFIG_ARM64 +obj-y += timer.o +endif ifdef CONFIG_SPL_BUILD obj-$(CONFIG_DRAM_SUN4I) += dram_sun4i.oarch/arm/mach-sunxi/timer.c renamed from arch/arm/cpu/armv7/sunxi/timer.c +4
-3@@ -51,6 +51,7 @@ int timer_init(void)struct sunxi_timer_reg *timers = (struct sunxi_timer_reg *)SUNXI_TIMER_BASE ;struct sunxi_timer *timer = &timers->timer[TIMER_NUM ]; +writel (TIMER_LOAD_VAL , &timer->inter);writel (TIMER_MODE |TIMER_DIV |TIMER_SRC |TIMER_RELOAD |TIMER_EN , &timer->ctl);@@ -58,15 +59,14 @@ int timer_init(void)return 0 ; } -/* timer without interrupts */ static ulong get_timer_masked (void ) {/* current tick value */ ulong now =TICKS_TO_HZ (read_timer ()); -if (now >= gd->arch.lastinc)/* normal (non rollover) */ +if (now >= gd->arch.lastinc) {/* normal (non rollover) */ gd->arch.tbl += (now - gd->arch.lastinc); -else { + }else {/* rollover */ gd->arch.tbl += (TICKS_TO_HZ (TIMER_LOAD_VAL ) - gd->arch.lastinc) + now;@@ -76,6 +76,7 @@ static ulong get_timer_masked(void)return gd->arch.tbl; } +/* timer without interrupts */ ulong get_timer (ulong base) {return get_timer_masked () - base;
Re: [PATCH v2 02/12] mach-sunxi: Move timer code to mach folder
On Thu, 27 Jan 2022 15:40:13 -0500
Jesse Taube <[email protected]> wrote:
Hi,
Quoted 8 lines · Andre Przywara
Quoted 7 lines
Quoted 1 line · On Wed, 26 Jan 2022 08:53:19 -0500 Jesse Taube <[email protected]> wrote:
Both armv7 and arm926ejs use this timer code so move it to mach-sunxi.
Very nice, thanks for cleaning this up.
Quoted 7 lines
Quoted 3 lines
But please remove the respective line from the
Makefileinarch/arm/cpu/armv7/sunxi/, otherwise 32-bit board builds fail:
make[2]: *** No rule to make target 'arch/arm/cpu/armv7/sunxi/timer.o' ...Oh my I'm very sorry about this. There is one thing though
arch/arm/cpu/armv7/sunxi/needs to have one .o file in there to compile. If I removeifdef CONFIG_SPL_BUILDforfel_utilsit will work but its not used in u-boot proper.
Mmh, not sure I follow, I cannot reproduce any problem. Can you elaborate? And did you do a "make clean" afterwards?
Cheers,
Andre
Quoted 69 lines
Quoted 69 lines
Cheers,
AndreQuoted 65 lines
Signed-off-by Jesse Taube <[email protected]>---
V1->V2:
* New commit--- arch/arm/mach-sunxi/Makefile | 3 +++ arch/arm/{cpu/armv7/sunxi => mach-sunxi}/timer.c | 7 ++++--- 2 files changed, 7 insertions(+), 3 deletions(-)rename
arch/arm/{cpu/armv7/sunxi=>mach-sunxi}/timer.c(97%)arch/arm/mach-sunxi/Makefile +3
-0@@ -25,6 +25,9 @@ obj-$(CONFIG_MACH_SUN8I) += clock_sun6i.o endif obj-$(CONFIG_MACH_SUN9I) += clock_sun9i.o gtbus_sun9i.o obj-$(CONFIG_SUN50I_GEN_H6) += clock_sun50i_h6.o +ifndef CONFIG_ARM64 +obj-y += timer.o +endif ifdef CONFIG_SPL_BUILD obj-$(CONFIG_DRAM_SUN4I) += dram_sun4i.oarch/arm/mach-sunxi/timer.c renamed from arch/arm/cpu/armv7/sunxi/timer.c +4
-3@@ -51,6 +51,7 @@ int timer_init(void)struct sunxi_timer_reg *timers = (struct sunxi_timer_reg *)SUNXI_TIMER_BASE ;struct sunxi_timer *timer = &timers->timer[TIMER_NUM ]; +writel (TIMER_LOAD_VAL , &timer->inter);writel (TIMER_MODE |TIMER_DIV |TIMER_SRC |TIMER_RELOAD |TIMER_EN , &timer->ctl);@@ -58,15 +59,14 @@ int timer_init(void)return 0 ; } -/* timer without interrupts */ static ulong get_timer_masked (void ) {/* current tick value */ ulong now =TICKS_TO_HZ (read_timer ()); -if (now >= gd->arch.lastinc)/* normal (non rollover) */ +if (now >= gd->arch.lastinc) {/* normal (non rollover) */ gd->arch.tbl += (now - gd->arch.lastinc); -else { + }else {/* rollover */ gd->arch.tbl += (TICKS_TO_HZ (TIMER_LOAD_VAL ) - gd->arch.lastinc) + now;@@ -76,6 +76,7 @@ static ulong get_timer_masked(void)return gd->arch.tbl; } +/* timer without interrupts */ ulong get_timer (ulong base) {return get_timer_masked () - base;
Re: [PATCH v2 02/12] mach-sunxi: Move timer code to mach folder
Quoted 16 lines · Andre Przywara
On Thu, 27 Jan 2022 15:40:13 -0500
Jesse Taube <[email protected]> wrote:Hi,
Quoted 11 lines · Andre Przywara
Quoted 10 lines
Quoted 1 line · On Wed, 26 Jan 2022 08:53:19 -0500 Jesse Taube <[email protected]> wrote:
Both armv7 and arm926ejs use this timer code so move it to mach-sunxi.
Very nice, thanks for cleaning this up.
But please remove the respective line from the
Makefileinarch/arm/cpu/armv7/sunxi/, otherwise 32-bit board builds fail:
make[2]: *** No rule to make target 'arch/arm/cpu/armv7/sunxi/timer.o' ...
Quoted 7 lines
Quoted 4 lines
Oh my I'm very sorry about this. There is one thing though
arch/arm/cpu/armv7/sunxi/needs to have one .o file in there to compile. If I removeifdef CONFIG_SPL_BUILDforfel_utilsit will work but its not used in u-boot proper.Mmh, not sure I follow, I cannot reproduce any problem. Can you elaborate? And did you do a "make clean" afterwards?
If nothing is built by that MAKEFILE which would happen if !(CONFIG_MACH_SUN6I || CONFIG_MACH_SUN8I_H3 CONFIG_MACH_SUN8I || CONFIG_ARMV7_PSCI) it will error with the following ar: arch/arm/cpu/armv7/sunxi/built-in.o: No such file or directory
I don't know if there is a config that will break it currently but it is possible. So we will have to let it generate some .o file. Even if it is optimized out.
Should I still wait for your review of V2?
Also thank you so much for being interested in this!
Have my patches been okay so far?
I really hope this gets in before cleanup of sunxi starts as rebasing it was already difficult.
Thank you,
Jesse Taube
Quoted 73 lines
Cheers, Andre
Quoted 69 lines
Quoted 69 lines
Cheers,
AndreQuoted 65 lines
Signed-off-by Jesse Taube <[email protected]>---
V1->V2:
* New commit--- arch/arm/mach-sunxi/Makefile | 3 +++ arch/arm/{cpu/armv7/sunxi => mach-sunxi}/timer.c | 7 ++++--- 2 files changed, 7 insertions(+), 3 deletions(-)rename
arch/arm/{cpu/armv7/sunxi=>mach-sunxi}/timer.c(97%)arch/arm/mach-sunxi/Makefile +3
-0@@ -25,6 +25,9 @@ obj-$(CONFIG_MACH_SUN8I) += clock_sun6i.o endif obj-$(CONFIG_MACH_SUN9I) += clock_sun9i.o gtbus_sun9i.o obj-$(CONFIG_SUN50I_GEN_H6) += clock_sun50i_h6.o +ifndef CONFIG_ARM64 +obj-y += timer.o +endif ifdef CONFIG_SPL_BUILD obj-$(CONFIG_DRAM_SUN4I) += dram_sun4i.oarch/arm/mach-sunxi/timer.c renamed from arch/arm/cpu/armv7/sunxi/timer.c +4
-3@@ -51,6 +51,7 @@ int timer_init(void)struct sunxi_timer_reg *timers = (struct sunxi_timer_reg *)SUNXI_TIMER_BASE ;struct sunxi_timer *timer = &timers->timer[TIMER_NUM ]; +writel (TIMER_LOAD_VAL , &timer->inter);writel (TIMER_MODE |TIMER_DIV |TIMER_SRC |TIMER_RELOAD |TIMER_EN , &timer->ctl);@@ -58,15 +59,14 @@ int timer_init(void)return 0 ; } -/* timer without interrupts */ static ulong get_timer_masked (void ) {/* current tick value */ ulong now =TICKS_TO_HZ (read_timer ()); -if (now >= gd->arch.lastinc)/* normal (non rollover) */ +if (now >= gd->arch.lastinc) {/* normal (non rollover) */ gd->arch.tbl += (now - gd->arch.lastinc); -else { + }else {/* rollover */ gd->arch.tbl += (TICKS_TO_HZ (TIMER_LOAD_VAL ) - gd->arch.lastinc) + now;@@ -76,6 +76,7 @@ static ulong get_timer_masked(void)return gd->arch.tbl; } +/* timer without interrupts */ ulong get_timer (ulong base) {return get_timer_masked () - base;
Re: [PATCH v2 02/12] mach-sunxi: Move timer code to mach folder
On Thu, 27 Jan 2022 23:51:09 -0500
Jesse Taube <[email protected]> wrote:
Hi Jesse,
Quoted 22 lines · Andre Przywara
Quoted 21 lines
On Thu, 27 Jan 2022 15:40:13 -0500
Jesse Taube <[email protected]> wrote:Hi,
Quoted 15 lines · Andre Przywara
Quoted 10 lines
Quoted 1 line · On Wed, 26 Jan 2022 08:53:19 -0500 Jesse Taube <[email protected]> wrote:
Both armv7 and arm926ejs use this timer code so move it to mach-sunxi.
Very nice, thanks for cleaning this up.
But please remove the respective line from the
Makefileinarch/arm/cpu/armv7/sunxi/, otherwise 32-bit board builds fail:
make[2]: *** No rule to make target 'arch/arm/cpu/armv7/sunxi/timer.o' ...Oh my I'm very sorry about this. There is one thing though
arch/arm/cpu/armv7/sunxi/needs to have one .o file in there to compile. If I removeifdef CONFIG_SPL_BUILDforfel_utilsit will work but its not used in u-boot proper.
Quoted 6 lines
Quoted 2 lines
Mmh, not sure I follow, I cannot reproduce any problem. Can you elaborate? And did you do a "make clean" afterwards?
If nothing is built by that MAKEFILE which would happen if !(CONFIG_MACH_SUN6I ||
CONFIG_MACH_SUN8I_H3CONFIG_MACH_SUN8I||CONFIG_ARMV7_PSCI) it will error with the followingar: arch/arm/cpu/armv7/sunxi/built-in.o: No such file or directory
How did you trigger this? I built all 159 (+1 F1C100s) sunxi defconfigs without errors.
What toolchain are you using? I see that for instance Cubieboard_defconfig comes out empty for U-Boot proper, but this does not seem to be a problem for my "arm-linux-gnueabihf-gcc (Ubuntu 9.3.0-17ubuntu1~20.04) 9.3.0" and "GNU ld (GNU Binutils for Ubuntu) 2.34". I see an 8 byte sized built-in.o, and no other .o files in the directory.
Quoted 5 lines
I don't know if there is a config that will break it currently but it is possible. So we will have to let it generate some .o file. Even if it is optimized out.
Should I still wait for your review of V2?
I will check the rest of the patches today, but there are only minor things.
Quoted 1 line
Also thank you so much for being interested in this!
Yeah, I decided to bite the bullet and join Allwinner's race to the bottom ;-) After all, a mainline Linux capable device in the size of an SD card has something to it, even when it's missing half of the bits ;-) I ordered a LicheePi Nano, but not sure if that makes it out before Chinese New Year still.
Quoted 1 line
Have my patches been okay so far?
They look good so far, yes.
Quoted 2 lines
I really hope this gets in before cleanup of sunxi starts as rebasing it was already difficult.
Pretty sure of that.
Cheers,
Andre
Quoted 77 lines
Thank you,
Jesse TaubeQuoted 74 lines
Cheers,
AndreQuoted 69 lines
Quoted 69 lines
Cheers,
AndreQuoted 65 lines
Signed-off-by Jesse Taube <[email protected]>---
V1->V2:
* New commit--- arch/arm/mach-sunxi/Makefile | 3 +++ arch/arm/{cpu/armv7/sunxi => mach-sunxi}/timer.c | 7 ++++--- 2 files changed, 7 insertions(+), 3 deletions(-)rename
arch/arm/{cpu/armv7/sunxi=>mach-sunxi}/timer.c(97%)arch/arm/mach-sunxi/Makefile +3
-0@@ -25,6 +25,9 @@ obj-$(CONFIG_MACH_SUN8I) += clock_sun6i.o endif obj-$(CONFIG_MACH_SUN9I) += clock_sun9i.o gtbus_sun9i.o obj-$(CONFIG_SUN50I_GEN_H6) += clock_sun50i_h6.o +ifndef CONFIG_ARM64 +obj-y += timer.o +endif ifdef CONFIG_SPL_BUILD obj-$(CONFIG_DRAM_SUN4I) += dram_sun4i.oarch/arm/mach-sunxi/timer.c renamed from arch/arm/cpu/armv7/sunxi/timer.c +4
-3@@ -51,6 +51,7 @@ int timer_init(void)struct sunxi_timer_reg *timers = (struct sunxi_timer_reg *)SUNXI_TIMER_BASE ;struct sunxi_timer *timer = &timers->timer[TIMER_NUM ]; +writel (TIMER_LOAD_VAL , &timer->inter);writel (TIMER_MODE |TIMER_DIV |TIMER_SRC |TIMER_RELOAD |TIMER_EN , &timer->ctl);@@ -58,15 +59,14 @@ int timer_init(void)return 0 ; } -/* timer without interrupts */ static ulong get_timer_masked (void ) {/* current tick value */ ulong now =TICKS_TO_HZ (read_timer ()); -if (now >= gd->arch.lastinc)/* normal (non rollover) */ +if (now >= gd->arch.lastinc) {/* normal (non rollover) */ gd->arch.tbl += (now - gd->arch.lastinc); -else { + }else {/* rollover */ gd->arch.tbl += (TICKS_TO_HZ (TIMER_LOAD_VAL ) - gd->arch.lastinc) + now;@@ -76,6 +76,7 @@ static ulong get_timer_masked(void)return gd->arch.tbl; } +/* timer without interrupts */ ulong get_timer (ulong base) {return get_timer_masked () - base;
Re: [PATCH v2 02/12] mach-sunxi: Move timer code to mach folder
Quoted 34 lines · Andre Przywara
On Thu, 27 Jan 2022 23:51:09 -0500
Jesse Taube <[email protected]> wrote:Hi Jesse,
Quoted 22 lines · Andre Przywara
Quoted 21 lines
On Thu, 27 Jan 2022 15:40:13 -0500
Jesse Taube <[email protected]> wrote:Hi,
Quoted 15 lines · Andre Przywara
Quoted 10 lines
Quoted 1 line · On Wed, 26 Jan 2022 08:53:19 -0500 Jesse Taube <[email protected]> wrote:
Both armv7 and arm926ejs use this timer code so move it to mach-sunxi.
Very nice, thanks for cleaning this up.
But please remove the respective line from the
Makefileinarch/arm/cpu/armv7/sunxi/, otherwise 32-bit board builds fail:
make[2]: *** No rule to make target 'arch/arm/cpu/armv7/sunxi/timer.o' ...Oh my I'm very sorry about this. There is one thing though
arch/arm/cpu/armv7/sunxi/needs to have one .o file in there to compile. If I removeifdef CONFIG_SPL_BUILDforfel_utilsit will work but its not used in u-boot proper.Quoted 6 lines
Quoted 2 lines
Mmh, not sure I follow, I cannot reproduce any problem. Can you elaborate? And did you do a "make clean" afterwards?
If nothing is built by that MAKEFILE which would happen if !(CONFIG_MACH_SUN6I ||
CONFIG_MACH_SUN8I_H3CONFIG_MACH_SUN8I||CONFIG_ARMV7_PSCI) it will error with the followingar: arch/arm/cpu/armv7/sunxi/built-in.o: No such file or directory
Quoted 7 lines
How did you trigger this? I built all 159 (+1 F1C100s) sunxi defconfigs without errors.
What toolchain are you using? I see that for instanceCubieboard_defconfigcomes out empty for U-Boot proper, but this does not seem to be a problem for my "arm-linux-gnueabihf-gcc (Ubuntu 9.3.0-17ubuntu1~20.04) 9.3.0" and "GNU ld (GNU Binutils for Ubuntu) 2.34". I see an 8 byte sized built-in.o, and no other .o files in the directory.
Ah I see. My misunderstanding of how it worked.
If the MAKEFILE has nothing in it it will cause it.
It will also happen if ifdefs make the file empty. This was happening with arm926ejs/sunxi and I thought it had to do with there being nothing assembled or compiled. I thought the same may happen with this file but adding anything not in an ifdef will cuase it to be fixed. If you dont understand what I'm saying that's fine its unimportant because my issue doesn't exist sorry for the confusion.
Sorry,
Jesse Taube
Quoted 107 lines
Quoted 5 lines
I don't know if there is a config that will break it currently but it is possible. So we will have to let it generate some .o file. Even if it is optimized out.
Should I still wait for your review of V2?
I will check the rest of the patches today, but there are only minor things.
Quoted 1 line
Also thank you so much for being interested in this!
Yeah, I decided to bite the bullet and join Allwinner's race to the bottom ;-) After all, a mainline Linux capable device in the size of an SD card has something to it, even when it's missing half of the bits ;-) I ordered a LicheePi Nano, but not sure if that makes it out before Chinese New Year still.
Quoted 1 line
Have my patches been okay so far?
They look good so far, yes.
Quoted 2 lines
I really hope this gets in before cleanup of sunxi starts as rebasing it was already difficult.
Pretty sure of that.
Cheers,
AndreQuoted 77 lines
Thank you,
Jesse TaubeQuoted 74 lines
Cheers,
AndreQuoted 69 lines
Quoted 69 lines
Cheers,
AndreQuoted 65 lines
Signed-off-by Jesse Taube <[email protected]>---
V1->V2:
* New commit--- arch/arm/mach-sunxi/Makefile | 3 +++ arch/arm/{cpu/armv7/sunxi => mach-sunxi}/timer.c | 7 ++++--- 2 files changed, 7 insertions(+), 3 deletions(-) rename arch/arm/{cpu/armv7/sunxi => mach-sunxi}/timer.c (97%)arch/arm/mach-sunxi/Makefile +3
-0@@ -25,6 +25,9 @@ obj-$(CONFIG_MACH_SUN8I) += clock_sun6i.o endif obj-$(CONFIG_MACH_SUN9I) += clock_sun9i.o gtbus_sun9i.o obj-$(CONFIG_SUN50I_GEN_H6) += clock_sun50i_h6.o +ifndef CONFIG_ARM64 +obj-y += timer.o +endif ifdef CONFIG_SPL_BUILD obj-$(CONFIG_DRAM_SUN4I) += dram_sun4i.oarch/arm/mach-sunxi/timer.c renamed from arch/arm/cpu/armv7/sunxi/timer.c +4
-3@@ -51,6 +51,7 @@ int timer_init(void)struct sunxi_timer_reg *timers = (struct sunxi_timer_reg *)SUNXI_TIMER_BASE ;struct sunxi_timer *timer = &timers->timer[TIMER_NUM ]; +writel (TIMER_LOAD_VAL , &timer->inter);writel (TIMER_MODE |TIMER_DIV |TIMER_SRC |TIMER_RELOAD |TIMER_EN , &timer->ctl);@@ -58,15 +59,14 @@ int timer_init(void)return 0 ; } -/* timer without interrupts */ static ulong get_timer_masked (void ) {/* current tick value */ ulong now =TICKS_TO_HZ (read_timer ()); -if (now >= gd->arch.lastinc)/* normal (non rollover) */ +if (now >= gd->arch.lastinc) {/* normal (non rollover) */ gd->arch.tbl += (now - gd->arch.lastinc); -else { + }else {/* rollover */ gd->arch.tbl += (TICKS_TO_HZ (TIMER_LOAD_VAL ) - gd->arch.lastinc) + now;@@ -76,6 +76,7 @@ static ulong get_timer_masked(void)return gd->arch.tbl; } +/* timer without interrupts */ ulong get_timer (ulong base) {return get_timer_masked () - base;
PATCH v2 3/12 arm: arm926ej-s: Add sunxi code
In reply to Jesse TaubeFrom: Icenowy Zheng <[email protected]>
Some Allwinner SoCs use ARM926EJ-S core.
Add Allwinner/sunXi specific code to ARM926EJ-S CPU dircetory.
---V1->V2:
* Fix Copyright notice
* Remove lowlevel_init
* Remove replaced timer.c
* Remove Read CP15 Control Register
* Remove unused start.c
--- arch/arm/cpu/arm926ejs/Makefile | 1 + arch/arm/cpu/arm926ejs/sunxi/Makefile | 5 +++ arch/arm/cpu/arm926ejs/sunxi/config.mk | 6 +++ arch/arm/cpu/arm926ejs/sunxi/fel_utils.S | 33 ++++++++++++++ arch/arm/cpu/arm926ejs/sunxi/u-boot-spl.lds | 48 +++++++++++++++++++++ 5 files changed, 93 insertions(+) create mode 100644 arch/arm/cpu/arm926ejs/sunxi/Makefile create mode 100644 arch/arm/cpu/arm926ejs/sunxi/config.mk create mode 100644 arch/arm/cpu/arm926ejs/sunxi/fel_utils.S create mode 100644 arch/arm/cpu/arm926ejs/sunxi/u-boot-spl.lds
arch/arm/cpu/arm926ejs/Makefile +1 -0
@@ -15,6 +15,7 @@ endif obj-$(CONFIG_MX27) += mx27/ obj-$(if $(filter mxs,$(SOC)),y) += mxs/ obj-$(if $(filter spear,$(SOC)),y) += spear/ +obj-$(CONFIG_ARCH_SUNXI) += sunxi/ # some files can only build in ARM or THUMB2, not THUMB1
arch/arm/cpu/arm926ejs/sunxi/Makefile new file +5 -0
@@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0+ +# (C) Copyright 2012 Henrik Nordstrom <[email protected]> + +obj-y += fel_utils.o +CFLAGS_fel_utils.o := -marm
arch/arm/cpu/arm926ejs/sunxi/config.mk new file +6 -0
@@ -0,0 +1,6 @@ +# Build a combined spl + u-boot image +ifdef CONFIG_SPL +ifndef CONFIG_SPL_BUILD +ALL-y += u-boot-sunxi-with-spl.bin +endif +endif
arch/arm/cpu/arm926ejs/sunxi/fel_utils.S new file +33 -0
@@ -0,0 +1,33 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Utility functions for FEL mode. + * + * Copyright (c) 2015 Google, Inc + */ + +#include <asm-offsets.h> +#include <config.h> +#include <asm/system.h> +#include <linux/linkage.h> + +ENTRY(save_boot_params) + ldr r0, =fel_stash + str sp, [r0, #0] + str lr, [r0, #4] + mrs lr, cpsr @ Read CPSR + str lr, [r0, #8] + mrc p15, 0, lr, c1, c0, 0 @ Read CP15 SCTLR Register + str lr, [r0, #12] + b save_boot_params_ret +ENDPROC(save_boot_params) + +ENTRY(return_to_fel) + mov sp, r0 + mov lr, r1 + ldr r0, =fel_stash + ldr r1, [r0, #16] + mcr p15, 0, r1, c1, c0, 0 @ Write CP15 Control Register + ldr r1, [r0, #12] + msr cpsr, r1 @ Write CPSR + bx lr +ENDPROC(return_to_fel)
arch/arm/cpu/arm926ejs/sunxi/u-boot-spl.lds new file +48 -0
48 lines not on this page · raw message
Signature · 1 line
2.34.1
Re: [PATCH v2 03/12] arm: arm926ej-s: Add sunxi code
Quoted 5 lines · On Wed, 26 Jan 2022 08:53:20 -0500 Jesse Taube <[email protected]> wrote:
From: Icenowy Zheng <[email protected]>
Some Allwinner SoCs use ARM926EJ-S core.
Add Allwinner/sunXi specific code to ARM926EJ-S CPU dircetory.
It looks like we eventually won't need this, since the SPL linker script is basically identical to the v7 one, and the VBAR access in the FEL code could be #ifdef'ed. But I see it's not straight-forward to do this now, so I am OK with this. We can look at cleaning this up later.
Quoted 2 lines
Signed-off-by Icenowy Zheng <[email protected]>Signed-off-by Jesse Taube <[email protected]>
Thanks for the changes!
Andre
Quoted 147 lines
---
V1->V2:
* Fix Copyright notice
* Removelowlevel_init
* Remove replacedtimer.c
* Remove Read CP15 Control Register
* Remove unusedstart.c--- arch/arm/cpu/arm926ejs/Makefile | 1 + arch/arm/cpu/arm926ejs/sunxi/Makefile | 5 +++ arch/arm/cpu/arm926ejs/sunxi/config.mk | 6 +++ arch/arm/cpu/arm926ejs/sunxi/fel_utils.S | 33 ++++++++++++++ arch/arm/cpu/arm926ejs/sunxi/u-boot-spl.lds | 48 +++++++++++++++++++++ 5 files changed, 93 insertions(+) create mode 100644 arch/arm/cpu/arm926ejs/sunxi/Makefile create mode 100644 arch/arm/cpu/arm926ejs/sunxi/config.mk create mode 100644 arch/arm/cpu/arm926ejs/sunxi/fel_utils.S create mode 100644 arch/arm/cpu/arm926ejs/sunxi/u-boot-spl.ldsarch/arm/cpu/arm926ejs/Makefile +1
-0@@ -15,6 +15,7 @@ endif obj-$(CONFIG_MX27) += mx27/ obj-$(if $(filter mxs,$(SOC)),y) += mxs/ obj-$(if $(filter spear,$(SOC)),y) += spear/ +obj-$(CONFIG_ARCH_SUNXI) += sunxi/ # some files can only build in ARM or THUMB2, not THUMB1arch/arm/cpu/arm926ejs/sunxi/Makefile new file +5
-0@@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0+ +# (C) Copyright 2012 Henrik Nordstrom <[email protected]> + +obj-y += fel_utils.o +CFLAGS_fel_utils.o := -marmarch/arm/cpu/arm926ejs/sunxi/config.mk new file +6
-0@@ -0,0 +1,6 @@ +# Build a combined spl + u-boot image +ifdef CONFIG_SPL +ifndef CONFIG_SPL_BUILD +ALL-y += u-boot-sunxi-with-spl.bin +endif +endifarch/arm/cpu/arm926ejs/sunxi/fel_utils.S new file +33
-0@@ -0,0 +1,33 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Utility functions for FEL mode. + * + * Copyright (c) 2015 Google, Inc + */ + +#include <asm-offsets.h> +#include <config.h> +#include <asm/system.h> +#include <linux/linkage.h> + +ENTRY(save_boot_params) + ldr r0, =fel_stash + str sp, [r0, #0] + str lr, [r0, #4] + mrs lr, cpsr @ Read CPSR + str lr, [r0, #8] + mrc p15, 0, lr, c1, c0, 0 @ Read CP15 SCTLR Register + str lr, [r0, #12] + b save_boot_params_ret +ENDPROC(save_boot_params) + +ENTRY(return_to_fel) + mov sp, r0 + mov lr, r1 + ldr r0, =fel_stash + ldr r1, [r0, #16] + mcr p15, 0, r1, c1, c0, 0 @ Write CP15 Control Register + ldr r1, [r0, #12] + msr cpsr, r1 @ Write CPSR + bx lr +ENDPROC(return_to_fel)arch/arm/cpu/arm926ejs/sunxi/u-boot-spl.lds new file +48
-0@@ -0,0 +1,48 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * (C) Copyright 2018 + * Icenowy Zheng <[email protected]> + * + * Based on arch/arm/cpu/armv7/sunxi/u-boot-spl.lds: + */ +MEMORY { .sram : ORIGIN = CONFIG_SPL_TEXT_BASE,\ + LENGTH = CONFIG_SPL_MAX_SIZE } +MEMORY { .sdram : ORIGIN = CONFIG_SPL_BSS_START_ADDR, \ + LENGTH = CONFIG_SPL_BSS_MAX_SIZE } + +OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm") +OUTPUT_ARCH(arm) +ENTRY(_start) +SECTIONS +{ + .text : + { + __start = .; + *(.vectors) + *(.text*) + } > .sram + + . = ALIGN(4); + .rodata : { *(SORT_BY_ALIGNMENT(.rodata*)) } >.sram + + . = ALIGN(4); + .data : { *(SORT_BY_ALIGNMENT(.data*)) } >.sram + + . = ALIGN(4); + .u_boot_list : { + KEEP(*(SORT(.u_boot_list*))); + } > .sram + + . = ALIGN(4); + __image_copy_end = .; + _end = .; + + .bss : + { + . = ALIGN(4); + __bss_start = .; + *(.bss*) + . = ALIGN(4); + __bss_end = .; + } > .sdram +}
Re: [PATCH v2 03/12] arm: arm926ej-s: Add sunxi code
Quoted 14 lines · Andre Przywara
Quoted 5 lines · On Wed, 26 Jan 2022 08:53:20 -0500 Jesse Taube <[email protected]> wrote:
From: Icenowy Zheng <[email protected]>
Some Allwinner SoCs use ARM926EJ-S core.
Add Allwinner/sunXi specific code to ARM926EJ-S CPU dircetory.
It looks like we eventually won't need this, since the SPL linker script is basically identical to the v7 one, and the VBAR access in the FEL code could be #ifdef'ed. But I see it's not straight-forward to do this now, so I am OK with this. We can look at cleaning this up later.
Quoted 4 lines
Quoted 2 lines
Signed-off-by Icenowy Zheng <[email protected]>Signed-off-by Jesse Taube <[email protected]>Reviewed-by Andre Przywara <[email protected]>
I added sdelay in this commit.Is Reviewed still okay.
arch/arm/cpu/arm926ejs/cpu.c +13 -0
@@ -21,6 +21,19 @@static void cache_flush (void ); +/************************************************************ +* sdelay() - simple spin loop. Will be constant time as +* its generally used in bypass conditions only. This +* is necessary until timers are accessible. +* +* not inline to increase chances its in cache when called +*************************************************************/ +void sdelay (unsigned long loops) +{ + __asm__volatile ("1:\n" "subs %0, %1, #1\n" +"bne 1b" :"=r" (loops):"0" (loops)); +} +
Quoted 151 lines
Thanks for the changes!
AndreQuoted 147 lines
---
V1->V2:
* Fix Copyright notice
* Removelowlevel_init
* Remove replacedtimer.c
* Remove Read CP15 Control Register
* Remove unusedstart.c--- arch/arm/cpu/arm926ejs/Makefile | 1 + arch/arm/cpu/arm926ejs/sunxi/Makefile | 5 +++ arch/arm/cpu/arm926ejs/sunxi/config.mk | 6 +++ arch/arm/cpu/arm926ejs/sunxi/fel_utils.S | 33 ++++++++++++++ arch/arm/cpu/arm926ejs/sunxi/u-boot-spl.lds | 48 +++++++++++++++++++++ 5 files changed, 93 insertions(+)create mode 100644
arch/arm/cpu/arm926ejs/sunxi/Makefilecreate mode 100644arch/arm/cpu/arm926ejs/sunxi/config.mkcreate mode 100644arch/arm/cpu/arm926ejs/sunxi/fel_utils.Screate mode 100644arch/arm/cpu/arm926ejs/sunxi/u-boot-spl.ldsarch/arm/cpu/arm926ejs/Makefile +1
-0@@ -15,6 +15,7 @@ endif obj-$(CONFIG_MX27) += mx27/ obj-$(if $(filter mxs,$(SOC)),y) += mxs/ obj-$(if $(filter spear,$(SOC)),y) += spear/ +obj-$(CONFIG_ARCH_SUNXI) += sunxi/ # some files can only build in ARM or THUMB2, not THUMB1arch/arm/cpu/arm926ejs/sunxi/Makefile new file +5
-0@@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0+ +# (C) Copyright 2012 Henrik Nordstrom <[email protected]> + +obj-y += fel_utils.o +CFLAGS_fel_utils.o := -marmarch/arm/cpu/arm926ejs/sunxi/config.mk new file +6
-0@@ -0,0 +1,6 @@ +# Build a combined spl + u-boot image +ifdef CONFIG_SPL +ifndef CONFIG_SPL_BUILD +ALL-y += u-boot-sunxi-with-spl.bin +endif +endifarch/arm/cpu/arm926ejs/sunxi/fel_utils.S new file +33
-0@@ -0,0 +1,33 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Utility functions for FEL mode. + * + * Copyright (c) 2015 Google, Inc + */ + +#include <asm-offsets.h> +#include <config.h> +#include <asm/system.h> +#include <linux/linkage.h> + +ENTRY(save_boot_params) + ldr r0, =fel_stash + str sp, [r0, #0] + str lr, [r0, #4] + mrs lr, cpsr @ Read CPSR + str lr, [r0, #8] + mrc p15, 0, lr, c1, c0, 0 @ Read CP15 SCTLR Register + str lr, [r0, #12] + b save_boot_params_ret +ENDPROC(save_boot_params) + +ENTRY(return_to_fel) + mov sp, r0 + mov lr, r1 + ldr r0, =fel_stash + ldr r1, [r0, #16] + mcr p15, 0, r1, c1, c0, 0 @ Write CP15 Control Register + ldr r1, [r0, #12] + msr cpsr, r1 @ Write CPSR + bx lr +ENDPROC(return_to_fel)arch/arm/cpu/arm926ejs/sunxi/u-boot-spl.lds new file +48
-0@@ -0,0 +1,48 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * (C) Copyright 2018 + * Icenowy Zheng <[email protected]> + * + * Based on arch/arm/cpu/armv7/sunxi/u-boot-spl.lds: + */ +MEMORY { .sram : ORIGIN = CONFIG_SPL_TEXT_BASE,\ + LENGTH = CONFIG_SPL_MAX_SIZE } +MEMORY { .sdram : ORIGIN = CONFIG_SPL_BSS_START_ADDR, \ + LENGTH = CONFIG_SPL_BSS_MAX_SIZE } + +OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm") +OUTPUT_ARCH(arm) +ENTRY(_start) +SECTIONS +{ + .text : + { + __start = .; + *(.vectors) + *(.text*) + } > .sram + + . = ALIGN(4); + .rodata : { *(SORT_BY_ALIGNMENT(.rodata*)) } >.sram + + . = ALIGN(4); + .data : { *(SORT_BY_ALIGNMENT(.data*)) } >.sram + + . = ALIGN(4); + .u_boot_list : { + KEEP(*(SORT(.u_boot_list*))); + } > .sram + + . = ALIGN(4); + __image_copy_end = .; + _end = .; + + .bss : + { + . = ALIGN(4); + __bss_start = .; + *(.bss*) + . = ALIGN(4); + __bss_end = .; + } > .sdram +}
Re: [PATCH v2 03/12] arm: arm926ej-s: Add sunxi code
On Fri, 28 Jan 2022 21:42:44 -0500
Jesse Taube <[email protected]> wrote:
Hi Jesse,
Quoted 15 lines · Andre Przywara
Quoted 14 lines
Quoted 5 lines · On Wed, 26 Jan 2022 08:53:20 -0500 Jesse Taube <[email protected]> wrote:
From: Icenowy Zheng <[email protected]>
Some Allwinner SoCs use ARM926EJ-S core.
Add Allwinner/sunXi specific code to ARM926EJ-S CPU dircetory.
It looks like we eventually won't need this, since the SPL linker script is basically identical to the v7 one, and the VBAR access in the FEL code could be #ifdef'ed. But I see it's not straight-forward to do this now, so I am OK with this. We can look at cleaning this up later.
Quoted 6 lines
Quoted 4 lines
Quoted 2 lines
Signed-off-by Icenowy Zheng <[email protected]>Signed-off-by Jesse Taube <[email protected]>Reviewed-by Andre Przywara <[email protected]>I added sdelay in this commit.Is Reviewed still okay.
Yeah, that's always the question ;-) In this case I suggested it and it's a copy of existing code, so you could just keep it. But if in doubt, it's always safer to drop it. That doesn't really hold anything back, I will just add by R-b: when applying the patch.
Cheers,
Andre
Quoted 170 lines
arch/arm/cpu/arm926ejs/cpu.c +13
-0@@ -21,6 +21,19 @@static void cache_flush (void ); +/************************************************************ +* sdelay() - simple spin loop. Will be constant time as +* its generally used in bypass conditions only. This +* is necessary until timers are accessible. +* +* not inline to increase chances its in cache when called +*************************************************************/ +void sdelay (unsigned long loops) +{ + __asm__volatile ("1:\n" "subs %0, %1, #1\n" +"bne 1b" :"=r" (loops):"0" (loops)); +} +Quoted 151 lines
Thanks for the changes!
AndreQuoted 147 lines
---
V1->V2:
* Fix Copyright notice
* Removelowlevel_init
* Remove replacedtimer.c
* Remove Read CP15 Control Register
* Remove unusedstart.c--- arch/arm/cpu/arm926ejs/Makefile | 1 + arch/arm/cpu/arm926ejs/sunxi/Makefile | 5 +++ arch/arm/cpu/arm926ejs/sunxi/config.mk | 6 +++ arch/arm/cpu/arm926ejs/sunxi/fel_utils.S | 33 ++++++++++++++ arch/arm/cpu/arm926ejs/sunxi/u-boot-spl.lds | 48 +++++++++++++++++++++ 5 files changed, 93 insertions(+)create mode 100644
arch/arm/cpu/arm926ejs/sunxi/Makefilecreate mode 100644arch/arm/cpu/arm926ejs/sunxi/config.mkcreate mode 100644arch/arm/cpu/arm926ejs/sunxi/fel_utils.Screate mode 100644arch/arm/cpu/arm926ejs/sunxi/u-boot-spl.ldsarch/arm/cpu/arm926ejs/Makefile +1
-0@@ -15,6 +15,7 @@ endif obj-$(CONFIG_MX27) += mx27/ obj-$(if $(filter mxs,$(SOC)),y) += mxs/ obj-$(if $(filter spear,$(SOC)),y) += spear/ +obj-$(CONFIG_ARCH_SUNXI) += sunxi/ # some files can only build in ARM or THUMB2, not THUMB1arch/arm/cpu/arm926ejs/sunxi/Makefile new file +5
-0@@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0+ +# (C) Copyright 2012 Henrik Nordstrom <[email protected]> + +obj-y += fel_utils.o +CFLAGS_fel_utils.o := -marmarch/arm/cpu/arm926ejs/sunxi/config.mk new file +6
-0@@ -0,0 +1,6 @@ +# Build a combined spl + u-boot image +ifdef CONFIG_SPL +ifndef CONFIG_SPL_BUILD +ALL-y += u-boot-sunxi-with-spl.bin +endif +endifarch/arm/cpu/arm926ejs/sunxi/fel_utils.S new file +33
-0@@ -0,0 +1,33 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Utility functions for FEL mode. + * + * Copyright (c) 2015 Google, Inc + */ + +#include <asm-offsets.h> +#include <config.h> +#include <asm/system.h> +#include <linux/linkage.h> + +ENTRY(save_boot_params) + ldr r0, =fel_stash + str sp, [r0, #0] + str lr, [r0, #4] + mrs lr, cpsr @ Read CPSR + str lr, [r0, #8] + mrc p15, 0, lr, c1, c0, 0 @ Read CP15 SCTLR Register + str lr, [r0, #12] + b save_boot_params_ret +ENDPROC(save_boot_params) + +ENTRY(return_to_fel) + mov sp, r0 + mov lr, r1 + ldr r0, =fel_stash + ldr r1, [r0, #16] + mcr p15, 0, r1, c1, c0, 0 @ Write CP15 Control Register + ldr r1, [r0, #12] + msr cpsr, r1 @ Write CPSR + bx lr +ENDPROC(return_to_fel)arch/arm/cpu/arm926ejs/sunxi/u-boot-spl.lds new file +48
-0@@ -0,0 +1,48 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * (C) Copyright 2018 + * Icenowy Zheng <[email protected]> + * + * Based on arch/arm/cpu/armv7/sunxi/u-boot-spl.lds: + */ +MEMORY { .sram : ORIGIN = CONFIG_SPL_TEXT_BASE,\ + LENGTH = CONFIG_SPL_MAX_SIZE } +MEMORY { .sdram : ORIGIN = CONFIG_SPL_BSS_START_ADDR, \ + LENGTH = CONFIG_SPL_BSS_MAX_SIZE } + +OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm") +OUTPUT_ARCH(arm) +ENTRY(_start) +SECTIONS +{ + .text : + { + __start = .; + *(.vectors) + *(.text*) + } > .sram + + . = ALIGN(4); + .rodata : { *(SORT_BY_ALIGNMENT(.rodata*)) } >.sram + + . = ALIGN(4); + .data : { *(SORT_BY_ALIGNMENT(.data*)) } >.sram + + . = ALIGN(4); + .u_boot_list : { + KEEP(*(SORT(.u_boot_list*))); + } > .sram + + . = ALIGN(4); + __image_copy_end = .; + _end = .; + + .bss : + { + . = ALIGN(4); + __bss_start = .; + *(.bss*) + . = ALIGN(4); + __bss_end = .; + } > .sdram +}
PATCH v2 4/12 dt-bindings: clock: Add initial suniv headers
In reply to Jesse TaubeFrom: Icenowy Zheng <[email protected]>
This commit introduces suniv dt-bindings headers needed for device tree files.
---V1->V2:
* Sync with Linux
--- include/dt-bindings/clock/suniv-ccu.h | 69 +++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 include/dt-bindings/clock/suniv-ccu.h
include/dt-bindings/clock/suniv-ccu.h new file +69 -0
@@ -0,0 +1,69 @@ +/* SPDX-License-Identifier: (GPL-2.0+ or MIT) */ +/* +* Copyright (c) 2018 Icenowy Zheng <[email protected]> +*/ + +#ifndef _DT_BINDINGS_CLK_SUNIV_H_ +#define _DT_BINDINGS_CLK_SUNIV_H_ + +#define CLK_CPU 11 + +#define CLK_BUS_DMA 14 +#define CLK_BUS_MMC0 15 +#define CLK_BUS_MMC1 16 +#define CLK_BUS_DRAM 17 +#define CLK_BUS_SPI0 18 +#define CLK_BUS_SPI1 19 +#define CLK_BUS_OTG 20 +#define CLK_BUS_VE 21 +#define CLK_BUS_LCD 22 +#define CLK_BUS_DEINTERLACE 23 +#define CLK_BUS_CSI 24 +#define CLK_BUS_TVD 25 +#define CLK_BUS_TVE 26 +#define CLK_BUS_DE_BE 27 +#define CLK_BUS_DE_FE 28 +#define CLK_BUS_CODEC 29 +#define CLK_BUS_SPDIF 30 +#define CLK_BUS_IR 31 +#define CLK_BUS_RSB 32 +#define CLK_BUS_I2S0 33 +#define CLK_BUS_I2C0 34 +#define CLK_BUS_I2C1 35 +#define CLK_BUS_I2C2 36 +#define CLK_BUS_PIO 37 +#define CLK_BUS_UART0 38 +#define CLK_BUS_UART1 39 +#define CLK_BUS_UART2 40 + +#define CLK_MMC0 41 +#define CLK_MMC0_SAMPLE 42 +#define CLK_MMC0_OUTPUT 43 +#define CLK_MMC1 44 +#define CLK_MMC1_SAMPLE 45 +#define CLK_MMC1_OUTPUT 46 +#define CLK_I2S 47 +#define CLK_SPDIF 48 + +#define CLK_USB_PHY0 49 + +#define CLK_DRAM_VE 50 +#define CLK_DRAM_CSI 51 +#define CLK_DRAM_DEINTERLACE 52 +#define CLK_DRAM_TVD 53 +#define CLK_DRAM_DE_FE 54 +#define CLK_DRAM_DE_BE 55 + +#define CLK_DE_BE 56 +#define CLK_DE_FE 57 +#define CLK_TCON 58 +#define CLK_DEINTERLACE 59 +#define CLK_TVE2_CLK 60 +#define CLK_TVE1_CLK 61 +#define CLK_TVD 62 +#define CLK_CSI 63 +#define CLK_VE 64 +#define CLK_CODEC 65 +#define CLK_AVS 66 + +#endif
Signature · 1 line
2.34.1
Re: [PATCH v2 04/12] dt-bindings: clock: Add initial suniv headers
Quoted 4 lines · On Wed, 26 Jan 2022 08:53:21 -0500 Jesse Taube <[email protected]> wrote:
From: Icenowy Zheng <[email protected]>
This commit introduces suniv dt-bindings headers needed for device tree files.
Looks better, but please do a verbatim copy from a (recent) Linux tree, using the mainline file names, and noting the tag or commit hash in the commit message (just take 5.16.0, for instance). And please merge this with the next patch (the reset header), and actually also the device tree files from patch 11/12. I think the original series had clock driver support, for which we need the symbols from those headers earlier, but in this version here this is not the case.
So to reduce the churn: One patch towards the end, with .h, .dtsi and .dts, all directly copied from Linux.
Cheers,
Andre
Quoted 85 lines
Signed-off-by Icenowy Zheng <[email protected]>Signed-off-by Jesse Taube <[email protected]>---
V1->V2:
* Sync with Linux--- include/dt-bindings/clock/suniv-ccu.h | 69 +++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 include/dt-bindings/clock/suniv-ccu.hinclude/dt-bindings/clock/suniv-ccu.h new file +69
-0@@ -0,0 +1,69 @@ +/* SPDX-License-Identifier: (GPL-2.0+ or MIT) */ +/* +* Copyright (c) 2018 Icenowy Zheng <[email protected]> +*/ + +#ifndef _DT_BINDINGS_CLK_SUNIV_H_ +#define _DT_BINDINGS_CLK_SUNIV_H_ + +#define CLK_CPU 11 + +#define CLK_BUS_DMA 14 +#define CLK_BUS_MMC0 15 +#define CLK_BUS_MMC1 16 +#define CLK_BUS_DRAM 17 +#define CLK_BUS_SPI0 18 +#define CLK_BUS_SPI1 19 +#define CLK_BUS_OTG 20 +#define CLK_BUS_VE 21 +#define CLK_BUS_LCD 22 +#define CLK_BUS_DEINTERLACE 23 +#define CLK_BUS_CSI 24 +#define CLK_BUS_TVD 25 +#define CLK_BUS_TVE 26 +#define CLK_BUS_DE_BE 27 +#define CLK_BUS_DE_FE 28 +#define CLK_BUS_CODEC 29 +#define CLK_BUS_SPDIF 30 +#define CLK_BUS_IR 31 +#define CLK_BUS_RSB 32 +#define CLK_BUS_I2S0 33 +#define CLK_BUS_I2C0 34 +#define CLK_BUS_I2C1 35 +#define CLK_BUS_I2C2 36 +#define CLK_BUS_PIO 37 +#define CLK_BUS_UART0 38 +#define CLK_BUS_UART1 39 +#define CLK_BUS_UART2 40 + +#define CLK_MMC0 41 +#define CLK_MMC0_SAMPLE 42 +#define CLK_MMC0_OUTPUT 43 +#define CLK_MMC1 44 +#define CLK_MMC1_SAMPLE 45 +#define CLK_MMC1_OUTPUT 46 +#define CLK_I2S 47 +#define CLK_SPDIF 48 + +#define CLK_USB_PHY0 49 + +#define CLK_DRAM_VE 50 +#define CLK_DRAM_CSI 51 +#define CLK_DRAM_DEINTERLACE 52 +#define CLK_DRAM_TVD 53 +#define CLK_DRAM_DE_FE 54 +#define CLK_DRAM_DE_BE 55 + +#define CLK_DE_BE 56 +#define CLK_DE_FE 57 +#define CLK_TCON 58 +#define CLK_DEINTERLACE 59 +#define CLK_TVE2_CLK 60 +#define CLK_TVE1_CLK 61 +#define CLK_TVD 62 +#define CLK_CSI 63 +#define CLK_VE 64 +#define CLK_CODEC 65 +#define CLK_AVS 66 + +#endif
PATCH v2 5/12 dt-bindings: reset: Add initial suniv headers
In reply to Jesse TaubeFrom: Icenowy Zheng <[email protected]>
This commit introduces suniv dt-bindings headers
needed for device tree files.
---V1->V2:
* Sync with Linux
--- include/dt-bindings/reset/suniv-ccu.h | 37 +++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 include/dt-bindings/reset/suniv-ccu.h
include/dt-bindings/reset/suniv-ccu.h new file +37 -0
@@ -0,0 +1,37 @@ +/* SPDX-License-Identifier: (GPL-2.0+ or MIT) */ +/* +* Copyright (C) 2018 Icenowy Zheng <[email protected]> +*/ + +#ifndef _DT_BINDINGS_RST_SUNIV_H_ +#define _DT_BINDINGS_RST_SUNIV_H_ + +#define RST_USB_PHY0 0 +#define RST_BUS_DMA 1 +#define RST_BUS_MMC0 2 +#define RST_BUS_MMC1 3 +#define RST_BUS_DRAM 4 +#define RST_BUS_SPI0 5 +#define RST_BUS_SPI1 6 +#define RST_BUS_OTG 7 +#define RST_BUS_VE 8 +#define RST_BUS_LCD 9 +#define RST_BUS_DEINTERLACE 10 +#define RST_BUS_CSI 11 +#define RST_BUS_TVD 12 +#define RST_BUS_TVE 13 +#define RST_BUS_DE_BE 14 +#define RST_BUS_DE_FE 15 +#define RST_BUS_CODEC 16 +#define RST_BUS_SPDIF 17 +#define RST_BUS_IR 18 +#define RST_BUS_RSB 19 +#define RST_BUS_I2S0 20 +#define RST_BUS_I2C0 21 +#define RST_BUS_I2C1 22 +#define RST_BUS_I2C2 23 +#define RST_BUS_UART0 24 +#define RST_BUS_UART1 25 +#define RST_BUS_UART2 26 + +#endif /* _DT_BINDINGS_RST_SUNIV_H_ */
Signature · 1 line
2.34.1
PATCH v2 6/12 ARM: sunxi: Add clock and uart to sunxi headers
In reply to Jesse TaubeFrom: Icenowy Zheng <[email protected]>
This patch aims to add header files for the suniv. The header files included add support for uart, and clocks.
---V1->V2:
* Change commit description and topic
* Change PLL6_CFG_DEFAULT
* Combine APB1_GATE ifdefs
* Combine SUNXI_UART0_BASE ifdefs
* Fix negative logic
* Remove unused macros
--- arch/arm/include/asm/arch-sunxi/clock.h | 2 +- arch/arm/include/asm/arch-sunxi/clock_sun6i.h | 13 +++++++++++++ arch/arm/include/asm/arch-sunxi/cpu_sun4i.h | 6 ++++++ arch/arm/include/asm/arch-sunxi/gpio.h | 1 + 4 files changed, 21 insertions(+), 1 deletion(-)
arch/arm/include/asm/arch-sunxi/clock.h +1 -1
@@ -19,7 +19,7 @@#elif defined(CONFIG_SUN50I_GEN_H6 )#include <asm/arch/clock_sun50i_h6.h> #elif defined(CONFIG_MACH_SUN6I ) || defined(CONFIG_MACH_SUN8I ) || \ - defined(CONFIG_MACH_SUN50I ) + defined(CONFIG_MACH_SUN50I ) || defined(CONFIG_MACH_SUNIV )#include <asm/arch/clock_sun6i.h> #elif defined(CONFIG_MACH_SUN9I )#include <asm/arch/clock_sun9i.h>
arch/arm/include/asm/arch-sunxi/clock_sun6i.h +13 -0
@@ -226,7 +226,12 @@ struct sunxi_ccm_reg {#define CCM_PLL5_CTRL_SIGMA_DELTA_EN (0x1 << 24)#define CCM_PLL5_CTRL_EN (0x1 << 31) +#ifdef CONFIG_MACH_SUNIV +/* suniv pll6 doesn't have postdiv 2, so k is set to 0 */ +#define PLL6_CFG_DEFAULT 0x90041801 +#else #define PLL6_CFG_DEFAULT 0x90041811/* 600 MHz */ +#endif #define CCM_PLL6_CTRL_N_SHIFT 8#define CCM_PLL6_CTRL_N_MASK (0x1f << CCM_PLL6_CTRL_N_SHIFT)
@@ -488,6 +493,14 @@ struct sunxi_ccm_reg {#define AHB_RESET_OFFSET_EPHY 2#define AHB_RESET_OFFSET_LVDS 0 +/* apb1 reset */ +#ifdef CONFIG_MACH_SUNIV +#define APB1_GATE_UART_SHIFT (20) +#define APB1_GATE_TWI_SHIFT (16) +#define APB1_RESET_UART_SHIFT (20) +#define APB1_RESET_TWI_SHIFT (16) +#endif +/* apb2 reset */ #define APB2_RESET_UART_SHIFT (16)#define APB2_RESET_UART_MASK (0xff << APB2_RESET_UART_SHIFT)
arch/arm/include/asm/arch-sunxi/cpu_sun4i.h +6 -0
@@ -129,9 +129,15 @@ defined(CONFIG_MACH_SUN50I)#define SUNXI_CPUCFG_BASE 0x01c25c00#endif +#ifndef CONFIG_MACH_SUNIV #define SUNXI_UART0_BASE 0x01c28000#define SUNXI_UART1_BASE 0x01c28400#define SUNXI_UART2_BASE 0x01c28800 +#else +#define SUNXI_UART0_BASE 0x01c25000 +#define SUNXI_UART1_BASE 0x01c25400 +#define SUNXI_UART2_BASE 0x01c25800 +#endif #define SUNXI_UART3_BASE 0x01c28c00#define SUNXI_UART4_BASE 0x01c29000#define SUNXI_UART5_BASE 0x01c29400
arch/arm/include/asm/arch-sunxi/gpio.h +1 -0
@@ -165,6 +165,7 @@ enum sunxi_gpio_number {#define SUNXI_GPD_LVDS0 3#define SUNXI_GPD_PWM 2 +#define SUNIV_GPE_UART0 5#define SUN8I_GPE_TWI2 3#define SUN50I_GPE_TWI2 3
Signature · 1 line
2.34.1
Re: [PATCH v2 06/12] ARM: sunxi: Add clock and uart to sunxi headers
Quoted 7 lines · On Wed, 26 Jan 2022 08:53:23 -0500 Jesse Taube <[email protected]> wrote:
From: Icenowy Zheng <[email protected]>
This patch aims to add header files for the suniv. The header files included add support for uart, and clocks.
Signed-off-by Icenowy Zheng <[email protected]>Signed-off-by Jesse Taube <[email protected]>
Thanks for the changes, looks good now.
Cheers,
Andre
Quoted 92 lines
---
V1->V2:
* Change commit description and topic
* ChangePLL6_CFG_DEFAULT
* CombineAPB1_GATEifdefs
* CombineSUNXI_UART0_BASEifdefs
* Fix negative logic
* Remove unused macros--- arch/arm/include/asm/arch-sunxi/clock.h | 2 +- arch/arm/include/asm/arch-sunxi/clock_sun6i.h | 13 +++++++++++++ arch/arm/include/asm/arch-sunxi/cpu_sun4i.h | 6 ++++++ arch/arm/include/asm/arch-sunxi/gpio.h | 1 + 4 files changed, 21 insertions(+), 1 deletion(-)arch/arm/include/asm/arch-sunxi/clock.h +1
-1@@ -19,7 +19,7 @@#elif defined(CONFIG_SUN50I_GEN_H6 )#include <asm/arch/clock_sun50i_h6.h> #elif defined(CONFIG_MACH_SUN6I ) || defined(CONFIG_MACH_SUN8I ) || \ - defined(CONFIG_MACH_SUN50I ) + defined(CONFIG_MACH_SUN50I ) || defined(CONFIG_MACH_SUNIV )#include <asm/arch/clock_sun6i.h> #elif defined(CONFIG_MACH_SUN9I )#include <asm/arch/clock_sun9i.h> arch/arm/include/asm/arch-sunxi/clock_sun6i.h +13
-0@@ -226,7 +226,12 @@ struct sunxi_ccm_reg {#define CCM_PLL5_CTRL_SIGMA_DELTA_EN (0x1 << 24)#define CCM_PLL5_CTRL_EN (0x1 << 31) +#ifdef CONFIG_MACH_SUNIV +/* suniv pll6 doesn't have postdiv 2, so k is set to 0 */ +#define PLL6_CFG_DEFAULT 0x90041801 +#else #define PLL6_CFG_DEFAULT 0x90041811/* 600 MHz */ +#endif #define CCM_PLL6_CTRL_N_SHIFT 8#define CCM_PLL6_CTRL_N_MASK (0x1f << CCM_PLL6_CTRL_N_SHIFT)@@ -488,6 +493,14 @@ struct sunxi_ccm_reg {#define AHB_RESET_OFFSET_EPHY 2#define AHB_RESET_OFFSET_LVDS 0 +/* apb1 reset */ +#ifdef CONFIG_MACH_SUNIV +#define APB1_GATE_UART_SHIFT (20) +#define APB1_GATE_TWI_SHIFT (16) +#define APB1_RESET_UART_SHIFT (20) +#define APB1_RESET_TWI_SHIFT (16) +#endif +/* apb2 reset */ #define APB2_RESET_UART_SHIFT (16)#define APB2_RESET_UART_MASK (0xff << APB2_RESET_UART_SHIFT)arch/arm/include/asm/arch-sunxi/cpu_sun4i.h +6
-0@@ -129,9 +129,15 @@ defined(CONFIG_MACH_SUN50I)#define SUNXI_CPUCFG_BASE 0x01c25c00#endif +#ifndef CONFIG_MACH_SUNIV #define SUNXI_UART0_BASE 0x01c28000#define SUNXI_UART1_BASE 0x01c28400#define SUNXI_UART2_BASE 0x01c28800 +#else +#define SUNXI_UART0_BASE 0x01c25000 +#define SUNXI_UART1_BASE 0x01c25400 +#define SUNXI_UART2_BASE 0x01c25800 +#endif #define SUNXI_UART3_BASE 0x01c28c00#define SUNXI_UART4_BASE 0x01c29000#define SUNXI_UART5_BASE 0x01c29400arch/arm/include/asm/arch-sunxi/gpio.h +1
-0@@ -165,6 +165,7 @@ enum sunxi_gpio_number {#define SUNXI_GPD_LVDS0 3#define SUNXI_GPD_PWM 2 +#define SUNIV_GPE_UART0 5#define SUN8I_GPE_TWI2 3#define SUN50I_GPE_TWI2 3
PATCH v2 7/12 sunxi: Add F1C100s DRAM initial support
In reply to Jesse TaubeFrom: Icenowy Zheng <[email protected]>
Add support for F1C100s internal dram controller.
---V1->V2:
* Nothing done
--- arch/arm/include/asm/arch-sunxi/dram.h | 2 + arch/arm/include/asm/arch-sunxi/dram_suniv.h | 46 ++ arch/arm/mach-sunxi/Makefile | 2 + arch/arm/mach-sunxi/dram_helpers.c | 4 + arch/arm/mach-sunxi/dram_suniv.c | 420 +++++++++++++++++++ 5 files changed, 474 insertions(+) create mode 100644 arch/arm/include/asm/arch-sunxi/dram_suniv.h create mode 100644 arch/arm/mach-sunxi/dram_suniv.c
arch/arm/include/asm/arch-sunxi/dram.h +2 -0
@@ -31,6 +31,8 @@#include <asm/arch/dram_sun50i_h6.h> #elif defined(CONFIG_MACH_SUN50I_H616 )#include <asm/arch/dram_sun50i_h616.h> +#elif defined(CONFIG_MACH_SUNIV ) +#include <asm/arch/dram_suniv.h> #else #include <asm/arch/dram_sun4i.h> #endif
arch/arm/include/asm/arch-sunxi/dram_suniv.h new file +46 -0
46 lines not on this page · raw message
arch/arm/mach-sunxi/Makefile +2 -0
@@ -13,6 +13,7 @@ obj-y += dram_helpers.o obj-y += pinmux.o obj-$(CONFIG_SUN6I_PRCM) += prcm.o obj-$(CONFIG_AXP_PMIC_BUS) += pmic_bus.o +obj-$(CONFIG_MACH_SUNIV) += clock_sun6i.o obj-$(CONFIG_MACH_SUN4I) += clock_sun4i.o obj-$(CONFIG_MACH_SUN5I) += clock_sun4i.o obj-$(CONFIG_MACH_SUN6I) += clock_sun6i.o
@@ -30,6 +31,7 @@ obj-y += timer.o endif ifdef CONFIG_SPL_BUILD +obj-$(CONFIG_MACH_SUNIV) += dram_suniv.o obj-$(CONFIG_DRAM_SUN4I) += dram_sun4i.o obj-$(CONFIG_DRAM_SUN6I) += dram_sun6i.o obj-$(CONFIG_DRAM_SUN8I_A23) += dram_sun8i_a23.o
arch/arm/mach-sunxi/dram_helpers.c +4 -0
@@ -26,7 +26,10 @@ void mctl_await_completion(u32 *reg, u32 mask, u32 val)/* * Test if memory at offset offset matches memory at begin of DRAM +* +* Note: dsb() is not available on ARMv5 in Thumb mode */ +#ifndef CONFIG_MACH_SUNIV bool mctl_mem_matches (u32 offset) {/* Try to write different values to RAM at two addresses */
@@ -37,3 +40,4 @@ bool mctl_mem_matches(u32 offset)return readl (CONFIG_SYS_SDRAM_BASE ) == readl((ulong)CONFIG_SYS_SDRAM_BASE + offset); } +#endif
arch/arm/mach-sunxi/dram_suniv.c new file +420 -0
420 lines not on this page · raw message
Signature · 1 line
2.34.1
PATCH v2 8/12 sunxi: board: Add support for SUNIV
In reply to Jesse TaubeFrom: Icenowy Zheng <[email protected]>
Generic Timer Extension is not available on SUNIV.
---V1->V2:
* Nothing done
--- board/sunxi/board.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
board/sunxi/board.c +2 -2
@@ -197,7 +197,7 @@ int board_init(void) gd->bd->bi_boot_params = (PHYS_SDRAM_0 +0x100 ); -#ifndef CONFIG_ARM64 +#if !defined(CONFIG_ARM64 ) && !defined(CONFIG_MACH_SUNIV ) asmvolatile ("mrc p15, 0, %0, c0, c1, 1" :"=r" (id_pfr1));debug ("id_pfr1: 0x%08x\n" , id_pfr1);/* Generic Timer Extension available? */
@@ -224,7 +224,7 @@ int board_init(void) #endif } } -#endif /* !CONFIG_ARM64 */ +#endif /* !CONFIG_ARM64 && !CONFIG_MACH_SUNIV */ ret =axp_gpio_init ();if (ret)
Signature · 1 line
2.34.1
PATCH v2 9/12 configs: sunxi: Add common SUNIV header
In reply to Jesse TaubeFrom: Icenowy Zheng <[email protected]>
Adds support for SUNIV and the F1C100s.
---V1->V2:
* Combine ifdefs
* Fix indentation
* Fix negative logic
* Fix rebase artifacts
* Remove CONFIG_SYS_LOAD_ADDR
* Remove CONFIG_ENV_SECT_SIZE
--- include/configs/suniv.h | 14 ++++++++ include/configs/sunxi-common.h | 59 +++++++++++++++++++++++++--------- 2 files changed, 57 insertions(+), 16 deletions(-) create mode 100644 include/configs/suniv.h
include/configs/suniv.h new file +14 -0
@@ -0,0 +1,14 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* +* Configuration settings for new Allwinner F-series (suniv) CPU +*/ + +#ifndef __CONFIG_H +#define __CONFIG_H + +/* +* Include common sunxi configuration where most the settings are +*/ +#include <configs/sunxi-common.h> + +#endif /* __CONFIG_H */
include/configs/sunxi-common.h +43 -16
84 lines not on this page · raw message
Signature · 1 line
2.34.1
Re: [PATCH v2 09/12] configs: sunxi: Add common SUNIV header
Quoted 112 lines · Jesse Taube
From: Icenowy Zheng <[email protected]>
Adds support for SUNIV and the F1C100s.
Signed-off-by Icenowy Zheng <[email protected]>Signed-off-by Jesse Taube <[email protected]>---
V1->V2:
* Combine ifdefs
* Fix indentation
* Fix negative logic
* Fix rebase artifacts
* RemoveCONFIG_SYS_LOAD_ADDR
* RemoveCONFIG_ENV_SECT_SIZE--- include/configs/suniv.h | 14 ++++++++ include/configs/sunxi-common.h | 59 +++++++++++++++++++++++++--------- 2 files changed, 57 insertions(+), 16 deletions(-)create mode 100644
include/configs/suniv.hinclude/configs/suniv.h new file +14
-0@@ -0,0 +1,14 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* +* Configuration settings for new Allwinner F-series (suniv) CPU +*/ + +#ifndef __CONFIG_H +#define __CONFIG_H + +/* +* Include common sunxi configuration where most the settings are +*/ +#include <configs/sunxi-common.h> + +#endif /* __CONFIG_H */ include/configs/sunxi-common.h +26
-16@@ -22,7 +22,12 @@/* Serial & console */ #define CONFIG_SYS_NS16550_SERIAL /* ns16550 reg in the low bits of cpu reg */ +#ifdef CONFIG_MACH_SUNIV +/* suniv doesn't have apb2 and uart is connected to apb1 */ +#define CONFIG_SYS_NS16550_CLK 100000000 +#else #define CONFIG_SYS_NS16550_CLK 24000000 +#endif #ifndef CONFIG_DM_SERIAL # define CONFIG_SYS_NS16550_REG_SIZE -4# define CONFIG_SYS_NS16550_COM1 SUNXI_UART0_BASE@@ -49,6 +54,15 @@* since it needs to fit in with the other values. By also #defining it * we get warnings if the Kconfig value mismatches. */ #define CONFIG_SPL_BSS_START_ADDR 0x2ff80000 +#elif defined(CONFIG_MACH_SUNIV ) +#define SDRAM_OFFSET (x) 0x8##x +#define CONFIG_SYS_SDRAM_BASE 0x80000000 +/* Note SPL_STACK_R_ADDR is set through Kconfig, we include it here +* since it needs to fit in with the other values. By also #defining it +* we get warnings if the Kconfig value mismatches. +*/ +#define CONFIG_SPL_STACK_R_ADDR 0x81e00000 +#define CONFIG_SPL_BSS_START_ADDR 0x81f80000#else #define SDRAM_OFFSET (x) 0x4##x#define CONFIG_SYS_SDRAM_BASE 0x40000000@@ -186,21 +200,7 @@#define FDTOVERLAY_ADDR_R __stringify(SDRAM_OFFSET(FE00000))#define RAMDISK_ADDR_R __stringify(SDRAM_OFFSET(FF00000)) -#else -/* -* 160M RAM (256M minimum minus 64MB heap + 32MB for u-boot, stack, fb, etc. -* 32M uncompressed kernel, 16M compressed kernel, 1M fdt, -* 1M script, 1M pxe, 1M dt overlay and the ramdisk at the end. -*/ -#ifndef CONFIG_MACH_SUN8I_V3S -#define BOOTM_SIZE __stringify(0xa000000) -#define KERNEL_ADDR_R __stringify(SDRAM_OFFSET(2000000)) -#define FDT_ADDR_R __stringify(SDRAM_OFFSET(3000000)) -#define SCRIPT_ADDR_R __stringify(SDRAM_OFFSET(3100000)) -#define PXEFILE_ADDR_R __stringify(SDRAM_OFFSET(3200000)) -#define FDTOVERLAY_ADDR_R __stringify(SDRAM_OFFSET(3300000)) -#define RAMDISK_ADDR_R __stringify(SDRAM_OFFSET(3400000)) -#else +#elif defined(CONFIG_MACH_SUN8I_V3S )/* * 64M RAM minus 2MB heap + 16MB for u-boot, stack, fb, etc. * 16M uncompressed kernel, 8M compressed kernel, 1M fdt, @@ -213,7 +213,34 @@#define PXEFILE_ADDR_R __stringify(SDRAM_OFFSET(1A00000))#define FDTOVERLAY_ADDR_R __stringify(SDRAM_OFFSET(1B00000))#define RAMDISK_ADDR_R __stringify(SDRAM_OFFSET(1C00000)) -#endif + +#elif defined(CONFIG_MACH_SUNIV ) +/* +* 32M RAM minus 1MB heap + 8MB for u-boot, stack, fb, etc. +* 8M uncompressed kernel, 4M compressed kernel, 512K fdt, +* 512K script, 512K pxe and the ramdisk at the end. +*/ +#define BOOTM_SIZE __stringify(0x1700000) +#define KERNEL_ADDR_R __stringify(SDRAM_OFFSET(0500000)) +#define FDT_ADDR_R __stringify(SDRAM_OFFSET(0C00000)) +#define SCRIPT_ADDR_R __stringify(SDRAM_OFFSET(0C50000))
include/configs/sunxi-common.h line 236
Quoted 10 lines
include/configs/sunxi-common.h +10
-0+#define PXEFILE_ADDR_R __stringify(SDRAM_OFFSET(0D00000)) +#define FDTOVERLAY_ADDR_R __stringify(SDRAM_OFFSET(0D50000)) +#define RAMDISK_ADDR_R __stringify(SDRAM_OFFSET(0D60000)) + +#else +/* +* 160M RAM (256M minimum minus 64MB heap + 32MB for u-boot, stack, fb, etc. +* 32M uncompressed kernel, 16M compressed kernel, 1M fdt, +* 1M script, 1M pxe and the ramdisk at the end. +*/
^^^^^^ I copied wrong comment I'll fix this in V3...
Quoted 10 lines
include/configs/sunxi-common.h +7
-0+#define BOOTM_SIZE __stringify(0xa000000) +#define KERNEL_ADDR_R __stringify(SDRAM_OFFSET(2000000)) +#define FDT_ADDR_R __stringify(SDRAM_OFFSET(3000000)) +#define SCRIPT_ADDR_R __stringify(SDRAM_OFFSET(3100000)) +#define PXEFILE_ADDR_R __stringify(SDRAM_OFFSET(3200000)) +#define FDTOVERLAY_ADDR_R __stringify(SDRAM_OFFSET(3300000)) +#define RAMDISK_ADDR_R __stringify(SDRAM_OFFSET(3400000))#endif #define MEM_LAYOUT_ENV_SETTINGS \
Re: [PATCH v2 09/12] configs: sunxi: Add common SUNIV header
In reply to Jesse TaubeQuoted 6 lines · On Wed, 26 Jan 2022 08:53:26 -0500 Jesse Taube <[email protected]> wrote:
From: Icenowy Zheng <[email protected]>
Adds support for SUNIV and the F1C100s.
Signed-off-by Icenowy Zheng <[email protected]>Signed-off-by Jesse Taube <[email protected]>
With that comment fixed, as you mentioned in the reply to this mail, and with making sure the V3s comment stays the same (you lost dt overlay):
Cheers,
Andre
Quoted 126 lines
---
V1->V2:
* Combine ifdefs
* Fix indentation
* Fix negative logic
* Fix rebase artifacts
* RemoveCONFIG_SYS_LOAD_ADDR
* RemoveCONFIG_ENV_SECT_SIZE--- include/configs/suniv.h | 14 ++++++++ include/configs/sunxi-common.h | 59 +++++++++++++++++++++++++--------- 2 files changed, 57 insertions(+), 16 deletions(-) create mode 100644 include/configs/suniv.hinclude/configs/suniv.h new file +14
-0@@ -0,0 +1,14 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* +* Configuration settings for new Allwinner F-series (suniv) CPU +*/ + +#ifndef __CONFIG_H +#define __CONFIG_H + +/* +* Include common sunxi configuration where most the settings are +*/ +#include <configs/sunxi-common.h> + +#endif /* __CONFIG_H */ include/configs/sunxi-common.h +43
-16@@ -22,7 +22,12 @@/* Serial & console */ #define CONFIG_SYS_NS16550_SERIAL /* ns16550 reg in the low bits of cpu reg */ +#ifdef CONFIG_MACH_SUNIV +/* suniv doesn't have apb2 and uart is connected to apb1 */ +#define CONFIG_SYS_NS16550_CLK 100000000 +#else #define CONFIG_SYS_NS16550_CLK 24000000 +#endif #ifndef CONFIG_DM_SERIAL # define CONFIG_SYS_NS16550_REG_SIZE -4# define CONFIG_SYS_NS16550_COM1 SUNXI_UART0_BASE@@ -49,6 +54,15 @@* since it needs to fit in with the other values. By also #defining it * we get warnings if the Kconfig value mismatches. */ #define CONFIG_SPL_BSS_START_ADDR 0x2ff80000 +#elif defined(CONFIG_MACH_SUNIV ) +#define SDRAM_OFFSET (x) 0x8##x +#define CONFIG_SYS_SDRAM_BASE 0x80000000 +/* Note SPL_STACK_R_ADDR is set through Kconfig, we include it here +* since it needs to fit in with the other values. By also #defining it +* we get warnings if the Kconfig value mismatches. +*/ +#define CONFIG_SPL_STACK_R_ADDR 0x81e00000 +#define CONFIG_SPL_BSS_START_ADDR 0x81f80000#else #define SDRAM_OFFSET (x) 0x4##x#define CONFIG_SYS_SDRAM_BASE 0x40000000@@ -186,21 +200,7 @@#define FDTOVERLAY_ADDR_R __stringify(SDRAM_OFFSET(FE00000))#define RAMDISK_ADDR_R __stringify(SDRAM_OFFSET(FF00000)) -#else -/* -* 160M RAM (256M minimum minus 64MB heap + 32MB for u-boot, stack, fb, etc. -* 32M uncompressed kernel, 16M compressed kernel, 1M fdt, -* 1M script, 1M pxe, 1M dt overlay and the ramdisk at the end. -*/ -#ifndef CONFIG_MACH_SUN8I_V3S -#define BOOTM_SIZE __stringify(0xa000000) -#define KERNEL_ADDR_R __stringify(SDRAM_OFFSET(2000000)) -#define FDT_ADDR_R __stringify(SDRAM_OFFSET(3000000)) -#define SCRIPT_ADDR_R __stringify(SDRAM_OFFSET(3100000)) -#define PXEFILE_ADDR_R __stringify(SDRAM_OFFSET(3200000)) -#define FDTOVERLAY_ADDR_R __stringify(SDRAM_OFFSET(3300000)) -#define RAMDISK_ADDR_R __stringify(SDRAM_OFFSET(3400000)) -#else +#elif defined(CONFIG_MACH_SUN8I_V3S )/* * 64M RAM minus 2MB heap + 16MB for u-boot, stack, fb, etc. * 16M uncompressed kernel, 8M compressed kernel, 1M fdt, @@ -213,7 +213,34 @@#define PXEFILE_ADDR_R __stringify(SDRAM_OFFSET(1A00000))#define FDTOVERLAY_ADDR_R __stringify(SDRAM_OFFSET(1B00000))#define RAMDISK_ADDR_R __stringify(SDRAM_OFFSET(1C00000)) -#endif + +#elif defined(CONFIG_MACH_SUNIV ) +/* +* 32M RAM minus 1MB heap + 8MB for u-boot, stack, fb, etc. +* 8M uncompressed kernel, 4M compressed kernel, 512K fdt, +* 512K script, 512K pxe and the ramdisk at the end. +*/ +#define BOOTM_SIZE __stringify(0x1700000) +#define KERNEL_ADDR_R __stringify(SDRAM_OFFSET(0500000)) +#define FDT_ADDR_R __stringify(SDRAM_OFFSET(0C00000)) +#define SCRIPT_ADDR_R __stringify(SDRAM_OFFSET(0C50000)) +#define PXEFILE_ADDR_R __stringify(SDRAM_OFFSET(0D00000)) +#define FDTOVERLAY_ADDR_R __stringify(SDRAM_OFFSET(0D50000)) +#define RAMDISK_ADDR_R __stringify(SDRAM_OFFSET(0D60000)) + +#else +/* +* 160M RAM (256M minimum minus 64MB heap + 32MB for u-boot, stack, fb, etc. +* 32M uncompressed kernel, 16M compressed kernel, 1M fdt, +* 1M script, 1M pxe and the ramdisk at the end. +*/ +#define BOOTM_SIZE __stringify(0xa000000) +#define KERNEL_ADDR_R __stringify(SDRAM_OFFSET(2000000)) +#define FDT_ADDR_R __stringify(SDRAM_OFFSET(3000000)) +#define SCRIPT_ADDR_R __stringify(SDRAM_OFFSET(3100000)) +#define PXEFILE_ADDR_R __stringify(SDRAM_OFFSET(3200000)) +#define FDTOVERLAY_ADDR_R __stringify(SDRAM_OFFSET(3300000)) +#define RAMDISK_ADDR_R __stringify(SDRAM_OFFSET(3400000))#endif #define MEM_LAYOUT_ENV_SETTINGS \
PATCH v2 10/12 mach-sunxi: Add support for SUNIV architecture
In reply to Jesse TaubeFrom: Icenowy Zheng <[email protected]>
Add support for the suniv architecture, which is newer ARM9 SoCs by Allwinner. The design of it seems to be a mixture of sun3i, sun4i and sun6i.
---V1->V2:
* Remove change in s_init (sunxi: remove lowlevel_init)
--- arch/arm/mach-sunxi/Kconfig | 16 +++++++++-- arch/arm/mach-sunxi/board.c | 28 ++++++++++++++++++- arch/arm/mach-sunxi/clock.c | 3 +- arch/arm/mach-sunxi/clock_sun6i.c | 46 ++++++++++++++++++++++++++++++- arch/arm/mach-sunxi/cpu_info.c | 2 ++ 5 files changed, 89 insertions(+), 6 deletions(-)
arch/arm/mach-sunxi/Kconfig +13 -3
@@ -1,7 +1,8 @@ if ARCH_SUNXI config SPL_LDSCRIPT - default "arch/arm/cpu/armv7/sunxi/u-boot-spl.lds" if !ARM64 + default "arch/arm/cpu/arm926ejs/sunxi/u-boot-spl.lds" if MACH_SUNIV + default "arch/arm/cpu/armv7/sunxi/u-boot-spl.lds" if !ARM64 && !MACH_SUNIV config IDENT_STRING default " Allwinner Technology"
@@ -183,6 +184,12 @@ choice prompt "Sunxi SoC Variant" optional +config MACH_SUNIV + bool "suniv (Allwinner F1C100s/F1C200s/F1C600/R6)" + select CPU_ARM926EJS + select SUNXI_GEN_SUN6I + select SUPPORT_SPL + config MACH_SUN4I bool "sun4i (Allwinner A10)" select CPU_V7A
@@ -587,6 +594,7 @@ config DRAM_ODT_CORRECTION endif config SYS_CLK_FREQ + default 408000000 if MACH_SUNIV default 1008000000 if MACH_SUN4I default 1008000000 if MACH_SUN5I default 1008000000 if MACH_SUN6I
@@ -598,6 +606,7 @@ config SYS_CLK_FREQ default 1008000000 if MACH_SUN50I_H616 config SYS_CONFIG_NAME + default "suniv" if MACH_SUNIV default "sun4i" if MACH_SUN4I default "sun5i" if MACH_SUN5I default "sun6i" if MACH_SUN6I
@@ -805,7 +814,7 @@ config VIDEO_SUNXI config VIDEO_HDMI bool "HDMI output support" - depends on VIDEO_SUNXI && !MACH_SUN8I + depends on VIDEO_SUNXI && !MACH_SUN8I && !MACH_SUNIV default y ---help--- Say Y here to add support for outputting video over HDMI.
@@ -1005,6 +1014,7 @@ config GMAC_TX_DELAY Set the GMAC Transmit Clock Delay Chain value. config SPL_STACK_R_ADDR + default 0x81e00000 if MACH_SUNIV default 0x4fe00000 if MACH_SUN4I default 0x4fe00000 if MACH_SUN5I default 0x4fe00000 if MACH_SUN6I
@@ -1016,7 +1026,7 @@ config SPL_STACK_R_ADDR config SPL_SPI_SUNXI bool "Support for SPI Flash on Allwinner SoCs in SPL" - depends on MACH_SUN4I || MACH_SUN5I || MACH_SUN7I || MACH_SUNXI_H3_H5 || MACH_SUN50I || MACH_SUN8I_R40 || MACH_SUN50I_H6 + depends on MACH_SUN4I || MACH_SUN5I || MACH_SUN7I || MACH_SUNXI_H3_H5 || MACH_SUN50I || MACH_SUN8I_R40 || MACH_SUN50I_H6 || MACH_SUNIV help Enable support for SPI Flash. This option allows SPL to read from sunxi SPI Flash. It uses the same method as the boot ROM, so does
arch/arm/mach-sunxi/board.c +27 -1
@@ -86,7 +86,8 @@ static int gpio_init(void)sunxi_gpio_set_cfgpin (SUNXI_GPB (22 ),SUNXI_GPIO_INPUT );sunxi_gpio_set_cfgpin (SUNXI_GPB (23 ),SUNXI_GPIO_INPUT );#endif -#if defined(CONFIG_MACH_SUN8I ) && !defined(CONFIG_MACH_SUN8I_R40 ) +#if (defined(CONFIG_MACH_SUN8I ) && !defined(CONFIG_MACH_SUN8I_R40 )) || \ + defined(CONFIG_MACH_SUNIV )sunxi_gpio_set_cfgpin (SUNXI_GPF (2 ),SUN8I_GPF_UART0 );sunxi_gpio_set_cfgpin (SUNXI_GPF (4 ),SUN8I_GPF_UART0 );#else
@@ -94,6 +95,10 @@ static int gpio_init(void)sunxi_gpio_set_cfgpin (SUNXI_GPF (4 ),SUNXI_GPF_UART0 );#endif sunxi_gpio_set_pull (SUNXI_GPF (4 ),1 ); +#elif CONFIG_CONS_INDEX == 1 && defined(CONFIG_MACH_SUNIV) +sunxi_gpio_set_cfgpin (SUNXI_GPE (0 ),SUNIV_GPE_UART0 ); +sunxi_gpio_set_cfgpin (SUNXI_GPE (1 ),SUNIV_GPE_UART0 ); +sunxi_gpio_set_pull (SUNXI_GPE (1 ),SUNXI_GPIO_PULL_UP );#elif CONFIG_CONS_INDEX == 1 && (defined(CONFIG_MACH_SUN4I) || \ defined(CONFIG_MACH_SUN7I) || \ defined(CONFIG_MACH_SUN8I_R40))
@@ -328,10 +333,31 @@ unsigned long spl_mmc_get_uboot_raw_sector(struct mmc *mmc,return sector; } +#ifndef CONFIG_MACH_SUNIV u32 spl_boot_device (void ) {return sunxi_get_boot_device (); } +#else +/* +* suniv BROM do not pass the boot media type to SPL, so we try with the +* boot sequence in BROM: mmc0->spinor->fail. +*/ +void board_boot_order (u32 *spl_boot_list) +{ +/* +* See the comments above in sunxi_get_boot_device() for information +* about FEL boot. +*/ +if (!is_boot0_magic (SPL_ADDR +4 )) { + spl_boot_list[0 ] =BOOT_DEVICE_BOARD ; +return ; + } + + spl_boot_list[0 ] =BOOT_DEVICE_MMC1 ; + spl_boot_list[1 ] =BOOT_DEVICE_SPI ; +} +#endif void board_init_f (ulong dummy) {
arch/arm/mach-sunxi/clock.c +2 -1
@@ -35,7 +35,8 @@ int clock_init(void) }/* These functions are shared between various SoCs so put them here. */ -#if definedCONFIG_SUNXI_GEN_SUN6I && !definedCONFIG_MACH_SUN9I +#if definedCONFIG_SUNXI_GEN_SUN6I && !definedCONFIG_MACH_SUN9I && \ + !definedCONFIG_MACH_SUNIV int clock_twi_onoff (int port,int state) { struct sunxi_ccm_reg *const ccm =
arch/arm/mach-sunxi/clock_sun6i.c +45 -1
103 lines not on this page · raw message
arch/arm/mach-sunxi/cpu_info.c +2 -0
@@ -57,6 +57,8 @@ int print_cpuinfo(void) {#ifdef CONFIG_MACH_SUN4I puts ("CPU: Allwinner A10 (SUN4I)\n" ); +#elif definedCONFIG_MACH_SUNIV +puts ("CPU: Allwinner F Series (SUNIV)\n" );#elif definedCONFIG_MACH_SUN5I u32 val =readl (SUNXI_SID_BASE +0x08 );switch ((val >>12 ) &0xf ) {
Signature · 1 line
2.34.1
PATCH v2 11/12 ARM: dts: suniv: Add device tree files for F1C100s
In reply to Jesse TaubeFrom: Icenowy Zheng <[email protected]>
Add device tree files for suniv and
Lichee Pi Nano it is a board based on F1C100s.
---V1->V2:
* Sync with Linux
* Re-add MMC node
--- arch/arm/dts/Makefile | 2 + arch/arm/dts/suniv-f1c100s-licheepi-nano.dts | 29 ++++ arch/arm/dts/suniv-f1c100s.dtsi | 6 + arch/arm/dts/suniv.dtsi | 160 +++++++++++++++++++ 4 files changed, 197 insertions(+) create mode 100644 arch/arm/dts/suniv-f1c100s-licheepi-nano.dts create mode 100644 arch/arm/dts/suniv-f1c100s.dtsi create mode 100644 arch/arm/dts/suniv.dtsi
arch/arm/dts/Makefile +2 -0
@@ -497,6 +497,8 @@ dtb-$(CONFIG_STM32H7) += stm32h743i-disco.dtb \ stm32h743i-eval.dtb \ stm32h750i-art-pi.dtb +dtb-$(CONFIG_MACH_SUNIV) += \ + suniv-f1c100s-licheepi-nano.dtb dtb-$(CONFIG_MACH_SUN4I) += \ sun4i-a10-a1000.dtb \ sun4i-a10-ba10-tvbox.dtb \
arch/arm/dts/suniv-f1c100s-licheepi-nano.dts new file +29 -0
@@ -0,0 +1,29 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR X11) +/* + * Copyright 2018 Icenowy Zheng <[email protected]> + */ + +/dts-v1/; +#include "suniv-f1c100s.dtsi" + +#include <dt-bindings/gpio/gpio.h> + +/ { + model = "Lichee Pi Nano"; + compatible = "licheepi,licheepi-nano", "allwinner,suniv-f1c100s", + "allwinner,suniv"; + + aliases { + serial0 = &uart0; + }; + + chosen { + stdout-path = "serial0:115200n8"; + }; +}; + +&uart0 { + pinctrl-names = "default"; + pinctrl-0 = <&uart0_pe_pins>; + status = "okay"; +};
arch/arm/dts/suniv-f1c100s.dtsi new file +6 -0
@@ -0,0 +1,6 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR X11) +/* + * Copyright 2018 Icenowy Zheng <[email protected]> + */ + +#include "suniv.dtsi"
arch/arm/dts/suniv.dtsi new file +160 -0
160 lines not on this page · raw message
Signature · 1 line
2.34.1
Re: [PATCH v2 11/12] ARM: dts: suniv: Add device tree files for F1C100s
Quoted 4 lines · On Wed, 26 Jan 2022 08:53:28 -0500 Jesse Taube <[email protected]> wrote:
From: Icenowy Zheng <[email protected]>
Add device tree files for suniv and
Lichee Pi Nano it is a board based on F1C100s.
As mentioned in the other email, please do a 1:1 copy from the current Linux tree. Yes, this will miss MMC and USB, but I am happy to take a fixup patch on short notice when the respective kernel patches hit some maintainer tree.
Cheers,
Andre
Quoted 243 lines
Signed-off-by Icenowy Zheng <[email protected]>Signed-off-by Jesse Taube <[email protected]>---
V1->V2:
* Sync with Linux
* Re-add MMC node--- arch/arm/dts/Makefile | 2 + arch/arm/dts/suniv-f1c100s-licheepi-nano.dts | 29 ++++ arch/arm/dts/suniv-f1c100s.dtsi | 6 + arch/arm/dts/suniv.dtsi | 160 +++++++++++++++++++ 4 files changed, 197 insertions(+) create mode 100644 arch/arm/dts/suniv-f1c100s-licheepi-nano.dts create mode 100644 arch/arm/dts/suniv-f1c100s.dtsi create mode 100644 arch/arm/dts/suniv.dtsiarch/arm/dts/Makefile +2
-0@@ -497,6 +497,8 @@ dtb-$(CONFIG_STM32H7) += stm32h743i-disco.dtb \ stm32h743i-eval.dtb \ stm32h750i-art-pi.dtb +dtb-$(CONFIG_MACH_SUNIV) += \ + suniv-f1c100s-licheepi-nano.dtb dtb-$(CONFIG_MACH_SUN4I) += \ sun4i-a10-a1000.dtb \ sun4i-a10-ba10-tvbox.dtb \arch/arm/dts/suniv-f1c100s-licheepi-nano.dts new file +29
-0@@ -0,0 +1,29 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR X11) +/* + * Copyright 2018 Icenowy Zheng <[email protected]> + */ + +/dts-v1/; +#include "suniv-f1c100s.dtsi" + +#include <dt-bindings/gpio/gpio.h> + +/ { + model = "Lichee Pi Nano"; + compatible = "licheepi,licheepi-nano", "allwinner,suniv-f1c100s", + "allwinner,suniv"; + + aliases { + serial0 = &uart0; + }; + + chosen { + stdout-path = "serial0:115200n8"; + }; +}; + +&uart0 { + pinctrl-names = "default"; + pinctrl-0 = <&uart0_pe_pins>; + status = "okay"; +};arch/arm/dts/suniv-f1c100s.dtsi new file +6
-0@@ -0,0 +1,6 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR X11) +/* + * Copyright 2018 Icenowy Zheng <[email protected]> + */ + +#include "suniv.dtsi"arch/arm/dts/suniv.dtsi new file +160
-0@@ -0,0 +1,160 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR X11) +/* + * Copyright 2018 Icenowy Zheng <[email protected]> + */ + +#include <dt-bindings/clock/suniv-ccu.h> +#include <dt-bindings/reset/suniv-ccu.h> + +/ { + #address-cells = <1>; + #size-cells = <1>; + interrupt-parent = <&intc>; + + clocks { + osc24M: clk-24M { + #clock-cells = <0>; + compatible = "fixed-clock"; + clock-frequency = <24000000>; + clock-output-names = "osc24M"; + }; + + osc32k: clk-32k { + #clock-cells = <0>; + compatible = "fixed-clock"; + clock-frequency = <32768>; + clock-output-names = "osc32k"; + }; + }; + + cpus { + cpu { + compatible = "arm,arm926ej-s"; + device_type = "cpu"; + }; + }; + + soc { + compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <1>; + ranges; + + sram-controller@1c00000 { + compatible = "allwinner,suniv-f1c100s-system-control", + "allwinner,sun4i-a10-sram-controller"; + reg = <0x01c00000 0x30>; + #address-cells = <1>; + #size-cells = <1>; + ranges; + + sram_d: sram@10000 { + compatible = "mmio-sram"; + reg = <0x00010000 0x1000>; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0 0x00010000 0x1000>; + + otg_sram: sram-section@0 { + compatible = "allwinner,suniv-f1c100s-sram-d", + "allwinner,sun4i-a10-sram-d"; + reg = <0x0000 0x1000>; + status = "disabled"; + }; + }; + }; + + mmc0: mmc@1c0f000 { + compatible = "allwinner,sun4i-a10-mmc"; + reg = <0x01c0f000 0x1000>; + clocks = <&ccu CLK_BUS_MMC0>, <&ccu CLK_MMC0>; + clock-names = "ahb", "mmc"; + interrupts = <32>; + resets = <&ccu RST_BUS_MMC0>; + reset-names = "ahb"; + status = "disabled"; + #address-cells = <1>; + #size-cells = <0>; + }; + + ccu: clock@1c20000 { + compatible = "allwinner,suniv-ccu"; + reg = <0x01c20000 0x400>; + clocks = <&osc24M>, <&osc32k>; + clock-names = "hosc", "losc"; + #clock-cells = <1>; + #reset-cells = <1>; + }; + + intc: interrupt-controller@1c20400 { + compatible = "allwinner,suniv-ic"; + reg = <0x01c20400 0x400>; + interrupt-controller; + #interrupt-cells = <1>; + }; + + pio: pinctrl@1c20800 { + compatible = "allwinner,suniv-pinctrl"; + reg = <0x01c20800 0x400>; + interrupts = <38>, <39>, <40>; + clocks = <&ccu CLK_BUS_PIO>, <&osc24M>, <&osc32k>; + clock-names = "apb", "hosc", "losc"; + gpio-controller; + interrupt-controller; + #interrupt-cells = <3>; + #gpio-cells = <3>; + + uart0_pe_pins: uart0-pe-pins { + pins = "PE0", "PE1"; + function = "uart0"; + }; + }; + + timer@1c20c00 { + compatible = "allwinner,suniv-f1c100s-timer", + "allwinner,sun4i-a10-timer"; + reg = <0x01c20c00 0x90>; + interrupts = <13>; + clocks = <&osc24M>; + }; + + wdt: watchdog@1c20ca0 { + compatible = "allwinner,suniv-f1c100s-wdt", + "allwinner,sun6i-a31-wdt"; + reg = <0x01c20ca0 0x20>; + }; + + uart0: serial@1c25000 { + compatible = "snps,dw-apb-uart"; + reg = <0x01c25000 0x400>; + interrupts = <1>; + reg-shift = <2>; + reg-io-width = <4>; + clocks = <&ccu CLK_BUS_UART0>; + resets = <&ccu RST_BUS_UART0>; + status = "disabled"; + }; + + uart1: serial@1c25400 { + compatible = "snps,dw-apb-uart"; + reg = <0x01c25400 0x400>; + interrupts = <2>; + reg-shift = <2>; + reg-io-width = <4>; + clocks = <&ccu CLK_BUS_UART1>; + resets = <&ccu RST_BUS_UART1>; + status = "disabled"; + }; + + uart2: serial@1c25800 { + compatible = "snps,dw-apb-uart"; + reg = <0x01c25800 0x400>; + interrupts = <3>; + reg-shift = <2>; + reg-io-width = <4>; + clocks = <&ccu CLK_BUS_UART2>; + resets = <&ccu RST_BUS_UART2>; + status = "disabled"; + }; + }; +};
Re: [PATCH v2 11/12] ARM: dts: suniv: Add device tree files for F1C100s
Quoted 5 lines · Andre Przywara
Quoted 2 lines · On Wed, 26 Jan 2022 08:53:28 -0500 Jesse Taube <[email protected]> wrote:
From: Icenowy Zheng <[email protected]>
Quoted 7 lines
Quoted 2 lines
Add device tree files for suniv and
Lichee Pi Nano it is a board based on F1C100s.As mentioned in the other email, please do a 1:1 copy from the current Linux tree. Yes, this will miss MMC and USB, but I am happy to take a fixup patch on short notice when the respective kernel patches hit some maintainer tree. > Cheers,
Uh dts wont compile without a mmc node its a bug in another sunxi dts. Also Icenowy's email chnaged to to .io not .xyz can i change that in this?
Quoted 246 lines
Andre
Quoted 243 lines
Signed-off-by Icenowy Zheng <[email protected]>Signed-off-by Jesse Taube <[email protected]>---
V1->V2:
* Sync with Linux
* Re-add MMC node--- arch/arm/dts/Makefile | 2 + arch/arm/dts/suniv-f1c100s-licheepi-nano.dts | 29 ++++ arch/arm/dts/suniv-f1c100s.dtsi | 6 + arch/arm/dts/suniv.dtsi | 160 +++++++++++++++++++ 4 files changed, 197 insertions(+)create mode 100644
arch/arm/dts/suniv-f1c100s-licheepi-nano.dtscreate mode 100644arch/arm/dts/suniv-f1c100s.dtsicreate mode 100644arch/arm/dts/suniv.dtsiarch/arm/dts/Makefile +2
-0@@ -497,6 +497,8 @@ dtb-$(CONFIG_STM32H7) += stm32h743i-disco.dtb \ stm32h743i-eval.dtb \ stm32h750i-art-pi.dtb +dtb-$(CONFIG_MACH_SUNIV) += \ + suniv-f1c100s-licheepi-nano.dtb dtb-$(CONFIG_MACH_SUN4I) += \ sun4i-a10-a1000.dtb \ sun4i-a10-ba10-tvbox.dtb \arch/arm/dts/suniv-f1c100s-licheepi-nano.dts new file +29
-0@@ -0,0 +1,29 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR X11) +/* + * Copyright 2018 Icenowy Zheng <[email protected]> + */ + +/dts-v1/; +#include "suniv-f1c100s.dtsi" + +#include <dt-bindings/gpio/gpio.h> + +/ { + model = "Lichee Pi Nano"; + compatible = "licheepi,licheepi-nano", "allwinner,suniv-f1c100s", + "allwinner,suniv"; + + aliases { + serial0 = &uart0; + }; + + chosen { + stdout-path = "serial0:115200n8"; + }; +}; + +&uart0 { + pinctrl-names = "default"; + pinctrl-0 = <&uart0_pe_pins>; + status = "okay"; +};arch/arm/dts/suniv-f1c100s.dtsi new file +6
-0@@ -0,0 +1,6 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR X11) +/* + * Copyright 2018 Icenowy Zheng <[email protected]> + */ + +#include "suniv.dtsi"arch/arm/dts/suniv.dtsi new file +160
-0@@ -0,0 +1,160 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR X11) +/* + * Copyright 2018 Icenowy Zheng <[email protected]> + */ + +#include <dt-bindings/clock/suniv-ccu.h> +#include <dt-bindings/reset/suniv-ccu.h> + +/ { + #address-cells = <1>; + #size-cells = <1>; + interrupt-parent = <&intc>; + + clocks { + osc24M: clk-24M { + #clock-cells = <0>; + compatible = "fixed-clock"; + clock-frequency = <24000000>; + clock-output-names = "osc24M"; + }; + + osc32k: clk-32k { + #clock-cells = <0>; + compatible = "fixed-clock"; + clock-frequency = <32768>; + clock-output-names = "osc32k"; + }; + }; + + cpus { + cpu { + compatible = "arm,arm926ej-s"; + device_type = "cpu"; + }; + }; + + soc { + compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <1>; + ranges; + + sram-controller@1c00000 { + compatible = "allwinner,suniv-f1c100s-system-control", + "allwinner,sun4i-a10-sram-controller"; + reg = <0x01c00000 0x30>; + #address-cells = <1>; + #size-cells = <1>; + ranges; + + sram_d: sram@10000 { + compatible = "mmio-sram"; + reg = <0x00010000 0x1000>; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0 0x00010000 0x1000>; + + otg_sram: sram-section@0 { + compatible = "allwinner,suniv-f1c100s-sram-d", + "allwinner,sun4i-a10-sram-d"; + reg = <0x0000 0x1000>; + status = "disabled"; + }; + }; + }; + + mmc0: mmc@1c0f000 { + compatible = "allwinner,sun4i-a10-mmc"; + reg = <0x01c0f000 0x1000>; + clocks = <&ccu CLK_BUS_MMC0>, <&ccu CLK_MMC0>; + clock-names = "ahb", "mmc"; + interrupts = <32>; + resets = <&ccu RST_BUS_MMC0>; + reset-names = "ahb"; + status = "disabled"; + #address-cells = <1>; + #size-cells = <0>; + }; + + ccu: clock@1c20000 { + compatible = "allwinner,suniv-ccu"; + reg = <0x01c20000 0x400>; + clocks = <&osc24M>, <&osc32k>; + clock-names = "hosc", "losc"; + #clock-cells = <1>; + #reset-cells = <1>; + }; + + intc: interrupt-controller@1c20400 { + compatible = "allwinner,suniv-ic"; + reg = <0x01c20400 0x400>; + interrupt-controller; + #interrupt-cells = <1>; + }; + + pio: pinctrl@1c20800 { + compatible = "allwinner,suniv-pinctrl"; + reg = <0x01c20800 0x400>; + interrupts = <38>, <39>, <40>; + clocks = <&ccu CLK_BUS_PIO>, <&osc24M>, <&osc32k>; + clock-names = "apb", "hosc", "losc"; + gpio-controller; + interrupt-controller; + #interrupt-cells = <3>; + #gpio-cells = <3>; + + uart0_pe_pins: uart0-pe-pins { + pins = "PE0", "PE1"; + function = "uart0"; + }; + }; + + timer@1c20c00 { + compatible = "allwinner,suniv-f1c100s-timer", + "allwinner,sun4i-a10-timer"; + reg = <0x01c20c00 0x90>; + interrupts = <13>; + clocks = <&osc24M>; + }; + + wdt: watchdog@1c20ca0 { + compatible = "allwinner,suniv-f1c100s-wdt", + "allwinner,sun6i-a31-wdt"; + reg = <0x01c20ca0 0x20>; + }; + + uart0: serial@1c25000 { + compatible = "snps,dw-apb-uart"; + reg = <0x01c25000 0x400>; + interrupts = <1>; + reg-shift = <2>; + reg-io-width = <4>; + clocks = <&ccu CLK_BUS_UART0>; + resets = <&ccu RST_BUS_UART0>; + status = "disabled"; + }; + + uart1: serial@1c25400 { + compatible = "snps,dw-apb-uart"; + reg = <0x01c25400 0x400>; + interrupts = <2>; + reg-shift = <2>; + reg-io-width = <4>; + clocks = <&ccu CLK_BUS_UART1>; + resets = <&ccu RST_BUS_UART1>; + status = "disabled"; + }; + + uart2: serial@1c25800 { + compatible = "snps,dw-apb-uart"; + reg = <0x01c25800 0x400>; + interrupts = <3>; + reg-shift = <2>; + reg-io-width = <4>; + clocks = <&ccu CLK_BUS_UART2>; + resets = <&ccu RST_BUS_UART2>; + status = "disabled"; + }; + }; +};
Re: [PATCH v2 11/12] ARM: dts: suniv: Add device tree files for F1C100s
Quoted 6 lines · On Fri, 28 Jan 2022 21:31:28 -0500 Jesse Taube <[email protected]> wrote:
Quoted 5 lines · Andre Przywara
Quoted 2 lines · On Wed, 26 Jan 2022 08:53:28 -0500 Jesse Taube <[email protected]> wrote:
From: Icenowy Zheng <[email protected]>
Quoted 8 lines
Quoted 7 lines
Quoted 2 lines
Add device tree files for suniv and
Lichee Pi Nano it is a board based on F1C100s.As mentioned in the other email, please do a 1:1 copy from the current Linux tree. Yes, this will miss MMC and USB, but I am happy to take a fixup patch on short notice when the respective kernel patches hit some maintainer tree. > Cheers,
Uh dts wont compile without a mmc node its a bug in another sunxi dts.
Not sure I follow, it compiles fine in the kernel, doesn't it?
Quoted 1 line
Also Icenowy's email chnaged to to .io not .xyz can i change that in this?
Please no changes compared to Linux, there is no "U-Boot DT", it's the same hardware, so the same DT, just synced from the definitive repository (the Linux tree).
Yes, the file split is different here, but that doesn't matter, just copy the current Linux files.
Cheers,
Andre
Quoted 246 lines
Quoted 246 lines
Andre
Quoted 243 lines
Signed-off-by Icenowy Zheng <[email protected]>Signed-off-by Jesse Taube <[email protected]>---
V1->V2:
* Sync with Linux
* Re-add MMC node--- arch/arm/dts/Makefile | 2 + arch/arm/dts/suniv-f1c100s-licheepi-nano.dts | 29 ++++ arch/arm/dts/suniv-f1c100s.dtsi | 6 + arch/arm/dts/suniv.dtsi | 160 +++++++++++++++++++ 4 files changed, 197 insertions(+)create mode 100644
arch/arm/dts/suniv-f1c100s-licheepi-nano.dtscreate mode 100644arch/arm/dts/suniv-f1c100s.dtsicreate mode 100644arch/arm/dts/suniv.dtsiarch/arm/dts/Makefile +2
-0@@ -497,6 +497,8 @@ dtb-$(CONFIG_STM32H7) += stm32h743i-disco.dtb \ stm32h743i-eval.dtb \ stm32h750i-art-pi.dtb +dtb-$(CONFIG_MACH_SUNIV) += \ + suniv-f1c100s-licheepi-nano.dtb dtb-$(CONFIG_MACH_SUN4I) += \ sun4i-a10-a1000.dtb \ sun4i-a10-ba10-tvbox.dtb \arch/arm/dts/suniv-f1c100s-licheepi-nano.dts new file +29
-0@@ -0,0 +1,29 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR X11) +/* + * Copyright 2018 Icenowy Zheng <[email protected]> + */ + +/dts-v1/; +#include "suniv-f1c100s.dtsi" + +#include <dt-bindings/gpio/gpio.h> + +/ { + model = "Lichee Pi Nano"; + compatible = "licheepi,licheepi-nano", "allwinner,suniv-f1c100s", + "allwinner,suniv"; + + aliases { + serial0 = &uart0; + }; + + chosen { + stdout-path = "serial0:115200n8"; + }; +}; + +&uart0 { + pinctrl-names = "default"; + pinctrl-0 = <&uart0_pe_pins>; + status = "okay"; +};arch/arm/dts/suniv-f1c100s.dtsi new file +6
-0@@ -0,0 +1,6 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR X11) +/* + * Copyright 2018 Icenowy Zheng <[email protected]> + */ + +#include "suniv.dtsi"arch/arm/dts/suniv.dtsi new file +160
-0@@ -0,0 +1,160 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR X11) +/* + * Copyright 2018 Icenowy Zheng <[email protected]> + */ + +#include <dt-bindings/clock/suniv-ccu.h> +#include <dt-bindings/reset/suniv-ccu.h> + +/ { + #address-cells = <1>; + #size-cells = <1>; + interrupt-parent = <&intc>; + + clocks { + osc24M: clk-24M { + #clock-cells = <0>; + compatible = "fixed-clock"; + clock-frequency = <24000000>; + clock-output-names = "osc24M"; + }; + + osc32k: clk-32k { + #clock-cells = <0>; + compatible = "fixed-clock"; + clock-frequency = <32768>; + clock-output-names = "osc32k"; + }; + }; + + cpus { + cpu { + compatible = "arm,arm926ej-s"; + device_type = "cpu"; + }; + }; + + soc { + compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <1>; + ranges; + + sram-controller@1c00000 { + compatible = "allwinner,suniv-f1c100s-system-control", + "allwinner,sun4i-a10-sram-controller"; + reg = <0x01c00000 0x30>; + #address-cells = <1>; + #size-cells = <1>; + ranges; + + sram_d: sram@10000 { + compatible = "mmio-sram"; + reg = <0x00010000 0x1000>; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0 0x00010000 0x1000>; + + otg_sram: sram-section@0 { + compatible = "allwinner,suniv-f1c100s-sram-d", + "allwinner,sun4i-a10-sram-d"; + reg = <0x0000 0x1000>; + status = "disabled"; + }; + }; + }; + + mmc0: mmc@1c0f000 { + compatible = "allwinner,sun4i-a10-mmc"; + reg = <0x01c0f000 0x1000>; + clocks = <&ccu CLK_BUS_MMC0>, <&ccu CLK_MMC0>; + clock-names = "ahb", "mmc"; + interrupts = <32>; + resets = <&ccu RST_BUS_MMC0>; + reset-names = "ahb"; + status = "disabled"; + #address-cells = <1>; + #size-cells = <0>; + }; + + ccu: clock@1c20000 { + compatible = "allwinner,suniv-ccu"; + reg = <0x01c20000 0x400>; + clocks = <&osc24M>, <&osc32k>; + clock-names = "hosc", "losc"; + #clock-cells = <1>; + #reset-cells = <1>; + }; + + intc: interrupt-controller@1c20400 { + compatible = "allwinner,suniv-ic"; + reg = <0x01c20400 0x400>; + interrupt-controller; + #interrupt-cells = <1>; + }; + + pio: pinctrl@1c20800 { + compatible = "allwinner,suniv-pinctrl"; + reg = <0x01c20800 0x400>; + interrupts = <38>, <39>, <40>; + clocks = <&ccu CLK_BUS_PIO>, <&osc24M>, <&osc32k>; + clock-names = "apb", "hosc", "losc"; + gpio-controller; + interrupt-controller; + #interrupt-cells = <3>; + #gpio-cells = <3>; + + uart0_pe_pins: uart0-pe-pins { + pins = "PE0", "PE1"; + function = "uart0"; + }; + }; + + timer@1c20c00 { + compatible = "allwinner,suniv-f1c100s-timer", + "allwinner,sun4i-a10-timer"; + reg = <0x01c20c00 0x90>; + interrupts = <13>; + clocks = <&osc24M>; + }; + + wdt: watchdog@1c20ca0 { + compatible = "allwinner,suniv-f1c100s-wdt", + "allwinner,sun6i-a31-wdt"; + reg = <0x01c20ca0 0x20>; + }; + + uart0: serial@1c25000 { + compatible = "snps,dw-apb-uart"; + reg = <0x01c25000 0x400>; + interrupts = <1>; + reg-shift = <2>; + reg-io-width = <4>; + clocks = <&ccu CLK_BUS_UART0>; + resets = <&ccu RST_BUS_UART0>; + status = "disabled"; + }; + + uart1: serial@1c25400 { + compatible = "snps,dw-apb-uart"; + reg = <0x01c25400 0x400>; + interrupts = <2>; + reg-shift = <2>; + reg-io-width = <4>; + clocks = <&ccu CLK_BUS_UART1>; + resets = <&ccu RST_BUS_UART1>; + status = "disabled"; + }; + + uart2: serial@1c25800 { + compatible = "snps,dw-apb-uart"; + reg = <0x01c25800 0x400>; + interrupts = <3>; + reg-shift = <2>; + reg-io-width = <4>; + clocks = <&ccu CLK_BUS_UART2>; + resets = <&ccu RST_BUS_UART2>; + status = "disabled"; + }; + }; +};
Re: [PATCH v2 11/12] ARM: dts: suniv: Add device tree files for F1C100s
Quoted 12 lines · Andre Przywara
Quoted 9 lines · On Fri, 28 Jan 2022 21:31:28 -0500 Jesse Taube <[email protected]> wrote:
Quoted 8 lines · Andre Przywara
Quoted 4 lines · On Wed, 26 Jan 2022 08:53:28 -0500 Jesse Taube <[email protected]> wrote:
From: Icenowy Zheng <[email protected]>
Add device tree files for suniv and
Lichee Pi Nano it is a board based on F1C100s.
Quoted 7 lines
Quoted 5 lines
Quoted 4 lines
As mentioned in the other email, please do a 1:1 copy from the current Linux tree. Yes, this will miss MMC and USB, but I am happy to take a fixup patch on short notice when the respective kernel patches hit some maintainer tree. > Cheers,
Uh dts wont compile without a mmc node its a bug in another sunxi dts.
Not sure I follow, it compiles fine in the kernel, doesn't it?
arch/arm/dts/suniv-f1c100s-licheepi-nano.dtb: ERROR (path_references): /aliases: Reference to non-existent node or label "mmc0" the alias is in:arch/arm/dts/sunxi-u-boot.dtsi:15 mmc0 = &mmc0;
Quoted 259 lines
Quoted 1 line
Also Icenowy's email chnaged to to .io not .xyz can i change that in this?
Please no changes compared to Linux, there is no "U-Boot DT", it's the same hardware, so the same DT, just synced from the definitive repository (the Linux tree).
Yes, the file split is different here, but that doesn't matter, just copy the current Linux files.Cheers,
AndreQuoted 246 lines
Quoted 246 lines
Andre
Quoted 243 lines
Signed-off-by Icenowy Zheng <[email protected]>Signed-off-by Jesse Taube <[email protected]>---
V1->V2:
* Sync with Linux
* Re-add MMC node--- arch/arm/dts/Makefile | 2 + arch/arm/dts/suniv-f1c100s-licheepi-nano.dts | 29 ++++ arch/arm/dts/suniv-f1c100s.dtsi | 6 + arch/arm/dts/suniv.dtsi | 160 +++++++++++++++++++ 4 files changed, 197 insertions(+)create mode 100644
arch/arm/dts/suniv-f1c100s-licheepi-nano.dtscreate mode 100644arch/arm/dts/suniv-f1c100s.dtsicreate mode 100644arch/arm/dts/suniv.dtsiarch/arm/dts/Makefile +2
-0@@ -497,6 +497,8 @@ dtb-$(CONFIG_STM32H7) += stm32h743i-disco.dtb \ stm32h743i-eval.dtb \ stm32h750i-art-pi.dtb +dtb-$(CONFIG_MACH_SUNIV) += \ + suniv-f1c100s-licheepi-nano.dtb dtb-$(CONFIG_MACH_SUN4I) += \ sun4i-a10-a1000.dtb \ sun4i-a10-ba10-tvbox.dtb \arch/arm/dts/suniv-f1c100s-licheepi-nano.dts new file +29
-0@@ -0,0 +1,29 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR X11) +/* + * Copyright 2018 Icenowy Zheng <[email protected]> + */ + +/dts-v1/; +#include "suniv-f1c100s.dtsi" + +#include <dt-bindings/gpio/gpio.h> + +/ { + model = "Lichee Pi Nano"; + compatible = "licheepi,licheepi-nano", "allwinner,suniv-f1c100s", + "allwinner,suniv"; + + aliases { + serial0 = &uart0; + }; + + chosen { + stdout-path = "serial0:115200n8"; + }; +}; + +&uart0 { + pinctrl-names = "default"; + pinctrl-0 = <&uart0_pe_pins>; + status = "okay"; +};arch/arm/dts/suniv-f1c100s.dtsi new file +6
-0@@ -0,0 +1,6 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR X11) +/* + * Copyright 2018 Icenowy Zheng <[email protected]> + */ + +#include "suniv.dtsi"arch/arm/dts/suniv.dtsi new file +160
-0@@ -0,0 +1,160 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR X11) +/* + * Copyright 2018 Icenowy Zheng <[email protected]> + */ + +#include <dt-bindings/clock/suniv-ccu.h> +#include <dt-bindings/reset/suniv-ccu.h> + +/ { + #address-cells = <1>; + #size-cells = <1>; + interrupt-parent = <&intc>; + + clocks { + osc24M: clk-24M { + #clock-cells = <0>; + compatible = "fixed-clock"; + clock-frequency = <24000000>; + clock-output-names = "osc24M"; + }; + + osc32k: clk-32k { + #clock-cells = <0>; + compatible = "fixed-clock"; + clock-frequency = <32768>; + clock-output-names = "osc32k"; + }; + }; + + cpus { + cpu { + compatible = "arm,arm926ej-s"; + device_type = "cpu"; + }; + }; + + soc { + compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <1>; + ranges; + + sram-controller@1c00000 { + compatible = "allwinner,suniv-f1c100s-system-control", + "allwinner,sun4i-a10-sram-controller"; + reg = <0x01c00000 0x30>; + #address-cells = <1>; + #size-cells = <1>; + ranges; + + sram_d: sram@10000 { + compatible = "mmio-sram"; + reg = <0x00010000 0x1000>; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0 0x00010000 0x1000>; + + otg_sram: sram-section@0 { + compatible = "allwinner,suniv-f1c100s-sram-d", + "allwinner,sun4i-a10-sram-d"; + reg = <0x0000 0x1000>; + status = "disabled"; + }; + }; + }; + + mmc0: mmc@1c0f000 { + compatible = "allwinner,sun4i-a10-mmc"; + reg = <0x01c0f000 0x1000>; + clocks = <&ccu CLK_BUS_MMC0>, <&ccu CLK_MMC0>; + clock-names = "ahb", "mmc"; + interrupts = <32>; + resets = <&ccu RST_BUS_MMC0>; + reset-names = "ahb"; + status = "disabled"; + #address-cells = <1>; + #size-cells = <0>; + }; + + ccu: clock@1c20000 { + compatible = "allwinner,suniv-ccu"; + reg = <0x01c20000 0x400>; + clocks = <&osc24M>, <&osc32k>; + clock-names = "hosc", "losc"; + #clock-cells = <1>; + #reset-cells = <1>; + }; + + intc: interrupt-controller@1c20400 { + compatible = "allwinner,suniv-ic"; + reg = <0x01c20400 0x400>; + interrupt-controller; + #interrupt-cells = <1>; + }; + + pio: pinctrl@1c20800 { + compatible = "allwinner,suniv-pinctrl"; + reg = <0x01c20800 0x400>; + interrupts = <38>, <39>, <40>; + clocks = <&ccu CLK_BUS_PIO>, <&osc24M>, <&osc32k>; + clock-names = "apb", "hosc", "losc"; + gpio-controller; + interrupt-controller; + #interrupt-cells = <3>; + #gpio-cells = <3>; + + uart0_pe_pins: uart0-pe-pins { + pins = "PE0", "PE1"; + function = "uart0"; + }; + }; + + timer@1c20c00 { + compatible = "allwinner,suniv-f1c100s-timer", + "allwinner,sun4i-a10-timer"; + reg = <0x01c20c00 0x90>; + interrupts = <13>; + clocks = <&osc24M>; + }; + + wdt: watchdog@1c20ca0 { + compatible = "allwinner,suniv-f1c100s-wdt", + "allwinner,sun6i-a31-wdt"; + reg = <0x01c20ca0 0x20>; + }; + + uart0: serial@1c25000 { + compatible = "snps,dw-apb-uart"; + reg = <0x01c25000 0x400>; + interrupts = <1>; + reg-shift = <2>; + reg-io-width = <4>; + clocks = <&ccu CLK_BUS_UART0>; + resets = <&ccu RST_BUS_UART0>; + status = "disabled"; + }; + + uart1: serial@1c25400 { + compatible = "snps,dw-apb-uart"; + reg = <0x01c25400 0x400>; + interrupts = <2>; + reg-shift = <2>; + reg-io-width = <4>; + clocks = <&ccu CLK_BUS_UART1>; + resets = <&ccu RST_BUS_UART1>; + status = "disabled"; + }; + + uart2: serial@1c25800 { + compatible = "snps,dw-apb-uart"; + reg = <0x01c25800 0x400>; + interrupts = <3>; + reg-shift = <2>; + reg-io-width = <4>; + clocks = <&ccu CLK_BUS_UART2>; + resets = <&ccu RST_BUS_UART2>; + status = "disabled"; + }; + }; +};
Re: [PATCH v2 11/12] ARM: dts: suniv: Add device tree files for F1C100s
Quoted 17 lines · On Fri, 28 Jan 2022 22:01:29 -0500 Jesse Taube <[email protected]> wrote:
Quoted 16 lines · Andre Przywara
Quoted 13 lines · On Fri, 28 Jan 2022 21:31:28 -0500 Jesse Taube <[email protected]> wrote:
Quoted 12 lines · Andre Przywara
Quoted 4 lines · On Wed, 26 Jan 2022 08:53:28 -0500 Jesse Taube <[email protected]> wrote:
From: Icenowy Zheng <[email protected]>
Add device tree files for suniv and
Lichee Pi Nano it is a board based on F1C100s.As mentioned in the other email, please do a 1:1 copy from the current Linux tree. Yes, this will miss MMC and USB, but I am happy to take a fixup patch on short notice when the respective kernel patches hit some maintainer tree. > Cheers,
Quoted 7 lines
Quoted 3 lines
Quoted 1 line
Uh dts wont compile without a mmc node its a bug in another sunxi dts.
Not sure I follow, it compiles fine in the kernel, doesn't it?
arch/arm/dts/suniv-f1c100s-licheepi-nano.dtb: ERROR (path_references):
/aliases: Reference to non-existent node or label "mmc0" the alias is in:arch/arm/dts/sunxi-u-boot.dtsi:15mmc0 = &mmc0;
Ah, I see, our alias hack. Since it's temporary, we can just #ifndef it with CONFIG_MACH_SUNIV in sunxi-u-boot.dtsi.
Try that, or I fix it up later.
Cheers,
Andre
Quoted 260 lines
Quoted 260 lines
Quoted 2 lines
Also Icenowy's email chnaged to to .io not .xyz can i change that in this?
Please no changes compared to Linux, there is no "U-Boot DT", it's the same hardware, so the same DT, just synced from the definitive repository (the Linux tree).
Yes, the file split is different here, but that doesn't matter, just copy the current Linux files.Cheers,
AndreQuoted 246 lines
Quoted 246 lines
Andre
Quoted 243 lines
Signed-off-by Icenowy Zheng <[email protected]>Signed-off-by Jesse Taube <[email protected]>---
V1->V2:
* Sync with Linux
* Re-add MMC node--- arch/arm/dts/Makefile | 2 + arch/arm/dts/suniv-f1c100s-licheepi-nano.dts | 29 ++++ arch/arm/dts/suniv-f1c100s.dtsi | 6 + arch/arm/dts/suniv.dtsi | 160 +++++++++++++++++++ 4 files changed, 197 insertions(+)create mode 100644
arch/arm/dts/suniv-f1c100s-licheepi-nano.dtscreate mode 100644arch/arm/dts/suniv-f1c100s.dtsicreate mode 100644arch/arm/dts/suniv.dtsiarch/arm/dts/Makefile +2
-0@@ -497,6 +497,8 @@ dtb-$(CONFIG_STM32H7) += stm32h743i-disco.dtb \ stm32h743i-eval.dtb \ stm32h750i-art-pi.dtb +dtb-$(CONFIG_MACH_SUNIV) += \ + suniv-f1c100s-licheepi-nano.dtb dtb-$(CONFIG_MACH_SUN4I) += \ sun4i-a10-a1000.dtb \ sun4i-a10-ba10-tvbox.dtb \arch/arm/dts/suniv-f1c100s-licheepi-nano.dts new file +29
-0@@ -0,0 +1,29 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR X11) +/* + * Copyright 2018 Icenowy Zheng <[email protected]> + */ + +/dts-v1/; +#include "suniv-f1c100s.dtsi" + +#include <dt-bindings/gpio/gpio.h> + +/ { + model = "Lichee Pi Nano"; + compatible = "licheepi,licheepi-nano", "allwinner,suniv-f1c100s", + "allwinner,suniv"; + + aliases { + serial0 = &uart0; + }; + + chosen { + stdout-path = "serial0:115200n8"; + }; +}; + +&uart0 { + pinctrl-names = "default"; + pinctrl-0 = <&uart0_pe_pins>; + status = "okay"; +};arch/arm/dts/suniv-f1c100s.dtsi new file +6
-0@@ -0,0 +1,6 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR X11) +/* + * Copyright 2018 Icenowy Zheng <[email protected]> + */ + +#include "suniv.dtsi"arch/arm/dts/suniv.dtsi new file +160
-0@@ -0,0 +1,160 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR X11) +/* + * Copyright 2018 Icenowy Zheng <[email protected]> + */ + +#include <dt-bindings/clock/suniv-ccu.h> +#include <dt-bindings/reset/suniv-ccu.h> + +/ { + #address-cells = <1>; + #size-cells = <1>; + interrupt-parent = <&intc>; + + clocks { + osc24M: clk-24M { + #clock-cells = <0>; + compatible = "fixed-clock"; + clock-frequency = <24000000>; + clock-output-names = "osc24M"; + }; + + osc32k: clk-32k { + #clock-cells = <0>; + compatible = "fixed-clock"; + clock-frequency = <32768>; + clock-output-names = "osc32k"; + }; + }; + + cpus { + cpu { + compatible = "arm,arm926ej-s"; + device_type = "cpu"; + }; + }; + + soc { + compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <1>; + ranges; + + sram-controller@1c00000 { + compatible = "allwinner,suniv-f1c100s-system-control", + "allwinner,sun4i-a10-sram-controller"; + reg = <0x01c00000 0x30>; + #address-cells = <1>; + #size-cells = <1>; + ranges; + + sram_d: sram@10000 { + compatible = "mmio-sram"; + reg = <0x00010000 0x1000>; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0 0x00010000 0x1000>; + + otg_sram: sram-section@0 { + compatible = "allwinner,suniv-f1c100s-sram-d", + "allwinner,sun4i-a10-sram-d"; + reg = <0x0000 0x1000>; + status = "disabled"; + }; + }; + }; + + mmc0: mmc@1c0f000 { + compatible = "allwinner,sun4i-a10-mmc"; + reg = <0x01c0f000 0x1000>; + clocks = <&ccu CLK_BUS_MMC0>, <&ccu CLK_MMC0>; + clock-names = "ahb", "mmc"; + interrupts = <32>; + resets = <&ccu RST_BUS_MMC0>; + reset-names = "ahb"; + status = "disabled"; + #address-cells = <1>; + #size-cells = <0>; + }; + + ccu: clock@1c20000 { + compatible = "allwinner,suniv-ccu"; + reg = <0x01c20000 0x400>; + clocks = <&osc24M>, <&osc32k>; + clock-names = "hosc", "losc"; + #clock-cells = <1>; + #reset-cells = <1>; + }; + + intc: interrupt-controller@1c20400 { + compatible = "allwinner,suniv-ic"; + reg = <0x01c20400 0x400>; + interrupt-controller; + #interrupt-cells = <1>; + }; + + pio: pinctrl@1c20800 { + compatible = "allwinner,suniv-pinctrl"; + reg = <0x01c20800 0x400>; + interrupts = <38>, <39>, <40>; + clocks = <&ccu CLK_BUS_PIO>, <&osc24M>, <&osc32k>; + clock-names = "apb", "hosc", "losc"; + gpio-controller; + interrupt-controller; + #interrupt-cells = <3>; + #gpio-cells = <3>; + + uart0_pe_pins: uart0-pe-pins { + pins = "PE0", "PE1"; + function = "uart0"; + }; + }; + + timer@1c20c00 { + compatible = "allwinner,suniv-f1c100s-timer", + "allwinner,sun4i-a10-timer"; + reg = <0x01c20c00 0x90>; + interrupts = <13>; + clocks = <&osc24M>; + }; + + wdt: watchdog@1c20ca0 { + compatible = "allwinner,suniv-f1c100s-wdt", + "allwinner,sun6i-a31-wdt"; + reg = <0x01c20ca0 0x20>; + }; + + uart0: serial@1c25000 { + compatible = "snps,dw-apb-uart"; + reg = <0x01c25000 0x400>; + interrupts = <1>; + reg-shift = <2>; + reg-io-width = <4>; + clocks = <&ccu CLK_BUS_UART0>; + resets = <&ccu RST_BUS_UART0>; + status = "disabled"; + }; + + uart1: serial@1c25400 { + compatible = "snps,dw-apb-uart"; + reg = <0x01c25400 0x400>; + interrupts = <2>; + reg-shift = <2>; + reg-io-width = <4>; + clocks = <&ccu CLK_BUS_UART1>; + resets = <&ccu RST_BUS_UART1>; + status = "disabled"; + }; + + uart2: serial@1c25800 { + compatible = "snps,dw-apb-uart"; + reg = <0x01c25800 0x400>; + interrupts = <3>; + reg-shift = <2>; + reg-io-width = <4>; + clocks = <&ccu CLK_BUS_UART2>; + resets = <&ccu RST_BUS_UART2>; + status = "disabled"; + }; + }; +};
PATCH v2 12/12 configs: sunxi: Add support for Lichee Pi Nano
In reply to Jesse TaubeFrom: Icenowy Zheng <[email protected]>
The Lichee Pi Nano is a board based on the F1C100s. Add defconfigs for it.
---V1->V2:
* Add SKIP_LOWLEVEL_INIT_ONLY
* Remove spi defconfig
--- configs/licheepi_nano_defconfig | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 configs/licheepi_nano_defconfig
configs/licheepi_nano_defconfig new file +15 -0
@@ -0,0 +1,15 @@ +CONFIG_ARM=y +CONFIG_ARCH_SUNXI=y +CONFIG_MACH_SUNIV=y +CONFIG_SKIP_LOWLEVEL_INIT_ONLY=y +CONFIG_SPL_SKIP_LOWLEVEL_INIT_ONLY=y +CONFIG_SYS_TEXT_BASE=0x81700000 +CONFIG_SYS_LOAD_ADDR=0x81000000 +CONFIG_SYS_MALLOC_LEN=0x120000 +CONFIG_DRAM_CLK=156 +CONFIG_SYS_DCACHE_OFF=y +CONFIG_DRAM_ZQ=0 +# CONFIG_VIDEO_SUNXI is not set +CONFIG_DEFAULT_DEVICE_TREE="suniv-f1c100s-licheepi-nano" +CONFIG_SPL=y +# CONFIG_SPL_DM_SERIAL is not set
Signature · 1 line
2.34.1
On Wed, 26 Jan 2022 08:53:17 -0500
Jesse Taube <[email protected]> wrote:
Hi Jesse,
Quoted 11 lines
This patch set aims to add support for the SUNIV and F1C100s. Support has been in linux for a while now, but not in u-boot.
This patchset contains:
- CPU specific initialization code
- SUNIV dram driver
- SUNIV clock driver adaption
- SUNIV gpio driver adaption
- SUNIV uart driver adaption
- F1C100s basic support
Quoted 4 lines
The SUNIV seems to be similar to sun6i and sun4i, so we use code from both platforms. We also add suniv to the cpu dircetory as it uses arm926ejs.
NOTE: To work this will need patchset "sunxi: remove
lowlevel_init".
So I think I am done with reviewing this version. Please send an updated version. If there are smaller issues left, I will probably just fix them up while committing.
Thanks for your good and prompt work on this!
Cheers,
Andre
Quoted 65 lines
Icenowy Zheng (11):
arm: arm926ej-s:start.S: portsave_boot_paramssupport from armv7
code
arm: arm926ej-s: Add sunxi code
dt-bindings: clock: Add initial suniv headers
dt-bindings: reset: Add initial suniv headers
ARM: sunxi: Add clock and uart to sunxi headers
sunxi: Add F1C100s DRAM initial support
sunxi: board: Add support for SUNIV
configs: sunxi: Add common SUNIV header
mach-sunxi: Add support for SUNIV architecture
ARM: dts: suniv: Add device tree files for F1C100s
configs: sunxi: Add support for Lichee Pi NanoJesse Taube (1):
mach-sunxi: Move timer code to mach folderarch/arm/cpu/arm926ejs/Makefile | 1 + arch/arm/cpu/arm926ejs/start.S | 19 + arch/arm/cpu/arm926ejs/sunxi/Makefile | 5 + arch/arm/cpu/arm926ejs/sunxi/config.mk | 6 + arch/arm/cpu/arm926ejs/sunxi/fel_utils.S | 33 ++ arch/arm/cpu/arm926ejs/sunxi/u-boot-spl.lds | 48 ++ arch/arm/dts/Makefile | 2 + arch/arm/dts/suniv-f1c100s-licheepi-nano.dts | 29 ++ arch/arm/dts/suniv-f1c100s.dtsi | 6 + arch/arm/dts/suniv.dtsi | 160 +++++++ arch/arm/include/asm/arch-sunxi/clock.h | 2 +- arch/arm/include/asm/arch-sunxi/clock_sun6i.h | 13 + arch/arm/include/asm/arch-sunxi/cpu_sun4i.h | 6 + arch/arm/include/asm/arch-sunxi/dram.h | 2 + arch/arm/include/asm/arch-sunxi/dram_suniv.h | 46 ++ arch/arm/include/asm/arch-sunxi/gpio.h | 1 + arch/arm/mach-sunxi/Kconfig | 16 +- arch/arm/mach-sunxi/Makefile | 5 + arch/arm/mach-sunxi/board.c | 28 +- arch/arm/mach-sunxi/clock.c | 3 +- arch/arm/mach-sunxi/clock_sun6i.c | 46 +- arch/arm/mach-sunxi/cpu_info.c | 2 + arch/arm/mach-sunxi/dram_helpers.c | 4 + arch/arm/mach-sunxi/dram_suniv.c | 420 ++++++++++++++++++ .../{cpu/armv7/sunxi => mach-sunxi}/timer.c | 7 +- board/sunxi/board.c | 4 +- configs/licheepi_nano_defconfig | 15 + include/configs/suniv.h | 14 + include/configs/sunxi-common.h | 59 ++- include/dt-bindings/clock/suniv-ccu.h | 69 +++ include/dt-bindings/reset/suniv-ccu.h | 37 ++ 31 files changed, 1080 insertions(+), 28 deletions(-) create mode 100644 arch/arm/cpu/arm926ejs/sunxi/Makefile create mode 100644 arch/arm/cpu/arm926ejs/sunxi/config.mk create mode 100644 arch/arm/cpu/arm926ejs/sunxi/fel_utils.S create mode 100644 arch/arm/cpu/arm926ejs/sunxi/u-boot-spl.lds create mode 100644 arch/arm/dts/suniv-f1c100s-licheepi-nano.dts create mode 100644 arch/arm/dts/suniv-f1c100s.dtsi create mode 100644 arch/arm/dts/suniv.dtsi create mode 100644 arch/arm/include/asm/arch-sunxi/dram_suniv.h create mode 100644 arch/arm/mach-sunxi/dram_suniv.c rename arch/arm/{cpu/armv7/sunxi => mach-sunxi}/timer.c (97%) create mode 100644 configs/licheepi_nano_defconfig create mode 100644 include/configs/suniv.h create mode 100644 include/dt-bindings/clock/suniv-ccu.h create mode 100644 include/dt-bindings/reset/suniv-ccu.h
Quoted 19 lines · Andre Przywara
On Wed, 26 Jan 2022 08:53:17 -0500
Jesse Taube <[email protected]> wrote:Hi Jesse,
Quoted 14 lines
This patch set aims to add support for the SUNIV and F1C100s. Support has been in linux for a while now, but not in u-boot.
This patchset contains:
- CPU specific initialization code
- SUNIV dram driver
- SUNIV clock driver adaption
- SUNIV gpio driver adaption
- SUNIV uart driver adaption
- F1C100s basic supportThe SUNIV seems to be similar to sun6i and sun4i, so we use code from both platforms. We also add suniv to the cpu dircetory as it uses arm926ejs.
Quoted 7 lines
Quoted 1 line
NOTE: To work this will need patchset "sunxi: remove
lowlevel_init".So I think I am done with reviewing this version. Please send an updated version. If there are smaller issues left, I will probably just fix them up while committing.
Thanks for your good and prompt work on this!
No worries I'm happy to do it an i think its fun. And if i wasn't doing this i would be playing video games. And I didn't convince my school to let me graduate early to play video games :).
Quoted 69 lines
Cheers,
AndreQuoted 65 lines
Icenowy Zheng (11):
arm: arm926ej-s:start.S: portsave_boot_paramssupport from armv7
code
arm: arm926ej-s: Add sunxi code
dt-bindings: clock: Add initial suniv headers
dt-bindings: reset: Add initial suniv headers
ARM: sunxi: Add clock and uart to sunxi headers
sunxi: Add F1C100s DRAM initial support
sunxi: board: Add support for SUNIV
configs: sunxi: Add common SUNIV header
mach-sunxi: Add support for SUNIV architecture
ARM: dts: suniv: Add device tree files for F1C100s
configs: sunxi: Add support for Lichee Pi NanoJesse Taube (1):
mach-sunxi: Move timer code to mach folderarch/arm/cpu/arm926ejs/Makefile | 1 + arch/arm/cpu/arm926ejs/start.S | 19 + arch/arm/cpu/arm926ejs/sunxi/Makefile | 5 + arch/arm/cpu/arm926ejs/sunxi/config.mk | 6 + arch/arm/cpu/arm926ejs/sunxi/fel_utils.S | 33 ++ arch/arm/cpu/arm926ejs/sunxi/u-boot-spl.lds | 48 ++ arch/arm/dts/Makefile | 2 + arch/arm/dts/suniv-f1c100s-licheepi-nano.dts | 29 ++ arch/arm/dts/suniv-f1c100s.dtsi | 6 + arch/arm/dts/suniv.dtsi | 160 +++++++ arch/arm/include/asm/arch-sunxi/clock.h | 2 +- arch/arm/include/asm/arch-sunxi/clock_sun6i.h | 13 + arch/arm/include/asm/arch-sunxi/cpu_sun4i.h | 6 + arch/arm/include/asm/arch-sunxi/dram.h | 2 + arch/arm/include/asm/arch-sunxi/dram_suniv.h | 46 ++ arch/arm/include/asm/arch-sunxi/gpio.h | 1 + arch/arm/mach-sunxi/Kconfig | 16 +- arch/arm/mach-sunxi/Makefile | 5 + arch/arm/mach-sunxi/board.c | 28 +- arch/arm/mach-sunxi/clock.c | 3 +- arch/arm/mach-sunxi/clock_sun6i.c | 46 +- arch/arm/mach-sunxi/cpu_info.c | 2 + arch/arm/mach-sunxi/dram_helpers.c | 4 + arch/arm/mach-sunxi/dram_suniv.c | 420 ++++++++++++++++++ .../{cpu/armv7/sunxi => mach-sunxi}/timer.c | 7 +- board/sunxi/board.c | 4 +- configs/licheepi_nano_defconfig | 15 + include/configs/suniv.h | 14 + include/configs/sunxi-common.h | 59 ++- include/dt-bindings/clock/suniv-ccu.h | 69 +++ include/dt-bindings/reset/suniv-ccu.h | 37 ++ 31 files changed, 1080 insertions(+), 28 deletions(-)create mode 100644
arch/arm/cpu/arm926ejs/sunxi/Makefilecreate mode 100644arch/arm/cpu/arm926ejs/sunxi/config.mkcreate mode 100644arch/arm/cpu/arm926ejs/sunxi/fel_utils.Screate mode 100644arch/arm/cpu/arm926ejs/sunxi/u-boot-spl.ldscreate mode 100644arch/arm/dts/suniv-f1c100s-licheepi-nano.dtscreate mode 100644arch/arm/dts/suniv-f1c100s.dtsicreate mode 100644arch/arm/dts/suniv.dtsi
create mode 100644arch/arm/include/asm/arch-sunxi/dram_suniv.hcreate mode 100644arch/arm/mach-sunxi/dram_suniv.crenamearch/arm/{cpu/armv7/sunxi=>mach-sunxi}/timer.c(97%) create mode 100644 configs/licheepi_nano_defconfig create mode 100644include/configs/suniv.h
create mode 100644include/dt-bindings/clock/suniv-ccu.hcreate mode 100644include/dt-bindings/reset/suniv-ccu.h