diff options
| author | Visa Hankala <visa@cvs.openbsd.org> | 2021-04-24 07:49:12 +0000 |
|---|---|---|
| committer | Visa Hankala <visa@cvs.openbsd.org> | 2021-04-24 07:49:12 +0000 |
| commit | 1863763ec057a1e33218137818d1c964c733bb27 (patch) | |
| tree | bdec899e72cefbae040ae95b42a089f69d3cde5b /sys/arch/armv7 | |
| parent | c69311f4a3fe9c9313a4b5686dc7971619f0a3b5 (diff) | |
Add cduart(4), a driver for the Cadence UART found on Xilinx Zynq SoCs.
Tested on Xilinx Zynq-7000.
Input and OK kettenis@
Diffstat (limited to 'sys/arch/armv7')
| -rw-r--r-- | sys/arch/armv7/armv7/platform.c | 4 | ||||
| -rw-r--r-- | sys/arch/armv7/conf/GENERIC | 5 | ||||
| -rw-r--r-- | sys/arch/armv7/conf/RAMDISK | 5 |
3 files changed, 11 insertions, 3 deletions
diff --git a/sys/arch/armv7/armv7/platform.c b/sys/arch/armv7/armv7/platform.c index 650886e6dfa..19166736a9f 100644 --- a/sys/arch/armv7/armv7/platform.c +++ b/sys/arch/armv7/armv7/platform.c @@ -1,4 +1,4 @@ -/* $OpenBSD: platform.c,v 1.25 2021/03/25 04:12:01 jsg Exp $ */ +/* $OpenBSD: platform.c,v 1.26 2021/04/24 07:49:11 visa Exp $ */ /* * Copyright (c) 2014 Patrick Wildt <patrick@blueri.se> * @@ -30,6 +30,7 @@ static struct armv7_platform *platform; void agtimer_init(void); +extern void cduart_init_cons(void); extern void exuart_init_cons(void); extern void imxuart_init_cons(void); extern void com_fdt_init_cons(void); @@ -87,6 +88,7 @@ platform_init_cons(void) platform->init_cons(); return; } + cduart_init_cons(); exuart_init_cons(); imxuart_init_cons(); com_fdt_init_cons(); diff --git a/sys/arch/armv7/conf/GENERIC b/sys/arch/armv7/conf/GENERIC index 3bf925a2be7..b0a969af57c 100644 --- a/sys/arch/armv7/conf/GENERIC +++ b/sys/arch/armv7/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.134 2021/02/04 16:25:39 anton Exp $ +# $OpenBSD: GENERIC,v 1.135 2021/04/24 07:49:11 visa Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -211,6 +211,9 @@ iic* at rkiic? rktemp* at fdt? dwdog* at fdt? +# Xilinx Zynq-7000 +cduart* at fdt? + # I2C devices abcrtc* at iic? # Abracon x80x RTC axppmic* at iic? # axp209 pmic diff --git a/sys/arch/armv7/conf/RAMDISK b/sys/arch/armv7/conf/RAMDISK index eedd98aeadd..5fd79188455 100644 --- a/sys/arch/armv7/conf/RAMDISK +++ b/sys/arch/armv7/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.120 2021/03/11 07:57:18 deraadt Exp $ +# $OpenBSD: RAMDISK,v 1.121 2021/04/24 07:49:11 visa Exp $ machine armv7 arm @@ -196,6 +196,9 @@ rkiic* at fdt? iic* at rkiic? dwdog* at fdt? +# Xilinx Zynq-7000 +cduart* at fdt? + axppmic* at iic? # axp209 pmic crosec* at iic? wskbd* at crosec? mux 1 |