From e5651e83980c6e9909a02130e714f685930d054e Mon Sep 17 00:00:00 2001 From: Lubomir Rintel <lkundrak@v3.sk> Date: Sun, 19 Apr 2020 22:17:15 +0200 Subject: [PATCH] dt-bindings: serial: Move Marvell compatible string to 8250 binding doc These ports are compatible with NS8250 and handled by the same driver. Get rid of the extra document that fails to document the properties that are actually supported. Signed-off-by: Lubomir Rintel <lkundrak@v3.sk> Signed-off-by: Rob Herring <robh@kernel.org> --- Documentation/devicetree/bindings/serial/8250.txt | 2 ++ Documentation/devicetree/bindings/serial/mrvl-serial.txt | 4 ---- 2 files changed, 2 insertions(+), 4 deletions(-) delete mode 100644 Documentation/devicetree/bindings/serial/mrvl-serial.txt diff --git a/Documentation/devicetree/bindings/serial/8250.txt b/Documentation/devicetree/bindings/serial/8250.txt index 55700f20f6ee..a543702859e2 100644 --- a/Documentation/devicetree/bindings/serial/8250.txt +++ b/Documentation/devicetree/bindings/serial/8250.txt @@ -26,6 +26,8 @@ Required properties: - "aspeed,ast2400-vuart" - "aspeed,ast2500-vuart" - "nuvoton,npcm750-uart" + - "mrvl,mmp-uart" + - "mrvl,pxa-uart" - "serial" if the port type is unknown. - reg : offset and length of the register set for the device. - interrupts : should contain uart interrupt. diff --git a/Documentation/devicetree/bindings/serial/mrvl-serial.txt b/Documentation/devicetree/bindings/serial/mrvl-serial.txt deleted file mode 100644 index d744340de887..000000000000 --- a/Documentation/devicetree/bindings/serial/mrvl-serial.txt +++ /dev/null @@ -1,4 +0,0 @@ -PXA UART controller - -Required properties: -- compatible : should be "mrvl,mmp-uart" or "mrvl,pxa-uart".