Actions S700 SoC support
Subsystems (6)
v10 cover Actions S700 SoC support
This adds Cubieboard7[1] support based on Action Semi's S700 SoC[2], It's Quad-core ARMv8 SoC with Cortex-A53 cores. Peripheral like UART seems to be compatible with S900 SoC(basic support for it is alreay present in u-boot).
This series(v10) takes care the commments provided by Mani and patches 04/12, 07/12 and 12/12 has been changed to address those comments.
Previous series(v9) fixes a Bug that breaks bubblegum96 board boot(reported by Mani). It was due to fact that driver data read is not proper in the clock driver. There are changes in patch 06/12 to fix it.
Series(v8) removes the SoC specific include instead just uses owl-common. For this patch 01/12 and 09/12 changes a bit.
Series(v7) fixes a serious Bug that breaks S900, it was there since v5.Thanks to Andre for pointing it out.
Series(v6)[3] does following changes:
* [PATCH v5 06/11] becomes [PATCH v6 03/11]
* [PATCH v5 03/11] becomes [PATCH v6 04/11]
* Introduce a new patch to move defconfig options to Kconfig which is [PATCH v6 10/12]
Series(v5)[4] just re-orders the patches so that U-BOOT(with bubblegum96_defconfig) builds after every patch of the series(suggested by Andre).
S700 support is tested[5] on Cubieboard7-lite board and S900 support is just compiled tested.
This patch series can be tested using below tree:
https://github.com/Atomar25/u-boot/commits/s700_v10
[1]: http://www.cubietech.com/product-detail/cubieboard7/
[2]: http://www.actions-semi.com/en/productview.aspx?id=225
[3]: http://u-boot.10912.n7.nabble.com/PATCH-v6-00-12-Actions-S700-SoC-support-td403562.html#a403567
[4]: http://u-boot.10912.n7.nabble.com/PATCH-v5-00-11-Actions-S700-SoC-support-td402752.html#a402762
[5]: https://paste.ubuntu.com/p/TbBtk5dPGS/
Amit Singh Tomar (12):
arm: actions: Add common framework for Actions Owl Semi SoCs
arm: actions: rename sysmap-s900 to sysmap-owl
serial: actions: add compatible string
arm: dts: sync dts for Action Semi S900
arm: dts: actions: s900: add u-boot specific dtsi file
clk: actions: Add common clock driver
arm: actions: add S700 SoC device tree
arm: dts: actions: s700: add u-boot specific dtsi file
arm: add support Actions Semi S700
actions: Move defconfig options to Kconfig
arm: add Cubieboard7 board support
doc: boards: add Cubieboard7 documentation
MAINTAINERS | 3 +- arch/arm/Kconfig | 5 +- arch/arm/dts/Makefile | 4 +- arch/arm/dts/s700-cubieboard7.dts | 92 +++++++ arch/arm/dts/s700-u-boot.dtsi | 18 ++ arch/arm/dts/s700.dtsi | 248 +++++++++++++++++++ arch/arm/dts/s900-u-boot.dtsi | 17 ++ arch/arm/dts/s900.dtsi | 322 +++++++++++++++++++++++-- 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 | 49 ++-- arch/arm/mach-owl/Makefile | 3 +- arch/arm/mach-owl/soc.c | 57 +++++ 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 | 57 ----- configs/bubblegum_96_defconfig | 12 +- configs/cubieboard7_defconfig | 9 + doc/board/actions/cubieboard7.rst | 114 +++++++++ doc/board/actions/index.rst | 10 + doc/board/index.rst | 1 + drivers/clk/owl/Kconfig | 8 +- drivers/clk/owl/Makefile | 2 +- drivers/clk/owl/clk_owl.c | 155 ++++++++++++ drivers/clk/owl/clk_owl.h | 64 +++++ drivers/clk/owl/clk_s900.c | 137 ----------- drivers/serial/serial_owl.c | 2 +- include/configs/bubblegum_96.h | 40 --- include/configs/owl-common.h | 40 +++ include/dt-bindings/clock/actions,s700-cmu.h | 118 +++++++++ include/dt-bindings/clock/actions,s900-cmu.h | 129 ++++++++++ include/dt-bindings/clock/s900_cmu.h | 77 ------ include/dt-bindings/reset/actions,s700-reset.h | 34 +++ include/dt-bindings/reset/actions,s900-reset.h | 65 +++++ 37 files changed, 1607 insertions(+), 486 deletions(-) create mode 100644 arch/arm/dts/s700-cubieboard7.dts create mode 100644 arch/arm/dts/s700-u-boot.dtsi create mode 100644 arch/arm/dts/s700.dtsi create mode 100644 arch/arm/dts/s900-u-boot.dtsi 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/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 doc/board/actions/cubieboard7.rst create mode 100644 doc/board/actions/index.rst create mode 100644 drivers/clk/owl/clk_owl.c create mode 100644 drivers/clk/owl/clk_owl.h 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/dt-bindings/clock/actions,s700-cmu.h create mode 100644 include/dt-bindings/clock/actions,s900-cmu.h delete mode 100644 include/dt-bindings/clock/s900_cmu.h create mode 100644 include/dt-bindings/reset/actions,s700-reset.h create mode 100644 include/dt-bindings/reset/actions,s900-reset.h
Signature · 1 line
2.7.4
PATCH v10 1/12 arm: actions: Add common framework for Actions Owl Semi SoCs
This commit adds common arch support for Actions Semi Owl series SoCs and removes the Bubblegum96 board files.
---
Changes since v9:
* Added Reviewed-by tag from Mani.
Changes since v8:
* Added Reviewed-by tag.
Changes since v7:
* Removed S900 specific include file.
* Removed the file list entry in MAINTAINERS file.
Changes since v6:
* No change.
Changes since v5:
* No change.
Changes since v4:
* No change.
Changes since v3:
* Corrected the file list entry in MAINTAINERS file.
Changes since v2:
* Moved the file list details to root MAINTAINERS file.
* Updated the commit message as suggested by Mani.
* Used the "Owl" keyword to describe SoC family.
Changes since v1:
* Moved S700 specific changes to patch 4 of 9.
* Moved couple of symbols from defconfig to arch/arm/Kconfig and platform owl Kconfig.
--- MAINTAINERS | 3 +- arch/arm/Kconfig | 3 +- arch/arm/mach-owl/Kconfig | 29 ++++++-------- arch/arm/mach-owl/Makefile | 1 + arch/arm/mach-owl/soc.c | 57 ++++++++++++++++++++++++++++ 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 | 57 ---------------------------- configs/bubblegum_96_defconfig | 4 +- include/configs/bubblegum_96.h | 40 ------------------- include/configs/owl-common.h | 40 +++++++++++++++++++ 12 files changed, 114 insertions(+), 144 deletions(-) create mode 100644 arch/arm/mach-owl/soc.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 delete mode 100644 include/configs/bubblegum_96.h create mode 100644 include/configs/owl-common.h
MAINTAINERS +2 -1
@@ -272,9 +272,10 @@ M: Manivannan Sadhasivam <[email protected]> S: Maintained F: arch/arm/include/asm/arch-owl/ F: arch/arm/mach-owl/ -F: board/ucRobotics/ F: drivers/clk/owl/ F: drivers/serial/serial_owl.c +F: include/configs/owl-common.h +F: configs/bubblegum_96_defconfig ARM RENESAS RMOBILE/R-CAR M: Nobuhiro Iwamatsu <[email protected]>
arch/arm/Kconfig +1 -2
@@ -873,9 +873,9 @@ config ARCH_MX5 config ARCH_OWL bool "Actions Semi OWL SoCs" - select ARM64 select DM select DM_SERIAL + select OWL_SERIAL select OF_CONTROL imply CMD_DM
@@ -1868,7 +1868,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/variscite/dart_6ul/Kconfig"
arch/arm/mach-owl/Kconfig +12 -17
@@ -1,27 +1,22 @@ if ARCH_OWL -config SYS_SOC - default "owl" - choice - prompt "Actions Semi OWL SoCs board select" + prompt "Actions Semi Owl 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_S900 + bool "Actions Semi S900 SoC" + select ARM64 endchoice -source "board/ucRobotics/bubblegum_96/Kconfig" +config SYS_TEXT_BASE + default 0x11000000 + +config SYS_CONFIG_NAME + default "owl-common" + +config SYS_SOC + default "s900" if MACH_S900 endif
arch/arm/mach-owl/Makefile +1 -0
@@ -1,3 +1,4 @@ # SPDX-License-Identifier: GPL-2.0+ +obj-y += soc.o obj-y += sysmap-s900.o
arch/arm/mach-owl/soc.c new file +57 -0
57 lines not on this page · raw message
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 -57
57 lines not on this page · raw message
configs/bubblegum_96_defconfig +1 -3
@@ -1,9 +1,8 @@ CONFIG_ARM=y CONFIG_ARCH_OWL=y -CONFIG_SYS_TEXT_BASE=0x11000000 CONFIG_ENV_SIZE=0x2000 -CONFIG_TARGET_BUBBLEGUM_96=y CONFIG_NR_DRAM_BANKS=1 +CONFIG_MACH_S900=y CONFIG_IDENT_STRING="\nBubblegum-96" CONFIG_DISTRO_DEFAULTS=y CONFIG_BOOTDELAY=5
@@ -21,4 +20,3 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_CLK=y CONFIG_CLK_OWL=y CONFIG_CLK_S900=y -CONFIG_OWL_SERIAL=y
include/configs/bubblegum_96.h deleted +0 -40
@@ -1,40 +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 - -/* 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 +40 -0
@@ -0,0 +1,40 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* +* Board configuration file for Actions Semi Owl SoCs. +* +* 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 + +/* Console configuration */ +#define CONFIG_SYS_CBSIZE 1024/* Console buffer size */ +#define CONFIG_SYS_MAXARGS 64 +#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE + +#endif
Signature · 1 line
2.7.4
PATCH v10 2/12 arm: actions: rename sysmap-s900 to sysmap-owl
In reply to Amit Singh TomarNow that memory maps(for both S700 and S900 SoCs) can be managed using a common file, rename sysmap-s900 to sysmap-owl to reflect the same.
---
Changes since v9:
* No changes.
Changes since v8:
* No changes.
Changes since v7:
* No changes.
Changes since v6:
* No changes.
Changes since v5:
* No changes.
Changes since v4:
* No changes.
Changes since v3:
* Added reviewed-by tag.
Changes since v2:
* Fixed the commit message and header.
Changes since v1:
* compile sysmap-owl.c against CONFIG_ARM64 now.
--- arch/arm/mach-owl/Makefile | 2 +- arch/arm/mach-owl/sysmap-owl.c | 32 ++++++++++++++++++++++++++++++++ arch/arm/mach-owl/sysmap-s900.c | 32 -------------------------------- 3 files changed, 33 insertions(+), 33 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 -1
@@ -1,4 +1,4 @@ # SPDX-License-Identifier: GPL-2.0+ obj-y += soc.o -obj-y += sysmap-s900.o +obj-$(CONFIG_ARM64) += sysmap-owl.o
arch/arm/mach-owl/sysmap-owl.c new file +32 -0
@@ -0,0 +1,32 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* +* Memory map for Actions Semi Owl series SoCs. +* +* 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
PATCH v10 3/12 serial: actions: add compatible string
In reply to Amit Singh TomarThis patch adds "actions,owl-uart" string to the owl uart driver. It is also defined in Linux kernel.
---
Changes since v9:
* Added Reviewed-by tag from Mani.
Changes since v8:
* No changes.
Changes since v7:
* No changes.
Changes since v6:
* Added Reviewd-by tag.
Changes since v5:
* Moved it to from 06/11 to 03/11.
* Used appropriate commit message.
* Removed the reviwed-by tag.
Changes since v4:
* Moved it to from 09/11 to 06/11.
Changes since v3:
* Used only owl-uart for compatible string.
Changes since v2:
* No changes.
Changes since v1:
* No changes.
--- 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
PATCH v10 4/12 arm: dts: sync dts for Action Semi S900
In reply to Amit Singh TomarSynchronize device tree bindings with v5.5-rc6 tag with commit id "b3a987b0264d".
Also, it removes older clock binding defined for S900 along with undocumented compatible string "actions,s900-serial" from serial driver and adapts clock driver to cater to new bindings.
---
Changes since v9:
* Added Reviewed-by tag from Mani.
* Pulled in changes(that enables bubblegum DT build based on CONFIG_MACH_S900) from patch 07/12.
Changes since v8:
* No changes.
Changes since v7:
* No changes.
Changes since v6:
* Added Reviewed-by tag.
Changes since v5:
* Moved it 04/11 from 03/11.
* removed the undocumented compatible string "actions,s900-serial".
* removed the reviewed-by tag.
Changes since v4:
* This patch is re-ordered, moved from 07/11 to 03/11.
* Used the commit-id(12 chars long) in commit message.
Changes since v3:
* Added Reviewed-by: tag.
Changes since v2:
* Newly added patch, not there in v2/v1.
--- arch/arm/dts/Makefile | 2 +- arch/arm/dts/s900.dtsi | 322 +++++++++++++++++++++++-- drivers/clk/owl/clk_s900.c | 6 +- drivers/serial/serial_owl.c | 1 - include/dt-bindings/clock/actions,s900-cmu.h | 129 ++++++++++ include/dt-bindings/clock/s900_cmu.h | 77 ------ include/dt-bindings/reset/actions,s900-reset.h | 65 +++++ 7 files changed, 499 insertions(+), 103 deletions(-) create mode 100644 include/dt-bindings/clock/actions,s900-cmu.h delete mode 100644 include/dt-bindings/clock/s900_cmu.h create mode 100644 include/dt-bindings/reset/actions,s900-reset.h
arch/arm/dts/Makefile +1 -1
@@ -64,7 +64,7 @@ dtb-$(CONFIG_KIRKWOOD) += \ kirkwood-pogo_e02.dtb \ kirkwood-sheevaplug.dtb -dtb-$(CONFIG_ARCH_OWL) += \ +dtb-$(CONFIG_MACH_S900) += \ bubblegum_96.dtb dtb-$(CONFIG_ROCKCHIP_PX30) += \
arch/arm/dts/s900.dtsi +301 -21
346 lines not on this page · raw message
drivers/clk/owl/clk_s900.c +3 -3
@@ -12,7 +12,7 @@#include <asm/arch-owl/regs_s900.h> #include <asm/io.h> -#include <dt-bindings/clock/s900_cmu.h> +#include <dt-bindings/clock/actions,s900-cmu.h> void owl_clk_init (struct owl_clk_priv *priv) {
@@ -78,7 +78,7 @@ int owl_clk_enable(struct clk *clk)struct owl_clk_priv *priv =dev_get_priv (clk->dev);switch (clk->id) { -case CLOCK_UART5 : +case CLK_UART5 :owl_uart_clk_enable (priv);break ;default :
@@ -93,7 +93,7 @@ int owl_clk_disable(struct clk *clk)struct owl_clk_priv *priv =dev_get_priv (clk->dev);switch (clk->id) { -case CLOCK_UART5 : +case CLK_UART5 :owl_uart_clk_disable (priv);break ;default :
drivers/serial/serial_owl.c +0 -1
@@ -120,7 +120,6 @@ 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" }, { } };
include/dt-bindings/clock/actions,s900-cmu.h new file +129 -0
129 lines not on this page · raw message
include/dt-bindings/clock/s900_cmu.h deleted +0 -77
77 lines not on this page · raw message
include/dt-bindings/reset/actions,s900-reset.h new file +65 -0
65 lines not on this page · raw message
Signature · 1 line
2.7.4
PATCH v10 5/12 arm: dts: actions: s900: add u-boot specific dtsi file
In reply to Amit Singh TomarDevices like uart and clk are needed to be enabled before relocation. This patch adds u-boot.dtsi file that mark these device as dm-pre-reloc.
---
Changes since v9:
* Added Reviewed-by tag from Mani.
Changes since v8:
* No changes.
Changes since v7:
* No changes.
Changes since v6:
* No changes.
Changes since v5:
* No changes.
Changes since v4:
* This patch is re-ordered, moved from 08/11 to 04/11.
Changes since v3:
* Replaced dtsi with dts in subject line along with arm:dts:
to the prefix.
* Added reviewed-by tag.
Changes since v2:
* Newly added patch, not there in v2/v1.
--- arch/arm/dts/s900-u-boot.dtsi | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 arch/arm/dts/s900-u-boot.dtsi
arch/arm/dts/s900-u-boot.dtsi new file +17 -0
@@ -0,0 +1,17 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + */ + +/{ + soc { + u-boot,dm-pre-reloc; + }; +}; + +&uart5 { + u-boot,dm-pre-reloc; +}; + +&cmu { + u-boot,dm-pre-reloc; +};
Signature · 1 line
2.7.4
PATCH v10 6/12 clk: actions: Add common clock driver
In reply to Amit Singh TomarThis patch converts S900 clock driver to something common that can be used for other SoCs, for instance S700(few of clk registers are same).
---
Changes since v9:
* Checked the relevant SoC model.
Changes since v8:
* Fixed the bubblegum-96 boot issue by introducing dev_get_driver_data API to read driver data.
Changes since v7:
* No changes.
Changes since v6:
* Fixed the bug that breaks S900(missing break in switch statement).
Changes since v5:
* No changes.
Changes since v4:
* This patch is re-ordered, moved from 08/11 to 04/11.
Changes since v3:
* Replaced dtsi with dts in subject line along with arm:dts:
to the prefix.
* Added reviewed-by tag.
Changes since v2:
* Newly added patch, not there in v2/v1.
--- arch/arm/Kconfig | 2 + arch/arm/include/asm/arch-owl/clk_s900.h | 57 ----------- arch/arm/include/asm/arch-owl/regs_s700.h | 56 +++++++++++ configs/bubblegum_96_defconfig | 3 - drivers/clk/owl/Kconfig | 8 +- drivers/clk/owl/Makefile | 2 +- drivers/clk/owl/clk_owl.c | 155 ++++++++++++++++++++++++++++++ drivers/clk/owl/clk_owl.h | 64 ++++++++++++ drivers/clk/owl/clk_s900.c | 137 -------------------------- 9 files changed, 280 insertions(+), 204 deletions(-) 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 create mode 100644 drivers/clk/owl/clk_owl.h delete mode 100644 drivers/clk/owl/clk_s900.c
arch/arm/Kconfig +2 -0
@@ -876,6 +876,8 @@ config ARCH_OWL select DM select DM_SERIAL select OWL_SERIAL + select CLK + select CLK_OWL select OF_CONTROL imply CMD_DM
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
configs/bubblegum_96_defconfig +0 -3
@@ -17,6 +17,3 @@ CONFIG_CMD_CACHE=y CONFIG_CMD_TIMER=y CONFIG_DEFAULT_DEVICE_TREE="bubblegum_96" CONFIG_SYS_RELOC_GD_ENV_ADDR=y -CONFIG_CLK=y -CONFIG_CLK_OWL=y -CONFIG_CLK_S900=y
drivers/clk/owl/Kconfig +2 -6
@@ -3,10 +3,6 @@ config CLK_OWL depends on CLK && ARCH_OWL help Enable support for clock managemet unit present in Actions Semi - OWL SoCs. + Owl series S900/S700 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 +155 -0
155 lines not on this page · raw message
drivers/clk/owl/clk_owl.h new file +64 -0
64 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
PATCH v10 6/12 clk: actions: Add common clock driver
Quoted 5 lines · Amit Singh Tomar
This patch converts S900 clock driver to something common that can be used for other SoCs, for instance S700(few of clk registers are same).
Reviewed-by Andre Przywara <[email protected]>Signed-off-by Amit Singh Tomar <[email protected]>
Thanks,
Mani
Quoted 589 lines
---
Changes since v9:
* Checked the relevant SoC model.
Changes since v8:
* Fixed the bubblegum-96 boot issue by introducingdev_get_driver_dataAPI to read driver data.
Changes since v7:
* No changes.
Changes since v6:
* Fixed the bug that breaks S900(missing break in switch statement).
Changes since v5:
* No changes.
Changes since v4:
* This patch is re-ordered, moved from 08/11 to 04/11.
Changes since v3:
* Replaced dtsi with dts in subject line along with arm:dts:
to the prefix.
* Added reviewed-by tag.
Changes since v2:
* Newly added patch, not there in v2/v1.--- arch/arm/Kconfig | 2 + arch/arm/include/asm/arch-owl/clk_s900.h | 57 ----------- arch/arm/include/asm/arch-owl/regs_s700.h | 56 +++++++++++ configs/bubblegum_96_defconfig | 3 - drivers/clk/owl/Kconfig | 8 +- drivers/clk/owl/Makefile | 2 +- drivers/clk/owl/clk_owl.c | 155 ++++++++++++++++++++++++++++++ drivers/clk/owl/clk_owl.h | 64 ++++++++++++ drivers/clk/owl/clk_s900.c | 137 -------------------------- 9 files changed, 280 insertions(+), 204 deletions(-) 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 create mode 100644 drivers/clk/owl/clk_owl.h delete mode 100644 drivers/clk/owl/clk_s900.carch/arm/Kconfig +2
-0@@ -876,6 +876,8 @@ config ARCH_OWL select DM select DM_SERIAL select OWL_SERIAL + select CLK + select CLK_OWL select OF_CONTROL imply CMD_DMarch/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 configs/bubblegum_96_defconfig +0
-3@@ -17,6 +17,3 @@ CONFIG_CMD_CACHE=y CONFIG_CMD_TIMER=y CONFIG_DEFAULT_DEVICE_TREE="bubblegum_96" CONFIG_SYS_RELOC_GD_ENV_ADDR=y -CONFIG_CLK=y -CONFIG_CLK_OWL=y -CONFIG_CLK_S900=ydrivers/clk/owl/Kconfig +2
-6@@ -3,10 +3,6 @@ config CLK_OWL depends on CLK && ARCH_OWL help Enable support for clock managemet unit present in Actions Semi - OWL SoCs. + Owl series S900/S700 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.odrivers/clk/owl/clk_owl.c new file +155
-0@@ -0,0 +1,155 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* +* Common clock driver for Actions Semi SoCs. +* +* Copyright (C) 2015 Actions Semi Co., Ltd. +* Copyright (C) 2018 Manivannan Sadhasivam <[email protected]> +*/ + +#include <common.h> +#include <dm.h> +#include "clk_owl.h" +#include <asm/io.h> +#if defined(CONFIG_MACH_S900 ) +#include <asm/arch-owl/regs_s900.h> +#include <dt-bindings/clock/actions,s900-cmu.h> +#elif defined(CONFIG_MACH_S700 ) +#include <asm/arch-owl/regs_s700.h> +#include <dt-bindings/clock/actions,s700-cmu.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); +enum owl_soc model =dev_get_driver_data (clk->dev); + +switch (clk->id) { +case CLK_UART5 : +if (model !=S900 ) +return -EINVAL ; +/* 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 ); +break ; +case CLK_UART3 : +if (model !=S700 ) +return -EINVAL ; +/* 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 ); +break ; +default : +return -EINVAL ; + } + +return 0 ; +} + +int owl_clk_disable (struct clk *clk) +{ +struct owl_clk_priv *priv =dev_get_priv (clk->dev); +enum owl_soc model =dev_get_driver_data (clk->dev); + +switch (clk->id) { +case CLK_UART5 : +if (model !=S900 ) +return -EINVAL ; +/* Disable UART5 interface clock */ +clrbits_le32 (priv->base +CMU_DEVCLKEN1 ,CMU_DEVCLKEN1_UART5 ); +break ; +case CLK_UART3 : +if (model !=S700 ) +return -EINVAL ; +/* Disable UART3 interface clock */ +clrbits_le32 (priv->base +CMU_DEVCLKEN1 ,CMU_DEVCLKEN1_UART3 ); +break ; +default : +return -EINVAL ; + } + +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 const struct clk_ops owl_clk_ops = { + .enable = owl_clk_enable, + .disable = owl_clk_disable, +}; + +static const struct udevice_id owl_clk_ids[] = { +#if defined(CONFIG_MACH_S900) + { .compatible ="actions,s900-cmu" , .data =S900 }, +#elif defined(CONFIG_MACH_S700) + { .compatible ="actions,s700-cmu" , .data =S700 }, +#endif + { } +}; + +U_BOOT_DRIVER (clk_owl) = { + .name ="clk_owl" , + .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, +};drivers/clk/owl/clk_owl.h new file +64
-0@@ -0,0 +1,64 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* +* Actions Semi SoCs 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> + +enum owl_soc { +S700 , +S900 , +}; + +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) + +#define PLL_STABILITY_WAIT_US 50 + +#define CMU_DEVCLKEN1_UART5 BIT(21) +#define CMU_DEVCLKEN1_UART3 BIT(11) + +#define CMU_DEVCLKEN1_ETH_S700 BIT(23) + +#endif 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/actions,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 CLK_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 CLK_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
PATCH v10 7/12 arm: actions: add S700 SoC device tree
In reply to Amit Singh TomarThis patch adds .dtsi file(sync with Linux 5.5-rc6 with hash "b3a987b0264d") and required binding for S700 SoC that is a 64-bit Quad-core ARM Cortex-A53 cores.
It also provisions dts file to be built based on selected platform(CONFIG_MACH_S900/S700).
---
Changes since v9:
* Moved changes(that enables bubblegum-96 DT build) to patch 04/12.
Changes since v8:
* No changes.
Changes since v7:
* No changes.
Changes since v6:
* No changes.
Changes since v5:
* Added reviwed-by tag.
Changes since v4:
* Move it to 07/11 from 05/11.
Changes since v3:
* Updated commit message to the Linux tag to
which the dtsi file is synced.
Changes since v2:
* Synced DTS bindings with Linux 5.5.
Changes since v1:
* Moved the u-boot specific changes to s700-u-boot.dtsi, now s700.dtsi is in complete sync with Linux 4.20.
--- arch/arm/dts/Makefile | 2 + arch/arm/dts/s700.dtsi | 248 +++++++++++++++++++++++++ include/dt-bindings/clock/actions,s700-cmu.h | 118 ++++++++++++ include/dt-bindings/reset/actions,s700-reset.h | 34 ++++ 4 files changed, 402 insertions(+) create mode 100644 arch/arm/dts/s700.dtsi create mode 100644 include/dt-bindings/clock/actions,s700-cmu.h create mode 100644 include/dt-bindings/reset/actions,s700-reset.h
arch/arm/dts/Makefile +2 -0
@@ -66,6 +66,8 @@ dtb-$(CONFIG_KIRKWOOD) += \ dtb-$(CONFIG_MACH_S900) += \ bubblegum_96.dtb +dtb-$(CONFIG_MACH_S700) += \ + s700-cubieboard7.dtb dtb-$(CONFIG_ROCKCHIP_PX30) += \ px30-evb.dtb \
arch/arm/dts/s700.dtsi new file +248 -0
248 lines not on this page · raw message
include/dt-bindings/clock/actions,s700-cmu.h new file +118 -0
118 lines not on this page · raw message
include/dt-bindings/reset/actions,s700-reset.h new file +34 -0
@@ -0,0 +1,34 @@ +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) +// +// Device Tree binding constants for Actions Semi S700 Reset Management Unit +// +// Copyright (c) 2018 Linaro Ltd. + +#ifndef __DT_BINDINGS_ACTIONS_S700_RESET_H +#define __DT_BINDINGS_ACTIONS_S700_RESET_H + +#define RESET_AUDIO 0 +#define RESET_CSI 1 +#define RESET_DE 2 +#define RESET_DSI 3 +#define RESET_GPIO 4 +#define RESET_I2C0 5 +#define RESET_I2C1 6 +#define RESET_I2C2 7 +#define RESET_I2C3 8 +#define RESET_KEY 9 +#define RESET_LCD0 10 +#define RESET_SI 11 +#define RESET_SPI0 12 +#define RESET_SPI1 13 +#define RESET_SPI2 14 +#define RESET_SPI3 15 +#define RESET_UART0 16 +#define RESET_UART1 17 +#define RESET_UART2 18 +#define RESET_UART3 19 +#define RESET_UART4 20 +#define RESET_UART5 21 +#define RESET_UART6 22 + +#endif /* __DT_BINDINGS_ACTIONS_S700_RESET_H */
Signature · 1 line
2.7.4
PATCH v10 8/12 arm: dts: actions: s700: add u-boot specific dtsi file
In reply to Amit Singh TomarDevices like uart and clk are needed to be enabled before relocation. this patch adds u-boot.dtsi file that mark these device as dm-pre-reloc.
---
Changes since v9:
* Added Reviewed-by tag from Mani.
Changes since v8:
* No changes.
Changes since v7:
* No changes.
Changes since v6:
* No changes.
Changes since v5:
* Added reviwed-by tag.
Changes since v4:
* Moved it to 08/11 to 06/11.
Changes since v3:
* Replaced dtsi with dts in subject line along with arm:dts:
to the prefix.
Changes since v2:
* Added License.
Changes since v1:
* This is newly added file that was *not* present in v1 and contains u-boot specific changes.
--- arch/arm/dts/s700-u-boot.dtsi | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 arch/arm/dts/s700-u-boot.dtsi
arch/arm/dts/s700-u-boot.dtsi new file +18 -0
@@ -0,0 +1,18 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2020 Amit Singh Tomar <[email protected]> + */ + +/{ + soc { + u-boot,dm-pre-reloc; + }; +}; + +&uart3 { + u-boot,dm-pre-reloc; +}; + +&cmu { + u-boot,dm-pre-reloc; +};
Signature · 1 line
2.7.4
PATCH v10 9/12 arm: add support Actions Semi S700
In reply to Amit Singh TomarThis patch adds basic support for Actions Semi based S700 SoC, which is driven by common owl framework.
---
Changes since v9:
* Added Reviewed-by tag from Mani.
Changes since v8:
* Added Reviewed-by tag.
Changes since v7:
* Removed S700 include file.
Changes since v6:
* No changes.
Changes since v5:
* Added reviewed-by tag.
Changes since v4:
* Moved it to 09/11 to 04/11.
Changes since v3:
* Added "SoC" keyword to Actions Semi S700.
Changes since v2:
* Fixed the commit message.
* Checked for the clk->id.
* Added a .data member with SoC type.
* Removed #ifdefs from few places.
Changes since v1:
* Moved CLK and CLK_OWL symbols from defconfig to arch/arm/Kconfig.
--- arch/arm/mach-owl/Kconfig | 5 +++++ 1 file changed, 5 insertions(+)
arch/arm/mach-owl/Kconfig +5 -0
@@ -8,6 +8,10 @@ config MACH_S900 bool "Actions Semi S900 SoC" select ARM64 +config MACH_S700 + bool "Actions Semi S700 SoC" + select ARM64 + endchoice config SYS_TEXT_BASE
@@ -18,5 +22,6 @@ config SYS_CONFIG_NAME config SYS_SOC default "s900" if MACH_S900 + default "s700" if MACH_S700 endif
Signature · 1 line
2.7.4
PATCH v10 10/12 actions: Move defconfig options to Kconfig
In reply to Amit Singh TomarThis patch moves some of the config options from bubblegum_96_defconfig to platform specific Kconfig file.
---
Changes since v9:
* Added Reviewed-by tag from Mani.
Changes since v8:
* No changes.
Changes since v7:
* No changes.
Changes since v6:
* remove unnecessary string from SYS_PROMPT.
Changes since v5:
* Newly added patch, was not there in earlier versions.
--- arch/arm/mach-owl/Kconfig | 15 +++++++++++++++ configs/bubblegum_96_defconfig | 5 ----- 2 files changed, 15 insertions(+), 5 deletions(-)
arch/arm/mach-owl/Kconfig +15 -0
@@ -24,4 +24,19 @@ config SYS_SOC default "s900" if MACH_S900 default "s700" if MACH_S700 +config DISTRO_DEFAULTS + default y + +config NR_DRAM_BANKS + default 1 + +config SYS_RELOC_GD_ENV_ADDR + default y + +config SYS_PROMPT + default "U-Boot => " + +config DISPLAY_BOARDINFO + default n + endif
configs/bubblegum_96_defconfig +0 -5
@@ -1,19 +1,14 @@ CONFIG_ARM=y CONFIG_ARCH_OWL=y CONFIG_ENV_SIZE=0x2000 -CONFIG_NR_DRAM_BANKS=1 CONFIG_MACH_S900=y CONFIG_IDENT_STRING="\nBubblegum-96" -CONFIG_DISTRO_DEFAULTS=y CONFIG_BOOTDELAY=5 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyOWL5,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="bubblegum_96" -CONFIG_SYS_RELOC_GD_ENV_ADDR=y
Signature · 1 line
2.7.4
PATCH v10 11/12 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 .dts(copied from Linux v5.5-rc6 with hash "b3a987b0264d").
---
Changes since v9:
* Added Reviewed-by tag from Mani.
Changes since v8:
* No changes.
Changes since v7:
* No changes.
Changes since v6:
* Added Reviewed-by tag.
Changes since v5:
* Trimmed of the cubieboard7_defconfig.
Changes since v4:
* No changes.
Changes since v3:
* added reviewed-by: tag.
Changes since v2:
* No changes.
Changes since v1:
* No changes.
--- arch/arm/dts/s700-cubieboard7.dts | 92 +++++++++++++++++++++++++++++++++++++++ configs/cubieboard7_defconfig | 9 ++++ 2 files changed, 101 insertions(+) create mode 100644 arch/arm/dts/s700-cubieboard7.dts create mode 100644 configs/cubieboard7_defconfig
arch/arm/dts/s700-cubieboard7.dts new file +92 -0
@@ -0,0 +1,92 @@ +// 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>; + }; +}; + +&i2c0 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&i2c0_default>; +}; + +&i2c1 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&i2c1_default>; +}; + +&i2c2 { + status = "disabled"; + pinctrl-names = "default"; + pinctrl-0 = <&i2c2_default>; +}; + +&pinctrl { + i2c0_default: i2c0_default { + pinmux { + groups = "i2c0_mfp"; + function = "i2c0"; + }; + pinconf { + pins = "i2c0_sclk", "i2c0_sdata"; + bias-pull-up; + }; + }; + + i2c1_default: i2c1_default { + pinmux { + groups = "i2c1_dummy"; + function = "i2c1"; + }; + pinconf { + pins = "i2c1_sclk", "i2c1_sdata"; + bias-pull-up; + }; + }; + + i2c2_default: i2c2_default { + pinmux { + groups = "i2c2_dummy"; + function = "i2c2"; + }; + pinconf { + pins = "i2c2_sclk", "i2c2_sdata"; + bias-pull-up; + }; + }; +}; + +&timer { + clocks = <&hosc>; +}; + +&uart3 { + status = "okay"; +};
configs/cubieboard7_defconfig new file +9 -0
@@ -0,0 +1,9 @@ +CONFIG_ARM=y +CONFIG_ARCH_OWL=y +CONFIG_MACH_S700=y +CONFIG_IDENT_STRING="\ncubieboard7" +CONFIG_BOOTDELAY=5 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyOWL3,115200n8" +# CONFIG_DISPLAY_CPUINFO is not set +CONFIG_DEFAULT_DEVICE_TREE="s700-cubieboard7"
Signature · 1 line
2.7.4
PATCH v10 12/12 doc: boards: add Cubieboard7 documentation
In reply to Amit Singh TomarThis adds build and flash steps for Actions S700
based Cubieboard7 board.
---
Changes since v9:
* Updated the heading to CUBIEBOARD7 to ACTIONS.
* Added shorthand for mkimage command.
Changes since v8:
* No changes.
Changes since v7:
* No changes.
Changes since v6:
* No changes.
Changes since v5:
* No changes.
Changes since v4:
* No changes.
Changes since v3:
* Convert plain text documentation to reStructuredText format.
Changes since v2:
* No Change.
Changes since v1:
* No Change.
--- doc/board/actions/cubieboard7.rst | 114 ++++++++++++++++++++++++++++++++++++++ doc/board/actions/index.rst | 10 ++++ doc/board/index.rst | 1 + 3 files changed, 125 insertions(+) create mode 100644 doc/board/actions/cubieboard7.rst create mode 100644 doc/board/actions/index.rst
doc/board/actions/cubieboard7.rst new file +114 -0
@@ -0,0 +1,114 @@ +.. SPDX-License-Identifier: GPL-2.0+ +.. Copyright (C) 2020 Amit Singh Tomar <[email protected]> + +CUBIEBOARD7 +=========== + +About this +---------- + +This document describes build and flash steps for Actions S700 SoC based Cubieboard7 +board. + +Cubieboard7 initial configuration +--------------------------------- + +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 entered 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. + +.. code-block:: none + + $ 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 +--------------------- + +.. code-block:: none + + $ 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): + +.. code-block:: none + + owl> ums 0 mmc 1 + +Above command would mount debian image partition on host machine. + +Building U-BOOT proper image +---------------------------- + +.. code-block:: none + + $ make clean + $ export CROSS_COMPILE=aarch64-linux-gnu- + $ make ARCH=arm cubieboard7_defconfig + $ make u-boot-dtb.img -j16 + +u-boot-dtb.img can now be flashed to debian image partition mounted on host machine. + +.. code-block:: none + + $ sudo dd if=u-boot-dtb.img of=/dev/sdb bs=1024 seek=3072 + +[1]: https://pan.baidu.com/s/1uawPr0Jao2HgWFLZCLzHAg#list/path=%2FCubieBoard_Download%2FBoard%2FCubieBoard7%2F%E6%96%B9%E7%B3%96%E6%96%B9%E6%A1%88%E5%BC%80%E5%8F%91%E8%B5%84%E6%96%99%2FImage%2FDebian%2FV2.1-test&parentPath=%2F
doc/board/actions/index.rst new file +10 -0
@@ -0,0 +1,10 @@ +.. SPDX-License-Identifier: GPL-2.0+ +.. Copyright (C) 2020 Amit Singh Tomar <[email protected]> + +Actions +======== + +.. toctree:: + :maxdepth: 2 + + cubieboard7
doc/board/index.rst +1 -0
@@ -6,6 +6,7 @@ Board-specific doc .. toctree:: :maxdepth: 2 + actions/index AndesTech/index atmel/index coreboot/index
Signature · 1 line
2.7.4
PATCH v10 12/12 doc: boards: add Cubieboard7 documentation
Quoted 4 lines · Amit Singh Tomar
This adds build and flash steps for Actions S700
based Cubieboard7 board.Signed-off-by Amit Singh Tomar <[email protected]>
Thanks,
Mani
Quoted 179 lines
---
Changes since v9:
* Updated the heading to CUBIEBOARD7 to ACTIONS.
* Added shorthand for mkimage command.
Changes since v8:
* No changes.
Changes since v7:
* No changes.
Changes since v6:
* No changes.
Changes since v5:
* No changes.
Changes since v4:
* No changes.
Changes since v3:
* Convert plain text documentation to reStructuredText format.
Changes since v2:
* No Change.
Changes since v1:
* No Change.--- doc/board/actions/cubieboard7.rst | 114 ++++++++++++++++++++++++++++++++++++++ doc/board/actions/index.rst | 10 ++++ doc/board/index.rst | 1 + 3 files changed, 125 insertions(+) create mode 100644 doc/board/actions/cubieboard7.rst create mode 100644 doc/board/actions/index.rstdoc/board/actions/cubieboard7.rst new file +114
-0@@ -0,0 +1,114 @@ +.. SPDX-License-Identifier: GPL-2.0+ +.. Copyright (C) 2020 Amit Singh Tomar <[email protected]> + +CUBIEBOARD7 +=========== + +About this +---------- + +This document describes build and flash steps for Actions S700 SoC based Cubieboard7 +board. + +Cubieboard7 initial configuration +--------------------------------- + +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 entered 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. + +.. code-block:: none + + $ 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 +--------------------- + +.. code-block:: none + + $ 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): + +.. code-block:: none + + owl> ums 0 mmc 1 + +Above command would mount debian image partition on host machine. + +Building U-BOOT proper image +---------------------------- + +.. code-block:: none + + $ make clean + $ export CROSS_COMPILE=aarch64-linux-gnu- + $ make ARCH=arm cubieboard7_defconfig + $ make u-boot-dtb.img -j16 + +u-boot-dtb.img can now be flashed to debian image partition mounted on host machine. + +.. code-block:: none + + $ sudo dd if=u-boot-dtb.img of=/dev/sdb bs=1024 seek=3072 + +[1]: https://pan.baidu.com/s/1uawPr0Jao2HgWFLZCLzHAg#list/path=%2FCubieBoard_Download%2FBoard%2FCubieBoard7%2F%E6%96%B9%E7%B3%96%E6%96%B9%E6%A1%88%E5%BC%80%E5%8F%91%E8%B5%84%E6%96%99%2FImage%2FDebian%2FV2.1-test&parentPath=%2Fdoc/board/actions/index.rst new file +10
-0@@ -0,0 +1,10 @@ +.. SPDX-License-Identifier: GPL-2.0+ +.. Copyright (C) 2020 Amit Singh Tomar <[email protected]> + +Actions +======== + +.. toctree:: + :maxdepth: 2 + + cubieboard7doc/board/index.rst +1
-0@@ -6,6 +6,7 @@ Board-specific doc .. toctree:: :maxdepth: 2 + actions/index AndesTech/index atmel/index coreboot/indexSignature · 1 line
2.7.4
v10 cover Actions S700 SoC support
In reply to Amit Singh TomarHi Tom,
Quoted 4 lines · Amit Singh Tomar
This adds Cubieboard7[1] support based on Action Semi's S700 SoC[2], It's Quad-core ARMv8 SoC with Cortex-A53 cores. Peripheral like UART seems to be compatible with S900 SoC(basic support for it is alreay present in u-boot).
I've reviewed all patches and tested them on Bubblegum96 board. Since we now have time for the next merge window, can you please apply this series once it is open?
Or let me know if I have to send you a pull req.
Thanks,
Mani
Quoted 115 lines
This series(v10) takes care the commments provided by Mani and patches 04/12, 07/12 and 12/12 has been changed to address those comments.
Previous series(v9) fixes a Bug that breaks bubblegum96 board boot(reported by Mani). It was due to fact that driver data read is not proper in the clock driver. There are changes in patch 06/12 to fix it.
Series(v8) removes the SoC specific include instead just uses owl-common. For this patch 01/12 and 09/12 changes a bit.
Series(v7) fixes a serious Bug that breaks S900, it was there since v5.Thanks to Andre for pointing it out.
Series(v6)[3] does following changes:
* [PATCH v5 06/11] becomes [PATCH v6 03/11]
* [PATCH v5 03/11] becomes [PATCH v6 04/11]
* Introduce a new patch to move defconfig options toKconfigwhich is [PATCH v6 10/12]Series(v5)[4] just re-orders the patches so that U-BOOT(with
bubblegum96_defconfig) builds after every patch of the series(suggested by Andre).S700 support is tested[5] on Cubieboard7-lite board and S900 support is just compiled tested.
This patch series can be tested using below tree:
https://github.com/Atomar25/u-boot/commits/s700_v10[1]: http://www.cubietech.com/product-detail/cubieboard7/
[2]: http://www.actions-semi.com/en/productview.aspx?id=225
[3]: http://u-boot.10912.n7.nabble.com/PATCH-v6-00-12-Actions-S700-SoC-support-td403562.html#a403567
[4]: http://u-boot.10912.n7.nabble.com/PATCH-v5-00-11-Actions-S700-SoC-support-td402752.html#a402762
[5]: https://paste.ubuntu.com/p/TbBtk5dPGS/Amit Singh Tomar (12):
arm: actions: Add common framework for Actions Owl Semi SoCs
arm: actions: rename sysmap-s900 to sysmap-owl
serial: actions: add compatible string
arm: dts: sync dts for Action Semi S900
arm: dts: actions: s900: add u-boot specific dtsi file
clk: actions: Add common clock driver
arm: actions: add S700 SoC device tree
arm: dts: actions: s700: add u-boot specific dtsi file
arm: add support Actions Semi S700
actions: Move defconfig options toKconfig
arm: add Cubieboard7 board support
doc: boards: add Cubieboard7 documentationMAINTAINERS | 3 +- arch/arm/Kconfig | 5 +- arch/arm/dts/Makefile | 4 +- arch/arm/dts/s700-cubieboard7.dts | 92 +++++++ arch/arm/dts/s700-u-boot.dtsi | 18 ++ arch/arm/dts/s700.dtsi | 248 +++++++++++++++++++ arch/arm/dts/s900-u-boot.dtsi | 17 ++ arch/arm/dts/s900.dtsi | 322 +++++++++++++++++++++++-- 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 | 49 ++-- arch/arm/mach-owl/Makefile | 3 +- arch/arm/mach-owl/soc.c | 57 +++++ 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 | 57 ----- configs/bubblegum_96_defconfig | 12 +- configs/cubieboard7_defconfig | 9 + doc/board/actions/cubieboard7.rst | 114 +++++++++ doc/board/actions/index.rst | 10 + doc/board/index.rst | 1 + drivers/clk/owl/Kconfig | 8 +- drivers/clk/owl/Makefile | 2 +- drivers/clk/owl/clk_owl.c | 155 ++++++++++++ drivers/clk/owl/clk_owl.h | 64 +++++ drivers/clk/owl/clk_s900.c | 137 ----------- drivers/serial/serial_owl.c | 2 +- include/configs/bubblegum_96.h | 40 --- include/configs/owl-common.h | 40 +++ include/dt-bindings/clock/actions,s700-cmu.h | 118 +++++++++ include/dt-bindings/clock/actions,s900-cmu.h | 129 ++++++++++ include/dt-bindings/clock/s900_cmu.h | 77 ------ include/dt-bindings/reset/actions,s700-reset.h | 34 +++ include/dt-bindings/reset/actions,s900-reset.h | 65 +++++ 37 files changed, 1607 insertions(+), 486 deletions(-) create mode 100644 arch/arm/dts/s700-cubieboard7.dts create mode 100644 arch/arm/dts/s700-u-boot.dtsi create mode 100644 arch/arm/dts/s700.dtsi create mode 100644 arch/arm/dts/s900-u-boot.dtsi 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/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 doc/board/actions/cubieboard7.rst create mode 100644 doc/board/actions/index.rst create mode 100644 drivers/clk/owl/clk_owl.c create mode 100644 drivers/clk/owl/clk_owl.h 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/dt-bindings/clock/actions,s700-cmu.h create mode 100644 include/dt-bindings/clock/actions,s900-cmu.h delete mode 100644 include/dt-bindings/clock/s900_cmu.h create mode 100644 include/dt-bindings/reset/actions,s700-reset.h create mode 100644 include/dt-bindings/reset/actions,s900-reset.hSignature · 1 line
2.7.4
v10 cover Actions S700 SoC support
Quoted 8 lines · Manivannan Sadhasivam
Hi Tom,
Quoted 4 lines · Amit Singh Tomar
This adds Cubieboard7[1] support based on Action Semi's S700 SoC[2], It's Quad-core ARMv8 SoC with Cortex-A53 cores. Peripheral like UART seems to be compatible with S900 SoC(basic support for it is alreay present in u-boot).
Quoted 5 lines
I've reviewed all patches and tested them on Bubblegum96 board. Since we now have time for the next merge window, can you please apply this series once it is open?
Or let me know if I have to send you a pull req.
I will take this for the next merge window/-next branch, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200406/2e5c6fd6/attachment.sig>
v10 cover Actions S700 SoC support
In reply to Amit Singh TomarQuoted 37 lines · Amit Singh Tomar
This adds Cubieboard7[1] support based on Action Semi's S700 SoC[2], It's Quad-core ARMv8 SoC with Cortex-A53 cores. Peripheral like UART seems to be compatible with S900 SoC(basic support for it is alreay present in u-boot).
This series(v10) takes care the commments provided by Mani and patches 04/12, 07/12 and 12/12 has been changed to address those comments.
Previous series(v9) fixes a Bug that breaks bubblegum96 board boot(reported by Mani). It was due to fact that driver data read is not proper in the clock driver. There are changes in patch 06/12 to fix it.
Series(v8) removes the SoC specific include instead just uses owl-common. For this patch 01/12 and 09/12 changes a bit.
Series(v7) fixes a serious Bug that breaks S900, it was there since v5.Thanks to Andre for pointing it out.
Series(v6)[3] does following changes:
* [PATCH v5 06/11] becomes [PATCH v6 03/11]
* [PATCH v5 03/11] becomes [PATCH v6 04/11]
* Introduce a new patch to move defconfig options toKconfigwhich is [PATCH v6 10/12]Series(v5)[4] just re-orders the patches so that U-BOOT(with
bubblegum96_defconfig) builds after every patch of the series(suggested by Andre).S700 support is tested[5] on Cubieboard7-lite board and S900 support is just compiled tested.
This patch series can be tested using below tree:
https://github.com/Atomar25/u-boot/commits/s700_v10[1]: http://www.cubietech.com/product-detail/cubieboard7/
[2]: http://www.actions-semi.com/en/productview.aspx?id=225
[3]: http://u-boot.10912.n7.nabble.com/PATCH-v6-00-12-Actions-S700-SoC-support-td403562.html#a403567
[4]: http://u-boot.10912.n7.nabble.com/PATCH-v5-00-11-Actions-S700-SoC-support-td402752.html#a402762
[5]: https://paste.ubuntu.com/p/TbBtk5dPGS/
Quoted 13 lines
Amit Singh Tomar (12):
arm: actions: Add common framework for Actions Owl Semi SoCs
arm: actions: rename sysmap-s900 to sysmap-owl
serial: actions: add compatible string
arm: dts: sync dts for Action Semi S900
arm: dts: actions: s900: add u-boot specific dtsi file
clk: actions: Add common clock driver
arm: actions: add S700 SoC device tree
arm: dts: actions: s700: add u-boot specific dtsi file
arm: add support Actions Semi S700
actions: Move defconfig options toKconfig
arm: add Cubieboard7 board support
doc: boards: add Cubieboard7 documentation
A few problems. First, "actions: Move defconfig options to Kconfig" breaks a large number of boards including p2371-2180 in one way and libretech_all_h5_cc_h5 (along with lots of other sunxi platforms) in a different but related way. Second, the new defconfig isn't listed under any MAINTAINERS file and needs to be. I had fixed this up while testing but the other problem is more severe and needs looking in to. Thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200416/b14e59ca/attachment.sig>
v10 cover Actions S700 SoC support
On 17/04/2020 04:05, Tom Rini wrote:
(adding Masahiro for Kconfig)
Quoted 53 lines · Amit Singh Tomar
Quoted 38 lines
This adds Cubieboard7[1] support based on Action Semi's S700 SoC[2], It's Quad-core ARMv8 SoC with Cortex-A53 cores. Peripheral like UART seems to be compatible with S900 SoC(basic support for it is alreay present in u-boot).
This series(v10) takes care the commments provided by Mani and patches 04/12, 07/12 and 12/12 has been changed to address those comments.
Previous series(v9) fixes a Bug that breaks bubblegum96 board boot(reported by Mani). It was due to fact that driver data read is not proper in the clock driver. There are changes in patch 06/12 to fix it.
Series(v8) removes the SoC specific include instead just uses owl-common. For this patch 01/12 and 09/12 changes a bit.
Series(v7) fixes a serious Bug that breaks S900, it was there since v5.Thanks to Andre for pointing it out.
Series(v6)[3] does following changes:
* [PATCH v5 06/11] becomes [PATCH v6 03/11]
* [PATCH v5 03/11] becomes [PATCH v6 04/11]
* Introduce a new patch to move defconfig options toKconfigwhich is [PATCH v6 10/12]Series(v5)[4] just re-orders the patches so that U-BOOT(with
bubblegum96_defconfig) builds after every patch of the series(suggested by Andre).S700 support is tested[5] on Cubieboard7-lite board and S900 support is just compiled tested.
This patch series can be tested using below tree:
https://github.com/Atomar25/u-boot/commits/s700_v10[1]: http://www.cubietech.com/product-detail/cubieboard7/
[2]: http://www.actions-semi.com/en/productview.aspx?id=225
[3]: http://u-boot.10912.n7.nabble.com/PATCH-v6-00-12-Actions-S700-SoC-support-td403562.html#a403567
[4]: http://u-boot.10912.n7.nabble.com/PATCH-v5-00-11-Actions-S700-SoC-support-td402752.html#a402762
[5]: https://paste.ubuntu.com/p/TbBtk5dPGS/Quoted 13 lines
Amit Singh Tomar (12):
arm: actions: Add common framework for Actions Owl Semi SoCs
arm: actions: rename sysmap-s900 to sysmap-owl
serial: actions: add compatible string
arm: dts: sync dts for Action Semi S900
arm: dts: actions: s900: add u-boot specific dtsi file
clk: actions: Add common clock driver
arm: actions: add S700 SoC device tree
arm: dts: actions: s700: add u-boot specific dtsi file
arm: add support Actions Semi S700
actions: Move defconfig options toKconfig
arm: add Cubieboard7 board support
doc: boards: add Cubieboard7 documentation
Quoted 4 lines
A few problems. First, "actions: Move defconfig options to
Kconfig" breaks a large number of boards including p2371-2180 in one way andlibretech_all_h5_cc_h5(along with lots of other sunxi platforms) in a different but related way.
(Masahiro: it's about this patch:
https://lists.denx.de/pipermail/u-boot/2020-April/405672.html)
Tom, many thanks for the heads up, I can confirm the problem, but am totally clueless as of *why* this happens:
The changes in this patch add options to arch/arm/mach-owl/Kconfig, and are totally contained inside an "if ARCH_OWL .. endif" clamp, so how could this even affect other platforms (which are clearly not defining ARCH_OWL)?
Cheers,
Andre
Quoted 4 lines
Second, the new defconfig isn't listed under
anyMAINTAINERSfile and needs to be. I had fixed this up while testing but the other problem is more severe and needs looking in to. Thanks!
v10 cover Actions S700 SoC support
Quoted 66 lines · Andr? Przywara
On 17/04/2020 04:05, Tom Rini wrote:
(adding Masahiro for
Kconfig)Quoted 53 lines · Amit Singh Tomar
Quoted 38 lines
This adds Cubieboard7[1] support based on Action Semi's S700 SoC[2], It's Quad-core ARMv8 SoC with Cortex-A53 cores. Peripheral like UART seems to be compatible with S900 SoC(basic support for it is alreay present in u-boot).
This series(v10) takes care the commments provided by Mani and patches 04/12, 07/12 and 12/12 has been changed to address those comments.
Previous series(v9) fixes a Bug that breaks bubblegum96 board boot(reported by Mani). It was due to fact that driver data read is not proper in the clock driver. There are changes in patch 06/12 to fix it.
Series(v8) removes the SoC specific include instead just uses owl-common. For this patch 01/12 and 09/12 changes a bit.
Series(v7) fixes a serious Bug that breaks S900, it was there since v5.Thanks to Andre for pointing it out.
Series(v6)[3] does following changes:
* [PATCH v5 06/11] becomes [PATCH v6 03/11]
* [PATCH v5 03/11] becomes [PATCH v6 04/11]
* Introduce a new patch to move defconfig options toKconfigwhich is [PATCH v6 10/12]Series(v5)[4] just re-orders the patches so that U-BOOT(with
bubblegum96_defconfig) builds after every patch of the series(suggested by Andre).S700 support is tested[5] on Cubieboard7-lite board and S900 support is just compiled tested.
This patch series can be tested using below tree:
https://github.com/Atomar25/u-boot/commits/s700_v10[1]: http://www.cubietech.com/product-detail/cubieboard7/
[2]: http://www.actions-semi.com/en/productview.aspx?id=225
[3]: http://u-boot.10912.n7.nabble.com/PATCH-v6-00-12-Actions-S700-SoC-support-td403562.html#a403567
[4]: http://u-boot.10912.n7.nabble.com/PATCH-v5-00-11-Actions-S700-SoC-support-td402752.html#a402762
[5]: https://paste.ubuntu.com/p/TbBtk5dPGS/Quoted 13 lines
Amit Singh Tomar (12):
arm: actions: Add common framework for Actions Owl Semi SoCs
arm: actions: rename sysmap-s900 to sysmap-owl
serial: actions: add compatible string
arm: dts: sync dts for Action Semi S900
arm: dts: actions: s900: add u-boot specific dtsi file
clk: actions: Add common clock driver
arm: actions: add S700 SoC device tree
arm: dts: actions: s700: add u-boot specific dtsi file
arm: add support Actions Semi S700
actions: Move defconfig options toKconfig
arm: add Cubieboard7 board support
doc: boards: add Cubieboard7 documentationQuoted 4 lines
A few problems. First, "actions: Move defconfig options to
Kconfig" breaks a large number of boards including p2371-2180 in one way andlibretech_all_h5_cc_h5(along with lots of other sunxi platforms) in a different but related way.(Masahiro: it's about this patch:
https://lists.denx.de/pipermail/u-boot/2020-April/405672.html)
Quoted 7 lines
Tom, many thanks for the heads up, I can confirm the problem, but am totally clueless as of *why* this happens:
The changes in this patch add options toarch/arm/mach-owl/Kconfig, and are totally contained inside an "ifARCH_OWL.. endif" clamp, so how could this even affect other platforms (which are clearly not definingARCH_OWL)?
scripts/diffconfig in Linux is useful to see how the resulted .config has changed.
This is the before/after diff of p2371-2180.
-BOOTCOMMAND "run distro_bootcmd" -BOOTP_PXE y
-BOOTP_PXE_CLIENTARCH 0x16 -CMD_EXT4_WRITE y
-EXT4_WRITE y
-FAT_WRITE y
-FS_FAT_MAX_CLUSTSIZE 65536
-MENU y
CMD_DHCP y -> n
CMD_EXT2 y -> n
CMD_EXT4 y -> n
CMD_FAT y -> n
CMD_FS_GENERIC y -> n
CMD_MII y -> n
CMD_PART y -> n
CMD_PING y -> n
CMD_PXE y -> n
CMD_SYSBOOT y -> n DISTRO_DEFAULTS y -> n DOS_PARTITION y -> n ENV_VARS_UBOOT_CONFIG y -> n FS_EXT4 y -> n
FS_FAT y -> n
HUSH_PARSER y -> n SUPPORT_RAW_INITRD y -> n USB_STORAGE y -> n USE_BOOTCOMMAND y -> n
It turned off DISTRO_DEFAULTS.
The menuconfig help shows
it now depends on 'ARM && ARCH_OWL'.
Presumably Kconfig was confused
by DISTRO_DEFAULTS being defined multiple times.
Signature · 2 lines
Best Regards Masahiro Yamada
v10 cover Actions S700 SoC support
Quoted 112 lines · Masahiro Yamada
Quoted 66 lines · Andr? Przywara
On 17/04/2020 04:05, Tom Rini wrote:
(adding Masahiro for
Kconfig)Quoted 53 lines · Amit Singh Tomar
Quoted 38 lines
This adds Cubieboard7[1] support based on Action Semi's S700 SoC[2], It's Quad-core ARMv8 SoC with Cortex-A53 cores. Peripheral like UART seems to be compatible with S900 SoC(basic support for it is alreay present in u-boot).
This series(v10) takes care the commments provided by Mani and patches 04/12, 07/12 and 12/12 has been changed to address those comments.
Previous series(v9) fixes a Bug that breaks bubblegum96 board boot(reported by Mani). It was due to fact that driver data read is not proper in the clock driver. There are changes in patch 06/12 to fix it.
Series(v8) removes the SoC specific include instead just uses owl-common. For this patch 01/12 and 09/12 changes a bit.
Series(v7) fixes a serious Bug that breaks S900, it was there since v5.Thanks to Andre for pointing it out.
Series(v6)[3] does following changes:
* [PATCH v5 06/11] becomes [PATCH v6 03/11]
* [PATCH v5 03/11] becomes [PATCH v6 04/11]
* Introduce a new patch to move defconfig options toKconfigwhich is [PATCH v6 10/12]Series(v5)[4] just re-orders the patches so that U-BOOT(with
bubblegum96_defconfig) builds after every patch of the series(suggested by Andre).S700 support is tested[5] on Cubieboard7-lite board and S900 support is just compiled tested.
This patch series can be tested using below tree:
https://github.com/Atomar25/u-boot/commits/s700_v10[1]: http://www.cubietech.com/product-detail/cubieboard7/
[2]: http://www.actions-semi.com/en/productview.aspx?id=225
[3]: http://u-boot.10912.n7.nabble.com/PATCH-v6-00-12-Actions-S700-SoC-support-td403562.html#a403567
[4]: http://u-boot.10912.n7.nabble.com/PATCH-v5-00-11-Actions-S700-SoC-support-td402752.html#a402762
[5]: https://paste.ubuntu.com/p/TbBtk5dPGS/Quoted 13 lines
Amit Singh Tomar (12):
arm: actions: Add common framework for Actions Owl Semi SoCs
arm: actions: rename sysmap-s900 to sysmap-owl
serial: actions: add compatible string
arm: dts: sync dts for Action Semi S900
arm: dts: actions: s900: add u-boot specific dtsi file
clk: actions: Add common clock driver
arm: actions: add S700 SoC device tree
arm: dts: actions: s700: add u-boot specific dtsi file
arm: add support Actions Semi S700
actions: Move defconfig options toKconfig
arm: add Cubieboard7 board support
doc: boards: add Cubieboard7 documentationQuoted 4 lines
A few problems. First, "actions: Move defconfig options to
Kconfig" breaks a large number of boards including p2371-2180 in one way andlibretech_all_h5_cc_h5(along with lots of other sunxi platforms) in a different but related way.(Masahiro: it's about this patch:
https://lists.denx.de/pipermail/u-boot/2020-April/405672.html)Quoted 7 lines
Tom, many thanks for the heads up, I can confirm the problem, but am totally clueless as of *why* this happens:
The changes in this patch add options toarch/arm/mach-owl/Kconfig, and are totally contained inside an "ifARCH_OWL.. endif" clamp, so how could this even affect other platforms (which are clearly not definingARCH_OWL)?
scripts/diffconfigin Linux is useful to see how the resulted .config has changed.This is the before/after diff of p2371-2180.
(quoted diff) +0
-8-BOOTCOMMAND "run distro_bootcmd" -BOOTP_PXE y -BOOTP_PXE_CLIENTARCH 0x16 -CMD_EXT4_WRITE y -EXT4_WRITE y -FAT_WRITE y -FS_FAT_MAX_CLUSTSIZE 65536 -MENU y CMD_DHCP y -> n CMD_EXT2 y -> n CMD_EXT4 y -> n CMD_FAT y -> n CMD_FS_GENERIC y -> n CMD_MII y -> n CMD_PART y -> n CMD_PING y -> n CMD_PXE y -> n CMD_SYSBOOT y -> n DISTRO_DEFAULTS y -> n DOS_PARTITION y -> n ENV_VARS_UBOOT_CONFIG y -> n FS_EXT4 y -> n FS_FAT y -> n HUSH_PARSER y -> n SUPPORT_RAW_INITRD y -> n USB_STORAGE y -> n USE_BOOTCOMMAND y -> n
Quoted 8 lines
It turned off
DISTRO_DEFAULTS.The menuconfig help shows
it now depends on 'ARM &&ARCH_OWL'.Presumably
Kconfigwas confused
byDISTRO_DEFAULTSbeing defined multiple times.
Ah, right. And they shouldn't be defined twice, it should be imply'd under ARCH_OWL (and the rest should be in the defconfigs, no re-listed in arch/arm/mach-owl/Kconfig). Thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200417/787bd0fc/attachment.sig>
v10 cover Actions S700 SoC support
Quoted 113 lines · Tom Rini
Quoted 112 lines · Masahiro Yamada
Quoted 66 lines · Andr? Przywara
On 17/04/2020 04:05, Tom Rini wrote:
(adding Masahiro for
Kconfig)Quoted 53 lines · Amit Singh Tomar
Quoted 38 lines
This adds Cubieboard7[1] support based on Action Semi's S700 SoC[2], It's Quad-core ARMv8 SoC with Cortex-A53 cores. Peripheral like UART seems to be compatible with S900 SoC(basic support for it is alreay present in u-boot).
This series(v10) takes care the commments provided by Mani and patches 04/12, 07/12 and 12/12 has been changed to address those comments.
Previous series(v9) fixes a Bug that breaks bubblegum96 board boot(reported by Mani). It was due to fact that driver data read is not proper in the clock driver. There are changes in patch 06/12 to fix it.
Series(v8) removes the SoC specific include instead just uses owl-common. For this patch 01/12 and 09/12 changes a bit.
Series(v7) fixes a serious Bug that breaks S900, it was there since v5.Thanks to Andre for pointing it out.
Series(v6)[3] does following changes:
* [PATCH v5 06/11] becomes [PATCH v6 03/11]
* [PATCH v5 03/11] becomes [PATCH v6 04/11]
* Introduce a new patch to move defconfig options toKconfigwhich is [PATCH v6 10/12]Series(v5)[4] just re-orders the patches so that U-BOOT(with
bubblegum96_defconfig) builds after every patch of the series(suggested by Andre).S700 support is tested[5] on Cubieboard7-lite board and S900 support is just compiled tested.
This patch series can be tested using below tree:
https://github.com/Atomar25/u-boot/commits/s700_v10[1]: http://www.cubietech.com/product-detail/cubieboard7/
[2]: http://www.actions-semi.com/en/productview.aspx?id=225
[3]: http://u-boot.10912.n7.nabble.com/PATCH-v6-00-12-Actions-S700-SoC-support-td403562.html#a403567
[4]: http://u-boot.10912.n7.nabble.com/PATCH-v5-00-11-Actions-S700-SoC-support-td402752.html#a402762
[5]: https://paste.ubuntu.com/p/TbBtk5dPGS/Quoted 13 lines
Amit Singh Tomar (12):
arm: actions: Add common framework for Actions Owl Semi SoCs
arm: actions: rename sysmap-s900 to sysmap-owl
serial: actions: add compatible string
arm: dts: sync dts for Action Semi S900
arm: dts: actions: s900: add u-boot specific dtsi file
clk: actions: Add common clock driver
arm: actions: add S700 SoC device tree
arm: dts: actions: s700: add u-boot specific dtsi file
arm: add support Actions Semi S700
actions: Move defconfig options toKconfig
arm: add Cubieboard7 board support
doc: boards: add Cubieboard7 documentationQuoted 4 lines
A few problems. First, "actions: Move defconfig options to
Kconfig" breaks a large number of boards including p2371-2180 in one way andlibretech_all_h5_cc_h5(along with lots of other sunxi platforms) in a different but related way.(Masahiro: it's about this patch:
https://lists.denx.de/pipermail/u-boot/2020-April/405672.html)Quoted 7 lines
Tom, many thanks for the heads up, I can confirm the problem, but am totally clueless as of *why* this happens:
The changes in this patch add options toarch/arm/mach-owl/Kconfig, and are totally contained inside an "ifARCH_OWL.. endif" clamp, so how could this even affect other platforms (which are clearly not definingARCH_OWL)?
scripts/diffconfigin Linux is useful to see how the resulted .config has changed.This is the before/after diff of p2371-2180.
(quoted diff) +0
-8-BOOTCOMMAND "run distro_bootcmd" -BOOTP_PXE y -BOOTP_PXE_CLIENTARCH 0x16 -CMD_EXT4_WRITE y -EXT4_WRITE y -FAT_WRITE y -FS_FAT_MAX_CLUSTSIZE 65536 -MENU y CMD_DHCP y -> n CMD_EXT2 y -> n CMD_EXT4 y -> n CMD_FAT y -> n CMD_FS_GENERIC y -> n CMD_MII y -> n CMD_PART y -> n CMD_PING y -> n CMD_PXE y -> n CMD_SYSBOOT y -> n DISTRO_DEFAULTS y -> n DOS_PARTITION y -> n ENV_VARS_UBOOT_CONFIG y -> n FS_EXT4 y -> n FS_FAT y -> n HUSH_PARSER y -> n SUPPORT_RAW_INITRD y -> n USB_STORAGE y -> n USE_BOOTCOMMAND y -> n
Quoted 8 lines
Quoted 8 lines
It turned off
DISTRO_DEFAULTS.The menuconfig help shows
it now depends on 'ARM &&ARCH_OWL'.Presumably
Kconfigwas confused
byDISTRO_DEFAULTSbeing defined multiple times.
It is, but only for ARCH_OWL, where it actually works as expected. I don't get how the additional listing of just DISTRO_DEFAULTS (without a type!) *guarded by if ARCH_OWL* would affect other platforms.
Besides, we do this all over the place for stuff like IDENT_STRING, SYS_CLK_FREQ, and, most prominently SYS_CONFIG_NAME, SYS_SOC and SYS_BOARD. And there it works fine. So what is the difference here?
Quoted 3 lines
Ah, right. And they shouldn't be defined twice, it should be imply'd under
ARCH_OWL(and the rest should be in the defconfigs, no re-listed inarch/arm/mach-owl/Kconfig). Thanks!
So yes, the fix is relatively easy (Amit actually had it this way before). It's just that I actually recommended this approach here to Amit, to avoid putting platform specific defaults into generic Kconfig files (like we do for sunxi at the moment).
Conceptually I find it cleaner to gather platform specific defaults in the platform Kconfig instead of spreading this out all over the tree.
Cheers,
Andre.
v10 cover Actions S700 SoC support
Quoted 127 lines · Andr? Przywara
Quoted 113 lines · Tom Rini
Quoted 112 lines · Masahiro Yamada
Quoted 66 lines · Andr? Przywara
On 17/04/2020 04:05, Tom Rini wrote:
(adding Masahiro for
Kconfig)Quoted 53 lines · Amit Singh Tomar
Quoted 38 lines
This adds Cubieboard7[1] support based on Action Semi's S700 SoC[2], It's Quad-core ARMv8 SoC with Cortex-A53 cores. Peripheral like UART seems to be compatible with S900 SoC(basic support for it is alreay present in u-boot).
This series(v10) takes care the commments provided by Mani and patches 04/12, 07/12 and 12/12 has been changed to address those comments.
Previous series(v9) fixes a Bug that breaks bubblegum96 board boot(reported by Mani). It was due to fact that driver data read is not proper in the clock driver. There are changes in patch 06/12 to fix it.
Series(v8) removes the SoC specific include instead just uses owl-common. For this patch 01/12 and 09/12 changes a bit.
Series(v7) fixes a serious Bug that breaks S900, it was there since v5.Thanks to Andre for pointing it out.
Series(v6)[3] does following changes:
* [PATCH v5 06/11] becomes [PATCH v6 03/11]
* [PATCH v5 03/11] becomes [PATCH v6 04/11]
* Introduce a new patch to move defconfig options toKconfigwhich is [PATCH v6 10/12]Series(v5)[4] just re-orders the patches so that U-BOOT(with
bubblegum96_defconfig) builds after every patch of the series(suggested by Andre).S700 support is tested[5] on Cubieboard7-lite board and S900 support is just compiled tested.
This patch series can be tested using below tree:
https://github.com/Atomar25/u-boot/commits/s700_v10[1]: http://www.cubietech.com/product-detail/cubieboard7/
[2]: http://www.actions-semi.com/en/productview.aspx?id=225
[3]: http://u-boot.10912.n7.nabble.com/PATCH-v6-00-12-Actions-S700-SoC-support-td403562.html#a403567
[4]: http://u-boot.10912.n7.nabble.com/PATCH-v5-00-11-Actions-S700-SoC-support-td402752.html#a402762
[5]: https://paste.ubuntu.com/p/TbBtk5dPGS/Quoted 13 lines
Amit Singh Tomar (12):
arm: actions: Add common framework for Actions Owl Semi SoCs
arm: actions: rename sysmap-s900 to sysmap-owl
serial: actions: add compatible string
arm: dts: sync dts for Action Semi S900
arm: dts: actions: s900: add u-boot specific dtsi file
clk: actions: Add common clock driver
arm: actions: add S700 SoC device tree
arm: dts: actions: s700: add u-boot specific dtsi file
arm: add support Actions Semi S700
actions: Move defconfig options toKconfig
arm: add Cubieboard7 board support
doc: boards: add Cubieboard7 documentationQuoted 4 lines
A few problems. First, "actions: Move defconfig options to
Kconfig" breaks a large number of boards including p2371-2180 in one way andlibretech_all_h5_cc_h5(along with lots of other sunxi platforms) in a different but related way.(Masahiro: it's about this patch:
https://lists.denx.de/pipermail/u-boot/2020-April/405672.html)Quoted 7 lines
Tom, many thanks for the heads up, I can confirm the problem, but am totally clueless as of *why* this happens:
The changes in this patch add options toarch/arm/mach-owl/Kconfig, and are totally contained inside an "ifARCH_OWL.. endif" clamp, so how could this even affect other platforms (which are clearly not definingARCH_OWL)?
scripts/diffconfigin Linux is useful to see how the resulted .config has changed.This is the before/after diff of p2371-2180.
(quoted diff) +0
-8-BOOTCOMMAND "run distro_bootcmd" -BOOTP_PXE y -BOOTP_PXE_CLIENTARCH 0x16 -CMD_EXT4_WRITE y -EXT4_WRITE y -FAT_WRITE y -FS_FAT_MAX_CLUSTSIZE 65536 -MENU y CMD_DHCP y -> n CMD_EXT2 y -> n CMD_EXT4 y -> n CMD_FAT y -> n CMD_FS_GENERIC y -> n CMD_MII y -> n CMD_PART y -> n CMD_PING y -> n CMD_PXE y -> n CMD_SYSBOOT y -> n DISTRO_DEFAULTS y -> n DOS_PARTITION y -> n ENV_VARS_UBOOT_CONFIG y -> n FS_EXT4 y -> n FS_FAT y -> n HUSH_PARSER y -> n SUPPORT_RAW_INITRD y -> n USB_STORAGE y -> n USE_BOOTCOMMAND y -> nQuoted 8 lines
Quoted 8 lines
It turned off
DISTRO_DEFAULTS.The menuconfig help shows
it now depends on 'ARM &&ARCH_OWL'.Presumably
Kconfigwas confused
byDISTRO_DEFAULTSbeing defined multiple times.It is, but only for
ARCH_OWL, where it actually works as expected. I don't get how the additional listing of justDISTRO_DEFAULTS(without a type!) *guarded by if ARCH_OWL* would affect other platforms.
Quoted 3 lines
Besides, we do this all over the place for stuff like
IDENT_STRING,SYS_CLK_FREQ, and, most prominentlySYS_CONFIG_NAME,SYS_SOCandSYS_BOARD. And there it works fine. So what is the difference here?
It doesn't quite work fine, and DISTRO_DEFAULTS is the case where it shows up badly (which is why everyone else does imply/select).
Quoted 10 lines
Quoted 3 lines
Ah, right. And they shouldn't be defined twice, it should be imply'd under
ARCH_OWL(and the rest should be in the defconfigs, no re-listed inarch/arm/mach-owl/Kconfig). Thanks!So yes, the fix is relatively easy (Amit actually had it this way before). It's just that I actually recommended this approach here to Amit, to avoid putting platform specific defaults into generic
Kconfigfiles (like we do for sunxi at the moment).
Conceptually I find it cleaner to gather platform specific defaults in the platformKconfiginstead of spreading this out all over the tree.
The problem is that Kconfig doesn't work that way. All of the SYS_foo stuff we have in board/SoC Kconfig files has some unfortunate side-effects that Yamada-san has noted elsewhere. The long list of "default ... if ...." aren't ideal, but my hope is that by consolidating who wants/needs what values we can first come up with better defaults and then perhaps come up with a better tool for everyone (how do you manage kernel defconfigs is its own problem).
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200417/c27b1314/attachment.sig>
v10 cover Actions S700 SoC support
Quoted 146 lines · Tom Rini
Quoted 127 lines · Andr? Przywara
Quoted 113 lines · Tom Rini
Quoted 112 lines · Masahiro Yamada
Quoted 66 lines · Andr? Przywara
On 17/04/2020 04:05, Tom Rini wrote:
(adding Masahiro for
Kconfig)Quoted 53 lines · Amit Singh Tomar
Quoted 38 lines
This adds Cubieboard7[1] support based on Action Semi's S700 SoC[2], It's Quad-core ARMv8 SoC with Cortex-A53 cores. Peripheral like UART seems to be compatible with S900 SoC(basic support for it is alreay present in u-boot).
This series(v10) takes care the commments provided by Mani and patches 04/12, 07/12 and 12/12 has been changed to address those comments.
Previous series(v9) fixes a Bug that breaks bubblegum96 board boot(reported by Mani). It was due to fact that driver data read is not proper in the clock driver. There are changes in patch 06/12 to fix it.
Series(v8) removes the SoC specific include instead just uses owl-common. For this patch 01/12 and 09/12 changes a bit.
Series(v7) fixes a serious Bug that breaks S900, it was there since v5.Thanks to Andre for pointing it out.
Series(v6)[3] does following changes:
* [PATCH v5 06/11] becomes [PATCH v6 03/11]
* [PATCH v5 03/11] becomes [PATCH v6 04/11]
* Introduce a new patch to move defconfig options toKconfigwhich is [PATCH v6 10/12]Series(v5)[4] just re-orders the patches so that U-BOOT(with
bubblegum96_defconfig) builds after every patch of the series(suggested by Andre).S700 support is tested[5] on Cubieboard7-lite board and S900 support is just compiled tested.
This patch series can be tested using below tree:
https://github.com/Atomar25/u-boot/commits/s700_v10[1]: http://www.cubietech.com/product-detail/cubieboard7/
[2]: http://www.actions-semi.com/en/productview.aspx?id=225
[3]: http://u-boot.10912.n7.nabble.com/PATCH-v6-00-12-Actions-S700-SoC-support-td403562.html#a403567
[4]: http://u-boot.10912.n7.nabble.com/PATCH-v5-00-11-Actions-S700-SoC-support-td402752.html#a402762
[5]: https://paste.ubuntu.com/p/TbBtk5dPGS/Quoted 13 lines
Amit Singh Tomar (12):
arm: actions: Add common framework for Actions Owl Semi SoCs
arm: actions: rename sysmap-s900 to sysmap-owl
serial: actions: add compatible string
arm: dts: sync dts for Action Semi S900
arm: dts: actions: s900: add u-boot specific dtsi file
clk: actions: Add common clock driver
arm: actions: add S700 SoC device tree
arm: dts: actions: s700: add u-boot specific dtsi file
arm: add support Actions Semi S700
actions: Move defconfig options toKconfig
arm: add Cubieboard7 board support
doc: boards: add Cubieboard7 documentationQuoted 4 lines
A few problems. First, "actions: Move defconfig options to
Kconfig" breaks a large number of boards including p2371-2180 in one way andlibretech_all_h5_cc_h5(along with lots of other sunxi platforms) in a different but related way.(Masahiro: it's about this patch:
https://lists.denx.de/pipermail/u-boot/2020-April/405672.html)Quoted 7 lines
Tom, many thanks for the heads up, I can confirm the problem, but am totally clueless as of *why* this happens:
The changes in this patch add options toarch/arm/mach-owl/Kconfig, and are totally contained inside an "ifARCH_OWL.. endif" clamp, so how could this even affect other platforms (which are clearly not definingARCH_OWL)?
scripts/diffconfigin Linux is useful to see how the resulted .config has changed.This is the before/after diff of p2371-2180.
(quoted diff) +0
-8-BOOTCOMMAND "run distro_bootcmd" -BOOTP_PXE y -BOOTP_PXE_CLIENTARCH 0x16 -CMD_EXT4_WRITE y -EXT4_WRITE y -FAT_WRITE y -FS_FAT_MAX_CLUSTSIZE 65536 -MENU y CMD_DHCP y -> n CMD_EXT2 y -> n CMD_EXT4 y -> n CMD_FAT y -> n CMD_FS_GENERIC y -> n CMD_MII y -> n CMD_PART y -> n CMD_PING y -> n CMD_PXE y -> n CMD_SYSBOOT y -> n DISTRO_DEFAULTS y -> n DOS_PARTITION y -> n ENV_VARS_UBOOT_CONFIG y -> n FS_EXT4 y -> n FS_FAT y -> n HUSH_PARSER y -> n SUPPORT_RAW_INITRD y -> n USB_STORAGE y -> n USE_BOOTCOMMAND y -> nQuoted 8 lines
Quoted 8 lines
It turned off
DISTRO_DEFAULTS.The menuconfig help shows
it now depends on 'ARM &&ARCH_OWL'.Presumably
Kconfigwas confused
byDISTRO_DEFAULTSbeing defined multiple times.It is, but only for
ARCH_OWL, where it actually works as expected. I don't get how the additional listing of justDISTRO_DEFAULTS(without a type!) *guarded by if ARCH_OWL* would affect other platforms.Quoted 3 lines
Besides, we do this all over the place for stuff like
IDENT_STRING,SYS_CLK_FREQ, and, most prominentlySYS_CONFIG_NAME,SYS_SOCandSYS_BOARD. And there it works fine. So what is the difference here?It doesn't quite work fine, and
DISTRO_DEFAULTSis the case where it shows up badly (which is why everyone else does imply/select).Quoted 10 lines
Quoted 3 lines
Ah, right. And they shouldn't be defined twice, it should be imply'd under
ARCH_OWL(and the rest should be in the defconfigs, no re-listed inarch/arm/mach-owl/Kconfig). Thanks!So yes, the fix is relatively easy (Amit actually had it this way before). It's just that I actually recommended this approach here to Amit, to avoid putting platform specific defaults into generic
Kconfigfiles (like we do for sunxi at the moment).
Conceptually I find it cleaner to gather platform specific defaults in the platformKconfiginstead of spreading this out all over the tree.
Quoted 3 lines
The problem is that
Kconfigdoesn't work that way. All of theSYS_foostuff we have in board/SoCKconfigfiles has some unfortunate side-effects that Yamada-san has noted elsewhere.
Ah, OK, thanks for the heads up. I just found those examples, but didn't know that they are actually considered somewhat broken.
Quoted 5 lines
The long list of
"default ... if ...." aren't ideal, but my hope is that by consolidating who wants/needs what values we can first come up with better defaults and then perhaps come up with a better tool for everyone (how do you manage kernel defconfigs is its own problem).
Fair enough, if those "default ... if" sequences are the way to go, then so be it.
I was just hoping there would be a cleaner way of expressing: "this *platform* relies on/always sets this option". Unfortunately both select and imply seem to come with their own set of issues, at least for certain kind of options.
Cheers,
Andre