Skip to content

ARM: dts: Select the PL011 platform driver#7023

Merged
popcornmix merged 1 commit intoraspberrypi:rpi-6.12.yfrom
pelwell:is7019
Sep 25, 2025
Merged

ARM: dts: Select the PL011 platform driver#7023
popcornmix merged 1 commit intoraspberrypi:rpi-6.12.yfrom
pelwell:is7019

Conversation

@pelwell
Copy link
Contributor

@pelwell pelwell commented Aug 29, 2025

The PL011 driver in this downstream kernel tree supports an extra compatible string - arm,pl011-axi - for use by RP1. This registers as a platform driver, not an AMBA driver, and has the advantage of responding to dynamic Device Tree changes such as loading one of the "uart" overlays.

Change all of the downstream Raspberry Pi dts files to use the new compatible string. At the same time, remove the override of the periphid as the upstream code now has the correct value.

See: #7019

The PL011 driver in this downstream kernel tree supports an extra
compatible string - arm,pl011-axi - for use by RP1. This registers as a
platform driver, not an AMBA driver, and has the advantage of responding
to dynamic Device Tree changes such as loading one of the "uart<n>"
overlays.

Change all of the downstream Raspberry Pi dts files to use the new
compatible string. At the same time, remove the override of the periphid
as the upstream code now has the correct value.

See: raspberrypi#7019

Signed-off-by: Phil Elwell <phil@raspberrypi.com>
@pelwell
Copy link
Contributor Author

pelwell commented Sep 25, 2025

Any objections to merging this, @popcornmix?

@popcornmix popcornmix merged commit e165d4f into raspberrypi:rpi-6.12.y Sep 25, 2025
12 checks passed
popcornmix added a commit to raspberrypi/firmware that referenced this pull request Sep 27, 2025
See: raspberrypi/linux#6945

kernel: net: phy: broadcom: Add led-swap property support
See: raspberrypi/linux#7060

kernel: Select internal MSI target for 32-bit DMA on Pi 5 PCIe
See: raspberrypi/linux#7059

kernel: configs: Add CONFIG_VEML6030=m
See: raspberrypi/linux#7052

kernel: media: i2c: imx219: Scale the pixel rate for analog binning
See: raspberrypi/linux#7045

kernel: staging: vc-sm-cma: Fix field-spanning write warning
See: raspberrypi/linux#7064

kernel: drm/rp1: rp1-dsi: Add support for inverting lane polarities
See: raspberrypi/linux#7065

kernel: ARM: dts: Select the PL011 platform driver
See: raspberrypi/linux#7023

kernel: media: i2c: imx219: fix binning and rate_factor for 480p and 1232p
See: raspberrypi/linux#7063
popcornmix added a commit to raspberrypi/rpi-firmware that referenced this pull request Sep 27, 2025
See: raspberrypi/linux#6945

kernel: net: phy: broadcom: Add led-swap property support
See: raspberrypi/linux#7060

kernel: Select internal MSI target for 32-bit DMA on Pi 5 PCIe
See: raspberrypi/linux#7059

kernel: configs: Add CONFIG_VEML6030=m
See: raspberrypi/linux#7052

kernel: media: i2c: imx219: Scale the pixel rate for analog binning
See: raspberrypi/linux#7045

kernel: staging: vc-sm-cma: Fix field-spanning write warning
See: raspberrypi/linux#7064

kernel: drm/rp1: rp1-dsi: Add support for inverting lane polarities
See: raspberrypi/linux#7065

kernel: ARM: dts: Select the PL011 platform driver
See: raspberrypi/linux#7023

kernel: media: i2c: imx219: fix binning and rate_factor for 480p and 1232p
See: raspberrypi/linux#7063
@nullr0ute
Copy link
Contributor

So uart10 is on the bcm2712 SoC itself and not on the RP1 chip so I don't think the change to uart10 is correct @pelwell but it should just be for the RP1 uarts.

@pelwell
Copy link
Contributor Author

pelwell commented Mar 11, 2026

Although prompted by RP1, I think the new compatible string is equally applicable to 2712 and 2711. There is no AMBA bus on any of these chips, and we'd rather have the benefit of responding to dynamic DT changes that you get from using a platform driver.

@nullr0ute
Copy link
Contributor

nullr0ute commented Mar 11, 2026

You should leave the original compatibles so there's fall back, eg this breaks with an upstream kernel.

pelwell added a commit to pelwell/linux that referenced this pull request Mar 17, 2026
Retain the original compatible strings as fallbacks.

See: raspberrypi#7023

Signed-off-by: Phil Elwell <phil@raspberrypi.com>
@pelwell
Copy link
Contributor Author

pelwell commented Mar 17, 2026

See #7278.

pelwell added a commit that referenced this pull request Mar 17, 2026
Retain the original compatible strings as fallbacks.

See: #7023

Signed-off-by: Phil Elwell <phil@raspberrypi.com>
pelwell added a commit that referenced this pull request Mar 17, 2026
Retain the original compatible strings as fallbacks.

See: #7023

Signed-off-by: Phil Elwell <phil@raspberrypi.com>
pelwell added a commit that referenced this pull request Mar 17, 2026
Retain the original compatible strings as fallbacks.

See: #7023

Signed-off-by: Phil Elwell <phil@raspberrypi.com>
pelwell added a commit that referenced this pull request Mar 17, 2026
Retain the original compatible strings as fallbacks.

See: #7023

Signed-off-by: Phil Elwell <phil@raspberrypi.com>
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.

3 participants