Skip to content

Commit 15dfba6

Browse files
pelwellpopcornmix
authored andcommitted
fixup! ARM: dts: Select the PL011 platform driver
Retain the original compatible strings as fallbacks. See: #7023 Signed-off-by: Phil Elwell <phil@raspberrypi.com>
1 parent 2fd0790 commit 15dfba6

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

arch/arm/boot/dts/broadcom/bcm270x.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@
239239
};
240240

241241
&uart0 {
242-
compatible = "arm,pl011-axi";
242+
compatible = "arm,pl011-axi", "arm,pl011", "arm,primecell";
243243
/* Enable CTS bug workaround */
244244
cts-event-workaround;
245245
};

arch/arm/boot/dts/broadcom/bcm2711-rpi-ds.dtsi

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -509,29 +509,29 @@ i2c_vc: &i2c0 {};
509509
};
510510

511511
&uart0 {
512-
compatible = "arm,pl011-axi";
512+
compatible = "arm,pl011-axi", "arm,pl011", "arm,primecell";
513513
};
514514

515515
&uart2 {
516-
compatible = "arm,pl011-axi";
516+
compatible = "arm,pl011-axi", "arm,pl011", "arm,primecell";
517517
pinctrl-0 = <&uart2_pins>;
518518
pinctrl-names = "default";
519519
};
520520

521521
&uart3 {
522-
compatible = "arm,pl011-axi";
522+
compatible = "arm,pl011-axi", "arm,pl011", "arm,primecell";
523523
pinctrl-0 = <&uart3_pins>;
524524
pinctrl-names = "default";
525525
};
526526

527527
&uart4 {
528-
compatible = "arm,pl011-axi";
528+
compatible = "arm,pl011-axi", "arm,pl011", "arm,primecell";
529529
pinctrl-0 = <&uart4_pins>;
530530
pinctrl-names = "default";
531531
};
532532

533533
&uart5 {
534-
compatible = "arm,pl011-axi";
534+
compatible = "arm,pl011-axi", "arm,pl011", "arm,primecell";
535535
pinctrl-0 = <&uart5_pins>;
536536
pinctrl-names = "default";
537537
};

arch/arm64/boot/dts/broadcom/bcm2712-ds.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -411,7 +411,7 @@
411411
};
412412

413413
&uart10 {
414-
compatible = "arm,pl011-axi";
414+
compatible = "arm,pl011-axi", "arm,pl011", "arm,primecell";
415415
};
416416

417417
&aon_intr {

0 commit comments

Comments
 (0)