Add support for SUNIV and F1C100s.
Subsystems (6)
v3 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.
Icenowy Zheng (9):
arm: arm926ej-s: start.S: port save_boot_params support from armv7
code
arm: arm926ej-s: Add sunxi code
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 and bindings for F1C100s
configs: sunxi: Add support for Lichee Pi Nano
Jesse Taube (1):
mach-sunxi: Move timer code to mach folder
Kconfig | 8 +-
arch/arm/cpu/arm926ejs/Makefile | 1 +
arch/arm/cpu/arm926ejs/cpu.c | 13 +
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/cpu/armv7/sunxi/Makefile | 1 -
arch/arm/dts/Makefile | 2 +
arch/arm/dts/suniv-f1c100s-licheepi-nano.dts | 26 ++
arch/arm/dts/suniv-f1c100s.dtsi | 144 ++++++
arch/arm/dts/sunxi-u-boot.dtsi | 2 +
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 | 14 +-
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 | 89 ++--
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 +-
boot/Kconfig | 7 +-
configs/licheepi_nano_defconfig | 11 +
include/configs/suniv.h | 14 +
include/configs/sunxi-common.h | 57 ++-
include/dt-bindings/clock/suniv-ccu-f1c100s.h | 70 +++
include/dt-bindings/reset/suniv-ccu-f1c100s.h | 38 ++
35 files changed, 1091 insertions(+), 60 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/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-f1c100s.h
create mode 100644 include/dt-bindings/reset/suniv-ccu-f1c100s.hSignature · 1 line
2.34.1
PATCH v3 1/10 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 doneV2->V3:
* 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 v3 2/10 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 commitV2->V3:
* Remove timer.o from armv7 Makefile
---
arch/arm/cpu/armv7/sunxi/Makefile | 1 -
arch/arm/mach-sunxi/Makefile | 3 +++
arch/arm/{cpu/armv7/sunxi => mach-sunxi}/timer.c | 7 ++++---
3 files changed, 7 insertions(+), 4 deletions(-)
rename arch/arm/{cpu/armv7/sunxi => mach-sunxi}/timer.c (97%)arch/arm/cpu/armv7/sunxi/Makefile +0 -1
@@ -5,7 +5,6 @@ # Based on some other Makefile # (C) Copyright 2000-2003 # Wolfgang Denk, DENX Software Engineering, [email protected]. -obj-y += timer.o obj-$(CONFIG_MACH_SUN6I) += tzpc.o obj-$(CONFIG_MACH_SUN8I_H3) += tzpc.o
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 v3 02/10] mach-sunxi: Move timer code to mach folder
Quoted 3 lines · On Sat, 29 Jan 2022 10:23:01 -0500 Jesse Taube <[email protected]> wrote:
Both armv7 and arm926ejs use this timer code so move it to mach-sunxi.
Signed-off-by Jesse Taube <[email protected]>
Thanks,
Andre
Quoted 79 lines
---
V1->V2:
* New commitV2->V3:
* Remove timer.o from armv7Makefile--- arch/arm/cpu/armv7/sunxi/Makefile | 1 - arch/arm/mach-sunxi/Makefile | 3 +++ arch/arm/{cpu/armv7/sunxi => mach-sunxi}/timer.c | 7 ++++--- 3 files changed, 7 insertions(+), 4 deletions(-) rename arch/arm/{cpu/armv7/sunxi => mach-sunxi}/timer.c (97%)arch/arm/cpu/armv7/sunxi/Makefile +0
-1@@ -5,7 +5,6 @@ # Based on some other Makefile # (C) Copyright 2000-2003 # Wolfgang Denk, DENX Software Engineering, [email protected]. -obj-y += timer.o obj-$(CONFIG_MACH_SUN6I) += tzpc.o obj-$(CONFIG_MACH_SUN8I_H3) += tzpc.oarch/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 v3 3/10 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.cV2->V3:
* Add sdelay to arm926ejs/cpu.c
--- arch/arm/cpu/arm926ejs/Makefile | 1 + arch/arm/cpu/arm926ejs/cpu.c | 13 ++++++ 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 +++++++++++++++++++++ 6 files changed, 106 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/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)); +} +int cleanup_before_linux (void ) {/*
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
PATCH v3 4/10 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 macrosV2->V3:
* Nothing done
--- 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
PATCH v3 5/10 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 doneV2->V3:
* 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 v3 6/10 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 doneV2->V3:
* 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 v3 7/10 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_SIZEV2->V3:
* Fix comment
--- include/configs/suniv.h | 14 +++++++++ include/configs/sunxi-common.h | 57 +++++++++++++++++++++++++--------- 2 files changed, 56 insertions(+), 15 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 +42 -15
88 lines not on this page · raw message
Signature · 1 line
2.34.1
PATCH v3 8/10 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) V2->V3:
* Covert to if(IS_ENABLED) from ifdef
* Remove busy loop
* Remove depends on for SPL_SPI_SUNXI
--- arch/arm/mach-sunxi/Kconfig | 14 ++++- arch/arm/mach-sunxi/board.c | 28 +++++++++- arch/arm/mach-sunxi/clock.c | 3 +- arch/arm/mach-sunxi/clock_sun6i.c | 89 +++++++++++++++++++++---------- arch/arm/mach-sunxi/cpu_info.c | 2 + 5 files changed, 104 insertions(+), 32 deletions(-)
arch/arm/mach-sunxi/Kconfig +12 -2
@@ -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
@@ -585,6 +592,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
@@ -596,6 +604,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
@@ -803,7 +812,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.
@@ -1003,6 +1012,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
arch/arm/mach-sunxi/board.c +27 -1
@@ -87,7 +87,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
@@ -95,6 +96,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))
@@ -271,10 +276,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 __weak void sunxi_sram_init (void ) {
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 +61 -28
125 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
Re: [PATCH v3 08/10] mach-sunxi: Add support for SUNIV architecture
Quoted 5 lines · On Sat, 29 Jan 2022 10:23:07 -0500 Jesse Taube <[email protected]> wrote:
From: 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.
Hey, many thanks for getting rid of those #ifdef's!
There is one small thing below, but I will fix this up when committing.
Quoted 191 lines
Signed-off-by Icenowy Zheng <[email protected]>Signed-off-by Jesse Taube <[email protected]>---
V1->V2:
* Remove change ins_init(sunxi: removelowlevel_init)V2->V3:
* Covert toif(IS_ENABLED)from ifdef
* Remove busy loop
* Remove depends on forSPL_SPI_SUNXI--- arch/arm/mach-sunxi/Kconfig | 14 ++++- arch/arm/mach-sunxi/board.c | 28 +++++++++- arch/arm/mach-sunxi/clock.c | 3 +- arch/arm/mach-sunxi/clock_sun6i.c | 89 +++++++++++++++++++++---------- arch/arm/mach-sunxi/cpu_info.c | 2 + 5 files changed, 104 insertions(+), 32 deletions(-)arch/arm/mach-sunxi/Kconfig +12
-2@@ -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@@ -585,6 +592,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@@ -596,6 +604,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@@ -803,7 +812,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.@@ -1003,6 +1012,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_SUN6Iarch/arm/mach-sunxi/board.c +27
-1@@ -87,7 +87,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 @@ -95,6 +96,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))@@ -271,10 +276,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 __weak void sunxi_sram_init (void ) {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 +7
-14@@ -23,7 +23,8 @@ void clock_init_safe(void)struct sunxi_ccm_reg *const ccm = (struct sunxi_ccm_reg *)SUNXI_CCM_BASE ; -#if !defined(CONFIG_MACH_SUNXI_H3_H5 ) && !defined(CONFIG_MACH_SUN50I ) +#if !defined(CONFIG_MACH_SUNXI_H3_H5 ) && !defined(CONFIG_MACH_SUN50I ) && \ + !defined(CONFIG_MACH_SUNIV )struct sunxi_prcm_reg *const prcm = (struct sunxi_prcm_reg *)SUNXI_PRCM_BASE ;@@ -49,9 +50,11 @@ void clock_init_safe(void)writel (AHB1_ABP1_DIV_DEFAULT , &ccm->ahb1_apb1_div); -writel (MBUS_CLK_DEFAULT , &ccm->mbus0_clk_cfg); -if (IS_ENABLED (CONFIG_MACH_SUN6I )) -writel (MBUS_CLK_DEFAULT , &ccm->mbus1_clk_cfg); +if (!IS_ENABLED (CONFIG_MACH_SUNIV )) { +writel (MBUS_CLK_DEFAULT , &ccm->mbus0_clk_cfg); +if (IS_ENABLED (CONFIG_MACH_SUN6I )) +writel (MBUS_CLK_DEFAULT , &ccm->mbus1_clk_cfg); + }#if defined(CONFIG_MACH_SUN8I_R40 ) && defined(CONFIG_SUNXI_AHCI )setbits_le32 (&ccm->sata_pll_cfg,CCM_SATA_PLL_DEFAULT );@@ -87,21 +90,38 @@ void clock_init_uart(void)struct sunxi_ccm_reg *const ccm = (struct sunxi_ccm_reg *)SUNXI_CCM_BASE ; -/* uart clock source is apb2 */ -writel (APB2_CLK_SRC_OSC24M | -APB2_CLK_RATE_N_1 | -APB2_CLK_RATE_M (1 ), - &ccm->apb2_div); - -/* open the clock for uart */ -setbits_le32 (&ccm->apb2_gate, -CLK_GATE_OPEN << (APB2_GATE_UART_SHIFT + -CONFIG_CONS_INDEX -1 ));
arch/arm/mach-sunxi/clock_sun6i.c void clock_init_uart(void) · line 97
Quoted 10 lines
arch/arm/mach-sunxi/clock_sun6i.c +5
-5- -/* deassert uart reset */ -setbits_le32 (&ccm->apb2_reset_cfg, -1 << (APB2_RESET_UART_SHIFT + -CONFIG_CONS_INDEX -1 )); +if (IS_ENABLED (CONFIG_MACH_SUNIV )) { +/* suniv doesn't have apb2, so uart clock source is apb1 */ +writel (PLL6_CFG_DEFAULT , &ccm->pll6_cfg); +while (!(readl (&ccm->pll6_cfg) &CCM_PLL6_CTRL_LOCK )) + ;
Sorry, I meant to remove that part, too, not just the AHB1_ABP1_DIV_DEFAULT part. I will fix this up locally.
Cheers,
Andre
Quoted 95 lines
arch/arm/mach-sunxi/clock_sun6i.c +49
-9+ +/* open the clock for uart */ +setbits_le32 (&ccm->apb1_gate, +CLK_GATE_OPEN << (APB1_GATE_UART_SHIFT + +CONFIG_CONS_INDEX -1 )); + +/* deassert uart reset */ +setbits_le32 (&ccm->apb1_reset_cfg, +1 << (APB1_RESET_UART_SHIFT + + CONFIG_CONS_INDEX - 1)); + }else { +/* uart clock source is apb2 */ +writel (APB2_CLK_SRC_OSC24M | +APB2_CLK_RATE_N_1 | +APB2_CLK_RATE_M (1 ), + &ccm->apb2_div); + +/* open the clock for uart */ +setbits_le32 (&ccm->apb2_gate, +CLK_GATE_OPEN << (APB2_GATE_UART_SHIFT + +CONFIG_CONS_INDEX -1 )); + +/* deassert uart reset */ +setbits_le32 (&ccm->apb2_reset_cfg, +1 << (APB2_RESET_UART_SHIFT + +CONFIG_CONS_INDEX -1 )); + }#else /* enable R_PIO and R_UART clocks, and de-assert resets */ prcm_apb0_enable (PRCM_APB0_GATE_PIO |PRCM_APB0_GATE_UART );@@ -125,10 +145,15 @@ void clock_set_pll1(unsigned int clk) }/* Switch to 24MHz clock while changing PLL1 */ -writel (AXI_DIV_3 <<AXI_DIV_SHIFT | -ATB_DIV_2 <<ATB_DIV_SHIFT | -CPU_CLK_SRC_OSC24M <<CPU_CLK_SRC_SHIFT , - &ccm->cpu_axi_cfg); +if (IS_ENABLED (CONFIG_MACH_SUNIV )) { +writel (CPU_CLK_SRC_OSC24M <<CPU_CLK_SRC_SHIFT , + &ccm->cpu_axi_cfg); + }else { +writel (AXI_DIV_3 <<AXI_DIV_SHIFT | +ATB_DIV_2 <<ATB_DIV_SHIFT | +CPU_CLK_SRC_OSC24M <<CPU_CLK_SRC_SHIFT , + &ccm->cpu_axi_cfg); + }/* * sun6i: PLL1 rate = ((24000000 * n * k) >> 0) / m (p is ignored) @@ -140,10 +165,15 @@ void clock_set_pll1(unsigned int clk)sdelay (200 );/* Switch CPU to PLL1 */ -writel (AXI_DIV_3 <<AXI_DIV_SHIFT | -ATB_DIV_2 <<ATB_DIV_SHIFT | -CPU_CLK_SRC_PLL1 <<CPU_CLK_SRC_SHIFT , - &ccm->cpu_axi_cfg); +if (IS_ENABLED (CONFIG_MACH_SUNIV )) { +writel (CPU_CLK_SRC_PLL1 <<CPU_CLK_SRC_SHIFT , + &ccm->cpu_axi_cfg); + }else { +writel (AXI_DIV_3 <<AXI_DIV_SHIFT | +ATB_DIV_2 <<ATB_DIV_SHIFT | +CPU_CLK_SRC_PLL1 <<CPU_CLK_SRC_SHIFT , + &ccm->cpu_axi_cfg); + } }#endif @@ -317,7 +347,10 @@ unsigned int clock_get_pll6(void)uint32_t rval =readl (&ccm->pll6_cfg);int n = ((rval &CCM_PLL6_CTRL_N_MASK ) >>CCM_PLL6_CTRL_N_SHIFT ) +1 ;int k = ((rval &CCM_PLL6_CTRL_K_MASK ) >>CCM_PLL6_CTRL_K_SHIFT ) +1 ; -return 24000000 * n * k /2 ; +if (IS_ENABLED (CONFIG_MACH_SUNIV )) +return 24000000 * n * k; +else +return 24000000 * n * k /2 ; }unsigned int clock_get_mipi_pll (void )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 ) {
PATCH v3 9/10 ARM: dts: suniv: Add device tree files and bindings 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.
dt-bindings/dts are synced with 5.16.0
---V1->V2:
* Sync with Linux
* Re-add MMC nodeV2->V3:
* Add ifndef for mmc in sunxi-u-boot.dtsi
* Direct copy of all files from linux
* Squash dt-bindings here
--- arch/arm/dts/Makefile | 2 + arch/arm/dts/suniv-f1c100s-licheepi-nano.dts | 26 ++++ arch/arm/dts/suniv-f1c100s.dtsi | 144 ++++++++++++++++++ arch/arm/dts/sunxi-u-boot.dtsi | 2 + include/dt-bindings/clock/suniv-ccu-f1c100s.h | 70 +++++++++ include/dt-bindings/reset/suniv-ccu-f1c100s.h | 38 +++++ 6 files changed, 282 insertions(+) create mode 100644 arch/arm/dts/suniv-f1c100s-licheepi-nano.dts create mode 100644 arch/arm/dts/suniv-f1c100s.dtsi create mode 100644 include/dt-bindings/clock/suniv-ccu-f1c100s.h create mode 100644 include/dt-bindings/reset/suniv-ccu-f1c100s.h
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 +26 -0
@@ -0,0 +1,26 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR X11) +/* + * Copyright 2018 Icenowy Zheng <[email protected]> + */ + +/dts-v1/; +#include "suniv-f1c100s.dtsi" + +/ { + model = "Lichee Pi Nano"; + compatible = "licheepi,licheepi-nano", "allwinner,suniv-f1c100s"; + + 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 +144 -0
144 lines not on this page · raw message
arch/arm/dts/sunxi-u-boot.dtsi +2 -0
@@ -12,7 +12,9 @@ / { aliases { +#ifndef CONFIG_MACH_SUNIV mmc0 = &mmc0; +#endif #if CONFIG_MMC_SUNXI_SLOT_EXTRA == 2 mmc1 = &mmc2; #endif
include/dt-bindings/clock/suniv-ccu-f1c100s.h new file +70 -0
70 lines not on this page · raw message
include/dt-bindings/reset/suniv-ccu-f1c100s.h new file +38 -0
@@ -0,0 +1,38 @@ +/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) +* +* Copyright (C) 2018 Icenowy Zheng <[email protected]> +* +*/ + +#ifndef _DT_BINDINGS_RST_SUNIV_F1C100S_H_ +#define _DT_BINDINGS_RST_SUNIV_F1C100S_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_F1C100S_H_ */
Signature · 1 line
2.34.1
Re: [PATCH v3 09/10] ARM: dts: suniv: Add device tree files and bindings for F1C100s
Quoted 5 lines · On Sat, 29 Jan 2022 10:23:08 -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.
dt-bindings/dts are synced with 5.16.0
Many thanks, that looks correct now. Confirmed that the files match exactly the Linux tree.
Quoted 3 lines
Signed-off-by Icenowy Zheng <[email protected]>Signed-off-by Jesse Taube <[email protected]>
Cheers,
Andre
Quoted 350 lines
---
V1->V2:
* Sync with Linux
* Re-add MMC nodeV2->V3:
* Add ifndef for mmc insunxi-u-boot.dtsi
* Direct copy of all files from linux
* Squash dt-bindings here--- arch/arm/dts/Makefile | 2 + arch/arm/dts/suniv-f1c100s-licheepi-nano.dts | 26 ++++ arch/arm/dts/suniv-f1c100s.dtsi | 144 ++++++++++++++++++ arch/arm/dts/sunxi-u-boot.dtsi | 2 + include/dt-bindings/clock/suniv-ccu-f1c100s.h | 70 +++++++++ include/dt-bindings/reset/suniv-ccu-f1c100s.h | 38 +++++ 6 files changed, 282 insertions(+) create mode 100644 arch/arm/dts/suniv-f1c100s-licheepi-nano.dts create mode 100644 arch/arm/dts/suniv-f1c100s.dtsi create mode 100644 include/dt-bindings/clock/suniv-ccu-f1c100s.h create mode 100644 include/dt-bindings/reset/suniv-ccu-f1c100s.harch/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 +26
-0@@ -0,0 +1,26 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR X11) +/* + * Copyright 2018 Icenowy Zheng <[email protected]> + */ + +/dts-v1/; +#include "suniv-f1c100s.dtsi" + +/ { + model = "Lichee Pi Nano"; + compatible = "licheepi,licheepi-nano", "allwinner,suniv-f1c100s"; + + 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 +144
-0@@ -0,0 +1,144 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR X11) +/* + * Copyright 2018 Icenowy Zheng <[email protected]> + * Copyright 2018 Mesih Kilinc <[email protected]> + */ + +/ { + #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-system-control"; + 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"; + }; + }; + }; + + ccu: clock@1c20000 { + compatible = "allwinner,suniv-f1c100s-ccu"; + reg = <0x01c20000 0x400>; + clocks = <&osc24M>, <&osc32k>; + clock-names = "hosc", "losc"; + #clock-cells = <1>; + #reset-cells = <1>; + }; + + intc: interrupt-controller@1c20400 { + compatible = "allwinner,suniv-f1c100s-ic"; + reg = <0x01c20400 0x400>; + interrupt-controller; + #interrupt-cells = <1>; + }; + + pio: pinctrl@1c20800 { + compatible = "allwinner,suniv-f1c100s-pinctrl"; + reg = <0x01c20800 0x400>; + interrupts = <38>, <39>, <40>; + clocks = <&ccu 37>, <&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"; + reg = <0x01c20c00 0x90>; + interrupts = <13>; + clocks = <&osc24M>; + }; + + wdt: watchdog@1c20ca0 { + compatible = "allwinner,suniv-f1c100s-wdt", + "allwinner,sun4i-a10-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 38>; + resets = <&ccu 24>; + status = "disabled"; + }; + + uart1: serial@1c25400 { + compatible = "snps,dw-apb-uart"; + reg = <0x01c25400 0x400>; + interrupts = <2>; + reg-shift = <2>; + reg-io-width = <4>; + clocks = <&ccu 39>; + resets = <&ccu 25>; + status = "disabled"; + }; + + uart2: serial@1c25800 { + compatible = "snps,dw-apb-uart"; + reg = <0x01c25800 0x400>; + interrupts = <3>; + reg-shift = <2>; + reg-io-width = <4>; + clocks = <&ccu 40>; + resets = <&ccu 26>; + status = "disabled"; + }; + }; +};arch/arm/dts/sunxi-u-boot.dtsi +2
-0@@ -12,7 +12,9 @@ / { aliases { +#ifndef CONFIG_MACH_SUNIV mmc0 = &mmc0; +#endif #if CONFIG_MMC_SUNXI_SLOT_EXTRA == 2 mmc1 = &mmc2; #endifinclude/dt-bindings/clock/suniv-ccu-f1c100s.h new file +70
-0@@ -0,0 +1,70 @@ +/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) +* +* Copyright (c) 2018 Icenowy Zheng <[email protected]> +* +*/ + +#ifndef _DT_BINDINGS_CLK_SUNIV_F1C100S_H_ +#define _DT_BINDINGS_CLK_SUNIV_F1C100S_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 include/dt-bindings/reset/suniv-ccu-f1c100s.h new file +38
-0@@ -0,0 +1,38 @@ +/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) +* +* Copyright (C) 2018 Icenowy Zheng <[email protected]> +* +*/ + +#ifndef _DT_BINDINGS_RST_SUNIV_F1C100S_H_ +#define _DT_BINDINGS_RST_SUNIV_F1C100S_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_F1C100S_H_ */
PATCH v3 10/10 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 defconfigV2->V3:
* Move SYS_MALLOC_F_LEN to kconf and format it
* Move SYS_LOAD_ADDR to kconf and format it
* Move SYS_TEXT_BASE to kconf and format it
--- Kconfig | 8 +++++--- boot/Kconfig | 7 ++++--- configs/licheepi_nano_defconfig | 11 +++++++++++ 3 files changed, 20 insertions(+), 6 deletions(-) create mode 100644 configs/licheepi_nano_defconfig
Kconfig +5 -3
@@ -246,9 +246,10 @@ config SYS_MALLOC_F_LEN config SYS_MALLOC_LEN hex "Define memory for Dynamic allocation" default 0x2000000 if ARCH_ROCKCHIP || ARCH_OMAP2PLUS || ARCH_MESON - default 0x4020000 if ARCH_SUNXI && !MACH_SUN8I_V3S default 0x200000 if ARCH_BMIPS || X86 - default 0x220000 if ARCH_SUNXI && MACH_SUN8I_V3S + default 0x120000 if MACH_SUNIV + default 0x220000 if MACH_SUN8I_V3S + default 0x4020000 if ARCH_SUNXI default 0x400000 help This defines memory to be allocated for Dynamic allocation
@@ -391,8 +392,9 @@ config SYS_LOAD_ADDR hex "Address in memory to use by default" default 0x01000000 if ARCH_SOCFPGA default 0x02000000 if PPC || X86 + default 0x81000000 if MACH_SUNIV default 0x22000000 if MACH_SUN9I - default 0x42000000 if ARCH_SUNXI && !MACH_SUN9I + default 0x42000000 if ARCH_SUNXI default 0x82000000 if ARCH_KEYSTONE || ARCH_OMAP2PLUS || ARCH_K3 default 0x82000000 if ARCH_MX6 && (MX6SL || MX6SLL || MX6SX || MX6UL || MX6ULL) default 0x12000000 if ARCH_MX6 && !(MX6SL || MX6SLL || MX6SX || MX6UL || MX6ULL)
boot/Kconfig +4 -3
@@ -351,9 +351,10 @@ config SYS_TEXT_BASE depends on HAVE_SYS_TEXT_BASE default 0x0 if POSITION_INDEPENDENT default 0x80800000 if ARCH_OMAP2PLUS || ARCH_K3 - default 0x4a000000 if ARCH_SUNXI && !MACH_SUN9I && !MACH_SUN8I_V3S - default 0x2a000000 if ARCH_SUNXI && MACH_SUN9I - default 0x42e00000 if ARCH_SUNXI && MACH_SUN8I_V3S + default 0x81700000 if MACH_SUNIV + default 0x2a000000 if MACH_SUN9I + default 0x42e00000 if MACH_SUN8I_V3S + default 0x4a000000 if ARCH_SUNXI hex "Text Base" help The address in memory that U-Boot will be running from, initially.
configs/licheepi_nano_defconfig new file +11 -0
@@ -0,0 +1,11 @@ +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_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
Signature · 1 line
2.34.1
Re: [PATCH v3 10/10] configs: sunxi: Add support for Lichee Pi Nano
Quoted 4 lines · On Sat, 29 Jan 2022 10:23:09 -0500 Jesse Taube <[email protected]> wrote:
From: Icenowy Zheng <[email protected]>
The Lichee Pi Nano is a board based on the F1C100s. Add defconfigs for it.
Looks very nice now, many thanks!
Quoted 3 lines
Signed-off-by Icenowy Zheng <[email protected]>Signed-off-by Jesse Taube <[email protected]>
Cheers,
Andre
Quoted 79 lines
---
V1->V2:
* AddSKIP_LOWLEVEL_INIT_ONLY
* Remove spi defconfigV2->V3:
* MoveSYS_MALLOC_F_LENto kconf and format it
* MoveSYS_LOAD_ADDRto kconf and format it
* MoveSYS_TEXT_BASEto kconf and format it--- Kconfig | 8 +++++--- boot/Kconfig | 7 ++++--- configs/licheepi_nano_defconfig | 11 +++++++++++ 3 files changed, 20 insertions(+), 6 deletions(-) create mode 100644 configs/licheepi_nano_defconfigKconfig +5
-3@@ -246,9 +246,10 @@ config SYS_MALLOC_F_LEN config SYS_MALLOC_LEN hex "Define memory for Dynamic allocation" default 0x2000000 if ARCH_ROCKCHIP || ARCH_OMAP2PLUS || ARCH_MESON - default 0x4020000 if ARCH_SUNXI && !MACH_SUN8I_V3S default 0x200000 if ARCH_BMIPS || X86 - default 0x220000 if ARCH_SUNXI && MACH_SUN8I_V3S + default 0x120000 if MACH_SUNIV + default 0x220000 if MACH_SUN8I_V3S + default 0x4020000 if ARCH_SUNXI default 0x400000 help This defines memory to be allocated for Dynamic allocation@@ -391,8 +392,9 @@ config SYS_LOAD_ADDR hex "Address in memory to use by default" default 0x01000000 if ARCH_SOCFPGA default 0x02000000 if PPC || X86 + default 0x81000000 if MACH_SUNIV default 0x22000000 if MACH_SUN9I - default 0x42000000 if ARCH_SUNXI && !MACH_SUN9I + default 0x42000000 if ARCH_SUNXI default 0x82000000 if ARCH_KEYSTONE || ARCH_OMAP2PLUS || ARCH_K3 default 0x82000000 if ARCH_MX6 && (MX6SL || MX6SLL || MX6SX || MX6UL || MX6ULL) default 0x12000000 if ARCH_MX6 && !(MX6SL || MX6SLL || MX6SX || MX6UL || MX6ULL)boot/Kconfig +4
-3@@ -351,9 +351,10 @@ config SYS_TEXT_BASE depends on HAVE_SYS_TEXT_BASE default 0x0 if POSITION_INDEPENDENT default 0x80800000 if ARCH_OMAP2PLUS || ARCH_K3 - default 0x4a000000 if ARCH_SUNXI && !MACH_SUN9I && !MACH_SUN8I_V3S - default 0x2a000000 if ARCH_SUNXI && MACH_SUN9I - default 0x42e00000 if ARCH_SUNXI && MACH_SUN8I_V3S + default 0x81700000 if MACH_SUNIV + default 0x2a000000 if MACH_SUN9I + default 0x42e00000 if MACH_SUN8I_V3S + default 0x4a000000 if ARCH_SUNXI hex "Text Base" help The address in memory that U-Boot will be running from, initially.configs/licheepi_nano_defconfig new file +11
-0@@ -0,0 +1,11 @@ +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_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