Re: [PATCH 03/13] dt-bindings: soc/microchip: update sys ctrlr compat string
From: <Conor.Dooley@microchip.com>
Date: 2021-11-30 08:35:44
Also in:
linux-crypto, linux-gpio, linux-i2c, linux-riscv, linux-rtc, linux-spi, linux-usb, lkml
On 29/11/2021 20:03, Rob Herring wrote:
EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe On Mon, Nov 08, 2021 at 03:05:44PM +0000, conor.dooley@microchip.com wrote:quoted
From: Conor Dooley <conor.dooley@microchip.com> Update 'compatible' strings for system controller drivers to the approved Microchip name.Why do I care what Microchip approved? You all picked identifiers (that's all it is) and now get to live with them.
Hi Rob, You're speaking to the person who was perfectly happy with "polarfire-soc" when I wrote the binding last year, but I was asked to change it in order avoid having a different compatible string in the device tree for the soc and in the binding for a device that only exists in that soc. If the v2 was a complete rename from "polarfire-soc-*" to "mpfs-*", including the file name - as opposed to an addition and I changed the commit message to the following would you be happier with the patch? > Change "polarfire-soc-*" compatible strings to "mpfs-*" in its system > controller bindings in order to match the compatible string used in > the soc binding and device tree. Thanks, Conor.
quoted
Signed-off-by: Conor Dooley <conor.dooley@microchip.com> --- .../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: - compatiblediff --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