Re: [PATCH v9 01/12] arm: actions: Add common framework for Actions Owl Semi SoCs
On Wed, Apr 01, 2020 at 12:49:24PM +0530, Amit Singh Tomar wrote: > This commit adds common arch support for Actions Semi Owl > series SoCs and removes the Bubblegum96 board files. > > Reviewed-by: Andre Przywara > Signed-off-by: Amit Singh Tomar Reviewed-by: Manivannan Sadhasivam Thanks, 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 > > diff --git a/MAINTAINERS b/MAINTAINERS > index b50652b..2eaacb7 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -272,9 +272,10 @@ M: Manivannan Sadhasivam > > 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 > diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig > index bbb1e27..de6b7f9 100644 > --- a/arch/arm/Kconfig > +++ b/arch/arm/Kconfig > @@ -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" > diff --git a/arch/arm/mach-owl/Kconfig b/arch/arm/mach-owl/Kconfig > index 199e772..28984c1 100644 > --- a/arch/arm/mach-owl/Kconfig > +++ b/arch/arm/mach-owl/Kconfig > @@ -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 0x1100 > + > +config SYS_CONFIG_NAME > +default "owl-common" > + > +config SYS_SOC > +default "s900" if MACH_S900 > > endif > diff --git a/arch/arm/mach-owl/Makefile b/arch/arm/mach-owl/Makefile > index 1b43dc2..0b181c6 100644 > --- a/arch/arm/mach-owl/Makefile > +++ b/arch/arm/mach-owl/Makefile > @@ -1,3 +1,4 @@ > # SPDX-License-Identifier:
[PATCH v9 01/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. Reviewed-by: Andre Przywara Signed-off-by: Amit Singh Tomar --- 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 diff --git a/MAINTAINERS b/MAINTAINERS index b50652b..2eaacb7 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -272,9 +272,10 @@ M: Manivannan Sadhasivam 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 diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index bbb1e27..de6b7f9 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -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" diff --git a/arch/arm/mach-owl/Kconfig b/arch/arm/mach-owl/Kconfig index 199e772..28984c1 100644 --- a/arch/arm/mach-owl/Kconfig +++ b/arch/arm/mach-owl/Kconfig @@ -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 0x1100 + +config SYS_CONFIG_NAME +default "owl-common" + +config SYS_SOC +default "s900" if MACH_S900 endif diff --git a/arch/arm/mach-owl/Makefile b/arch/arm/mach-owl/Makefile index 1b43dc2..0b181c6 100644 --- a/arch/arm/mach-owl/Makefile +++ b/arch/arm/mach-owl/Makefile @@ -1,3 +1,4 @@ # SPDX-License-Identifier: GPL-2.0+ +obj-y += soc.o obj-y += sysmap-s900.o diff --git a/arch/arm/mach-owl/soc.c b/arch/arm/mach-owl/soc.c new file mode 100644 index 000..409cbd3 --- /dev/null +++ b/arch/arm/mach-owl/soc.c @@ -0,0 +1,57 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Actions Semi Owl SoCs platform support. + * + * Copyright
