summaryrefslogtreecommitdiff
path: root/sys/arch/evbarm
diff options
context:
space:
mode:
authormartin <martin@NetBSD.org>2019-11-16 16:48:25 +0000
committermartin <martin@NetBSD.org>2019-11-16 16:48:25 +0000
commitbbfa294c6ccd6a3fa77a3807ef036dbddf5efd73 (patch)
tree83c2b7cbd8258c08323e34a382dc62a2391a43b5 /sys/arch/evbarm
parentc26e2b221139ff5820e79cd75d8ca613432dcb66 (diff)
Pull up following revision(s) (requested by jmcneill in ticket #427):
sys/dev/ic/dw_hdmi_phy.c: revision 1.2 sys/dev/ic/dw_hdmi.c: revision 1.4 sys/dev/fdt/ausoc.c: revision 1.5 sys/dev/ic/dw_hdmi.h: revision 1.2 sys/dev/ic/dw_hdmi.h: revision 1.3 sys/dev/ic/dw_hdmi.h: revision 1.4 sys/conf/files: revision 1.1242 sys/dev/fdt/fdtvar.h: revision 1.57 sys/arch/arm/rockchip/rk3399_cru.c: revision 1.11 sys/arch/arm/rockchip/rk3399_cru.c: revision 1.12 sys/arch/arm/rockchip/rk3399_cru.c: revision 1.13 sys/arch/evbarm/conf/GENERIC64: revision 1.110 sys/arch/arm/rockchip/rk_drm.c: revision 1.1 sys/arch/arm/rockchip/rk_drm.c: revision 1.2 sys/arch/evbarm/conf/GENERIC64: revision 1.112 sys/arch/arm/rockchip/rk_dwhdmi.c: revision 1.1 sys/dev/fdt/fdt_clock.c: revision 1.10 sys/arch/evbarm/conf/GENERIC64: revision 1.113 sys/arch/arm/rockchip/rk_dwhdmi.c: revision 1.2 sys/arch/arm/rockchip/rk_drm.h: revision 1.1 sys/arch/arm/rockchip/rk_dwhdmi.c: revision 1.3 sys/arch/arm/rockchip/rk_fb.c: revision 1.1 sys/arch/arm/dts/rk3399-rockpro64.dts: revision 1.9 sys/arch/arm/rockchip/rk_vop.c: revision 1.1 sys/arch/arm/rockchip/rk_vop.c: revision 1.2 sys/arch/arm/rockchip/rk_i2c.c: revision 1.6 sys/arch/arm/rockchip/rk_cru.h: revision 1.6 sys/arch/arm/rockchip/rk_cru.h: revision 1.7 sys/arch/arm/rockchip/rk_cru_composite.c: revision 1.4 sys/arch/arm/rockchip/rk_cru_composite.c: revision 1.5 sys/arch/arm/rockchip/files.rockchip: revision 1.21 sys/arch/arm/rockchip/rk_i2s.c: revision 1.1 sys/arch/arm/rockchip/files.rockchip: revision 1.22 sys/dev/ic/dw_hdmi.c: revision 1.2 sys/dev/ic/dw_hdmi_phy.c: revision 1.1 sys/dev/ic/dw_hdmi.c: revision 1.3 Support reads of more than 32 bytes in a single xfer. Add support for internal DesignWare HDMI PHYs Add fdtbus_clock_enable and fdtbus_clock_enable_index shortcuts Add HDMI and VOP clocks WIP display driver for Rockchip RK3399 Add (commented out) Rockchip display support Select the correct MPLL and PHY settings for the requested pixel clock Force DCLK_VOP0/1 dividers to 1 and select closest match when setting PLL rates. Fix typo in phy config table Fix a few swapped fields Remove debug output Enable Rockchip display support Set sysclk rate at set_format time, so the link set_format callback can read the new sysclk Add I2S audio input support. Add software volume controls. Add support for I2S clocks. Add driver for Rockchip I2S/PCM controller. Enable HDMI audio on ROCKPro64 Add rki2s Add audio support
Diffstat (limited to 'sys/arch/evbarm')
-rw-r--r--sys/arch/evbarm/conf/GENERIC648
1 files changed, 6 insertions, 2 deletions
diff --git a/sys/arch/evbarm/conf/GENERIC64 b/sys/arch/evbarm/conf/GENERIC64
index 11922b52fe1..017789ecc54 100644
--- a/sys/arch/evbarm/conf/GENERIC64
+++ b/sys/arch/evbarm/conf/GENERIC64
@@ -1,5 +1,5 @@
#
-# $NetBSD: GENERIC64,v 1.103.2.2 2019/10/03 17:14:47 martin Exp $
+# $NetBSD: GENERIC64,v 1.103.2.3 2019/11/16 16:48:25 martin Exp $
#
# GENERIC ARM (aarch64) kernel
#
@@ -340,7 +340,7 @@ options I2C_MAX_ADDR=0xfff
bsciic* at fdt? # Broadcom BCM283x Serial Control
dwiic* at fdt? # Designware I2C
dwiic* at acpi?
-rkiic* at fdt? # Rockchip I2C
+rkiic* at fdt? pass 4 # Rockchip I2C
sunxirsb* at fdt? pass 4 # Allwinner RSB
sunxitwi* at fdt? # Allwinner TWI
tegrai2c* at fdt? pass 4 # NVIDIA Tegra I2C
@@ -412,6 +412,7 @@ options HDAUDIOVERBOSE
options HDAUDIO_ENABLE_HDMI
options HDAUDIO_ENABLE_DISPLAYPORT
ausoc* at fdt? # Simple SoC audio card
+rki2s* at fdt? # Rockchip I2S/PCM
sunxicodec* at fdt? # Allwinner audio codec
sun8icodec* at fdt? # Allwinner audio codec (sun8i/sun50i)
h3codec* at fdt? # Allwinner H3 audio codec (analog part)
@@ -429,6 +430,9 @@ hdmicec* at hdmicecbus?
anxedp* at iic? # Analogix eDP TX
dispcon* at fdt? # Display connector devices
dwhdmi* at fdt? # Designware HDMI TX
+rkdrm* at fdt? pass 5 # Rockchip DRM master
+rkfb* at rkdrm? # Rockchip DRM framebuffer
+rkvop* at fdt? # Rockchip Visual Output Processor
sunxide2bus* at fdt? pass 4 # Allwinner DE2 bus
sunxidrm* at fdt? pass 5 # Allwinner Display Pipeline
sunxifb* at sunxidrm? # Allwinner DRM framebuffer