Add Cortina Access basic DM drivers
Subsystems (5)
v4 cover Add Cortina Access basic DM drivers
Cortina Access management has decided that we want to add formal upstream support of u-boot going forward for our line of SoCs and evaluation boards.
Our line of SoC’s all begin with the “CA” designation followed by 4 digits. i.e. CAxxxx. The CAxxxx series supports both ARM and MIPS ISA based custom cores.
All our drivers have cross platform support for both CPU ISAs. They will be placed in the normal drivers tree in u-boot.
In addition, our SoCs and development boards share common Cortina specific features which are not driver related. Those changes will be maintained in board/cortina/common. While specific development boards will be in board/cortina/board_name.
We would like to have a git-mailrc alias of "cortina" to allow us to better maintain and support our boards and common features found in the board/cortina subtree.
Changes in v4:
- clean up presidio_asic.h per trini recommendations
- use autogen savedefconfig instead of manual maintained file
Changes in v3:
- Remove CA ARM and MIPS common subdirectories from board/cortina/common after further discussions with trini
- clean up comment blocks
- fix rmw of baud rate bitfield change
- fixed dts closing bracket indentation
- presidio.h: remove deadcode from presidio.h
- presidio.h: remove CA_REG_READ/CA_REG_WRITE wrapper macros
- presidio.h: remove CA77xx define replace use CA common Kconfig SoC selection instead
- select SOC_CA7774 via board's Kconfig
- select BIT64 via board's Kconfig instead of presidio.h
Changes in v2:
- Modified filepath for CA ARM and MIPS per trini's recommendation
- Rename driver in DT namespace for consistency between all CA drivers.
- Remove blank line after SPDX identifier
- Remove Authorship as it is already recorded within Git and is redundant
- Replace printf() as debug()
- Rename driver in DT namespace for consistency between all CA drivers.
- Remove blank line after SPDX identifier
- Remove authorship comment as it is already recorded within Git and is redundant
- Use setbits_32() for read-modify-write operation.
- Rename driver in DT namespace for consistency between all CA drivers.
- Remove blank line after SPDX identifier
- Remove authorship comment as it is already recorded within Git and is redundant
- Merge serial_cortina.h reg defines into serial_cortina.c
- Modify ca_serial_pending() and API to get resource.
Alex Nemirovsky (2):
MAINTAINERS, git-mailrc: cortina: add Custodian for Cortina Access
Inc.
board: presidio-asic: Add basic G3 engr. development board support
Jason Li (4):
gpio: do not include <asm/arch/gpio.h> for Cortina CAxxxx SoCs
gpio: cortina_gpio: add DM_GPIO driver for CAxxxx SoCs
watchdog: cortina_wdt: add support for HW WDT on CAxxxx SoCs
serial: serial_cortina: add UART DM driver for CAxxxx SoCs
MAINTAINERS | 16 +++ arch/arm/Kconfig | 5 + arch/arm/dts/Makefile | 2 + arch/arm/dts/ca-presidio-engboard.dts | 69 +++++++++++ arch/arm/include/asm/gpio.h | 2 +- arch/arm/mach-cortina/Makefile | 5 + board/cortina/common/Kconfig | 6 + board/cortina/presidio-asic/Kconfig | 18 +++ board/cortina/presidio-asic/MAINTAINERS | 6 + board/cortina/presidio-asic/Makefile | 8 ++ board/cortina/presidio-asic/lowlevel_init.S | 87 ++++++++++++++ board/cortina/presidio-asic/presidio.c | 134 ++++++++++++++++++++++ configs/cortina_presidio-asic-base_defconfig | 29 +++++ doc/git-mailrc | 2 + drivers/gpio/Kconfig | 8 ++ drivers/gpio/Makefile | 1 + drivers/gpio/cortina_gpio.c | 111 ++++++++++++++++++ drivers/serial/Kconfig | 7 ++ drivers/serial/Makefile | 2 +- drivers/serial/serial_cortina.c | 164 +++++++++++++++++++++++++++ drivers/watchdog/Kconfig | 8 ++ drivers/watchdog/Makefile | 1 + drivers/watchdog/cortina_wdt.c | 138 ++++++++++++++++++++++ include/configs/presidio_asic.h | 75 ++++++++++++ 24 files changed, 902 insertions(+), 2 deletions(-) create mode 100644 arch/arm/dts/ca-presidio-engboard.dts create mode 100644 arch/arm/mach-cortina/Makefile create mode 100644 board/cortina/common/Kconfig create mode 100644 board/cortina/presidio-asic/Kconfig create mode 100644 board/cortina/presidio-asic/MAINTAINERS create mode 100644 board/cortina/presidio-asic/Makefile create mode 100644 board/cortina/presidio-asic/lowlevel_init.S create mode 100644 board/cortina/presidio-asic/presidio.c create mode 100644 configs/cortina_presidio-asic-base_defconfig create mode 100644 drivers/gpio/cortina_gpio.c create mode 100644 drivers/serial/serial_cortina.c create mode 100644 drivers/watchdog/cortina_wdt.c create mode 100644 include/configs/presidio_asic.h
Signature · 1 line
2.7.4
PATCH v4 1/6 MAINTAINERS, git-mailrc: cortina: add Custodian for Cortina Access Inc.
Assign Alex Nemirovsky as custodian for all
Cortina Access (CA) for ARM and MIPS based SoCs.
Currently Cortina Access CAxxxx family of SoCs support both ARM and MIPS ISA. Drivers have cross platform support for both architectures.
---
Changes in v4: None
Changes in v3:
- Remove CA ARM and MIPS common subdirectories from board/cortina/common after further discussions with trini
Changes in v2:
- Modified filepath for CA ARM and MIPS per trini's recommendation
MAINTAINERS | 16 ++++++++++++++++ board/cortina/common/Kconfig | 6 ++++++ doc/git-mailrc | 2 ++ 3 files changed, 24 insertions(+) create mode 100644 board/cortina/common/Kconfig
MAINTAINERS +16 -0
@@ -173,6 +173,14 @@ F: doc/README.bcm7xxx F: drivers/mmc/bcmstb_sdhci.c F: drivers/spi/bcmstb_spi.c +ARM CORTINA ACCESS CAxxxx +M: Alex Nemirovsky <[email protected]> +S: Supported +F: board/cortina/common/ +F: drivers/gpio/cortina_gpio.c +F: drivers/watchdog/cortina_wdt.c +F: drivers/serial/serial_cortina.c + ARM/CZ.NIC TURRIS MOX SUPPORT M: Marek Behun <[email protected]> S: Maintained
@@ -647,6 +655,14 @@ S: Maintained T: git https://gitlab.denx.de/u-boot/custodians/u-boot-mips.git F: arch/mips/ +MIPS CORTINA ACCESS CAxxxx +M: Alex Nemirovsky <[email protected]> +S: Supported +F: board/cortina/common/ +F: drivers/gpio/cortina_gpio.c +F: drivers/watchdog/cortina_wdt.c +F: drivers/serial/serial_cortina.c + MIPS MSCC M: Gregory CLEMENT <[email protected]> M: Lars Povlsen <[email protected]>
board/cortina/common/Kconfig new file +6 -0
@@ -0,0 +1,6 @@ +config CORTINA_PLATFORM + bool "Cortina-Access Platform" + default y + help + Select this option for Cortina-Access platforms + to enables selection of CAxxxx drivers
doc/git-mailrc +2 -0
@@ -15,6 +15,7 @@ alias abrodkin Alexey Brodkin <[email protected]> alias afleming Andy Fleming <[email protected]> alias ag Anatolij Gustschin <[email protected]> alias agraf Alexander Graf <[email protected]> +alias alexnemirovsky Alex Nemirovsky <[email protected]> alias alisonwang Alison Wang <[email protected]> alias angelo_ts Angelo Dureghello <[email protected]> alias bmeng Bin Meng <[email protected]>
@@ -56,6 +57,7 @@ alias arc uboot, abrodkin alias arm uboot, trini alias at91 uboot, abiessmann +alias cortina uboot, alexnemirovsky alias davinci ti alias imx uboot, sbabic alias kirkwood uboot, stroese
Signature · 1 line
2.7.4
PATCH v4 1/6 MAINTAINERS, git-mailrc: cortina: add Custodian for Cortina Access Inc.
Quoted 9 lines · Alex Nemirovsky
Assign Alex Nemirovsky as custodian for all
Cortina Access (CA) for ARM and MIPS based SoCs.Currently Cortina Access CAxxxx family of SoCs support both ARM and MIPS ISA. Drivers have cross platform support for both architectures.
Reviewed-by Tom Rini <[email protected]>Signed-off-by Alex Nemirovsky <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 833 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200207/666703b1/attachment.sig>
PATCH v4 2/6 gpio: do not include <asm/arch/gpio.h> for Cortina CAxxxx SoCs
In reply to Alex NemirovskyFrom: Jason Li <[email protected]>
The Cortina CAxxxx GPIO driver maintains DM_GPIO support across different CPU ISA in the CAxxxx Soc Family; Not just ARM. Therefore, it is not desirable to split out and maintain separete gpio header file for each CPU architecture.
---
Changes in v4: None
Changes in v3: None
Changes in v2: None
arch/arm/include/asm/gpio.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/include/asm/gpio.h +1 -1
@@ -3,7 +3,7 @@ !defined (CONFIG_ARCH_BCM63158 ) && !defined (CONFIG_ARCH_ROCKCHIP ) && \ !defined (CONFIG_ARCH_LX2160A ) && !defined (CONFIG_ARCH_LS1028A ) && \ !defined (CONFIG_ARCH_LS2080A ) && !defined (CONFIG_ARCH_LS1088A ) && \ - !defined(CONFIG_ARCH_ASPEED) + !defined(CONFIG_ARCH_ASPEED) && !defined(CONFIG_CORTINA_PLATFORM)#include <asm/arch/gpio.h> #endif #include <asm-generic/gpio.h>
Signature · 1 line
2.7.4
PATCH v4 2/6 gpio: do not include <asm/arch/gpio.h> for Cortina CAxxxx SoCs
Quoted 10 lines · Alex Nemirovsky
From: Jason Li <[email protected]>
The Cortina CAxxxx GPIO driver maintains
DM_GPIOsupport across different CPU ISA in the CAxxxx Soc Family; Not just ARM. Therefore, it is not desirable to split out and maintain separete gpio header file for each CPU architecture.Reviewed-by Tom Rini <[email protected]>Signed-off-by Jason Li <[email protected]>Signed-off-by Alex Nemirovsky <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 833 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200207/0f417b53/attachment.sig>
PATCH v4 3/6 gpio: cortina_gpio: add DM_GPIO driver for CAxxxx SoCs
In reply to Alex NemirovskyFrom: Jason Li <[email protected]>
DM_GPIO based GPIO controller driver for CAxxxx SoCs. This driver support multiple CPU architectures and Cortina Access SoC platforms.
---
Changes in v4: None
Changes in v3: None
Changes in v2:
- Rename driver in DT namespace for consistency between all CA drivers.
- Remove blank line after SPDX identifier
- Remove Authorship as it is already recorded within Git and is redundant
- Replace printf() as debug()
drivers/gpio/Kconfig | 8 ++++ drivers/gpio/Makefile | 1 + drivers/gpio/cortina_gpio.c | 111 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 120 insertions(+) create mode 100644 drivers/gpio/cortina_gpio.c
drivers/gpio/Kconfig +8 -0
@@ -59,6 +59,14 @@ config BCM6345_GPIO help This driver supports the GPIO banks on BCM6345 SoCs. +config CORTINA_GPIO + bool "Cortina-Access GPIO driver" + depends on DM_GPIO && CORTINA_PLATFORM + help + Enable support for the GPIO controller in Cortina CAxxxx SoCs. + This driver supports all CPU ISA variants supported by Cortina + Access CAxxxx SoCs. + config DWAPB_GPIO bool "DWAPB GPIO driver" depends on DM && DM_GPIO
drivers/gpio/Makefile +1 -0
@@ -17,6 +17,7 @@ endif obj-$(CONFIG_AT91_GPIO) += at91_gpio.o obj-$(CONFIG_ATMEL_PIO4) += atmel_pio4.o obj-$(CONFIG_BCM6345_GPIO) += bcm6345_gpio.o +obj-$(CONFIG_CORTINA_GPIO) += cortina_gpio.o obj-$(CONFIG_INTEL_GPIO) += intel_gpio.o obj-$(CONFIG_INTEL_ICH6_GPIO) += intel_ich6_gpio.o obj-$(CONFIG_INTEL_BROADWELL_GPIO) += intel_broadwell_gpio.o
drivers/gpio/cortina_gpio.c new file +111 -0
111 lines not on this page · raw message
Signature · 1 line
2.7.4
PATCH v4 3/6 gpio: cortina_gpio: add DM_GPIO driver for CAxxxx SoCs
Quoted 9 lines · Alex Nemirovsky
From: Jason Li <[email protected]>
DM_GPIObased GPIO controller driver for CAxxxx SoCs. This driver support multiple CPU architectures and Cortina Access SoC platforms.Reviewed-by Daniel Schwierzeck <[email protected]>Signed-off-by Jason Li <[email protected]>Signed-off-by Alex Nemirovsky <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 833 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200207/b0d2bc85/attachment.sig>
PATCH v4 4/6 watchdog: cortina_wdt: add support for HW WDT on CAxxxx SoCs
In reply to Alex NemirovskyFrom: Jason Li <[email protected]>
Add support for hardware watchdog timer on all Cortina Access CAxxxx family of SoCs.
---
Changes in v4: None
Changes in v3: None
Changes in v2:
- Rename driver in DT namespace for consistency between all CA drivers.
- Remove blank line after SPDX identifier
- Remove authorship comment as it is already recorded within Git and is redundant
- Use setbits_32() for read-modify-write operation.
drivers/watchdog/Kconfig | 8 +++ drivers/watchdog/Makefile | 1 + drivers/watchdog/cortina_wdt.c | 138 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 147 insertions(+) create mode 100644 drivers/watchdog/cortina_wdt.c
drivers/watchdog/Kconfig +8 -0
@@ -99,6 +99,14 @@ config WDT_CDNS Select this to enable Cadence watchdog timer, which can be found on some Xilinx Microzed Platform. +config WDT_CORTINA + bool "Cortina Access CAxxxx watchdog timer support" + depends on WDT + help + Cortina Access CAxxxx watchdog timer support. + This driver support all CPU ISAs supported by Cortina + Access CAxxxx SoCs. + config WDT_MPC8xx bool "MPC8xx watchdog timer support" depends on WDT && MPC8xx
drivers/watchdog/Makefile +1 -0
@@ -20,6 +20,7 @@ obj-$(CONFIG_WDT_SANDBOX) += sandbox_wdt.o obj-$(CONFIG_WDT_ARMADA_37XX) += armada-37xx-wdt.o obj-$(CONFIG_WDT_ASPEED) += ast_wdt.o obj-$(CONFIG_WDT_BCM6345) += bcm6345_wdt.o +obj-$(CONFIG_WDT_CORTINA) += cortina_wdt.o obj-$(CONFIG_WDT_ORION) += orion_wdt.o obj-$(CONFIG_WDT_CDNS) += cdns_wdt.o obj-$(CONFIG_WDT_MPC8xx) += mpc8xx_wdt.o
drivers/watchdog/cortina_wdt.c new file +138 -0
138 lines not on this page · raw message
Signature · 1 line
2.7.4
PATCH v4 4/6 watchdog: cortina_wdt: add support for HW WDT on CAxxxx SoCs
Quoted 9 lines · Alex Nemirovsky
From: Jason Li <[email protected]>
Add support for hardware watchdog timer on all Cortina Access CAxxxx family of SoCs.
Reviewed-by Daniel Schwierzeck <[email protected]>Reviewed-by Stefan Roese <[email protected]>Signed-off-by Jason Li <[email protected]>Signed-off-by Alex Nemirovsky <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 833 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200207/3059ea58/attachment.sig>
PATCH v4 5/6 serial: serial_cortina: add UART DM driver for CAxxxx SoCs
In reply to Alex NemirovskyFrom: Jason Li <[email protected]>
Add serial UART driver support for all Cortina Access CAxxxx family of SoCs.
---
Changes in v4: None
Changes in v3:
- clean up comment blocks
- fix rmw of baud rate bitfield change
Changes in v2:
- Rename driver in DT namespace for consistency between all CA drivers.
- Remove blank line after SPDX identifier
- Remove authorship comment as it is already recorded within Git and is redundant
- Merge serial_cortina.h reg defines into serial_cortina.c
- Modify ca_serial_pending() and API to get resource.
drivers/serial/Kconfig | 7 ++ drivers/serial/Makefile | 2 +- drivers/serial/serial_cortina.c | 164 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 172 insertions(+), 1 deletion(-) create mode 100644 drivers/serial/serial_cortina.c
drivers/serial/Kconfig +7 -0
@@ -539,6 +539,13 @@ config BCM6345_SERIAL help Select this to enable UART on BCM6345 SoCs. +config CORTINA_UART + bool "Cortina UART support" + depends on DM_SERIAL + help + Select this to enable UART support for Cortina-Access UART devices + found on CAxxxx SoCs. + config FSL_LINFLEXUART bool "Freescale Linflex UART support" depends on DM_SERIAL
drivers/serial/Makefile +1 -1
@@ -28,13 +28,13 @@ obj-$(CONFIG_PL010_SERIAL) += serial_pl01x.o obj-$(CONFIG_PL011_SERIAL) += serial_pl01x.o obj-$(CONFIG_SYS_NS16550_SERIAL) += serial_ns16550.o endif - obj-$(CONFIG_ALTERA_UART) += altera_uart.o obj-$(CONFIG_ALTERA_JTAG_UART) += altera_jtag_uart.o obj-$(CONFIG_AR933X_UART) += serial_ar933x.o obj-$(CONFIG_ARM_DCC) += arm_dcc.o obj-$(CONFIG_ATMEL_USART) += atmel_usart.o obj-$(CONFIG_BCM6345_SERIAL) += serial_bcm6345.o +obj-$(CONFIG_CORTINA_UART) += serial_cortina.o obj-$(CONFIG_EFI_APP) += serial_efi.o obj-$(CONFIG_LPC32XX_HSUART) += lpc32xx_hsuart.o obj-$(CONFIG_MCFUART) += mcfuart.o
drivers/serial/serial_cortina.c new file +164 -0
164 lines not on this page · raw message
Signature · 1 line
2.7.4
PATCH v4 5/6 serial: serial_cortina: add UART DM driver for CAxxxx SoCs
Quoted 8 lines · Alex Nemirovsky
From: Jason Li <[email protected]>
Add serial UART driver support for all Cortina Access CAxxxx family of SoCs.
Reviewed-by Daniel Schwierzeck <[email protected]>Signed-off-by Jason Li <[email protected]>Signed-off-by Alex Nemirovsky <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 833 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200207/757bc776/attachment.sig>
PATCH v4 6/6 board: presidio-asic: Add basic G3 engr. development board support
In reply to Alex NemirovskyAdd basic Presidio G3 engineering board support
---
Changes in v4:
- clean up presidio_asic.h per trini recommendations
- use autogen savedefconfig instead of manual maintained file
Changes in v3:
- fixed dts closing bracket indentation
- presidio.h: remove deadcode from presidio.h
- presidio.h: remove CA_REG_READ/CA_REG_WRITE wrapper macros
- presidio.h: remove CA77xx define replace use CA common Kconfig SoC selection instead
- select SOC_CA7774 via board's Kconfig
- select BIT64 via board's Kconfig instead of presidio.h
Changes in v2: None
arch/arm/Kconfig | 5 + arch/arm/dts/Makefile | 2 + arch/arm/dts/ca-presidio-engboard.dts | 69 ++++++++++++++ arch/arm/mach-cortina/Makefile | 5 + board/cortina/presidio-asic/Kconfig | 18 ++++ board/cortina/presidio-asic/MAINTAINERS | 6 ++ board/cortina/presidio-asic/Makefile | 8 ++ board/cortina/presidio-asic/lowlevel_init.S | 87 +++++++++++++++++ board/cortina/presidio-asic/presidio.c | 134 +++++++++++++++++++++++++++ configs/cortina_presidio-asic-base_defconfig | 29 ++++++ include/configs/presidio_asic.h | 75 +++++++++++++++ 11 files changed, 438 insertions(+) create mode 100644 arch/arm/dts/ca-presidio-engboard.dts create mode 100644 arch/arm/mach-cortina/Makefile create mode 100644 board/cortina/presidio-asic/Kconfig create mode 100644 board/cortina/presidio-asic/MAINTAINERS create mode 100644 board/cortina/presidio-asic/Makefile create mode 100644 board/cortina/presidio-asic/lowlevel_init.S create mode 100644 board/cortina/presidio-asic/presidio.c create mode 100644 configs/cortina_presidio-asic-base_defconfig create mode 100644 include/configs/presidio_asic.h
arch/arm/Kconfig +5 -0
@@ -1638,6 +1638,10 @@ config TARGET_DURIAN Support for durian platform. It has 2GB Sdram, uart and pcie. +config TARGET_PRESIDIO_ASIC + bool "Support Cortina Presidio ASIC Platform" + select ARM64 + endchoice config ARCH_SUPPORT_TFABOOT
@@ -1782,6 +1786,7 @@ source "board/Marvell/gplugd/Kconfig" source "board/armadeus/apf27/Kconfig" source "board/armltd/vexpress/Kconfig" source "board/armltd/vexpress64/Kconfig" +source "board/cortina/presidio-asic/Kconfig" source "board/broadcom/bcm23550_w1d/Kconfig" source "board/broadcom/bcm28155_ap/Kconfig" source "board/broadcom/bcm963158/Kconfig"
arch/arm/dts/Makefile +2 -0
@@ -849,6 +849,8 @@ dtb-$(CONFIG_TARGET_VEXPRESS_CA15_TC2) += vexpress-v2p-ca15_a7.dtb dtb-$(CONFIG_TARGET_DURIAN) += phytium-durian.dtb +dtb-$(CONFIG_TARGET_PRESIDIO_ASIC) += ca-presidio-engboard.dtb + targets += $(dtb-y) # Add any required device tree compiler flags here
arch/arm/dts/ca-presidio-engboard.dts new file +69 -0
69 lines not on this page · raw message
arch/arm/mach-cortina/Makefile new file +5 -0
@@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0+ +# +# (C) Copyright 2020 Cortina Access Inc. +# +obj-y += lowlevel_init.o
board/cortina/presidio-asic/Kconfig new file +18 -0
@@ -0,0 +1,18 @@ +if TARGET_PRESIDIO_ASIC +config BIT64 + bool + default y + +select SOC_CA7774 + +config SYS_BOARD + default "presidio-asic" + +config SYS_VENDOR + default "cortina" + +config SYS_CONFIG_NAME + default "presidio_asic" + +source "board/cortina/common/Kconfig" +endif
board/cortina/presidio-asic/MAINTAINERS new file +6 -0
@@ -0,0 +1,6 @@ +Cortina Presidio ASIC G3 Engineering BOARD +M: Alex Nemirovsky <[email protected]> +S: Supported +F: board/cortina/presidio-asic/ +F: include/configs/presidio_asic.h +F: configs/cortina_presidio-asic*defconfig
board/cortina/presidio-asic/Makefile new file +8 -0
@@ -0,0 +1,8 @@ +# SPDX-License-Identifier: GPL-2.0+ +# +# (C) Copyright 2020 Cortina-Access.Inc. +# +# + +obj-y := presidio.o +obj-y += lowlevel_init.o
board/cortina/presidio-asic/lowlevel_init.S new file +87 -0
87 lines not on this page · raw message
board/cortina/presidio-asic/presidio.c new file +134 -0
134 lines not on this page · raw message
configs/cortina_presidio-asic-base_defconfig new file +29 -0
@@ -0,0 +1,29 @@ +CONFIG_ARM=y +# CONFIG_SYS_ARCH_TIMER is not set +CONFIG_TARGET_PRESIDIO_ASIC=y +CONFIG_SYS_TEXT_BASE=0x04000000 +CONFIG_DM_GPIO=y +CONFIG_ENV_SIZE=0x20000 +CONFIG_NR_DRAM_BANKS=1 +CONFIG_IDENT_STRING="Presidio-SoC" +CONFIG_SHOW_BOOT_PROGRESS=y +CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="earlycon=serial,0xf4329148 console=ttyS0,115200 root=/dev/ram0" +CONFIG_BOARD_EARLY_INIT_R=y +CONFIG_SYS_PROMPT="G3#" +CONFIG_CMD_WDT=y +CONFIG_CMD_CACHE=y +CONFIG_CMD_TIMER=y +CONFIG_CMD_SMC=y +CONFIG_OF_CONTROL=y +CONFIG_OF_LIVE=y +CONFIG_DEFAULT_DEVICE_TREE="ca-presidio-engboard" +# CONFIG_NET is not set +CONFIG_DM=y +CONFIG_CORTINA_GPIO=y +# CONFIG_MMC is not set +CONFIG_DM_SERIAL=y +CONFIG_CORTINA_UART=y +CONFIG_WDT=y +CONFIG_WDT_CORTINA=y
include/configs/presidio_asic.h new file +75 -0
75 lines not on this page · raw message
Signature · 1 line
2.7.4
PATCH v4 6/6 board: presidio-asic: Add basic G3 engr. development board support
Hello Tom and Daniel,
This v4 of patch 6/6 in the series is the only one which yield feedback in the prior v3. All other are in “Reviewed-By” state. We hope that v4 sent out a week ago has addressed those issues.
Let us know if there is anything else holding up the series acceptance.
BR
-AN
Quoted 569 lines · Alex Nemirovsky
Add basic Presidio G3 engineering board support
Signed-off-by Alex Nemirovsky <[email protected]>---
Changes in v4:
- clean uppresidio_asic.hper trini recommendations
- use autogen savedefconfig instead of manual maintained fileChanges in v3:
- fixed dts closing bracket indentation
-presidio.h: remove deadcode frompresidio.h
-presidio.h: remove CA_REG_READ/CA_REG_WRITE wrapper macros
-presidio.h: remove CA77xx define replace use CA commonKconfigSoC selection instead
- selectSOC_CA7774via board'sKconfig
- select BIT64 via board'sKconfiginstead ofpresidio.hChanges in v2: None
arch/arm/Kconfig | 5 + arch/arm/dts/Makefile | 2 + arch/arm/dts/ca-presidio-engboard.dts | 69 ++++++++++++++ arch/arm/mach-cortina/Makefile | 5 + board/cortina/presidio-asic/Kconfig | 18 ++++ board/cortina/presidio-asic/MAINTAINERS | 6 ++ board/cortina/presidio-asic/Makefile | 8 ++ board/cortina/presidio-asic/lowlevel_init.S | 87 +++++++++++++++++ board/cortina/presidio-asic/presidio.c | 134 +++++++++++++++++++++++++++ configs/cortina_presidio-asic-base_defconfig | 29 ++++++ include/configs/presidio_asic.h | 75 +++++++++++++++ 11 files changed, 438 insertions(+)create mode 100644
arch/arm/dts/ca-presidio-engboard.dtscreate mode 100644arch/arm/mach-cortina/Makefilecreate mode 100644 board/cortina/presidio-asic/Kconfig create mode 100644 board/cortina/presidio-asic/MAINTAINERS create mode 100644 board/cortina/presidio-asic/Makefile create mode 100644board/cortina/presidio-asic/lowlevel_init.Screate mode 100644board/cortina/presidio-asic/presidio.ccreate mode 100644 configs/cortina_presidio-asic-base_defconfig create mode 100644include/configs/presidio_asic.harch/arm/Kconfig +4
-0@@ -1638,6 +1638,10 @@ config TARGET_DURIAN Support for durian platform. It has 2GB Sdram, uart and pcie. +config TARGET_PRESIDIO_ASIC + bool "Support Cortina Presidio ASIC Platform" + select ARM64 +endchoice
config
ARCH_SUPPORT_TFABOOTarch/arm/Kconfig +0
-0@@ -1782,6 +1786,7 @@ source "board/Marvell/gplugd/Kconfig"source "board/armadeus/apf27/Kconfig"
source "board/armltd/vexpress/Kconfig"
source "board/armltd/vexpress64/Kconfig"
+source "board/cortina/presidio-asic/Kconfig"
source "board/broadcom/bcm23550_w1d/Kconfig"
source "board/broadcom/bcm28155_ap/Kconfig"
source "board/broadcom/bcm963158/Kconfig"arch/arm/dts/Makefile +0
-0@@ -849,6 +849,8 @@ dtb-$(CONFIG_TARGET_VEXPRESS_CA15_TC2) += vexpress-v2p-ca15_a7.dtbdtb-$(CONFIG_TARGET_DURIAN) += phytium-durian.dtb
arch/arm/dts/Makefile +2
-0+dtb-$(CONFIG_TARGET_PRESIDIO_ASIC) += ca-presidio-engboard.dtb +targets += $(dtb-y)
# Add any required device tree compiler flags here
arch/arm/dts/ca-presidio-engboard.dts new file +69
-0@@ -0,0 +1,69 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2020, Cortina Access Inc. + */ + +/dts-v1/; + +/ { + #address-cells = <2>; + #size-cells = <1>; + + mmc0: mmc at f4400000 { + compatible = "snps,dw-cortina"; + reg = <0x0 0xf4400000 0x1000>; + bus-width = <4>; + io_ds = <0x77>; + fifo-mode; + sd_dll_ctrl = <0xf43200e8>; + io_drv_ctrl = <0xf432004c>; + }; + + gpio0: gpio-controller at 0xf4329280 { + compatible = "cortina,ca-gpio"; + reg = <0x0 0xf4329280 0x24>; + gpio-controller; + #gpio-cells = <2>; + status = "okay"; + }; + gpio1: gpio-controller at 0xf43292a4 { + compatible = "cortina,ca-gpio"; + reg = <0x0 0xf43292a4 0x24>; + gpio-controller; + #gpio-cells = <2>; + status = "disabled"; + }; + + watchdog: watchdog at 0xf432901c { + compatible = "cortina,ca-wdt"; + reg = <0x0 0xf432901c 0x34>, + <0x0 0xf4320020 0x04>; + status = "okay"; + }; + + uart0: serial at 0xf4329148 { + u-boot,dm-pre-reloc; + compatible = "cortina,ca-uart"; + reg = <0x0 0xf4329148 0x30>; + status = "okay"; + }; + + i2c: i2c at f4329120 { + compatible = "cortina,ca-i2c"; + reg = <0x0 0xf4329120 0x28>; + clock-frequency = <400000>; + }; + + sflash: sflash-controller at f4324000 { + #address-cells = <2>; + #size-cells = <1>; + compatible = "cortina,ca-sflash"; + reg = <0x0 0xf4324000 0x50>; + reg-names = "sflash-regs"; + flash at 0 { + compatible = "jedec,spi-nor"; + spi-rx-bus-width = <1>; + spi-max-frequency = <108000000>; + }; + }; +};arch/arm/mach-cortina/Makefile new file +5
-0@@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0+ +# +# (C) Copyright 2020 Cortina Access Inc. +# +obj-y += lowlevel_init.oboard/cortina/presidio-asic/Kconfig new file +18
-0@@ -0,0 +1,18 @@ +if TARGET_PRESIDIO_ASIC +config BIT64 + bool + default y + +select SOC_CA7774 + +config SYS_BOARD + default "presidio-asic" + +config SYS_VENDOR + default "cortina" + +config SYS_CONFIG_NAME + default "presidio_asic" + +source "board/cortina/common/Kconfig" +endifboard/cortina/presidio-asic/MAINTAINERS new file +6
-0@@ -0,0 +1,6 @@ +Cortina Presidio ASIC G3 Engineering BOARD +M: Alex Nemirovsky <[email protected]> +S: Supported +F: board/cortina/presidio-asic/ +F: include/configs/presidio_asic.h +F: configs/cortina_presidio-asic*defconfigboard/cortina/presidio-asic/Makefile new file +8
-0@@ -0,0 +1,8 @@ +# SPDX-License-Identifier: GPL-2.0+ +# +# (C) Copyright 2020 Cortina-Access.Inc. +# +# + +obj-y := presidio.o +obj-y += lowlevel_init.oboard/cortina/presidio-asic/lowlevel_init.S new file +87
-0@@ -0,0 +1,87 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Copyright (C) 2020 Cortina-Access + * + */ + + +#include <asm-offsets.h> +#include <config.h> +#include <linux/linkage.h> +#include <asm/macro.h> +#include <asm/armv8/mmu.h> + + .globl lowlevel_init +lowlevel_init: + mov x29, lr /* Save LR */ + +#if defined(CONFIG_SOC_CA7774) + /* Enable SMPEN in CPUECTLR */ + mrs x0, s3_1_c15_c2_1 + tst x0, #0x40 + b.ne skip_smp_setup + orr x0, x0, #0x40 + msr s3_1_c15_c2_1, x0 +skip_smp_setup: +#endif + +#if defined(CONFIG_SOC_CA8277B) + /* Enable CPU Timer */ + ldr x0, =CONFIG_SYS_TIMER_BASE + mov x1, #1 + str w1, [x0] +#endif + +#if defined(CONFIG_GICV2) || defined(CONFIG_GICV3) + branch_if_slave x0, 1f +#ifndef CONFIG_TARGET_VENUS + ldr x0, =GICD_BASE + bl gic_init_secure +#endif +1: +#if defined(CONFIG_GICV3) + ldr x0, =GICR_BASE + bl gic_init_secure_percpu +#elif defined(CONFIG_GICV2) + ldr x0, =GICD_BASE + ldr x1, =GICC_BASE + bl gic_init_secure_percpu +#endif +#endif + +#ifdef CONFIG_ARMV8_MULTIENTRY + branch_if_master x0, x1, 2f + + /* + * Slave should wait for master clearing spin table. + * This sync prevent salves observing incorrect + * value of spin table and jumping to wrong place. + */ +#if defined(CONFIG_GICV2) || defined(CONFIG_GICV3) +#ifdef CONFIG_GICV2 + ldr x0, =GICC_BASE +#endif + bl gic_wait_for_interrupt +#endif + + /* + * All slaves will enter EL2 and optionally EL1. + */ + adr x4, lowlevel_in_el2 + ldr x5, =ES_TO_AARCH64 + bl armv8_switch_to_el2 + +lowlevel_in_el2: +#ifdef CONFIG_ARMV8_SWITCH_TO_EL1 + adr x4, lowlevel_in_el1 + ldr x5, =ES_TO_AARCH64 + bl armv8_switch_to_el1 + +lowlevel_in_el1: +#endif + +#endif /* CONFIG_ARMV8_MULTIENTRY */ + +2: + mov lr, x29 /* Restore LR */ + retboard/cortina/presidio-asic/presidio.c new file +134
-0@@ -0,0 +1,134 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* +* (C) Copyright 2020 - Cortina Access Inc. +* +*/ +#include <common.h> +#include <malloc.h> +#include <errno.h> +#include <netdev.h> +#include <asm/io.h> +#include <linux/compiler.h> +#include <configs/presidio_asic.h> +#include <linux/psci.h> +#include <asm/psci.h> +#include <cpu_func.h> +#include <asm/armv8/mmu.h> + +DECLARE_GLOBAL_DATA_PTR ; + +#define CA_PERIPH_BASE 0xE0000000UL +#define CA_PERIPH_SIZE 0x20000000UL +#define CA_GLOBAL_BASE 0xf4320000 +#define CA_GLOBAL_JTAG_ID 0xf4320000 +#define CA_GLOBAL_BLOCK_RESET 0xf4320004 +#define CA_GLOBAL_BLOCK_RESET_RESET_DMA BIT(16) +#define CA_DMA_SEC_SSP_BAUDRATE_CTRL 0xf7001b94 +#define CA_DMA_SEC_SSP_ID 0xf7001b80 + +int print_cpuinfo (void ) +{ +printf ("CPU: Cortina Presidio G3\n" ); +return 0 ; +} + +static struct mm_region presidio_mem_map[] = { + { + .virt =DDR_BASE , + .phys =DDR_BASE , + .size =PHYS_SDRAM_1_SIZE , + .attrs =PTE_BLOCK_MEMTYPE (MT_NORMAL ) | +PTE_BLOCK_OUTER_SHARE + }, + { + .virt =CA_PERIPH_BASE , + .phys =CA_PERIPH_BASE , + .size =CA_PERIPH_SIZE , + .attrs =PTE_BLOCK_MEMTYPE (MT_DEVICE_NGNRNE ) | +PTE_BLOCK_NON_SHARE + }, + { +/* List terminator */ +0 , + } +}; + +struct mm_region *mem_map = presidio_mem_map; + +static noinline int invoke_psci_fn_smc(u64 function_id, u64 arg0, u64 arg1, +u64 arg2) +{ + asmvolatile ("mov x0, %0\n" +"mov x1, %1\n" +"mov x2, %2\n" +"mov x3, %3\n" +"smc #0\n" + :"+r" (function_id) + :"r" (arg0),"r" (arg1),"r" (arg2) + ); + +return function_id; +} + +int board_early_init_r (void ) +{ +dcache_disable (); +return 0 ; +} + +int board_init (void ) +{ +unsigned int reg_data, jtag_id; + +/* Enable timer */ +writel (1 ,CONFIG_SYS_TIMER_BASE ); + +/* Enable snoop in CCI400 slave port#4 */ +writel (3 ,0xF5595000 ); + + jtag_id =readl (CA_GLOBAL_JTAG_ID ); + +/* If this is HGU variant then do not use +* the Saturn daughter card ref. clk +*/ +if (jtag_id ==0x1010D8F3 ) { + reg_data =readl (0xF3100064 ); +/* change multifunc. REF CLK pin to +* a simple GPIO pin +*/ + reg_data |= (1 <<1 ); +writel (reg_data,0xf3100064 ); + } + +return 0 ; +} + +int dram_init (void ) +{ +unsigned int ddr_size; + + ddr_size =readl (0x111100c ); + gd->ram_size = ddr_size *0x100000 ; +return 0 ; +} + +void reset_cpu (ulong addr) +{ +invoke_psci_fn_smc (PSCI_0_2_FN_SYSTEM_RESET ,0 ,0 ,0 ); +} + +#ifdef CONFIG_LAST_STAGE_INIT +int last_stage_init (void ) +{ +u32 val; + + val =readl (CA_GLOBAL_BLOCK_RESET ); + val &= ~CA_GLOBAL_BLOCK_RESET_RESET_DMA ; +writel (val,CA_GLOBAL_BLOCK_RESET ); + +/* reduce output pclk ~3.7Hz to save power consumption */ +writel (0x000000FF ,CA_DMA_SEC_SSP_BAUDRATE_CTRL ); + +return 0 ; +} +#endif configs/cortina_presidio-asic-base_defconfig new file +29
-0@@ -0,0 +1,29 @@ +CONFIG_ARM=y +# CONFIG_SYS_ARCH_TIMER is not set +CONFIG_TARGET_PRESIDIO_ASIC=y +CONFIG_SYS_TEXT_BASE=0x04000000 +CONFIG_DM_GPIO=y +CONFIG_ENV_SIZE=0x20000 +CONFIG_NR_DRAM_BANKS=1 +CONFIG_IDENT_STRING="Presidio-SoC" +CONFIG_SHOW_BOOT_PROGRESS=y +CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="earlycon=serial,0xf4329148 console=ttyS0,115200 root=/dev/ram0" +CONFIG_BOARD_EARLY_INIT_R=y +CONFIG_SYS_PROMPT="G3#" +CONFIG_CMD_WDT=y +CONFIG_CMD_CACHE=y +CONFIG_CMD_TIMER=y +CONFIG_CMD_SMC=y +CONFIG_OF_CONTROL=y +CONFIG_OF_LIVE=y +CONFIG_DEFAULT_DEVICE_TREE="ca-presidio-engboard" +# CONFIG_NET is not set +CONFIG_DM=y +CONFIG_CORTINA_GPIO=y +# CONFIG_MMC is not set +CONFIG_DM_SERIAL=y +CONFIG_CORTINA_UART=y +CONFIG_WDT=y +CONFIG_WDT_CORTINA=yinclude/configs/presidio_asic.h new file +75
-0@@ -0,0 +1,75 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* +* Copyright (C) 2020 Cortina Access Inc. +* +* Configuration for Cortina-Access Presidio board. +*/ + +#ifndef __PRESIDIO_ASIC_H +#define __PRESIDIO_ASIC_H + +#define CONFIG_REMAKE_ELF + +#define CONFIG_SUPPORT_RAW_INITRD + +#define CONFIG_SYS_INIT_SP_ADDR 0x00100000 +#define CONFIG_SYS_BOOTM_LEN 0x00c00000 + +/* Generic Timer Definitions */ +#define COUNTER_FREQUENCY 25000000 +#define CONFIG_SYS_TIMER_RATE COUNTER_FREQUENCY +#define CONFIG_SYS_TIMER_COUNTER 0xf4321008 + +/* note: arch/arm/cpu/armv8/start.S which references GICD_BASE/GICC_BASE +* does not yet support DT. Thus define it here. +*/ +#define CONFIG_GICV2 +#define GICD_BASE 0xf7011000 +#define GICC_BASE 0xf7012000 + +#define CONFIG_SYS_MEMTEST_SCRATCH 0x00100000 +#define CONFIG_SYS_MEMTEST_START 0x05000000 +#define CONFIG_SYS_MEMTEST_END 0x0D000000 + +/* Size of malloc() pool */ +#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (8 << 20)) + +#define CONFIG_SYS_TIMER_BASE 0xf4321000 + +/* Use external clock source */ +#define PRESIDIO_APB_CLK 125000000 +#define CORTINA_PER_IO_FREQ PRESIDIO_APB_CLK + +/* Cortina Serial Configuration */ +#define CORTINA_UART_CLOCK (PRESIDIO_APB_CLK) +#define CORTINA_SERIAL_PORTS {(void *)CONFIG_SYS_SERIAL0, \ + (void *)CONFIG_SYS_SERIAL1} + +#define CONFIG_BAUDRATE 115200 +#define CONFIG_SYS_SERIAL0 PER_UART0_CFG +#define CONFIG_SYS_SERIAL1 PER_UART1_CFG + +/* BOOTP options */ +#define CONFIG_BOOTP_BOOTFILESIZE + +/* Miscellaneous configurable options */ +#define CONFIG_SYS_LOAD_ADDR (DDR_BASE + 0x10000000) +#define CONFIG_LAST_STAGE_INIT + +/* SDRAM Bank #1 */ +#define DDR_BASE 0x00000000 +#define PHYS_SDRAM_1 DDR_BASE +#define PHYS_SDRAM_1_SIZE 0x80000000/* 2GB */ +#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1 + +/* Console I/O Buffer Size */ +#define CONFIG_SYS_CBSIZE 256 +#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \ + sizeof(CONFIG_SYS_PROMPT) + 16) +#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE + +/* max command args */ +#define CONFIG_SYS_MAXARGS 64 +#define CONFIG_EXTRA_ENV_SETTINGS "silent=y\0" + +#endif /* __PRESIDIO_ASIC_H */ Signature · 1 line
2.7.4
PATCH v4 6/6 board: presidio-asic: Add basic G3 engr. development board support
In reply to Alex NemirovskyQuoted 3 lines · Alex Nemirovsky
Add basic Presidio G3 engineering board support
Signed-off-by Alex Nemirovsky <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 833 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200207/6a8f63c4/attachment.sig>