Skip to content

Waveshare fix compatible - #7698

Merged
pelwell merged 4 commits into
raspberrypi:rpi-6.18.yfrom
waveshareteam:Waveshare-fix-compatible
Oct 21, 2026
Merged

pelwell merged 4 commits into
raspberrypi:rpi-6.18.yfrom
waveshareteam:Waveshare-fix-compatible

Conversation

@EngineerWill

Copy link
Copy Markdown
Contributor

Fix the compatible strings of the Waveshare 4-lane DSI panels: a compatible
string takes the form "vendor,model" and may only contain a single comma, so
the ",4lane" suffix used by this batch is not valid.

This addresses the format noted in #7696 (and the batch that introduced it,
#6957):

   waveshare,12.3-dsi-touch-a,4lane  ->  waveshare,12.3-dsi-touch-a-4lane
   waveshare,10.1-dsi-touch-b,4lane  ->  waveshare,10.1-dsi-touch-b-4lane
   waveshare,10.1-dsi-touch-e,4lane  ->  waveshare,10.1-dsi-touch-e-4lane
   waveshare,9.0-dsi-touch-b,4lane   ->  waveshare,9.0-dsi-touch-b-4lane

The "-4lane" form is the one already used by the 8.0" and 10.1" a variants.

A compatible string takes the form "vendor,model" and may only contain a
single comma, so "waveshare,9.0-dsi-touch-b,4lane" and the other 4-lane
entries are not valid. Replace them with the "-4lane" suffix already used
by the 8.0" and 10.1" a variants.

The missing Waveshare 10.1-DSI-TOUCH-E entry is added at the same time.

Signed-off-by: Yu Dukai <646689853@qq.com>
…panels

Use a single comma in the compatible strings of the 4-lane panels, as
required by the DT specification and as already done for the 8.0" and
10.1" a variants.

The old strings are not retained as aliases, since a panel is selected
through the overlay parameter rather than the compatible string.

Signed-off-by: Yu Dukai <646689853@qq.com>
Update the overlay parameters for the 4-lane panels to the "-4lane" form
used by the driver and the binding now. The parameter names are left
unchanged, so existing configurations keep working.

Signed-off-by: Yu Dukai <646689853@qq.com>
Fix the compatible strings of the Waveshare 4-lane DSI panels: a compatible
   string takes the form "vendor,model" and may only contain a single comma, so
   the ",4lane" suffix used by this batch is not valid.

   This addresses the format noted in raspberrypi#7696 (and the batch that introduced it,
   raspberrypi#6957):

       waveshare,12.3-dsi-touch-a,4lane  ->  waveshare,12.3-dsi-touch-a-4lane
       waveshare,10.1-dsi-touch-b,4lane  ->  waveshare,10.1-dsi-touch-b-4lane
       waveshare,10.1-dsi-touch-e,4lane  ->  waveshare,10.1-dsi-touch-e-4lane
       waveshare,9.0-dsi-touch-b,4lane   ->  waveshare,9.0-dsi-touch-b-4lane

   The "-4lane" form is the one already used by the 8.0" and 10.1" a variants.
@pelwell
pelwell merged commit 1d57492 into raspberrypi:rpi-6.18.y Oct 21, 2026
12 checks passed
popcornmix added a commit to raspberrypi/firmware that referenced this pull request Oct 21, 2026
kernel: drm/panel: waveshare-dsi-v2: Update Waveshare 10.1-DSI-TOUCH-A display timing
See: raspberrypi/linux#7697

kernel: Add support for the Waveshare 10.1-DSI-TOUCH-E DSI panel
See: raspberrypi/linux#7696

kernel: Waveshare fix compatible
See: raspberrypi/linux#7698

kernel: ES8389: sync codec driver with upstream & enable for Waveshare ES8389 Audio HAT
See: raspberrypi/linux#7699
popcornmix added a commit to raspberrypi/rpi-firmware that referenced this pull request Oct 21, 2026
kernel: drm/panel: waveshare-dsi-v2: Update Waveshare 10.1-DSI-TOUCH-A display timing
See: raspberrypi/linux#7697

kernel: Add support for the Waveshare 10.1-DSI-TOUCH-E DSI panel
See: raspberrypi/linux#7696

kernel: Waveshare fix compatible
See: raspberrypi/linux#7698

kernel: ES8389: sync codec driver with upstream & enable for Waveshare ES8389 Audio HAT
See: raspberrypi/linux#7699
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.

2 participants