Skip to content

drm: rp1: Enable VEC->GPIO output; cosmetic change to registers#6974

Merged
njhollinghurst merged 1 commit intoraspberrypi:rpi-6.12.yfrom
njhollinghurst:vec-gpio
Aug 6, 2025
Merged

drm: rp1: Enable VEC->GPIO output; cosmetic change to registers#6974
njhollinghurst merged 1 commit intoraspberrypi:rpi-6.12.yfrom
njhollinghurst:vec-gpio

Conversation

@njhollinghurst
Copy link
Copy Markdown
Contributor

@njhollinghurst njhollinghurst commented Jul 25, 2025

In the VEC driver, enable mapping VEC (not DPI) to DPI GPIOs. This is to support VEC output over GPIO on Raspberry Pi CM5. It is harmless as DPI and VEC could not be used concurrently, and the output is anyway conditional on pinctrl.

Also, tweak the style of VIDEO_OUT_CFG register definitions (in both DPI and VEC drivers) to be more Linux-friendly.

In the VEC driver, enable mapping VEC (not DPI) to DPI GPIOs.
This is to support VEC output over GPIO on Raspberry Pi CM5.
It is harmless as DPI and VEC could not be used concurrently,
and the output is anyway conditional on pinctrl.

Also, tweak the style of VIDEO_OUT_CFG register definitions
(in both DPI and VEC drivers) to be more Linux-friendly.

Signed-off-by: Nick Hollinghurst <nick.hollinghurst@raspberrypi.com>
CFG_WRITE(VIDEO_OUT_CFG_SEL, VIDEO_OUT_CFG_SEL_VDAC_MUX_BITS);
/* VEC->Pads (GPIOs 11:4 with clock on GPIO0); VEC->VDAC */
CFG_WRITE(VIDEO_OUT_CFG_SEL,
VIDEO_OUT_CFG_SEL_VDAC_MUX | VIDEO_OUT_CFG_SEL_PAD_MUX);
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

^ The register style change somewhat obscures it; the functional change is this line only.

@njhollinghurst njhollinghurst marked this pull request as ready for review July 28, 2025 09:34
@njhollinghurst
Copy link
Copy Markdown
Contributor Author

Tested RP1 VEC and DPI, both still work as expected (apart from RPi-Distro/repo#397)

@njhollinghurst njhollinghurst merged commit 8394326 into raspberrypi:rpi-6.12.y Aug 6, 2025
12 checks passed
@njhollinghurst njhollinghurst deleted the vec-gpio branch August 6, 2025 09:12
popcornmix added a commit to raspberrypi/firmware that referenced this pull request Aug 13, 2025
See: raspberrypi/linux#6974

kernel: pisp_be: Stride alignment
See: raspberrypi/linux#6985

kernel: drm/panel: ilitek-ili9881c: Restore missing lanes configuration for nwe080 panel
See: raspberrypi/linux#6987

kernel: drivers: media: pisp_be: Fix alignment for V4L2_PIX_FMT_SRGGB8
See: raspberrypi/linux#6988

kernel: overlays: Fix sc16is752-spi1 emulation
See: raspberrypi/linux#6996

kernel: arm64/dma-mapping: Fix arch_sync_dma_for_device to respect dir parameter
See: raspberrypi/linux#6995
popcornmix added a commit to raspberrypi/rpi-firmware that referenced this pull request Aug 13, 2025
See: raspberrypi/linux#6974

kernel: pisp_be: Stride alignment
See: raspberrypi/linux#6985

kernel: drm/panel: ilitek-ili9881c: Restore missing lanes configuration for nwe080 panel
See: raspberrypi/linux#6987

kernel: drivers: media: pisp_be: Fix alignment for V4L2_PIX_FMT_SRGGB8
See: raspberrypi/linux#6988

kernel: overlays: Fix sc16is752-spi1 emulation
See: raspberrypi/linux#6996

kernel: arm64/dma-mapping: Fix arch_sync_dma_for_device to respect dir parameter
See: raspberrypi/linux#6995
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant