Message ID | 20191124205110.48031-1-stephan@gerhold.net (mailing list archive) |
---|---|
State | Mainlined |
Commit | b2ee5877508b491ce7d18fc50b2c7b670aef1b79 |
Headers | show |
Series | ARM: dts: ux500: Use "arm,pl031" compatible for PL031 | expand |
On Sun, Nov 24, 2019 at 9:52 PM Stephan Gerhold <stephan@gerhold.net> wrote: > The Ux500 device tree uses "arm,rtc-pl031" as compatible for PL031. > All other boards in Linux describe it using "arm,pl031" instead. > This works because the compatible is not actually used in Linux: > AMBA devices get probed based on "arm,primecell" and their peripheral ID. > > Nevertheless, some other projects (e.g. U-Boot) rely on the compatible > to probe the device with the correct driver. Those will look for > "arm,pl031" instead of "arm,rtc-pl031", preventing the RTC from being > probed. > > Change it to "arm,pl031" to match all other boards. > > Signed-off-by: Stephan Gerhold <stephan@gerhold.net> Patch applied. Yours, Linus Walleij
diff --git a/arch/arm/boot/dts/ste-dbx5x0.dtsi b/arch/arm/boot/dts/ste-dbx5x0.dtsi index 51ac65b78be0..0a5b88702b16 100644 --- a/arch/arm/boot/dts/ste-dbx5x0.dtsi +++ b/arch/arm/boot/dts/ste-dbx5x0.dtsi @@ -324,7 +324,7 @@ }; rtc@80154000 { - compatible = "arm,rtc-pl031", "arm,primecell"; + compatible = "arm,pl031", "arm,primecell"; reg = <0x80154000 0x1000>; interrupts = <GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH>;
The Ux500 device tree uses "arm,rtc-pl031" as compatible for PL031. All other boards in Linux describe it using "arm,pl031" instead. This works because the compatible is not actually used in Linux: AMBA devices get probed based on "arm,primecell" and their peripheral ID. Nevertheless, some other projects (e.g. U-Boot) rely on the compatible to probe the device with the correct driver. Those will look for "arm,pl031" instead of "arm,rtc-pl031", preventing the RTC from being probed. Change it to "arm,pl031" to match all other boards. Signed-off-by: Stephan Gerhold <stephan@gerhold.net> --- arch/arm/boot/dts/ste-dbx5x0.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)