dtoverlays: Switch ssd1306 to use the DRM driver#7034
Merged
pelwell merged 1 commit intoraspberrypi:rpi-6.12.yfrom Sep 3, 2025
Merged
dtoverlays: Switch ssd1306 to use the DRM driver#7034pelwell merged 1 commit intoraspberrypi:rpi-6.12.yfrom
pelwell merged 1 commit intoraspberrypi:rpi-6.12.yfrom
Conversation
Both drivers/gpu/drm/solomon/ssd130x-i2c.c and drivers/video/fbdev/ssd1307fb.c were registering the compatible "solomon,ssd1306fb-i2c", so bringing ambiguity as to which one got loaded. fbdev is largely deprecated, so adopt the updated compatible for the drm driver. Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
popcornmix
added a commit
to raspberrypi/firmware
that referenced
this pull request
Sep 5, 2025
kernel: configs: Add EROFS_FS_ZIP_ZSTD See: raspberrypi/linux#7028 kernel: dt: Add eth_max_speed override for CM4, Pi4, and Pi400 See: raspberrypi/linux#7031 kernel: mfd: rp1: Fix device links when modules disabled See: raspberrypi/linux#7027 kernel: Add adxl355 to i2c-sensor See: raspberrypi/linux#6823 kernel: dtoverlays: Switch ssd1306 to use the DRM driver See: raspberrypi/linux#7034 kernel: Added device tree overlays for the rpi-power HAT See: raspberrypi/linux#7036 kernel: fixup! misc: rp1-pio: Request a DMA burst size of 8 See: raspberrypi/linux#7037
popcornmix
added a commit
to raspberrypi/rpi-firmware
that referenced
this pull request
Sep 5, 2025
kernel: configs: Add EROFS_FS_ZIP_ZSTD See: raspberrypi/linux#7028 kernel: dt: Add eth_max_speed override for CM4, Pi4, and Pi400 See: raspberrypi/linux#7031 kernel: mfd: rp1: Fix device links when modules disabled See: raspberrypi/linux#7027 kernel: Add adxl355 to i2c-sensor See: raspberrypi/linux#6823 kernel: dtoverlays: Switch ssd1306 to use the DRM driver See: raspberrypi/linux#7034 kernel: Added device tree overlays for the rpi-power HAT See: raspberrypi/linux#7036 kernel: fixup! misc: rp1-pio: Request a DMA burst size of 8 See: raspberrypi/linux#7037
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Both drivers/gpu/drm/solomon/ssd130x-i2c.c and
drivers/video/fbdev/ssd1307fb.c were registering the compatible "solomon,ssd1306fb-i2c", so bringing ambiguity as to which one got loaded.
fbdev is largely deprecated, so adopt the updated compatible for the drm driver.
Fixes #7012 as this doesn't fail during shutdown.