From: Conor Dooley <conor.dooley@xxxxxxxxxxxxx> Update 'compatible' strings for system controller drivers to the approved Microchip name. Signed-off-by: Conor Dooley <conor.dooley@xxxxxxxxxxxxx> --- .../bindings/mailbox/microchip,polarfire-soc-mailbox.yaml | 4 +++- .../soc/microchip/microchip,polarfire-soc-sys-controller.yaml | 4 +++- drivers/mailbox/mailbox-mpfs.c | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/mailbox/microchip,polarfire-soc-mailbox.yaml b/Documentation/devicetree/bindings/mailbox/microchip,polarfire-soc-mailbox.yaml index bbb173ea483c..b08c8a158eea 100644 --- a/Documentation/devicetree/bindings/mailbox/microchip,polarfire-soc-mailbox.yaml +++ b/Documentation/devicetree/bindings/mailbox/microchip,polarfire-soc-mailbox.yaml @@ -11,7 +11,9 @@ maintainers: properties: compatible: - const: microchip,polarfire-soc-mailbox + enum: + - microchip,polarfire-soc-mailbox + - microchip,mpfs-mailbox reg: items: diff --git a/Documentation/devicetree/bindings/soc/microchip/microchip,polarfire-soc-sys-controller.yaml b/Documentation/devicetree/bindings/soc/microchip/microchip,polarfire-soc-sys-controller.yaml index 2cd3bc6bd8d6..d6c953cd154b 100644 --- a/Documentation/devicetree/bindings/soc/microchip/microchip,polarfire-soc-sys-controller.yaml +++ b/Documentation/devicetree/bindings/soc/microchip/microchip,polarfire-soc-sys-controller.yaml @@ -19,7 +19,9 @@ properties: maxItems: 1 compatible: - const: microchip,polarfire-soc-sys-controller + enum: + - microchip,polarfire-soc-sys-controller + - microchip,mpfs-sys-controller required: - compatible diff --git a/drivers/mailbox/mailbox-mpfs.c b/drivers/mailbox/mailbox-mpfs.c index 0d6e2231a2c7..9d5e558a6ee6 100644 --- a/drivers/mailbox/mailbox-mpfs.c +++ b/drivers/mailbox/mailbox-mpfs.c @@ -233,6 +233,7 @@ static int mpfs_mbox_probe(struct platform_device *pdev) static const struct of_device_id mpfs_mbox_of_match[] = { {.compatible = "microchip,polarfire-soc-mailbox", }, + {.compatible = "microchip,mpfs-mailbox", }, {}, }; MODULE_DEVICE_TABLE(of, mpfs_mbox_of_match); -- 2.33.1