Actions S700 SoC support
Subsystems (5)
cover Actions S700 SoC support
Hello,
This patch-set adds Cubieboard7[1] support based on Action Semi's S700 SoC[2], It's Quad-core ARMv8 SoC with Cortex-A53 cores.Most of peripherals seems to be compatible with S900 SoC(basic support for it is alreay present in u-boot).
First few patches consolidates Actions Semiconductor SoCs support in u-boot((mostly insprired by SUXNI as suggested by Andre).Idea is to move every bit out from board/ucRobotics into arch/arm/mach-owl. It allows different SoCs to be driven by single "soc and Kconfig" file. It also includes common clock driver for S700 and S900.Rest of patches enables S700 SoC support alongwith Cubieboard7 board.
S700 support is tested[3] on Cubieboard7 board and S900 support is just compiled tested.It would be great, if someone who has S900 based board can test S900 support.
Thanks,
-Amit
[1]: http://www.cubietech.com/product-detail/cubieboard7/
[2]: http://www.actions-semi.com/en/productview.aspx?id=225
[3]: https://paste.ubuntu.com/p/fkCdv5nw2Q/
Amit Singh Tomar (8):
arm: actions: Add common framework for Actions Semi SoCs
arm: actions: Add owl memory map regions
clk: actions: Add common clock driver
arm: board: Remove board files for bubblegum_96
arm: actions: add S700 SoC device tree
arm: add Cubieboard7 board support
serial: actions: add uart support for s700
actions: add Cubieboard7 README
arch/arm/Kconfig | 2 - arch/arm/dts/s700-cubieboard7.dts | 39 ++++++ arch/arm/dts/s700.dtsi | 193 +++++++++++++++++++++++++++ arch/arm/include/asm/arch-owl/clk_owl.h | 61 +++++++++ arch/arm/include/asm/arch-owl/clk_s900.h | 57 -------- arch/arm/include/asm/arch-owl/regs_s700.h | 56 ++++++++ arch/arm/mach-owl/Kconfig | 31 ++--- arch/arm/mach-owl/Makefile | 3 +- arch/arm/mach-owl/README.cubieboard7 | 88 ++++++++++++ arch/arm/mach-owl/soc.c | 56 ++++++++ arch/arm/mach-owl/sysmap-owl.c | 32 +++++ arch/arm/mach-owl/sysmap-s900.c | 32 ----- board/ucRobotics/bubblegum_96/Kconfig | 15 --- board/ucRobotics/bubblegum_96/MAINTAINERS | 6 - board/ucRobotics/bubblegum_96/Makefile | 3 - board/ucRobotics/bubblegum_96/bubblegum_96.c | 56 -------- configs/bubblegum_96_defconfig | 3 +- configs/cubieboard7_defconfig | 22 +++ drivers/clk/owl/Kconfig | 8 +- drivers/clk/owl/Makefile | 2 +- drivers/clk/owl/clk_owl.c | 132 ++++++++++++++++++ drivers/clk/owl/clk_s900.c | 137 ------------------- drivers/serial/serial_owl.c | 1 + include/configs/bubblegum_96.h | 42 ------ include/configs/owl-common.h | 42 ++++++ include/configs/s700.h | 15 +++ include/configs/s900.h | 18 +++ include/dt-bindings/clock/actions,s700-cmu.h | 118 ++++++++++++++++ 28 files changed, 893 insertions(+), 377 deletions(-) create mode 100644 arch/arm/dts/s700-cubieboard7.dts create mode 100644 arch/arm/dts/s700.dtsi create mode 100644 arch/arm/include/asm/arch-owl/clk_owl.h delete mode 100644 arch/arm/include/asm/arch-owl/clk_s900.h create mode 100644 arch/arm/include/asm/arch-owl/regs_s700.h create mode 100644 arch/arm/mach-owl/README.cubieboard7 create mode 100644 arch/arm/mach-owl/soc.c create mode 100644 arch/arm/mach-owl/sysmap-owl.c delete mode 100644 arch/arm/mach-owl/sysmap-s900.c delete mode 100644 board/ucRobotics/bubblegum_96/Kconfig delete mode 100644 board/ucRobotics/bubblegum_96/MAINTAINERS delete mode 100644 board/ucRobotics/bubblegum_96/Makefile delete mode 100644 board/ucRobotics/bubblegum_96/bubblegum_96.c create mode 100644 configs/cubieboard7_defconfig create mode 100644 drivers/clk/owl/clk_owl.c delete mode 100644 drivers/clk/owl/clk_s900.c delete mode 100644 include/configs/bubblegum_96.h create mode 100644 include/configs/owl-common.h create mode 100644 include/configs/s700.h create mode 100644 include/configs/s900.h create mode 100644 include/dt-bindings/clock/actions,s700-cmu.h
Signature · 1 line
2.7.4
RFC PATCH 1/8 arm: actions: Add common framework for Actions Semi SoCs
This adds common arch owl support that drives both s700 and s900, 64-bits SoCs from Actions Semiconductor.
--- arch/arm/Kconfig | 2 -- arch/arm/mach-owl/Kconfig | 31 +++++++++++------------ arch/arm/mach-owl/Makefile | 2 +- arch/arm/mach-owl/soc.c | 56 ++++++++++++++++++++++++++++++++++++++++++ configs/bubblegum_96_defconfig | 3 +-- include/configs/bubblegum_96.h | 42 ------------------------------- include/configs/owl-common.h | 42 +++++++++++++++++++++++++++++++ include/configs/s700.h | 15 +++++++++++ include/configs/s900.h | 18 ++++++++++++++ 9 files changed, 147 insertions(+), 64 deletions(-) create mode 100644 arch/arm/mach-owl/soc.c delete mode 100644 include/configs/bubblegum_96.h create mode 100644 include/configs/owl-common.h create mode 100644 include/configs/s700.h create mode 100644 include/configs/s900.h
arch/arm/Kconfig +0 -2
@@ -760,7 +760,6 @@ config ARCH_MX5 config ARCH_OWL bool "Actions Semi OWL SoCs" - select ARM64 select DM select DM_SERIAL select OF_CONTROL
@@ -1555,7 +1554,6 @@ source "board/spear/spear600/Kconfig" source "board/spear/x600/Kconfig" source "board/st/stv0991/Kconfig" source "board/tcl/sl50/Kconfig" -source "board/ucRobotics/bubblegum_96/Kconfig" source "board/birdland/bav335x/Kconfig" source "board/toradex/colibri_pxa270/Kconfig" source "board/vscom/baltos/Kconfig"
arch/arm/mach-owl/Kconfig +14 -17
@@ -1,27 +1,24 @@ if ARCH_OWL -config SYS_SOC - default "owl" - choice - prompt "Actions Semi OWL SoCs board select" + prompt "SemiActions SoC Variant" optional -config TARGET_BUBBLEGUM_96 - bool "96Boards Bubblegum-96" - help - Support for 96Boards Bubblegum-96. This board complies with - 96Board Consumer Edition Specification. Features: - - Actions Semi S900 SoC (4xCortex A53, Power VR G6230 GPU) - - 2GiB RAM - - 8GiB eMMC, uSD slot - - WiFi, Bluetooth and GPS module - - 2x Host, 1x Device USB port - - HDMI - - 20-pin low speed and 40-pin high speed expanders, 6 LED, 3 buttons +config MACH_S700 + bool "SemiActions S700" + select ARM64 + +config MACH_S900 + bool "SemiActions S900" + select ARM64 endchoice -source "board/ucRobotics/bubblegum_96/Kconfig" +config SYS_CONFIG_NAME + default "s900" if MACH_S900 + default "s700" if MACH_S700 + +config SYS_SOC + default "owl" endif
arch/arm/mach-owl/Makefile +1 -1
@@ -1,3 +1,3 @@ # SPDX-License-Identifier: GPL-2.0+ -obj-y += sysmap-s900.o +obj-y += soc.o
arch/arm/mach-owl/soc.c new file +56 -0
56 lines not on this page · raw message
configs/bubblegum_96_defconfig +1 -2
@@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_ARM_SMCCC=y CONFIG_ARCH_OWL=y CONFIG_SYS_TEXT_BASE=0x11000000 -CONFIG_TARGET_BUBBLEGUM_96=y +CONFIG_MACH_S900=y CONFIG_IDENT_STRING="\nBubblegum-96" CONFIG_DISTRO_DEFAULTS=y CONFIG_NR_DRAM_BANKS=1
@@ -19,5 +19,4 @@ CONFIG_CMD_TIMER=y CONFIG_DEFAULT_DEVICE_TREE="bubblegum_96" CONFIG_CLK=y CONFIG_CLK_OWL=y -CONFIG_CLK_S900=y CONFIG_OWL_SERIAL=y
include/configs/bubblegum_96.h deleted +0 -42
42 lines not on this page · raw message
include/configs/owl-common.h new file +42 -0
42 lines not on this page · raw message
include/configs/s700.h new file +15 -0
@@ -0,0 +1,15 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* +* Board configuration file for Action semi s700 +* +*/ + +#ifndef _CONFIG_S700_H_ +#define _CONFIG_S700_H_ + +/* +* Include common owl configuration where most the settings are +*/ +#include <configs/owl-common.h> + +#endif
include/configs/s900.h new file +18 -0
@@ -0,0 +1,18 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* +* Board configuration file for Bubblegum-96 +* +* Copyright (C) 2015 Actions Semi Co., Ltd. +* Copyright (C) 2018 Manivannan Sadhasivam <[email protected]> +* +*/ + +#ifndef _CONFIG_S900_H_ +#define _CONFIG_S900_H_ + +/* +* Include common owl configuration where most the settings are +*/ +#include <configs/owl-common.h> + +#endif
Signature · 1 line
2.7.4
RFC PATCH 1/8 arm: actions: Add common framework for Actions Semi SoCs
Quoted 2 lines · Amit Singh Tomar
This adds common arch owl support that drives both s700 and s900, 64-bits SoCs from Actions Semiconductor.
Nice cleanup.
Quoted 44 lines
Signed-off-by Amit Singh Tomar <[email protected]>--- arch/arm/Kconfig | 2 -- arch/arm/mach-owl/Kconfig | 31 +++++++++++------------ arch/arm/mach-owl/Makefile | 2 +- arch/arm/mach-owl/soc.c | 56 ++++++++++++++++++++++++++++++++++++++++++ configs/bubblegum_96_defconfig | 3 +-- include/configs/bubblegum_96.h | 42 ------------------------------- include/configs/owl-common.h | 42 +++++++++++++++++++++++++++++++ include/configs/s700.h | 15 +++++++++++ include/configs/s900.h | 18 ++++++++++++++ 9 files changed, 147 insertions(+), 64 deletions(-) create mode 100644 arch/arm/mach-owl/soc.c delete mode 100644 include/configs/bubblegum_96.h create mode 100644 include/configs/owl-common.h create mode 100644 include/configs/s700.h create mode 100644 include/configs/s900.harch/arm/Kconfig +0
-2@@ -760,7 +760,6 @@ config ARCH_MX5 config ARCH_OWL bool "Actions Semi OWL SoCs" - select ARM64 select DM select DM_SERIAL select OF_CONTROL@@ -1555,7 +1554,6 @@ source "board/spear/spear600/Kconfig" source "board/spear/x600/Kconfig" source "board/st/stv0991/Kconfig" source "board/tcl/sl50/Kconfig" -source "board/ucRobotics/bubblegum_96/Kconfig" source "board/birdland/bav335x/Kconfig" source "board/toradex/colibri_pxa270/Kconfig" source "board/vscom/baltos/Kconfig"arch/arm/mach-owl/Kconfig +0
-0
arch/arm/mach-owl/Kconfig line 4
Quoted 8 lines
arch/arm/mach-owl/Kconfig +1
-4@@ -1,27 +1,24 @@ if ARCH_OWL -config SYS_SOC - default "owl" - choice - prompt "Actions Semi OWL SoCs board select" + prompt "SemiActions SoC Variant"
Even after refactoring the company is still called Actions Semi ;-)
Quoted 7 lines
arch/arm/mach-owl/Kconfig +0
-5optional -config TARGET_BUBBLEGUM_96 - bool "96Boards Bubblegum-96" - help - Support for 96Boards Bubblegum-96. This board complies with - 96Board Consumer Edition Specification. Features:
arch/arm/mach-owl/Kconfig line 9
Quoted 10 lines
arch/arm/mach-owl/Kconfig +3
-7- - Actions Semi S900 SoC (4xCortex A53, Power VR G6230 GPU) - - 2GiB RAM - - 8GiB eMMC, uSD slot - - WiFi, Bluetooth and GPS module - - 2x Host, 1x Device USB port - - HDMI - - 20-pin low speed and 40-pin high speed expanders, 6 LED, 3 buttons +config MACH_S700 + bool "SemiActions S700" + select ARM64
It's probably a bit premature to introduce S700 here already. Just move that to a later patch.
arch/arm/mach-owl/Kconfig line 19
Quoted 11 lines
arch/arm/mach-owl/Kconfig +7
-1+ +config MACH_S900 + bool "SemiActions S900" + select ARM64 endchoice -source "board/ucRobotics/bubblegum_96/Kconfig" +config SYS_CONFIG_NAME + default "s900" if MACH_S900 + default "s700" if MACH_S700
Same here.
arch/arm/mach-owl/Makefile line 3
Quoted 13 lines
arch/arm/mach-owl/Kconfig +3
-0+ +config SYS_SOC + default "owl" endifarch/arm/mach-owl/Makefile +0
-1@@ -1,3 +1,3 @@ # SPDX-License-Identifier: GPL-2.0+ -obj-y += sysmap-s900.o
That breaks Bubblegum compilation. Just keep it in for now and remove it in the next patch.
arch/arm/mach-owl/soc.c line 3
Quoted 10 lines
arch/arm/mach-owl/Makefile +1
-0+obj-y += soc.oarch/arm/mach-owl/soc.c new file +3
-0@@ -0,0 +1,56 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* +* Bubblegum-96 Boards Support
That line should be changed to reflect the new generic nature of that file.
Quoted 30 lines
arch/arm/mach-owl/soc.c new file +30
-0+* +* Copyright (C) 2018 Manivannan Sadhasivam <[email protected]> +*/ + +#include <linux/arm-smccc.h> +#include <linux/psci.h> +#include <common.h> +#include <asm/io.h> +#include <asm/mach-types.h> +#include <asm/psci.h> + +DECLARE_GLOBAL_DATA_PTR ; + +/* +* dram_init - sets uboots idea of sdram size +*/ +int dram_init (void ) +{ + gd->ram_size =CONFIG_SYS_SDRAM_SIZE ; +return 0 ; +} + +/* This is called after dram_init() so use get_ram_size result */ +int dram_init_banksize (void ) +{ + gd->bd->bi_dram[0 ].start =CONFIG_SYS_SDRAM_BASE ; + gd->bd->bi_dram[0 ].size = gd->ram_size; + +return 0 ; +}
arch/arm/mach-owl/soc.c line 43
Quoted 10 lines
arch/arm/mach-owl/soc.c new file +10
-0+ +static void show_psci_version (void ) +{ +struct arm_smccc_res res; + +arm_smccc_smc (ARM_PSCI_0_2_FN_PSCI_VERSION ,0 ,0 ,0 ,0 ,0 ,0 ,0 , &res); + +printf ("PSCI: v%ld.%ld\n" , +PSCI_VERSION_MAJOR (res.a0), +PSCI_VERSION_MINOR (res.a0));
looks like a whitespace issue
include/configs/s700.h
Quoted 133 lines
arch/arm/mach-owl/soc.c new file +13
-0+} + +int board_init (void ) +{ +show_psci_version (); + +return 0 ; +} + +void reset_cpu (ulong addr) +{ +psci_system_reset (); +}configs/bubblegum_96_defconfig +1
-2@@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_ARM_SMCCC=y CONFIG_ARCH_OWL=y CONFIG_SYS_TEXT_BASE=0x11000000 -CONFIG_TARGET_BUBBLEGUM_96=y +CONFIG_MACH_S900=y CONFIG_IDENT_STRING="\nBubblegum-96" CONFIG_DISTRO_DEFAULTS=y CONFIG_NR_DRAM_BANKS=1@@ -19,5 +19,4 @@ CONFIG_CMD_TIMER=y CONFIG_DEFAULT_DEVICE_TREE="bubblegum_96" CONFIG_CLK=y CONFIG_CLK_OWL=y -CONFIG_CLK_S900=y CONFIG_OWL_SERIAL=yinclude/configs/bubblegum_96.h deleted +0
-42@@ -1,42 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* -* Board configuration file for Bubblegum-96 -* -* Copyright (C) 2015 Actions Semi Co., Ltd. -* Copyright (C) 2018 Manivannan Sadhasivam <[email protected]> -* -*/ - -#ifndef _BUBBLEGUM_96_H_ -#define _BUGGLEGUM_96_H_ - -/* SDRAM Definitions */ -#define CONFIG_SYS_SDRAM_BASE 0x0 -#define CONFIG_SYS_SDRAM_SIZE 0x80000000 - -/* Generic Timer Definitions */ -#define COUNTER_FREQUENCY (24000000)/* 24MHz */ - -#define CONFIG_SYS_MALLOC_LEN (32 * 1024 * 1024) - -/* Some commands use this as the default load address */ -#define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE + 0x7ffc0) - -/* -* This is the initial SP which is used only briefly for relocating the u-boot -* image to the top of SDRAM. After relocation u-boot moves the stack to the -* proper place. -*/ -#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_TEXT_BASE + 0x7ff00) - -/* UART Definitions */ -#define CONFIG_BAUDRATE 115200 - -#define CONFIG_ENV_SIZE 0x2000 - -/* Console configuration */ -#define CONFIG_SYS_CBSIZE 1024/* Console buffer size */ -#define CONFIG_SYS_MAXARGS 64 -#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE - -#endif include/configs/owl-common.h new file +42
-0@@ -0,0 +1,42 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* +* Board configuration file for Bubblegum-96 +* +* Copyright (C) 2015 Actions Semi Co., Ltd. +* Copyright (C) 2018 Manivannan Sadhasivam <[email protected]> +* +*/ + +#ifndef _OWL_COMMON_CONFIG_H_ +#define _OWL_COMMON_CONFIG_H_ + +/* SDRAM Definitions */ +#define CONFIG_SYS_SDRAM_BASE 0x0 +#define CONFIG_SYS_SDRAM_SIZE 0x80000000 + +/* Generic Timer Definitions */ +#define COUNTER_FREQUENCY (24000000)/* 24MHz */ + +#define CONFIG_SYS_MALLOC_LEN (32 * 1024 * 1024) + +/* Some commands use this as the default load address */ +#define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE + 0x7ffc0) + +/* +* This is the initial SP which is used only briefly for relocating the u-boot +* image to the top of SDRAM. After relocation u-boot moves the stack to the +* proper place. +*/ +#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_TEXT_BASE + 0x7ff00) + +/* UART Definitions */ +#define CONFIG_BAUDRATE 115200 + +#define CONFIG_ENV_SIZE 0x2000 + +/* Console configuration */ +#define CONFIG_SYS_CBSIZE 1024/* Console buffer size */ +#define CONFIG_SYS_MAXARGS 64 +#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE + +#endif include/configs/s700.h new file +0
-0
Same comment about S700 support. Just leave it out of this patch.
Cheers,
Andre.
Quoted 41 lines
include/configs/s700.h new file +15
-0@@ -0,0 +1,15 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* +* Board configuration file for Action semi s700 +* +*/ + +#ifndef _CONFIG_S700_H_ +#define _CONFIG_S700_H_ + +/* +* Include common owl configuration where most the settings are +*/ +#include <configs/owl-common.h> + +#endif include/configs/s900.h new file +18
-0@@ -0,0 +1,18 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* +* Board configuration file for Bubblegum-96 +* +* Copyright (C) 2015 Actions Semi Co., Ltd. +* Copyright (C) 2018 Manivannan Sadhasivam <[email protected]> +* +*/ + +#ifndef _CONFIG_S900_H_ +#define _CONFIG_S900_H_ + +/* +* Include common owl configuration where most the settings are +*/ +#include <configs/owl-common.h> + +#endif
RFC PATCH 2/8 arm: actions: Add owl memory map regions
In reply to Amit Singh TomarThis adds memory regions needed to setup MMU for actions S900 and S700 SoCs.
--- arch/arm/mach-owl/Makefile | 1 + arch/arm/mach-owl/sysmap-owl.c | 32 ++++++++++++++++++++++++++++++++ arch/arm/mach-owl/sysmap-s900.c | 32 -------------------------------- 3 files changed, 33 insertions(+), 32 deletions(-) create mode 100644 arch/arm/mach-owl/sysmap-owl.c delete mode 100644 arch/arm/mach-owl/sysmap-s900.c
arch/arm/mach-owl/Makefile +1 -0
@@ -1,3 +1,4 @@ # SPDX-License-Identifier: GPL-2.0+ obj-y += soc.o +obj-y += sysmap-owl.o
arch/arm/mach-owl/sysmap-owl.c new file +32 -0
@@ -0,0 +1,32 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* +* Actions Semi S900/S700 Memory map +* +* Copyright (C) 2015 Actions Semi Co., Ltd. +* Copyright (C) 2018 Manivannan Sadhasivam <[email protected]> +*/ + +#include <common.h> +#include <asm/armv8/mmu.h> + +static struct mm_region owl_mem_map[] = { + { + .virt =0x0UL ,/* DDR */ + .phys =0x0UL ,/* DDR */ + .size =0x80000000UL , + .attrs =PTE_BLOCK_MEMTYPE (MT_NORMAL ) | +PTE_BLOCK_INNER_SHARE + }, { + .virt =0xE0000000UL ,/* Peripheral block */ + .phys =0xE0000000UL ,/* Peripheral block */ + .size =0x08000000UL , + .attrs =PTE_BLOCK_MEMTYPE (MT_DEVICE_NGNRNE ) | +PTE_BLOCK_NON_SHARE | +PTE_BLOCK_PXN |PTE_BLOCK_UXN + }, { +/* List terminator */ +0 , + } +}; + +struct mm_region *mem_map = owl_mem_map;
arch/arm/mach-owl/sysmap-s900.c deleted +0 -32
@@ -1,32 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* -* Actions Semi S900 Memory map -* -* Copyright (C) 2015 Actions Semi Co., Ltd. -* Copyright (C) 2018 Manivannan Sadhasivam <[email protected]> -*/ - -#include <common.h> -#include <asm/armv8/mmu.h> - -static struct mm_region s900_mem_map[] = { - { - .virt =0x0UL ,/* DDR */ - .phys =0x0UL ,/* DDR */ - .size =0x80000000UL , - .attrs =PTE_BLOCK_MEMTYPE (MT_NORMAL ) | -PTE_BLOCK_INNER_SHARE - }, { - .virt =0xE0000000UL ,/* Peripheral block */ - .phys =0xE0000000UL ,/* Peripheral block */ - .size =0x08000000UL , - .attrs =PTE_BLOCK_MEMTYPE (MT_DEVICE_NGNRNE ) | -PTE_BLOCK_NON_SHARE | -PTE_BLOCK_PXN |PTE_BLOCK_UXN - }, { -/* List terminator */ -0 , - } -}; - -struct mm_region *mem_map = s900_mem_map;
Signature · 1 line
2.7.4
RFC PATCH 2/8 arm: actions: Add owl memory map regions
Quoted 27 lines · Amit Singh Tomar
This adds memory regions needed to setup MMU for actions S900 and S700 SoCs.
Signed-off-by Amit Singh Tomar <[email protected]>--- arch/arm/mach-owl/Makefile | 1 + arch/arm/mach-owl/sysmap-owl.c | 32 ++++++++++++++++++++++++++++++++ arch/arm/mach-owl/sysmap-s900.c | 32 -------------------------------- 3 files changed, 33 insertions(+), 32 deletions(-) create mode 100644 arch/arm/mach-owl/sysmap-owl.c delete mode 100644 arch/arm/mach-owl/sysmap-s900.carch/arm/mach-owl/Makefile +1
-0@@ -1,3 +1,4 @@ # SPDX-License-Identifier: GPL-2.0+ obj-y += soc.o +obj-y += sysmap-owl.oarch/arm/mach-owl/sysmap-owl.c new file +0
-0
arch/arm/mach-owl/sysmap-owl.c line 9
Quoted 9 lines
arch/arm/mach-owl/sysmap-owl.c new file +9
-0@@ -0,0 +1,32 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* +* Actions Semi S900/S700 Memory map +* +* Copyright (C) 2015 Actions Semi Co., Ltd. +* Copyright (C) 2018 Manivannan Sadhasivam <[email protected]> +*/ + +#include <common.h>
You might want to wrap the below contents with CONFIG_ARM64 since S500 has different memory map and it is an ARMv7 SoC.
Thanks,
Mani
Quoted 64 lines
arch/arm/mach-owl/sysmap-owl.c new file +23
-0+#include <asm/armv8/mmu.h> + +static struct mm_region owl_mem_map[] = { + { + .virt =0x0UL ,/* DDR */ + .phys =0x0UL ,/* DDR */ + .size =0x80000000UL , + .attrs =PTE_BLOCK_MEMTYPE (MT_NORMAL ) | +PTE_BLOCK_INNER_SHARE + }, { + .virt =0xE0000000UL ,/* Peripheral block */ + .phys =0xE0000000UL ,/* Peripheral block */ + .size =0x08000000UL , + .attrs =PTE_BLOCK_MEMTYPE (MT_DEVICE_NGNRNE ) | +PTE_BLOCK_NON_SHARE | +PTE_BLOCK_PXN |PTE_BLOCK_UXN + }, { +/* List terminator */ +0 , + } +}; + +struct mm_region *mem_map = owl_mem_map;arch/arm/mach-owl/sysmap-s900.c deleted +0
-32@@ -1,32 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* -* Actions Semi S900 Memory map -* -* Copyright (C) 2015 Actions Semi Co., Ltd. -* Copyright (C) 2018 Manivannan Sadhasivam <[email protected]> -*/ - -#include <common.h> -#include <asm/armv8/mmu.h> - -static struct mm_region s900_mem_map[] = { - { - .virt =0x0UL ,/* DDR */ - .phys =0x0UL ,/* DDR */ - .size =0x80000000UL , - .attrs =PTE_BLOCK_MEMTYPE (MT_NORMAL ) | -PTE_BLOCK_INNER_SHARE - }, { - .virt =0xE0000000UL ,/* Peripheral block */ - .phys =0xE0000000UL ,/* Peripheral block */ - .size =0x08000000UL , - .attrs =PTE_BLOCK_MEMTYPE (MT_DEVICE_NGNRNE ) | -PTE_BLOCK_NON_SHARE | -PTE_BLOCK_PXN |PTE_BLOCK_UXN - }, { -/* List terminator */ -0 , - } -}; - -struct mm_region *mem_map = s900_mem_map;Signature · 1 line
2.7.4
RFC PATCH 2/8 arm: actions: Add owl memory map regions
On 05/01/2019 18:27, Manivannan Sadhasivam wrote:
Hi,
Quoted 32 lines · Amit Singh Tomar
Quoted 31 lines
This adds memory regions needed to setup MMU for actions S900 and S700 SoCs.
Signed-off-by Amit Singh Tomar <[email protected]>--- arch/arm/mach-owl/Makefile | 1 + arch/arm/mach-owl/sysmap-owl.c | 32 ++++++++++++++++++++++++++++++++ arch/arm/mach-owl/sysmap-s900.c | 32 -------------------------------- 3 files changed, 33 insertions(+), 32 deletions(-) create mode 100644 arch/arm/mach-owl/sysmap-owl.c delete mode 100644 arch/arm/mach-owl/sysmap-s900.carch/arm/mach-owl/Makefile +1
-0@@ -1,3 +1,4 @@ # SPDX-License-Identifier: GPL-2.0+ obj-y += soc.o +obj-y += sysmap-owl.oarch/arm/mach-owl/sysmap-owl.c new file +4
-0@@ -0,0 +1,32 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* +* Actions Semi S900/S700 Memory map +*
Quoted 8 lines
arch/arm/mach-owl/sysmap-owl.c line 9
Quoted 5 lines
arch/arm/mach-owl/sysmap-owl.c new file +5
-0+* Copyright (C) 2015 Actions Semi Co., Ltd. +* Copyright (C) 2018 Manivannan Sadhasivam <[email protected]> +*/ + +#include <common.h> You might want to wrap the below contents with
CONFIG_ARM64since S500 has different memory map and it is an ARMv7 SoC.
If I am not mistaken, we need that struct mm_region only for v8 parts. So that would be better handled in the Makefile instead?
obj-$(CONFIG_ARM64) += sysmap-owl.o
Cheers,
Andre.
Quoted 65 lines
Quoted 65 lines
arch/arm/mach-owl/sysmap-owl.c new file +23
-0+#include <asm/armv8/mmu.h> + +static struct mm_region owl_mem_map[] = { + { + .virt =0x0UL ,/* DDR */ + .phys =0x0UL ,/* DDR */ + .size =0x80000000UL , + .attrs =PTE_BLOCK_MEMTYPE (MT_NORMAL ) | +PTE_BLOCK_INNER_SHARE + }, { + .virt =0xE0000000UL ,/* Peripheral block */ + .phys =0xE0000000UL ,/* Peripheral block */ + .size =0x08000000UL , + .attrs =PTE_BLOCK_MEMTYPE (MT_DEVICE_NGNRNE ) | +PTE_BLOCK_NON_SHARE | +PTE_BLOCK_PXN |PTE_BLOCK_UXN + }, { +/* List terminator */ +0 , + } +}; + +struct mm_region *mem_map = owl_mem_map;arch/arm/mach-owl/sysmap-s900.c deleted +0
-32@@ -1,32 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* -* Actions Semi S900 Memory map -* -* Copyright (C) 2015 Actions Semi Co., Ltd. -* Copyright (C) 2018 Manivannan Sadhasivam <[email protected]> -*/ - -#include <common.h> -#include <asm/armv8/mmu.h> - -static struct mm_region s900_mem_map[] = { - { - .virt =0x0UL ,/* DDR */ - .phys =0x0UL ,/* DDR */ - .size =0x80000000UL , - .attrs =PTE_BLOCK_MEMTYPE (MT_NORMAL ) | -PTE_BLOCK_INNER_SHARE - }, { - .virt =0xE0000000UL ,/* Peripheral block */ - .phys =0xE0000000UL ,/* Peripheral block */ - .size =0x08000000UL , - .attrs =PTE_BLOCK_MEMTYPE (MT_DEVICE_NGNRNE ) | -PTE_BLOCK_NON_SHARE | -PTE_BLOCK_PXN |PTE_BLOCK_UXN - }, { -/* List terminator */ -0 , - } -}; - -struct mm_region *mem_map = s900_mem_map;Signature · 1 line
2.7.4
RFC PATCH 2/8 arm: actions: Add owl memory map regions
Quoted 45 lines · André Przywara
On 05/01/2019 18:27, Manivannan Sadhasivam wrote:
Hi,
Quoted 32 lines · Amit Singh Tomar
Quoted 31 lines
This adds memory regions needed to setup MMU for actions S900 and S700 SoCs.
Signed-off-by Amit Singh Tomar <[email protected]>--- arch/arm/mach-owl/Makefile | 1 + arch/arm/mach-owl/sysmap-owl.c | 32 ++++++++++++++++++++++++++++++++ arch/arm/mach-owl/sysmap-s900.c | 32 -------------------------------- 3 files changed, 33 insertions(+), 32 deletions(-) create mode 100644 arch/arm/mach-owl/sysmap-owl.c delete mode 100644 arch/arm/mach-owl/sysmap-s900.carch/arm/mach-owl/Makefile +1
-0@@ -1,3 +1,4 @@ # SPDX-License-Identifier: GPL-2.0+ obj-y += soc.o +obj-y += sysmap-owl.oarch/arm/mach-owl/sysmap-owl.c new file +4
-0@@ -0,0 +1,32 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* +* Actions Semi S900/S700 Memory map +* Quoted 8 lines
arch/arm/mach-owl/sysmap-owl.c line 9
Quoted 5 lines
arch/arm/mach-owl/sysmap-owl.c new file +5
-0+* Copyright (C) 2015 Actions Semi Co., Ltd. +* Copyright (C) 2018 Manivannan Sadhasivam <[email protected]> +*/ + +#include <common.h> You might want to wrap the below contents with
CONFIG_ARM64since S500 has different memory map and it is an ARMv7 SoC.
Quoted 5 lines
If I am not mistaken, we need that struct
mm_regiononly for v8 parts. So that would be better handled in theMakefileinstead?obj-$(CONFIG_ARM64) += sysmap-owl.o
Yes, this makes sense!
Thanks,
Mani
Quoted 68 lines
Cheers,
Andre.Quoted 65 lines
Quoted 65 lines
arch/arm/mach-owl/sysmap-owl.c new file +23
-0+#include <asm/armv8/mmu.h> + +static struct mm_region owl_mem_map[] = { + { + .virt =0x0UL ,/* DDR */ + .phys =0x0UL ,/* DDR */ + .size =0x80000000UL , + .attrs =PTE_BLOCK_MEMTYPE (MT_NORMAL ) | +PTE_BLOCK_INNER_SHARE + }, { + .virt =0xE0000000UL ,/* Peripheral block */ + .phys =0xE0000000UL ,/* Peripheral block */ + .size =0x08000000UL , + .attrs =PTE_BLOCK_MEMTYPE (MT_DEVICE_NGNRNE ) | +PTE_BLOCK_NON_SHARE | +PTE_BLOCK_PXN |PTE_BLOCK_UXN + }, { +/* List terminator */ +0 , + } +}; + +struct mm_region *mem_map = owl_mem_map;arch/arm/mach-owl/sysmap-s900.c deleted +0
-32@@ -1,32 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* -* Actions Semi S900 Memory map -* -* Copyright (C) 2015 Actions Semi Co., Ltd. -* Copyright (C) 2018 Manivannan Sadhasivam <[email protected]> -*/ - -#include <common.h> -#include <asm/armv8/mmu.h> - -static struct mm_region s900_mem_map[] = { - { - .virt =0x0UL ,/* DDR */ - .phys =0x0UL ,/* DDR */ - .size =0x80000000UL , - .attrs =PTE_BLOCK_MEMTYPE (MT_NORMAL ) | -PTE_BLOCK_INNER_SHARE - }, { - .virt =0xE0000000UL ,/* Peripheral block */ - .phys =0xE0000000UL ,/* Peripheral block */ - .size =0x08000000UL , - .attrs =PTE_BLOCK_MEMTYPE (MT_DEVICE_NGNRNE ) | -PTE_BLOCK_NON_SHARE | -PTE_BLOCK_PXN |PTE_BLOCK_UXN - }, { -/* List terminator */ -0 , - } -}; - -struct mm_region *mem_map = s900_mem_map;Signature · 1 line
2.7.4
RFC PATCH 3/8 clk: actions: Add common clock driver
In reply to Amit Singh TomarCMU block on most of the actions SoC seems to be identical(S900, S700 and S500)?
This patch converts S900 clock driver to something common that can be used for other SoCs, for instance S700(most of clk registres are same).
--- arch/arm/include/asm/arch-owl/clk_owl.h | 61 +++++++++++++ arch/arm/include/asm/arch-owl/clk_s900.h | 57 ------------- arch/arm/include/asm/arch-owl/regs_s700.h | 56 ++++++++++++ drivers/clk/owl/Kconfig | 8 +- drivers/clk/owl/Makefile | 2 +- drivers/clk/owl/clk_owl.c | 132 ++++++++++++++++++++++++++++ drivers/clk/owl/clk_s900.c | 137 ------------------------------ 7 files changed, 252 insertions(+), 201 deletions(-) create mode 100644 arch/arm/include/asm/arch-owl/clk_owl.h delete mode 100644 arch/arm/include/asm/arch-owl/clk_s900.h create mode 100644 arch/arm/include/asm/arch-owl/regs_s700.h create mode 100644 drivers/clk/owl/clk_owl.c delete mode 100644 drivers/clk/owl/clk_s900.c
arch/arm/include/asm/arch-owl/clk_owl.h new file +61 -0
@@ -0,0 +1,61 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* +* Actions Semi S900 Clock Definitions +* +* Copyright (C) 2015 Actions Semi Co., Ltd. +* Copyright (C) 2018 Manivannan Sadhasivam <[email protected]> +* +*/ + +#ifndef _OWL_CLK_H_ +#define _OWL_CLK_H_ + +#include <clk-uclass.h> + +struct owl_clk_priv { +phys_addr_t base; +}; + +/* BUSCLK register definitions */ +#define CMU_PDBGDIV_8 7 +#define CMU_PDBGDIV_SHIFT 26 +#define CMU_PDBGDIV_DIV (CMU_PDBGDIV_8 << CMU_PDBGDIV_SHIFT) +#define CMU_PERDIV_8 7 +#define CMU_PERDIV_SHIFT 20 +#define CMU_PERDIV_DIV (CMU_PERDIV_8 << CMU_PERDIV_SHIFT) +#define CMU_NOCDIV_2 1 +#define CMU_NOCDIV_SHIFT 19 +#define CMU_NOCDIV_DIV (CMU_NOCDIV_2 << CMU_NOCDIV_SHIFT) +#define CMU_DMMCLK_SRC_APLL 2 +#define CMU_DMMCLK_SRC_SHIFT 10 +#define CMU_DMMCLK_SRC (CMU_DMMCLK_SRC_APLL << CMU_DMMCLK_SRC_SHIFT) +#define CMU_APBCLK_DIV BIT(8) +#define CMU_NOCCLK_SRC BIT(7) +#define CMU_AHBCLK_DIV BIT(4) +#define CMU_CORECLK_MASK 3 +#define CMU_CORECLK_CPLL BIT(1) +#define CMU_CORECLK_HOSC BIT(0) + +/* COREPLL register definitions */ +#define CMU_COREPLL_EN BIT(9) +#define CMU_COREPLL_HOSC_EN BIT(8) +#define CMU_COREPLL_OUT (1104 / 24) + +/* DEVPLL register definitions */ +#define CMU_DEVPLL_CLK BIT(12) +#define CMU_DEVPLL_EN BIT(8) +#define CMU_DEVPLL_OUT (660 / 6) + +/* UARTCLK register definitions */ +#define CMU_UARTCLK_SRC_DEVPLL BIT(16) + +/* DEVCLKEN1 register definitions */ +#if defined(CONFIG_MACH_S900 ) +#define CMU_DEVCLKEN1_UART5 BIT(21) +#elif defined(CONFIG_MACH_S700 ) +#define CMU_DEVCLKEN1_UART3 BIT(11) +#endif + +#define PLL_STABILITY_WAIT_US 50 + +#endif
arch/arm/include/asm/arch-owl/clk_s900.h deleted +0 -57
57 lines not on this page · raw message
arch/arm/include/asm/arch-owl/regs_s700.h new file +56 -0
56 lines not on this page · raw message
drivers/clk/owl/Kconfig +2 -6
@@ -1,12 +1,8 @@ config CLK_OWL bool "Actions Semi OWL clock drivers" - depends on CLK && ARCH_OWL + depends on CLK && ARCH_OWL && ARM64 help Enable support for clock managemet unit present in Actions Semi OWL SoCs. -config CLK_S900 - bool "Actions Semi S900 clock driver" - depends on CLK_OWL && ARM64 - help - Enable support for the clocks in Actions Semi S900 SoC. +
drivers/clk/owl/Makefile +1 -1
@@ -1,3 +1,3 @@ # SPDX-License-Identifier: GPL-2.0+ -obj-$(CONFIG_CLK_S900) += clk_s900.o +obj-$(CONFIG_CLK_OWL) += clk_owl.o
drivers/clk/owl/clk_owl.c new file +132 -0
132 lines not on this page · raw message
drivers/clk/owl/clk_s900.c deleted +0 -137
137 lines not on this page · raw message
Signature · 1 line
2.7.4
RFC PATCH 3/8 clk: actions: Add common clock driver
Quoted 3 lines · Amit Singh Tomar
CMU block on most of the actions SoC seems to be
identical(S900, S700 and S500)?
No :-) S500 is slightly different from S900/S700 but I will tackle this later.
Quoted 216 lines
This patch converts S900 clock driver to something common that can be used for other SoCs, for instance S700(most of clk registres are same).
Signed-off-by Amit Singh Tomar <[email protected]>--- arch/arm/include/asm/arch-owl/clk_owl.h | 61 +++++++++++++ arch/arm/include/asm/arch-owl/clk_s900.h | 57 ------------- arch/arm/include/asm/arch-owl/regs_s700.h | 56 ++++++++++++ drivers/clk/owl/Kconfig | 8 +- drivers/clk/owl/Makefile | 2 +- drivers/clk/owl/clk_owl.c | 132 ++++++++++++++++++++++++++++ drivers/clk/owl/clk_s900.c | 137 ------------------------------ 7 files changed, 252 insertions(+), 201 deletions(-) create mode 100644 arch/arm/include/asm/arch-owl/clk_owl.h delete mode 100644 arch/arm/include/asm/arch-owl/clk_s900.h create mode 100644 arch/arm/include/asm/arch-owl/regs_s700.h create mode 100644 drivers/clk/owl/clk_owl.c delete mode 100644 drivers/clk/owl/clk_s900.carch/arm/include/asm/arch-owl/clk_owl.h new file +61
-0@@ -0,0 +1,61 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* +* Actions Semi S900 Clock Definitions +* +* Copyright (C) 2015 Actions Semi Co., Ltd. +* Copyright (C) 2018 Manivannan Sadhasivam <[email protected]> +* +*/ + +#ifndef _OWL_CLK_H_ +#define _OWL_CLK_H_ + +#include <clk-uclass.h> + +struct owl_clk_priv { +phys_addr_t base; +}; + +/* BUSCLK register definitions */ +#define CMU_PDBGDIV_8 7 +#define CMU_PDBGDIV_SHIFT 26 +#define CMU_PDBGDIV_DIV (CMU_PDBGDIV_8 << CMU_PDBGDIV_SHIFT) +#define CMU_PERDIV_8 7 +#define CMU_PERDIV_SHIFT 20 +#define CMU_PERDIV_DIV (CMU_PERDIV_8 << CMU_PERDIV_SHIFT) +#define CMU_NOCDIV_2 1 +#define CMU_NOCDIV_SHIFT 19 +#define CMU_NOCDIV_DIV (CMU_NOCDIV_2 << CMU_NOCDIV_SHIFT) +#define CMU_DMMCLK_SRC_APLL 2 +#define CMU_DMMCLK_SRC_SHIFT 10 +#define CMU_DMMCLK_SRC (CMU_DMMCLK_SRC_APLL << CMU_DMMCLK_SRC_SHIFT) +#define CMU_APBCLK_DIV BIT(8) +#define CMU_NOCCLK_SRC BIT(7) +#define CMU_AHBCLK_DIV BIT(4) +#define CMU_CORECLK_MASK 3 +#define CMU_CORECLK_CPLL BIT(1) +#define CMU_CORECLK_HOSC BIT(0) + +/* COREPLL register definitions */ +#define CMU_COREPLL_EN BIT(9) +#define CMU_COREPLL_HOSC_EN BIT(8) +#define CMU_COREPLL_OUT (1104 / 24) + +/* DEVPLL register definitions */ +#define CMU_DEVPLL_CLK BIT(12) +#define CMU_DEVPLL_EN BIT(8) +#define CMU_DEVPLL_OUT (660 / 6) + +/* UARTCLK register definitions */ +#define CMU_UARTCLK_SRC_DEVPLL BIT(16) + +/* DEVCLKEN1 register definitions */ +#if defined(CONFIG_MACH_S900 ) +#define CMU_DEVCLKEN1_UART5 BIT(21) +#elif defined(CONFIG_MACH_S700 ) +#define CMU_DEVCLKEN1_UART3 BIT(11) +#endif + +#define PLL_STABILITY_WAIT_US 50 + +#endif arch/arm/include/asm/arch-owl/clk_s900.h deleted +0
-57@@ -1,57 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* -* Actions Semi S900 Clock Definitions -* -* Copyright (C) 2015 Actions Semi Co., Ltd. -* Copyright (C) 2018 Manivannan Sadhasivam <[email protected]> -* -*/ - -#ifndef _OWL_CLK_S900_H_ -#define _OWL_CLK_S900_H_ - -#include <clk-uclass.h> - -struct owl_clk_priv { -phys_addr_t base; -}; - -/* BUSCLK register definitions */ -#define CMU_PDBGDIV_8 7 -#define CMU_PDBGDIV_SHIFT 26 -#define CMU_PDBGDIV_DIV (CMU_PDBGDIV_8 << CMU_PDBGDIV_SHIFT) -#define CMU_PERDIV_8 7 -#define CMU_PERDIV_SHIFT 20 -#define CMU_PERDIV_DIV (CMU_PERDIV_8 << CMU_PERDIV_SHIFT) -#define CMU_NOCDIV_2 1 -#define CMU_NOCDIV_SHIFT 19 -#define CMU_NOCDIV_DIV (CMU_NOCDIV_2 << CMU_NOCDIV_SHIFT) -#define CMU_DMMCLK_SRC_APLL 2 -#define CMU_DMMCLK_SRC_SHIFT 10 -#define CMU_DMMCLK_SRC (CMU_DMMCLK_SRC_APLL << CMU_DMMCLK_SRC_SHIFT) -#define CMU_APBCLK_DIV BIT(8) -#define CMU_NOCCLK_SRC BIT(7) -#define CMU_AHBCLK_DIV BIT(4) -#define CMU_CORECLK_MASK 3 -#define CMU_CORECLK_CPLL BIT(1) -#define CMU_CORECLK_HOSC BIT(0) - -/* COREPLL register definitions */ -#define CMU_COREPLL_EN BIT(9) -#define CMU_COREPLL_HOSC_EN BIT(8) -#define CMU_COREPLL_OUT (1104 / 24) - -/* DEVPLL register definitions */ -#define CMU_DEVPLL_CLK BIT(12) -#define CMU_DEVPLL_EN BIT(8) -#define CMU_DEVPLL_OUT (660 / 6) - -/* UARTCLK register definitions */ -#define CMU_UARTCLK_SRC_DEVPLL BIT(16) - -/* DEVCLKEN1 register definitions */ -#define CMU_DEVCLKEN1_UART5 BIT(21) - -#define PLL_STABILITY_WAIT_US 50 - -#endif arch/arm/include/asm/arch-owl/regs_s700.h new file +56
-0@@ -0,0 +1,56 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* +* Actions Semi S700 Register Definitions +* +*/ + +#ifndef _OWL_REGS_S700_H_ +#define _OWL_REGS_S700_H_ + +#define CMU_COREPLL (0x0000) +#define CMU_DEVPLL (0x0004) +#define CMU_DDRPLL (0x0008) +#define CMU_NANDPLL (0x000C) +#define CMU_DISPLAYPLL (0x0010) +#define CMU_AUDIOPLL (0x0014) +#define CMU_TVOUTPLL (0x0018) +#define CMU_BUSCLK (0x001C) +#define CMU_SENSORCLK (0x0020) +#define CMU_LCDCLK (0x0024) +#define CMU_DSIPLLCLK (0x0028) +#define CMU_CSICLK (0x002C) +#define CMU_DECLK (0x0030) +#define CMU_SICLK (0x0034) +#define CMU_BUSCLK1 (0x0038) +#define CMU_HDECLK (0x003C) +#define CMU_VDECLK (0x0040) +#define CMU_VCECLK (0x0044) +#define CMU_NANDCCLK (0x004C) +#define CMU_SD0CLK (0x0050) +#define CMU_SD1CLK (0x0054) +#define CMU_SD2CLK (0x0058) +#define CMU_UART0CLK (0x005C) +#define CMU_UART1CLK (0x0060) +#define CMU_UART2CLK (0x0064) +#define CMU_UART3CLK (0x0068) +#define CMU_UART4CLK (0x006C) +#define CMU_UART5CLK (0x0070) +#define CMU_UART6CLK (0x0074) +#define CMU_PWM0CLK (0x0078) +#define CMU_PWM1CLK (0x007C) +#define CMU_PWM2CLK (0x0080) +#define CMU_PWM3CLK (0x0084) +#define CMU_PWM4CLK (0x0088) +#define CMU_PWM5CLK (0x008C) +#define CMU_GPU3DCLK (0x0090) +#define CMU_CORECTL (0x009C) +#define CMU_DEVCLKEN0 (0x00A0) +#define CMU_DEVCLKEN1 (0x00A4) +#define CMU_DEVRST0 (0x00A8) +#define CMU_DEVRST1 (0x00AC) +#define CMU_USBPLL (0x00B0) +#define CMU_ETHERNETPLL (0x00B4) +#define CMU_CVBSPLL (0x00B8) +#define CMU_SSTSCLK (0x00C0) + +#endif drivers/clk/owl/Kconfig +0
-0
drivers/clk/owl/Kconfig line 6
Quoted 7 lines
drivers/clk/owl/Kconfig +1
-1@@ -1,12 +1,8 @@ config CLK_OWL bool "Actions Semi OWL clock drivers" - depends on CLK && ARCH_OWL + depends on CLK && ARCH_OWL && ARM64 help Enable support for clock managemet unit present in Actions Semi OWL SoCs.
Mention S700 and S900 here.
Quoted 22 lines
drivers/clk/owl/Kconfig +1
-5-config CLK_S900 - bool "Actions Semi S900 clock driver" - depends on CLK_OWL && ARM64 - help - Enable support for the clocks in Actions Semi S900 SoC. +drivers/clk/owl/Makefile +1
-1@@ -1,3 +1,3 @@ # SPDX-License-Identifier: GPL-2.0+ -obj-$(CONFIG_CLK_S900) += clk_s900.o +obj-$(CONFIG_CLK_OWL) += clk_owl.odrivers/clk/owl/clk_owl.c new file +0
-0
drivers/clk/owl/clk_owl.c line 3
Quoted 3 lines
drivers/clk/owl/clk_owl.c new file +3
-0@@ -0,0 +1,132 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* +* Actions Semi S900 clock driver
This needs to be updated.
Quoted 119 lines
drivers/clk/owl/clk_owl.c new file +119
-0+* +* Copyright (C) 2015 Actions Semi Co., Ltd. +* Copyright (C) 2018 Manivannan Sadhasivam <[email protected]> +*/ + +#include <common.h> +#include <dm.h> +#include <asm/arch-owl/clk_owl.h> +#include <asm/io.h> +#if defined(CONFIG_MACH_S900 ) +#include <asm/arch-owl/regs_s900.h> +#elif defined(CONFIG_MACH_S700 ) +#include <asm/arch-owl/regs_s700.h> +#endif + +void owl_clk_init (struct owl_clk_priv *priv) +{ +u32 bus_clk =0 , core_pll, dev_pll; + +#if defined(CONFIG_MACH_S900 ) +/* Enable ASSIST_PLL */ +setbits_le32 (priv->base +CMU_ASSISTPLL ,BIT (0 )); + +udelay (PLL_STABILITY_WAIT_US ); +#endif + +/* Source HOSC to DEV_CLK */ +clrbits_le32 (priv->base +CMU_DEVPLL ,CMU_DEVPLL_CLK ); + +/* Configure BUS_CLK */ + bus_clk |= (CMU_PDBGDIV_DIV |CMU_PERDIV_DIV |CMU_NOCDIV_DIV | +CMU_DMMCLK_SRC |CMU_APBCLK_DIV |CMU_AHBCLK_DIV | +CMU_NOCCLK_SRC |CMU_CORECLK_HOSC ); +writel (bus_clk, priv->base +CMU_BUSCLK ); + +udelay (PLL_STABILITY_WAIT_US ); + +/* Configure CORE_PLL */ + core_pll =readl (priv->base +CMU_COREPLL ); + core_pll |= (CMU_COREPLL_EN |CMU_COREPLL_HOSC_EN |CMU_COREPLL_OUT ); +writel (core_pll, priv->base +CMU_COREPLL ); + +udelay (PLL_STABILITY_WAIT_US ); + +/* Configure DEV_PLL */ + dev_pll =readl (priv->base +CMU_DEVPLL ); + dev_pll |= (CMU_DEVPLL_EN |CMU_DEVPLL_OUT ); +writel (dev_pll, priv->base +CMU_DEVPLL ); + +udelay (PLL_STABILITY_WAIT_US ); + +/* Source CORE_PLL for CORE_CLK */ +clrsetbits_le32 (priv->base +CMU_BUSCLK ,CMU_CORECLK_MASK , +CMU_CORECLK_CPLL ); + +/* Source DEV_PLL for DEV_CLK */ +setbits_le32 (priv->base +CMU_DEVPLL ,CMU_DEVPLL_CLK ); + +udelay (PLL_STABILITY_WAIT_US ); +} + +int owl_clk_enable (struct clk *clk) +{ +struct owl_clk_priv *priv =dev_get_priv (clk->dev); + +#if defined(CONFIG_MACH_S900 ) +/* Source HOSC for UART5 interface */ +clrbits_le32 (priv->base +CMU_UART5CLK ,CMU_UARTCLK_SRC_DEVPLL ); + +/* Enable UART5 interface clock */ +setbits_le32 (priv->base +CMU_DEVCLKEN1 ,CMU_DEVCLKEN1_UART5 ); +#elif defined(CONFIG_MACH_S700 ) +/* Source HOSC for UART3 interface */ +clrbits_le32 (priv->base +CMU_UART3CLK ,CMU_UARTCLK_SRC_DEVPLL ); + +/* Enable UART3 interface clock */ +setbits_le32 (priv->base +CMU_DEVCLKEN1 ,CMU_DEVCLKEN1_UART3 ); +#endif + +return 0 ; +} + +int owl_clk_disable (struct clk *clk) +{ +struct owl_clk_priv *priv =dev_get_priv (clk->dev); +#if defined(CONFIG_MACH_S900 ) +/* Disable UART5 interface clock */ +clrbits_le32 (priv->base +CMU_DEVCLKEN1 ,CMU_DEVCLKEN1_UART5 ); +#elif defined(CONFIG_MACH_S700 ) +/* Disable UART3 interface clock */ +clrbits_le32 (priv->base +CMU_DEVCLKEN1 ,CMU_DEVCLKEN1_UART3 ); +#endif + +return 0 ; +} + +static int owl_clk_probe (struct udevice *dev) +{ +struct owl_clk_priv *priv =dev_get_priv (dev); + + priv->base =dev_read_addr (dev); +if (priv->base ==FDT_ADDR_T_NONE ) +return -EINVAL ; + +/* setup necessary clocks */ +owl_clk_init (priv); + +return 0 ; +} + +static struct clk_ops owl_clk_ops = { + .enable = owl_clk_enable, + .disable = owl_clk_disable, +}; + +static const struct udevice_id owl_clk_ids[] = { + { .compatible ="actions,s900-cmu" }, + { .compatible ="actions,s700-cmu" }, + { }
drivers/clk/owl/clk_owl.c line 132
Quoted 10 lines
drivers/clk/owl/clk_owl.c new file +10
-0+}; + +U_BOOT_DRIVER (clk_owl) = { + .name ="clk_s900" , + .id =UCLASS_CLK , + .of_match = owl_clk_ids, + .ops = &owl_clk_ops, + .priv_auto_alloc_size =sizeof (struct owl_clk_priv ), + .probe = owl_clk_probe, +};
We can live with this driver for now, but soon this needs to be reworked to support rest of the peripherals.
Thanks,
Mani
Quoted 146 lines
drivers/clk/owl/clk_s900.c deleted +0
-137@@ -1,137 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* -* Actions Semi S900 clock driver -* -* Copyright (C) 2015 Actions Semi Co., Ltd. -* Copyright (C) 2018 Manivannan Sadhasivam <[email protected]> -*/ - -#include <common.h> -#include <dm.h> -#include <asm/arch-owl/clk_s900.h> -#include <asm/arch-owl/regs_s900.h> -#include <asm/io.h> - -#include <dt-bindings/clock/s900_cmu.h> - -void owl_clk_init (struct owl_clk_priv *priv) -{ -u32 bus_clk =0 , core_pll, dev_pll; - -/* Enable ASSIST_PLL */ -setbits_le32 (priv->base +CMU_ASSISTPLL ,BIT (0 )); - -udelay (PLL_STABILITY_WAIT_US ); - -/* Source HOSC to DEV_CLK */ -clrbits_le32 (priv->base +CMU_DEVPLL ,CMU_DEVPLL_CLK ); - -/* Configure BUS_CLK */ - bus_clk |= (CMU_PDBGDIV_DIV |CMU_PERDIV_DIV |CMU_NOCDIV_DIV | -CMU_DMMCLK_SRC |CMU_APBCLK_DIV |CMU_AHBCLK_DIV | -CMU_NOCCLK_SRC |CMU_CORECLK_HOSC ); -writel (bus_clk, priv->base +CMU_BUSCLK ); - -udelay (PLL_STABILITY_WAIT_US ); - -/* Configure CORE_PLL */ - core_pll =readl (priv->base +CMU_COREPLL ); - core_pll |= (CMU_COREPLL_EN |CMU_COREPLL_HOSC_EN |CMU_COREPLL_OUT ); -writel (core_pll, priv->base +CMU_COREPLL ); - -udelay (PLL_STABILITY_WAIT_US ); - -/* Configure DEV_PLL */ - dev_pll =readl (priv->base +CMU_DEVPLL ); - dev_pll |= (CMU_DEVPLL_EN |CMU_DEVPLL_OUT ); -writel (dev_pll, priv->base +CMU_DEVPLL ); - -udelay (PLL_STABILITY_WAIT_US ); - -/* Source CORE_PLL for CORE_CLK */ -clrsetbits_le32 (priv->base +CMU_BUSCLK ,CMU_CORECLK_MASK , -CMU_CORECLK_CPLL ); - -/* Source DEV_PLL for DEV_CLK */ -setbits_le32 (priv->base +CMU_DEVPLL ,CMU_DEVPLL_CLK ); - -udelay (PLL_STABILITY_WAIT_US ); -} - -void owl_uart_clk_enable (struct owl_clk_priv *priv) -{ -/* Source HOSC for UART5 interface */ -clrbits_le32 (priv->base +CMU_UART5CLK ,CMU_UARTCLK_SRC_DEVPLL ); - -/* Enable UART5 interface clock */ -setbits_le32 (priv->base +CMU_DEVCLKEN1 ,CMU_DEVCLKEN1_UART5 ); -} - -void owl_uart_clk_disable (struct owl_clk_priv *priv) -{ -/* Disable UART5 interface clock */ -clrbits_le32 (priv->base +CMU_DEVCLKEN1 ,CMU_DEVCLKEN1_UART5 ); -} - -int owl_clk_enable (struct clk *clk) -{ -struct owl_clk_priv *priv =dev_get_priv (clk->dev); - -switch (clk->id) { -case CLOCK_UART5 : -owl_uart_clk_enable (priv); -break ; -default : -return 0 ; - } - -return 0 ; -} - -int owl_clk_disable (struct clk *clk) -{ -struct owl_clk_priv *priv =dev_get_priv (clk->dev); - -switch (clk->id) { -case CLOCK_UART5 : -owl_uart_clk_disable (priv); -break ; -default : -return 0 ; - } - -return 0 ; -} - -static int owl_clk_probe (struct udevice *dev) -{ -struct owl_clk_priv *priv =dev_get_priv (dev); - - priv->base =dev_read_addr (dev); -if (priv->base ==FDT_ADDR_T_NONE ) -return -EINVAL ; - -/* setup necessary clocks */ -owl_clk_init (priv); - -return 0 ; -} - -static struct clk_ops owl_clk_ops = { - .enable = owl_clk_enable, - .disable = owl_clk_disable, -}; - -static const struct udevice_id owl_clk_ids[] = { - { .compatible ="actions,s900-cmu" }, - { } -}; - -U_BOOT_DRIVER (clk_owl) = { - .name ="clk_s900" , - .id =UCLASS_CLK , - .of_match = owl_clk_ids, - .ops = &owl_clk_ops, - .priv_auto_alloc_size =sizeof (struct owl_clk_priv ), - .probe = owl_clk_probe, -};Signature · 1 line
2.7.4
RFC PATCH 4/8 arm: board: Remove board files for bubblegum_96
In reply to Amit Singh TomarBubblegum board now gets driven from common owl framework, so let's remove the respected board files.
--- board/ucRobotics/bubblegum_96/Kconfig | 15 -------- board/ucRobotics/bubblegum_96/MAINTAINERS | 6 --- board/ucRobotics/bubblegum_96/Makefile | 3 -- board/ucRobotics/bubblegum_96/bubblegum_96.c | 56 ---------------------------- 4 files changed, 80 deletions(-) delete mode 100644 board/ucRobotics/bubblegum_96/Kconfig delete mode 100644 board/ucRobotics/bubblegum_96/MAINTAINERS delete mode 100644 board/ucRobotics/bubblegum_96/Makefile delete mode 100644 board/ucRobotics/bubblegum_96/bubblegum_96.c
board/ucRobotics/bubblegum_96/Kconfig deleted +0 -15
@@ -1,15 +0,0 @@ -if TARGET_BUBBLEGUM_96 - -config SYS_BOARD - default "bubblegum_96" - -config SYS_VENDOR - default "ucRobotics" - -config SYS_SOC - default "s900" - -config SYS_CONFIG_NAME - default "bubblegum_96" - -endif
board/ucRobotics/bubblegum_96/MAINTAINERS deleted +0 -6
@@ -1,6 +0,0 @@ -BUBBLEGUM_96 BOARD -M: Manivannan Sadhasivam <[email protected]> -S: Maintained -F: board/ucRobotics/bubblegum_96/ -F: include/configs/bubblegum_96.h -F: configs/bubblegum_96_defconfig
board/ucRobotics/bubblegum_96/Makefile deleted +0 -3
@@ -1,3 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0+ - -obj-y := bubblegum_96.o
board/ucRobotics/bubblegum_96/bubblegum_96.c deleted +0 -56
56 lines not on this page · raw message
Signature · 1 line
2.7.4
RFC PATCH 4/8 arm: board: Remove board files for bubblegum_96
Quoted 2 lines · Amit Singh Tomar
Bubblegum board now gets driven from common owl framework, so let's remove the respected board files.
I think this patch could be split and merged into other patches, mostly 1/8.
board/ucRobotics/bubblegum_96/Kconfig
Quoted 17 lines
Signed-off-by Amit Singh Tomar <[email protected]>--- board/ucRobotics/bubblegum_96/Kconfig | 15 -------- board/ucRobotics/bubblegum_96/MAINTAINERS | 6 --- board/ucRobotics/bubblegum_96/Makefile | 3 -- board/ucRobotics/bubblegum_96/bubblegum_96.c | 56 ---------------------------- 4 files changed, 80 deletions(-) delete mode 100644 board/ucRobotics/bubblegum_96/Kconfig delete mode 100644 board/ucRobotics/bubblegum_96/MAINTAINERS delete mode 100644 board/ucRobotics/bubblegum_96/Makefile delete mode 100644 board/ucRobotics/bubblegum_96/bubblegum_96.cboard/ucRobotics/bubblegum_96/Kconfig deleted +0
-0
That should be part of patch 1/8, where you remove the inclusion of that file.
board/ucRobotics/bubblegum_96/MAINTAINERS
Quoted 21 lines
board/ucRobotics/bubblegum_96/Kconfig deleted +0
-15@@ -1,15 +0,0 @@ -if TARGET_BUBBLEGUM_96 - -config SYS_BOARD - default "bubblegum_96" - -config SYS_VENDOR - default "ucRobotics" - -config SYS_SOC - default "s900" - -config SYS_CONFIG_NAME - default "bubblegum_96" - -endifboard/ucRobotics/bubblegum_96/MAINTAINERS deleted +0
-0
Can you please adjust the paths in /MAINTAINERS? board/ucRobotics will be gone after this patch, that should be reflected there. This could be the only thing left in this patch or merged into 1/8.
board/ucRobotics/bubblegum_96/bubblegum_96.c
Quoted 21 lines
board/ucRobotics/bubblegum_96/MAINTAINERS deleted +0
-6@@ -1,6 +0,0 @@ -BUBBLEGUM_96 BOARD -M: Manivannan Sadhasivam <[email protected]> -S: Maintained -F: board/ucRobotics/bubblegum_96/ -F: include/configs/bubblegum_96.h -F: configs/bubblegum_96_defconfigboard/ucRobotics/bubblegum_96/Makefile deleted +0
-3@@ -1,3 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0+ - -obj-y := bubblegum_96.oboard/ucRobotics/bubblegum_96/bubblegum_96.c deleted +0
-0
That should be part of 1/8 as well, where you more or less rename that file here. That helps git to detect this and show this accordingly.
Cheers,
Andre.
Quoted 58 lines
board/ucRobotics/bubblegum_96/bubblegum_96.c deleted +0
-56@@ -1,56 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* -* Bubblegum-96 Boards Support -* -* Copyright (C) 2018 Manivannan Sadhasivam <[email protected]> -*/ - -#include <linux/arm-smccc.h> -#include <linux/psci.h> -#include <common.h> -#include <asm/io.h> -#include <asm/mach-types.h> -#include <asm/psci.h> - -DECLARE_GLOBAL_DATA_PTR ; - -/* -* dram_init - sets uboots idea of sdram size -*/ -int dram_init (void ) -{ - gd->ram_size =CONFIG_SYS_SDRAM_SIZE ; -return 0 ; -} - -/* This is called after dram_init() so use get_ram_size result */ -int dram_init_banksize (void ) -{ - gd->bd->bi_dram[0 ].start =CONFIG_SYS_SDRAM_BASE ; - gd->bd->bi_dram[0 ].size = gd->ram_size; - -return 0 ; -} - -static void show_psci_version (void ) -{ -struct arm_smccc_res res; - -arm_smccc_smc (ARM_PSCI_0_2_FN_PSCI_VERSION ,0 ,0 ,0 ,0 ,0 ,0 ,0 , &res); - -printf ("PSCI: v%ld.%ld\n" , -PSCI_VERSION_MAJOR (res.a0), -PSCI_VERSION_MINOR (res.a0)); -} - -int board_init (void ) -{ -show_psci_version (); - -return 0 ; -} - -void reset_cpu (ulong addr) -{ -psci_system_reset (); -}
RFC PATCH 5/8 arm: actions: add S700 SoC device tree
In reply to Amit Singh TomarThis patch adds .dtsi file(sync with Linux 4.20) and required binding for S700 SoC that is a 64-bit Quad-core ARM Cortex-A53 cores.
--- arch/arm/dts/s700.dtsi | 193 +++++++++++++++++++++++++++ include/dt-bindings/clock/actions,s700-cmu.h | 118 ++++++++++++++++ 2 files changed, 311 insertions(+) create mode 100644 arch/arm/dts/s700.dtsi create mode 100644 include/dt-bindings/clock/actions,s700-cmu.h
arch/arm/dts/s700.dtsi new file +193 -0
@@ -0,0 +1,193 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright (c) 2017 Andreas Färber + */ + +#include <dt-bindings/clock/actions,s700-cmu.h> +#include <dt-bindings/interrupt-controller/arm-gic.h> + +/ { + compatible = "actions,s700"; + interrupt-parent = <&gic>; + #address-cells = <2>; + #size-cells = <2>; + + cpus { + #address-cells = <2>; + #size-cells = <0>; + + cpu0: cpu at 0 { + device_type = "cpu"; + compatible = "arm,cortex-a53", "arm,armv8"; + reg = <0x0 0x0>; + enable-method = "psci"; + }; + + cpu1: cpu at 1 { + device_type = "cpu"; + compatible = "arm,cortex-a53", "arm,armv8"; + reg = <0x0 0x1>; + enable-method = "psci"; + }; + + cpu2: cpu at 2 { + device_type = "cpu"; + compatible = "arm,cortex-a53", "arm,armv8"; + reg = <0x0 0x2>; + enable-method = "psci"; + }; + + cpu3: cpu at 3 { + device_type = "cpu"; + compatible = "arm,cortex-a53", "arm,armv8"; + reg = <0x0 0x3>; + enable-method = "psci"; + }; + }; + + reserved-memory { + #address-cells = <2>; + #size-cells = <2>; + ranges; + + secmon at 1f000000 { + reg = <0x0 0x1f000000 0x0 0x1000000>; + no-map; + }; + }; + + psci { + compatible = "arm,psci-0.2"; + method = "smc"; + }; + + arm-pmu { + compatible = "arm,cortex-a53-pmu"; + interrupts = <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>; + interrupt-affinity = <&cpu0>, <&cpu1>, <&cpu2>, <&cpu3>; + }; + + timer { + compatible = "arm,armv8-timer"; + interrupts = <GIC_PPI 13 + (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>, + <GIC_PPI 14 + (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>, + <GIC_PPI 11 + (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>, + <GIC_PPI 10 + (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>; + }; + + hosc: hosc { + compatible = "fixed-clock"; + clock-frequency = <24000000>; + #clock-cells = <0>; + }; + + losc: losc { + compatible = "fixed-clock"; + clock-frequency = <32768>; + #clock-cells = <0>; + }; + + soc { + u-boot,dm-pre-reloc; + compatible = "simple-bus"; + #address-cells = <2>; + #size-cells = <2>; + ranges; + + gic: interrupt-controller at e00f1000 { + compatible = "arm,gic-400"; + reg = <0x0 0xe00f1000 0x0 0x1000>, + <0x0 0xe00f2000 0x0 0x2000>, + <0x0 0xe00f4000 0x0 0x2000>, + <0x0 0xe00f6000 0x0 0x2000>; + interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>; + interrupt-controller; + #interrupt-cells = <3>; + }; + + uart0: serial at e0120000 { + compatible = "actions,s900-uart", "actions,owl-uart"; + reg = <0x0 0xe0120000 0x0 0x2000>; + clocks = <&cmu CLK_UART0>; + interrupts = <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>; + status = "disabled"; + }; + + uart1: serial at e0122000 { + compatible = "actions,s900-uart", "actions,owl-uart"; + reg = <0x0 0xe0122000 0x0 0x2000>; + clocks = <&cmu CLK_UART1>; + interrupts = <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH>; + status = "disabled"; + }; + + uart2: serial at e0124000 { + compatible = "actions,s900-uart", "actions,owl-uart"; + reg = <0x0 0xe0124000 0x0 0x2000>; + clocks = <&cmu CLK_UART2>; + interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>; + status = "disabled"; + }; + + uart3: serial at e0126000 { + u-boot,dm-pre-reloc; + compatible = "actions,s900-uart", "actions,owl-uart"; + reg = <0x0 0xe0126000 0x0 0x2000>; + clocks = <&cmu CLK_UART3>; + interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>; + status = "disabled"; + }; + + uart4: serial at e0128000 { + compatible = "actions,s900-uart", "actions,owl-uart"; + reg = <0x0 0xe0128000 0x0 0x2000>; + clocks = <&cmu CLK_UART4>; + interrupts = <GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>; + status = "disabled"; + }; + + uart5: serial at e012a000 { + compatible = "actions,s900-uart", "actions,owl-uart"; + reg = <0x0 0xe012a000 0x0 0x2000>; + clocks = <&cmu CLK_UART5>; + interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>; + status = "disabled"; + }; + + uart6: serial at e012c000 { + compatible = "actions,s900-uart", "actions,owl-uart"; + reg = <0x0 0xe012c000 0x0 0x2000>; + clocks = <&cmu CLK_UART6>; + interrupts = <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>; + status = "disabled"; + }; + + cmu: clock-controller at e0168000 { + u-boot,dm-pre-reloc; + compatible = "actions,s700-cmu"; + reg = <0x0 0xe0168000 0x0 0x1000>; + clocks = <&hosc>, <&losc>; + #clock-cells = <1>; + }; + + sps: power-controller at e01b0100 { + compatible = "actions,s700-sps"; + reg = <0x0 0xe01b0100 0x0 0x100>; + #power-domain-cells = <1>; + }; + + timer: timer at e024c000 { + compatible = "actions,s700-timer"; + reg = <0x0 0xe024c000 0x0 0x4000>; + interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "timer1"; + }; + }; +};
include/dt-bindings/clock/actions,s700-cmu.h new file +118 -0
118 lines not on this page · raw message
Signature · 1 line
2.7.4
RFC PATCH 5/8 arm: actions: add S700 SoC device tree
Quoted 147 lines · Amit Singh Tomar
This patch adds .dtsi file(sync with Linux 4.20) and required binding for S700 SoC that is a 64-bit Quad-core ARM Cortex-A53 cores.
Signed-off-by Amit Singh Tomar <[email protected]>--- arch/arm/dts/s700.dtsi | 193 +++++++++++++++++++++++++++ include/dt-bindings/clock/actions,s700-cmu.h | 118 ++++++++++++++++ 2 files changed, 311 insertions(+) create mode 100644 arch/arm/dts/s700.dtsi create mode 100644 include/dt-bindings/clock/actions,s700-cmu.harch/arm/dts/s700.dtsi new file +130
-0@@ -0,0 +1,193 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright (c) 2017 Andreas Färber + */ + +#include <dt-bindings/clock/actions,s700-cmu.h> +#include <dt-bindings/interrupt-controller/arm-gic.h> + +/ { + compatible = "actions,s700"; + interrupt-parent = <&gic>; + #address-cells = <2>; + #size-cells = <2>; + + cpus { + #address-cells = <2>; + #size-cells = <0>; + + cpu0: cpu at 0 { + device_type = "cpu"; + compatible = "arm,cortex-a53", "arm,armv8"; + reg = <0x0 0x0>; + enable-method = "psci"; + }; + + cpu1: cpu at 1 { + device_type = "cpu"; + compatible = "arm,cortex-a53", "arm,armv8"; + reg = <0x0 0x1>; + enable-method = "psci"; + }; + + cpu2: cpu at 2 { + device_type = "cpu"; + compatible = "arm,cortex-a53", "arm,armv8"; + reg = <0x0 0x2>; + enable-method = "psci"; + }; + + cpu3: cpu at 3 { + device_type = "cpu"; + compatible = "arm,cortex-a53", "arm,armv8"; + reg = <0x0 0x3>; + enable-method = "psci"; + }; + }; + + reserved-memory { + #address-cells = <2>; + #size-cells = <2>; + ranges; + + secmon at 1f000000 { + reg = <0x0 0x1f000000 0x0 0x1000000>; + no-map; + }; + }; + + psci { + compatible = "arm,psci-0.2"; + method = "smc"; + }; + + arm-pmu { + compatible = "arm,cortex-a53-pmu"; + interrupts = <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>; + interrupt-affinity = <&cpu0>, <&cpu1>, <&cpu2>, <&cpu3>; + }; + + timer { + compatible = "arm,armv8-timer"; + interrupts = <GIC_PPI 13 + (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>, + <GIC_PPI 14 + (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>, + <GIC_PPI 11 + (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>, + <GIC_PPI 10 + (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>; + }; + + hosc: hosc { + compatible = "fixed-clock"; + clock-frequency = <24000000>; + #clock-cells = <0>; + }; + + losc: losc { + compatible = "fixed-clock"; + clock-frequency = <32768>; + #clock-cells = <0>; + }; + + soc { + u-boot,dm-pre-reloc; + compatible = "simple-bus"; + #address-cells = <2>; + #size-cells = <2>; + ranges; + + gic: interrupt-controller at e00f1000 { + compatible = "arm,gic-400"; + reg = <0x0 0xe00f1000 0x0 0x1000>, + <0x0 0xe00f2000 0x0 0x2000>, + <0x0 0xe00f4000 0x0 0x2000>, + <0x0 0xe00f6000 0x0 0x2000>; + interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>; + interrupt-controller; + #interrupt-cells = <3>; + }; + + uart0: serial at e0120000 { + compatible = "actions,s900-uart", "actions,owl-uart"; + reg = <0x0 0xe0120000 0x0 0x2000>; + clocks = <&cmu CLK_UART0>; + interrupts = <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>; + status = "disabled"; + }; + + uart1: serial at e0122000 { + compatible = "actions,s900-uart", "actions,owl-uart"; + reg = <0x0 0xe0122000 0x0 0x2000>; + clocks = <&cmu CLK_UART1>; + interrupts = <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH>; + status = "disabled"; + }; +
arch/arm/dts/s700.dtsi line 140
Quoted 10 lines
arch/arm/dts/s700.dtsi new file +10
-0+ uart2: serial at e0124000 { + compatible = "actions,s900-uart", "actions,owl-uart"; + reg = <0x0 0xe0124000 0x0 0x2000>; + clocks = <&cmu CLK_UART2>; + interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>; + status = "disabled"; + }; + + uart3: serial at e0126000 { + u-boot,dm-pre-reloc;
It would be best to keep this DTS unchanged with Linux and add the u-boot specific bits in -u-boot.dtsi.
Quoted 23 lines
arch/arm/dts/s700.dtsi new file +23
-0+ compatible = "actions,s900-uart", "actions,owl-uart"; + reg = <0x0 0xe0126000 0x0 0x2000>; + clocks = <&cmu CLK_UART3>; + interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>; + status = "disabled"; + }; + + uart4: serial at e0128000 { + compatible = "actions,s900-uart", "actions,owl-uart"; + reg = <0x0 0xe0128000 0x0 0x2000>; + clocks = <&cmu CLK_UART4>; + interrupts = <GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>; + status = "disabled"; + }; + + uart5: serial at e012a000 { + compatible = "actions,s900-uart", "actions,owl-uart"; + reg = <0x0 0xe012a000 0x0 0x2000>; + clocks = <&cmu CLK_UART5>; + interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>; + status = "disabled"; + }; +
arch/arm/dts/s700.dtsi line 173
Quoted 10 lines
arch/arm/dts/s700.dtsi new file +10
-0+ uart6: serial at e012c000 { + compatible = "actions,s900-uart", "actions,owl-uart"; + reg = <0x0 0xe012c000 0x0 0x2000>; + clocks = <&cmu CLK_UART6>; + interrupts = <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>; + status = "disabled"; + }; + + cmu: clock-controller at e0168000 { + u-boot,dm-pre-reloc;
Same as above comment.
Thanks,
Mani
Quoted 147 lines
arch/arm/dts/s700.dtsi new file +20
-0+ compatible = "actions,s700-cmu"; + reg = <0x0 0xe0168000 0x0 0x1000>; + clocks = <&hosc>, <&losc>; + #clock-cells = <1>; + }; + + sps: power-controller at e01b0100 { + compatible = "actions,s700-sps"; + reg = <0x0 0xe01b0100 0x0 0x100>; + #power-domain-cells = <1>; + }; + + timer: timer at e024c000 { + compatible = "actions,s700-timer"; + reg = <0x0 0xe024c000 0x0 0x4000>; + interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "timer1"; + }; + }; +};include/dt-bindings/clock/actions,s700-cmu.h new file +118
-0@@ -0,0 +1,118 @@ +/* SPDX-License-Identifier: GPL-2.0 +* +* Device Tree binding constants for Actions Semi S700 Clock Management Unit +* +* Copyright (c) 2014 Actions Semi Inc. +* Author: David Liu <[email protected]> +* +* Author: Pathiban Nallathambi <[email protected]> +* Author: Saravanan Sekar <[email protected]> +*/ + +#ifndef __DT_BINDINGS_CLOCK_S700_H +#define __DT_BINDINGS_CLOCK_S700_H + +#define CLK_NONE 0 + +/* pll clocks */ +#define CLK_CORE_PLL 1 +#define CLK_DEV_PLL 2 +#define CLK_DDR_PLL 3 +#define CLK_NAND_PLL 4 +#define CLK_DISPLAY_PLL 5 +#define CLK_TVOUT_PLL 6 +#define CLK_CVBS_PLL 7 +#define CLK_AUDIO_PLL 8 +#define CLK_ETHERNET_PLL 9 + +/* system clock */ +#define CLK_CPU 10 +#define CLK_DEV 11 +#define CLK_AHB 12 +#define CLK_APB 13 +#define CLK_DMAC 14 +#define CLK_NOC0_CLK_MUX 15 +#define CLK_NOC1_CLK_MUX 16 +#define CLK_HP_CLK_MUX 17 +#define CLK_HP_CLK_DIV 18 +#define CLK_NOC1_CLK_DIV 19 +#define CLK_NOC0 20 +#define CLK_NOC1 21 +#define CLK_SENOR_SRC 22 + +/* peripheral device clock */ +#define CLK_GPIO 23 +#define CLK_TIMER 24 +#define CLK_DSI 25 +#define CLK_CSI 26 +#define CLK_SI 27 +#define CLK_DE 28 +#define CLK_HDE 29 +#define CLK_VDE 30 +#define CLK_VCE 31 +#define CLK_NAND 32 +#define CLK_SD0 33 +#define CLK_SD1 34 +#define CLK_SD2 35 + +#define CLK_UART0 36 +#define CLK_UART1 37 +#define CLK_UART2 38 +#define CLK_UART3 39 +#define CLK_UART4 40 +#define CLK_UART5 41 +#define CLK_UART6 42 + +#define CLK_PWM0 43 +#define CLK_PWM1 44 +#define CLK_PWM2 45 +#define CLK_PWM3 46 +#define CLK_PWM4 47 +#define CLK_PWM5 48 +#define CLK_GPU3D 49 + +#define CLK_I2C0 50 +#define CLK_I2C1 51 +#define CLK_I2C2 52 +#define CLK_I2C3 53 + +#define CLK_SPI0 54 +#define CLK_SPI1 55 +#define CLK_SPI2 56 +#define CLK_SPI3 57 + +#define CLK_USB3_480MPLL0 58 +#define CLK_USB3_480MPHY0 59 +#define CLK_USB3_5GPHY 60 +#define CLK_USB3_CCE 61 +#define CLK_USB3_MAC 62 + +#define CLK_LCD 63 +#define CLK_HDMI_AUDIO 64 +#define CLK_I2SRX 65 +#define CLK_I2STX 66 + +#define CLK_SENSOR0 67 +#define CLK_SENSOR1 68 + +#define CLK_HDMI_DEV 69 + +#define CLK_ETHERNET 70 +#define CLK_RMII_REF 71 + +#define CLK_USB2H0_PLLEN 72 +#define CLK_USB2H0_PHY 73 +#define CLK_USB2H0_CCE 74 +#define CLK_USB2H1_PLLEN 75 +#define CLK_USB2H1_PHY 76 +#define CLK_USB2H1_CCE 77 + +#define CLK_TVOUT 78 + +#define CLK_THERMAL_SENSOR 79 + +#define CLK_IRC_SWITCH 80 +#define CLK_PCM1 81 +#define CLK_NR_CLKS (CLK_PCM1 + 1) + +#endif /* __DT_BINDINGS_CLOCK_S700_H */ Signature · 1 line
2.7.4
RFC PATCH 5/8 arm: actions: add S700 SoC device tree
Quoted 153 lines · Manivannan Sadhasivam
Quoted 152 lines · Amit Singh Tomar
This patch adds .dtsi file(sync with Linux 4.20) and required binding for S700 SoC that is a 64-bit Quad-core ARM Cortex-A53 cores.
Signed-off-by Amit Singh Tomar <[email protected]>--- arch/arm/dts/s700.dtsi | 193 +++++++++++++++++++++++++++ include/dt-bindings/clock/actions,s700-cmu.h | 118 ++++++++++++++++ 2 files changed, 311 insertions(+) create mode 100644 arch/arm/dts/s700.dtsi create mode 100644 include/dt-bindings/clock/actions,s700-cmu.harch/arm/dts/s700.dtsi new file +135
-0@@ -0,0 +1,193 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright (c) 2017 Andreas Färber + */ + +#include <dt-bindings/clock/actions,s700-cmu.h> +#include <dt-bindings/interrupt-controller/arm-gic.h> + +/ { + compatible = "actions,s700"; + interrupt-parent = <&gic>; + #address-cells = <2>; + #size-cells = <2>; + + cpus { + #address-cells = <2>; + #size-cells = <0>; + + cpu0: cpu at 0 { + device_type = "cpu"; + compatible = "arm,cortex-a53", "arm,armv8"; + reg = <0x0 0x0>; + enable-method = "psci"; + }; + + cpu1: cpu at 1 { + device_type = "cpu"; + compatible = "arm,cortex-a53", "arm,armv8"; + reg = <0x0 0x1>; + enable-method = "psci"; + }; + + cpu2: cpu at 2 { + device_type = "cpu"; + compatible = "arm,cortex-a53", "arm,armv8"; + reg = <0x0 0x2>; + enable-method = "psci"; + }; + + cpu3: cpu at 3 { + device_type = "cpu"; + compatible = "arm,cortex-a53", "arm,armv8"; + reg = <0x0 0x3>; + enable-method = "psci"; + }; + }; + + reserved-memory { + #address-cells = <2>; + #size-cells = <2>; + ranges; + + secmon at 1f000000 { + reg = <0x0 0x1f000000 0x0 0x1000000>; + no-map; + }; + }; + + psci { + compatible = "arm,psci-0.2"; + method = "smc"; + }; + + arm-pmu { + compatible = "arm,cortex-a53-pmu"; + interrupts = <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>; + interrupt-affinity = <&cpu0>, <&cpu1>, <&cpu2>, <&cpu3>; + }; + + timer { + compatible = "arm,armv8-timer"; + interrupts = <GIC_PPI 13 + (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>, + <GIC_PPI 14 + (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>, + <GIC_PPI 11 + (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>, + <GIC_PPI 10 + (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>; + }; + + hosc: hosc { + compatible = "fixed-clock"; + clock-frequency = <24000000>; + #clock-cells = <0>; + }; + + losc: losc { + compatible = "fixed-clock"; + clock-frequency = <32768>; + #clock-cells = <0>; + }; + + soc { + u-boot,dm-pre-reloc; + compatible = "simple-bus"; + #address-cells = <2>; + #size-cells = <2>; + ranges; + + gic: interrupt-controller at e00f1000 { + compatible = "arm,gic-400"; + reg = <0x0 0xe00f1000 0x0 0x1000>, + <0x0 0xe00f2000 0x0 0x2000>, + <0x0 0xe00f4000 0x0 0x2000>, + <0x0 0xe00f6000 0x0 0x2000>; + interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>; + interrupt-controller; + #interrupt-cells = <3>; + }; + + uart0: serial at e0120000 { + compatible = "actions,s900-uart", "actions,owl-uart"; + reg = <0x0 0xe0120000 0x0 0x2000>; + clocks = <&cmu CLK_UART0>; + interrupts = <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>; + status = "disabled"; + }; + + uart1: serial at e0122000 { + compatible = "actions,s900-uart", "actions,owl-uart"; + reg = <0x0 0xe0122000 0x0 0x2000>; + clocks = <&cmu CLK_UART1>; + interrupts = <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH>; + status = "disabled"; + }; + + uart2: serial at e0124000 { + compatible = "actions,s900-uart", "actions,owl-uart"; + reg = <0x0 0xe0124000 0x0 0x2000>; + clocks = <&cmu CLK_UART2>; + interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;
Quoted 8 lines
arch/arm/dts/s700.dtsi line 140
Quoted 5 lines
arch/arm/dts/s700.dtsi new file +5
-0+ status = "disabled"; + }; + + uart3: serial at e0126000 { + u-boot,dm-pre-reloc;It would be best to keep this DTS unchanged with Linux and add the u-boot specific bits in
-u-boot.dtsi.
Ah, good catch, I agree on the -u-boot.dtsi approach.
Amit, please don't claim it's "sync with Linux" if it isn't. At least document this change.
Also there is another instance above, directly on the /soc node.
Maybe we should do as others do and set DM_FLAG_PRE_RELOC on the driver, to avoid changing the DT at all?
Cheers,
Andre
Quoted 186 lines
Quoted 23 lines
arch/arm/dts/s700.dtsi new file +23
-0+ compatible = "actions,s900-uart", "actions,owl-uart"; + reg = <0x0 0xe0126000 0x0 0x2000>; + clocks = <&cmu CLK_UART3>; + interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>; + status = "disabled"; + }; + + uart4: serial at e0128000 { + compatible = "actions,s900-uart", "actions,owl-uart"; + reg = <0x0 0xe0128000 0x0 0x2000>; + clocks = <&cmu CLK_UART4>; + interrupts = <GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>; + status = "disabled"; + }; + + uart5: serial at e012a000 { + compatible = "actions,s900-uart", "actions,owl-uart"; + reg = <0x0 0xe012a000 0x0 0x2000>; + clocks = <&cmu CLK_UART5>; + interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>; + status = "disabled"; + }; +arch/arm/dts/s700.dtsi line 173
Quoted 10 lines
arch/arm/dts/s700.dtsi new file +10
-0+ uart6: serial at e012c000 { + compatible = "actions,s900-uart", "actions,owl-uart"; + reg = <0x0 0xe012c000 0x0 0x2000>; + clocks = <&cmu CLK_UART6>; + interrupts = <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>; + status = "disabled"; + }; + + cmu: clock-controller at e0168000 { + u-boot,dm-pre-reloc;Same as above comment.
Thanks,
ManiQuoted 147 lines
arch/arm/dts/s700.dtsi new file +20
-0+ compatible = "actions,s700-cmu"; + reg = <0x0 0xe0168000 0x0 0x1000>; + clocks = <&hosc>, <&losc>; + #clock-cells = <1>; + }; + + sps: power-controller at e01b0100 { + compatible = "actions,s700-sps"; + reg = <0x0 0xe01b0100 0x0 0x100>; + #power-domain-cells = <1>; + }; + + timer: timer at e024c000 { + compatible = "actions,s700-timer"; + reg = <0x0 0xe024c000 0x0 0x4000>; + interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "timer1"; + }; + }; +};include/dt-bindings/clock/actions,s700-cmu.h new file +118
-0@@ -0,0 +1,118 @@ +/* SPDX-License-Identifier: GPL-2.0 +* +* Device Tree binding constants for Actions Semi S700 Clock Management Unit +* +* Copyright (c) 2014 Actions Semi Inc. +* Author: David Liu <[email protected]> +* +* Author: Pathiban Nallathambi <[email protected]> +* Author: Saravanan Sekar <[email protected]> +*/ + +#ifndef __DT_BINDINGS_CLOCK_S700_H +#define __DT_BINDINGS_CLOCK_S700_H + +#define CLK_NONE 0 + +/* pll clocks */ +#define CLK_CORE_PLL 1 +#define CLK_DEV_PLL 2 +#define CLK_DDR_PLL 3 +#define CLK_NAND_PLL 4 +#define CLK_DISPLAY_PLL 5 +#define CLK_TVOUT_PLL 6 +#define CLK_CVBS_PLL 7 +#define CLK_AUDIO_PLL 8 +#define CLK_ETHERNET_PLL 9 + +/* system clock */ +#define CLK_CPU 10 +#define CLK_DEV 11 +#define CLK_AHB 12 +#define CLK_APB 13 +#define CLK_DMAC 14 +#define CLK_NOC0_CLK_MUX 15 +#define CLK_NOC1_CLK_MUX 16 +#define CLK_HP_CLK_MUX 17 +#define CLK_HP_CLK_DIV 18 +#define CLK_NOC1_CLK_DIV 19 +#define CLK_NOC0 20 +#define CLK_NOC1 21 +#define CLK_SENOR_SRC 22 + +/* peripheral device clock */ +#define CLK_GPIO 23 +#define CLK_TIMER 24 +#define CLK_DSI 25 +#define CLK_CSI 26 +#define CLK_SI 27 +#define CLK_DE 28 +#define CLK_HDE 29 +#define CLK_VDE 30 +#define CLK_VCE 31 +#define CLK_NAND 32 +#define CLK_SD0 33 +#define CLK_SD1 34 +#define CLK_SD2 35 + +#define CLK_UART0 36 +#define CLK_UART1 37 +#define CLK_UART2 38 +#define CLK_UART3 39 +#define CLK_UART4 40 +#define CLK_UART5 41 +#define CLK_UART6 42 + +#define CLK_PWM0 43 +#define CLK_PWM1 44 +#define CLK_PWM2 45 +#define CLK_PWM3 46 +#define CLK_PWM4 47 +#define CLK_PWM5 48 +#define CLK_GPU3D 49 + +#define CLK_I2C0 50 +#define CLK_I2C1 51 +#define CLK_I2C2 52 +#define CLK_I2C3 53 + +#define CLK_SPI0 54 +#define CLK_SPI1 55 +#define CLK_SPI2 56 +#define CLK_SPI3 57 + +#define CLK_USB3_480MPLL0 58 +#define CLK_USB3_480MPHY0 59 +#define CLK_USB3_5GPHY 60 +#define CLK_USB3_CCE 61 +#define CLK_USB3_MAC 62 + +#define CLK_LCD 63 +#define CLK_HDMI_AUDIO 64 +#define CLK_I2SRX 65 +#define CLK_I2STX 66 + +#define CLK_SENSOR0 67 +#define CLK_SENSOR1 68 + +#define CLK_HDMI_DEV 69 + +#define CLK_ETHERNET 70 +#define CLK_RMII_REF 71 + +#define CLK_USB2H0_PLLEN 72 +#define CLK_USB2H0_PHY 73 +#define CLK_USB2H0_CCE 74 +#define CLK_USB2H1_PLLEN 75 +#define CLK_USB2H1_PHY 76 +#define CLK_USB2H1_CCE 77 + +#define CLK_TVOUT 78 + +#define CLK_THERMAL_SENSOR 79 + +#define CLK_IRC_SWITCH 80 +#define CLK_PCM1 81 +#define CLK_NR_CLKS (CLK_PCM1 + 1) + +#endif /* __DT_BINDINGS_CLOCK_S700_H */ Signature · 1 line
2.7.4
RFC PATCH 5/8 arm: actions: add S700 SoC device tree
Quoted 1 line
Ah, good catch, I agree on the
-u-boot.dtsiapproach.
Thanks for talking about it( I was expecting this comment)
Quoted 2 lines
Amit, please don't claim it's "sync with Linux" if it isn't. At least document this change.
Yeah, I was aware of this situation but rightly so, I should have documented it in commit messages.
Sorry, I didn't.
Quoted 4 lines
Also there is another instance above, directly on the /soc node.
Maybe we should do as others do and set
DM_FLAG_PRE_RELOCon the driver, to avoid changing the DT at all?
Yeah, I had something similar in my mind(same was suggested in this thread[1] few days back)
but wasn't able to test it.
Also, if you see current s900.dtsi in u-boot , it uses those flag in dtsi itself.
Thanks
-Amit.
[1] : https://lists.denx.de/pipermail/u-boot/2019-January/353438.html
Hate to get up in morning, its cold out here(with bit of rain too) :(
RFC PATCH 6/8 arm: add Cubieboard7 board support
In reply to Amit Singh TomarThe Cubieboard is a single board computer containing a Actions S700 SoC(with 4 ARMv8 Cortex-A53 cores).
This patch adds respective defconfig alongwith device tree(sync with Linux 4.20).
--- arch/arm/dts/s700-cubieboard7.dts | 39 +++++++++++++++++++++++++++++++++++++++ configs/cubieboard7_defconfig | 22 ++++++++++++++++++++++ 2 files changed, 61 insertions(+) create mode 100644 arch/arm/dts/s700-cubieboard7.dts create mode 100644 configs/cubieboard7_defconfig
arch/arm/dts/s700-cubieboard7.dts new file +39 -0
@@ -0,0 +1,39 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright (c) 2017 Andreas Färber + */ + +/dts-v1/; + +#include "s700.dtsi" + +/ { + compatible = "cubietech,cubieboard7", "actions,s700"; + model = "CubieBoard7"; + + aliases { + serial3 = &uart3; + }; + + chosen { + stdout-path = "serial3:115200n8"; + }; + + memory at 0 { + device_type = "memory"; + reg = <0x0 0x0 0x0 0x80000000>; + }; + + memory at 1,e0000000 { + device_type = "memory"; + reg = <0x1 0xe0000000 0x0 0x0>; + }; +}; + +&timer { + clocks = <&hosc>; +}; + +&uart3 { + status = "okay"; +};
configs/cubieboard7_defconfig new file +22 -0
@@ -0,0 +1,22 @@ +CONFIG_ARM=y +CONFIG_ARM_SMCCC=y +CONFIG_ARCH_OWL=y +CONFIG_SYS_TEXT_BASE=0x11000000 +CONFIG_MACH_S700=y +CONFIG_IDENT_STRING="\ncubieboard7" +CONFIG_DISTRO_DEFAULTS=y +CONFIG_NR_DRAM_BANKS=1 +CONFIG_BOOTDELAY=5 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyOWL3,115200n8" +# CONFIG_DISPLAY_CPUINFO is not set +# CONFIG_DISPLAY_BOARDINFO is not set +CONFIG_SYS_PROMPT="U-Boot => " +CONFIG_CMD_MD5SUM=y +CONFIG_CMD_MEMINFO=y +CONFIG_CMD_CACHE=y +CONFIG_CMD_TIMER=y +CONFIG_DEFAULT_DEVICE_TREE="s700-cubieboard7" +CONFIG_CLK=y +CONFIG_CLK_OWL=y +CONFIG_OWL_SERIAL=y
Signature · 1 line
2.7.4
RFC PATCH 6/8 arm: add Cubieboard7 board support
On 03/01/2019 13:26, Amit Singh Tomar wrote:
Hi,
configs/cubieboard7_defconfig
Quoted 64 lines
The Cubieboard is a single board computer containing a Actions S700 SoC(with 4 ARMv8 Cortex-A53 cores).
This patch adds respective defconfig alongwith device tree(sync with Linux 4.20).
Signed-off-by Amit Singh Tomar <[email protected]>--- arch/arm/dts/s700-cubieboard7.dts | 39 +++++++++++++++++++++++++++++++++++++++ configs/cubieboard7_defconfig | 22 ++++++++++++++++++++++ 2 files changed, 61 insertions(+) create mode 100644 arch/arm/dts/s700-cubieboard7.dts create mode 100644 configs/cubieboard7_defconfigarch/arm/dts/s700-cubieboard7.dts new file +39
-0@@ -0,0 +1,39 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright (c) 2017 Andreas Färber + */ + +/dts-v1/; + +#include "s700.dtsi" + +/ { + compatible = "cubietech,cubieboard7", "actions,s700"; + model = "CubieBoard7"; + + aliases { + serial3 = &uart3; + }; + + chosen { + stdout-path = "serial3:115200n8"; + }; + + memory at 0 { + device_type = "memory"; + reg = <0x0 0x0 0x0 0x80000000>; + }; + + memory at 1,e0000000 { + device_type = "memory"; + reg = <0x1 0xe0000000 0x0 0x0>; + }; +}; + +&timer { + clocks = <&hosc>; +}; + +&uart3 { + status = "okay"; +};configs/cubieboard7_defconfig new file +0
-0
This is copied from the Bubblegum, right?
It contains a lot of symbols that are required by the platform, so should be tackled in the Kconfig instead of here.
This applies to the bubblegum config as well, so maybe these comments are more for Mani ;-)
configs/cubieboard7_defconfig line 2
Quoted 3 lines
configs/cubieboard7_defconfig new file +2
-0@@ -0,0 +1,22 @@ +CONFIG_ARM=y +CONFIG_ARM_SMCCC=y
Sounds like a generic OWL 64 bit requirement.
configs/cubieboard7_defconfig line 4
Quoted 2 lines
configs/cubieboard7_defconfig new file +2
-0+CONFIG_ARCH_OWL=y +CONFIG_SYS_TEXT_BASE=0x11000000
This is also a platform decision, to be handled generically.
configs/cubieboard7_defconfig line 15
Quoted 11 lines
configs/cubieboard7_defconfig new file +11
-0+CONFIG_MACH_S700=y +CONFIG_IDENT_STRING="\ncubieboard7" +CONFIG_DISTRO_DEFAULTS=y +CONFIG_NR_DRAM_BANKS=1 +CONFIG_BOOTDELAY=5 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyOWL3,115200n8" +# CONFIG_DISPLAY_CPUINFO is not set +# CONFIG_DISPLAY_BOARDINFO is not set +CONFIG_SYS_PROMPT="U-Boot => " +CONFIG_CMD_MD5SUM=y
What is this for? If it is required by something, it should be already selected automatically.
configs/cubieboard7_defconfig line 17
Quoted 2 lines
configs/cubieboard7_defconfig new file +2
-0+CONFIG_CMD_MEMINFO=y +CONFIG_CMD_CACHE=y
Why is this? Disabling the cache on the U-Boot command line sounds dodgy.
configs/cubieboard7_defconfig line 18
Quoted 1 line
configs/cubieboard7_defconfig new file +1
-0+CONFIG_CMD_TIMER=y
Is this needed by some boot script? Then it should be set somewhere generic.
configs/cubieboard7_defconfig line 22
Quoted 4 lines
configs/cubieboard7_defconfig new file +4
-0+CONFIG_DEFAULT_DEVICE_TREE="s700-cubieboard7" +CONFIG_CLK=y +CONFIG_CLK_OWL=y +CONFIG_OWL_SERIAL=y
Those last three should also be set in the Kconfig.
Cheers,
Andre.
RFC PATCH 7/8 serial: actions: add uart support for s700
In reply to Amit Singh TomarUART controller present on S700 is compatible with existing S900 UART, this patch simply adds a proper compatible string so that S900 uart driver can be reused for S700.
--- drivers/serial/serial_owl.c | 1 + 1 file changed, 1 insertion(+)
drivers/serial/serial_owl.c +1 -0
@@ -121,6 +121,7 @@ static const struct dm_serial_ops owl_serial_ops = {static const struct udevice_id owl_serial_ids[] = { { .compatible ="actions,s900-serial" }, + { .compatible ="actions,owl-uart" }, { } };
Signature · 1 line
2.7.4
RFC PATCH 7/8 serial: actions: add uart support for s700
Quoted 14 lines · Amit Singh Tomar
UART controller present on S700 is compatible with existing S900 UART, this patch simply adds a proper compatible string so that S900 uart driver can be reused for S700.
Signed-off-by Amit Singh Tomar <[email protected]>--- drivers/serial/serial_owl.c | 1 + 1 file changed, 1 insertion(+)drivers/serial/serial_owl.c +0
-0
drivers/serial/serial_owl.c static const struct dm_serial_ops owl_serial_ops = { · line 124
Quoted 4 lines
drivers/serial/serial_owl.c +1
-0@@ -121,6 +121,7 @@ static const struct dm_serial_ops owl_serial_ops = {static const struct udevice_id owl_serial_ids[] = { { .compatible ="actions,s900-serial" }, + { .compatible ="actions,owl-uart" },
"owl" is the family name for S series SoCs from Actions Semi. There are 3 SoCs so far, S500, S700 and S900. Reason for naming s900-serial was that there are hw difference between S500 (ARMv7) and S900/S700 (ARMv8). So, this should be "actions,s700-serial".
Thanks,
Mani
Quoted 6 lines
drivers/serial/serial_owl.c +0
-0{ } };Signature · 1 line
2.7.4
RFC PATCH 7/8 serial: actions: add uart support for s700
Quoted 16 lines · Manivannan Sadhasivam
Quoted 15 lines · Amit Singh Tomar
UART controller present on S700 is compatible with existing S900 UART, this patch simply adds a proper compatible string so that S900 uart driver can be reused for S700.
Signed-off-by Amit Singh Tomar <[email protected]>--- drivers/serial/serial_owl.c | 1 + 1 file changed, 1 insertion(+)drivers/serial/serial_owl.c +0
-0@@ -121,6 +121,7 @@ static const struct dm_serial_ops owl_serial_ops = {
Quoted 8 lines
drivers/serial/serial_owl.c static const struct dm_serial_ops owl_serial_ops = { · line 124
Quoted 3 lines
drivers/serial/serial_owl.c +1
-0static const struct udevice_id owl_serial_ids[] = { { .compatible ="actions,s900-serial" }, + { .compatible ="actions,owl-uart" },"owl" is the family name for S series SoCs from Actions Semi. There are 3 SoCs so far, S500, S700 and S900. Reason for naming s900-serial was that there are hw difference between S500 (ARMv7) and S900/S700 (ARMv8). So, this should be "actions,s700-serial".
Huh, how so? The Linux DT bindings, which should be authoritative, do not describe a s700 device. Also the Linux DTs use the s900 name. The only difference between the S500 and S900 type seems to be the FIFO size, which U-Boot doesn't care about.
As all the DTs I see in the Linux tree have owl-uart in their compatible list, it would actually be sufficient to list just that. This is what Linux' earlycon relies on.
But to play safe we could list both here, maybe even add s500-serial, for the sake of completeness.
But we should not invent a new compatible string here.
Cheers,
Andre.
Quoted 10 lines
Thanks,
ManiQuoted 6 lines
drivers/serial/serial_owl.c +0
-0{ } };Signature · 1 line
2.7.4
RFC PATCH 7/8 serial: actions: add uart support for s700
Quoted 26 lines · André Przywara
Quoted 16 lines · Manivannan Sadhasivam
Quoted 15 lines · Amit Singh Tomar
UART controller present on S700 is compatible with existing S900 UART, this patch simply adds a proper compatible string so that S900 uart driver can be reused for S700.
Signed-off-by Amit Singh Tomar <[email protected]>--- drivers/serial/serial_owl.c | 1 + 1 file changed, 1 insertion(+)drivers/serial/serial_owl.c +0
-0@@ -121,6 +121,7 @@ static const struct dm_serial_ops owl_serial_ops = {Quoted 8 lines
drivers/serial/serial_owl.c static const struct dm_serial_ops owl_serial_ops = { · line 124
Quoted 3 lines
drivers/serial/serial_owl.c +1
-0static const struct udevice_id owl_serial_ids[] = { { .compatible ="actions,s900-serial" }, + { .compatible ="actions,owl-uart" },"owl" is the family name for S series SoCs from Actions Semi. There are 3 SoCs so far, S500, S700 and S900. Reason for naming s900-serial was that there are hw difference between S500 (ARMv7) and S900/S700 (ARMv8). So, this should be "actions,s700-serial".
Quoted 10 lines
Huh, how so? The Linux DT bindings, which should be authoritative, do not describe a s700 device. Also the Linux DTs use the s900 name. The only difference between the S500 and S900 type seems to be the FIFO size, which U-Boot doesn't care about.
As all the DTs I see in the Linux tree have owl-uart in their compatible list, it would actually be sufficient to list just that. This is what Linux' earlycon relies on.
But to play safe we could list both here, maybe even add s500-serial, for the sake of completeness.
My argument above was based on the fact that Amit didn't remove "actions,s900-serial" compatible but added "actions,owl-serial". I'm okay with having "actions,owl-serial" for _all_ S series boards.
Thanks,
Mani
Quoted 17 lines
But we should not invent a new compatible string here.
Cheers,
Andre.Quoted 10 lines
Thanks,
ManiQuoted 6 lines
drivers/serial/serial_owl.c +0
-0{ } };Signature · 1 line
2.7.4
RFC PATCH 8/8 actions: add Cubieboard7 README
In reply to Amit Singh Tomar--- arch/arm/mach-owl/README.cubieboard7 | 88 ++++++++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+) create mode 100644 arch/arm/mach-owl/README.cubieboard7
arch/arm/mach-owl/README.cubieboard7 new file +88 -0
@@ -0,0 +1,88 @@ +Default Cubieboard7 comes with pre-installed Android where U-Boot is configured with a bootdelay of 0, entering a prompt by pressing keys does not seem to work. + +Though, one can enter ADFU mode and flash debian image(from host machine) where getting into u-boot prompt is easy. + +Enter ADFU Mode: + +Before write the firmware, let the development board entering the ADFU mode: insert +one end of the USB cable to the PC, press and hold the ADFU button, and then connect +the other end of the USB cable to the Mini USB port of the development board, release +the ADFU button, after connecting it will enter the ADFU mode. + +Check whether to enter ADFU Mode: + +The user needs to run the following command on the PC side to check if the ADFU +device is detected. ID realted to "Actions Semiconductor Co., Ltd" means that +the PC side has been correctly detected ADFU device, the development board +also enter into the ADFU mode. + +#lsusb +Bus 001 Device 005: ID 04f2:b2eb Chicony Electronics Co., Ltd +Bus 001 Device 004: ID 0a5c:21e6 Broadcom Corp. BCM20702 Bluetooth 4.0 [ThinkPad] +Bus 001 Device 003: ID 046d:c534 Logitech, Inc. Unifying Receiver +Bus 001 Device 002: ID 8087:0024 Intel Corp. Integrated Rate Matching Hub +Bus 001 Device 001: ID 1d6b:0002 Linux Foundation 2.0 root hub +Bus 004 Device 001: ID 1d6b:0003 Linux Foundation 3.0 root hub +Bus 003 Device 013: ID 10d6:10d6 Actions Semiconductor Co., Ltd +Bus 003 Device 001: ID 1d6b:0002 Linux Foundation 2.0 root hub + +Flashing debian image: + +#sudo ./ActionsFWU.py --fw=debian-stretch-desktop-cb7-emmc-v2.0.fw +ActionsFWU.py : 1.0.150828.0830 +libScript.so : 2.3.150825.0951 +libFileSystem.so: 2.3.150825.0952 +libProduction.so: 2.3.150915.1527 +=====burn all partition==== +FW_VER: 3.10.37.180608 +3% DOWNLOAD ADFUDEC ... +5% DOWNLOAD BOOT PARA ... +7% SWITCH ADFUDEC ... +12% DOWNLOAD BL31 ... +13% DOWNLOAD BL32 ... +15% DOWNLOAD VMLINUX ... +20% DOWNLOAD INITRD ... +24% DOWNLOAD FDT ... +27% DOWNLOAD ADFUS ... +30% SWITCH ADFUS ... +32% DOWNLOAD MBR ... +35% DOWNLOAD PARTITIONS ... +WRITE_MBRC_PARTITION +35% write p0 size = 2048 : ok +WRITE_BOOT_PARTITION +35% write p1 size = 2048 : ok +WRITE_MISC_PARTITION +36% write p2 size = 98304 : ok +WRITE_SYSTEM_PARTITION +94% write p3 size = 4608000 : ok +FORMAT_SWAP_PARTITION +94% write p4 size = 20480 : ok +95% TRANSFER OVER ... +Firmware upgrade successfully! + +Debian image can be downloaded from here[1]. + +Once debian image is flashed, one can get into u-boot prompt by pressing any key and from +there run ums command(make sure, usb cable is connected between host and target): + +owl> ums 0 mmc 1 + +Above command would mount debian image partition on host machine. + +Getting Cubieboard7 u-boot proper image: + +From u-boot root directory run following: + +#make clean +#export CROSS_COMPILE=aarch64-linux-gnu- +#make ARCH=arm cubieboard7_defconfig +#make -j16 +#mkimage -A arm -T firmware -C none -O u-boot -a 0x11000000 -e 0 -d u-boot-dtb.bin u-boot-dtb.img >/dev/null + +u-boot-dtb.img can now be flashed to debian image partition mounted on host machine. + +#sudo dd if=u-boot-dtb.img of=/dev/sdb bs=1024 seek=3072 + + +[1] https://mega.nz/#F!ZtwxCCJC!AIYHcTqz-ucjuzKnE9qD7A!xpJ0CSjQ +
Signature · 1 line
2.7.4
cover Actions S700 SoC support
In reply to Amit Singh TomarHi Amit,
Quoted 6 lines · Amit Singh Tomar
Hello,
This patch-set adds Cubieboard7[1] support based on Action Semi's S700 SoC[2], It's Quad-core ARMv8 SoC with Cortex-A53 cores.Most of peripherals seems to be compatible with S900 SoC(basic support for it is alreay present in u-boot).
Quoted 8 lines
First few patches consolidates Actions Semiconductor SoCs support in u-boot((mostly insprired by SUXNI as suggested by Andre).Idea is to move every bit out from board/ucRobotics into
arch/arm/mach-owl. It allows different SoCs to be driven by single "soc andKconfig" file. It also includes common clock driver for S700 and S900.Rest of patches enables S700 SoC support alongwith Cubieboard7 board.S700 support is tested[3] on Cubieboard7 board and S900 support is just compiled tested.It would be great, if someone who has S900 based board can test S900 support.
Thanks for the patchset! However, my S900 based Bubblegum96 board is broken and I have asked for replacement. So, I can't test it on board for until I get a new one. But we can proceed through the patches once review is sorted out.
Thanks,
Mani
Quoted 71 lines
Thanks,
-Amit[1]: http://www.cubietech.com/product-detail/cubieboard7/
[2]: http://www.actions-semi.com/en/productview.aspx?id=225
[3]: https://paste.ubuntu.com/p/fkCdv5nw2Q/Amit Singh Tomar (8):
arm: actions: Add common framework for Actions Semi SoCs
arm: actions: Add owl memory map regions
clk: actions: Add common clock driver
arm: board: Remove board files forbubblegum_96
arm: actions: add S700 SoC device tree
arm: add Cubieboard7 board support
serial: actions: add uart support for s700
actions: add Cubieboard7 READMEarch/arm/Kconfig | 2 - arch/arm/dts/s700-cubieboard7.dts | 39 ++++++ arch/arm/dts/s700.dtsi | 193 +++++++++++++++++++++++++++ arch/arm/include/asm/arch-owl/clk_owl.h | 61 +++++++++ arch/arm/include/asm/arch-owl/clk_s900.h | 57 -------- arch/arm/include/asm/arch-owl/regs_s700.h | 56 ++++++++ arch/arm/mach-owl/Kconfig | 31 ++--- arch/arm/mach-owl/Makefile | 3 +- arch/arm/mach-owl/README.cubieboard7 | 88 ++++++++++++ arch/arm/mach-owl/soc.c | 56 ++++++++ arch/arm/mach-owl/sysmap-owl.c | 32 +++++ arch/arm/mach-owl/sysmap-s900.c | 32 ----- board/ucRobotics/bubblegum_96/Kconfig | 15 --- board/ucRobotics/bubblegum_96/MAINTAINERS | 6 - board/ucRobotics/bubblegum_96/Makefile | 3 - board/ucRobotics/bubblegum_96/bubblegum_96.c | 56 -------- configs/bubblegum_96_defconfig | 3 +- configs/cubieboard7_defconfig | 22 +++ drivers/clk/owl/Kconfig | 8 +- drivers/clk/owl/Makefile | 2 +- drivers/clk/owl/clk_owl.c | 132 ++++++++++++++++++ drivers/clk/owl/clk_s900.c | 137 ------------------- drivers/serial/serial_owl.c | 1 + include/configs/bubblegum_96.h | 42 ------ include/configs/owl-common.h | 42 ++++++ include/configs/s700.h | 15 +++ include/configs/s900.h | 18 +++ include/dt-bindings/clock/actions,s700-cmu.h | 118 ++++++++++++++++ 28 files changed, 893 insertions(+), 377 deletions(-) create mode 100644 arch/arm/dts/s700-cubieboard7.dts create mode 100644 arch/arm/dts/s700.dtsi create mode 100644 arch/arm/include/asm/arch-owl/clk_owl.h delete mode 100644 arch/arm/include/asm/arch-owl/clk_s900.h create mode 100644 arch/arm/include/asm/arch-owl/regs_s700.h create mode 100644 arch/arm/mach-owl/README.cubieboard7 create mode 100644 arch/arm/mach-owl/soc.c create mode 100644 arch/arm/mach-owl/sysmap-owl.c delete mode 100644 arch/arm/mach-owl/sysmap-s900.c delete mode 100644 board/ucRobotics/bubblegum_96/Kconfig delete mode 100644 board/ucRobotics/bubblegum_96/MAINTAINERS delete mode 100644 board/ucRobotics/bubblegum_96/Makefile delete mode 100644 board/ucRobotics/bubblegum_96/bubblegum_96.c create mode 100644 configs/cubieboard7_defconfig create mode 100644 drivers/clk/owl/clk_owl.c delete mode 100644 drivers/clk/owl/clk_s900.c delete mode 100644 include/configs/bubblegum_96.h create mode 100644 include/configs/owl-common.h create mode 100644 include/configs/s700.h create mode 100644 include/configs/s900.h create mode 100644 include/dt-bindings/clock/actions,s700-cmu.hSignature · 1 line
2.7.4