Skip to contentSkip to conversation

FAILED: patch "[PATCH] dt-bindings: phy: g12a-usb2-phy: fix compatible string" failed to apply to 5.4-stable tree

PATCH [email protected] 1 participant 1 message Jan 22, 2023

Subsystems (4)
Stable branch Device tree bindings Arm/Amlogic Meson SoC support Generic PHY framework
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 5.4-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

Possible dependencies:

c63835bf1c75 ("dt-bindings: phy: g12a-usb2-phy: fix compatible string documentation") a7c85bcec679 ("dt-bindings: phy: Add Amlogic A1 USB2 PHY Bindings")

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From c63835bf1c750c9b3aec1d5c23d811d6375fc23d Mon Sep 17 00:00:00 2001
From: Heiner Kallweit <[email protected]>
Date: Mon, 16 Jan 2023 21:17:39 +0100
Subject: [PATCH] dt-bindings: phy: g12a-usb2-phy: fix compatible string
documentation

The compatible strings in the driver don't have the meson prefix. Fix this in the documentation and rename the file accordingly.

Fixes da86d286cce8 ("dt-bindings: phy: meson-g12a-usb2-phy: convert to yaml")
Cc [email protected]
Signed-off-by Heiner Kallweit <[email protected]>
Reviewed-by Martin Blumenstingl <[email protected]>
Reviewed-by Krzysztof Kozlowski <[email protected]>
Link https://lore.kernel.org/r/[email protected] open here
Signed-off-by Vinod Koul <[email protected]>
Documentation/devicetree/bindings/phy/amlogic,g12a-usb2-phy.yaml renamed from Documentation/devicetree/bindings/phy/amlogic,meson-g12a-usb2-phy.yaml +4 -4
similarity index 85%
rename from Documentation/devicetree/bindings/phy/amlogic,meson-g12a-usb2-phy.yaml
rename to Documentation/devicetree/bindings/phy/amlogic,g12a-usb2-phy.yaml
index f3a5fbabbbb5..bb01c6b34dab 100644
@@ -2,7 +2,7 @@
 # Copyright 2019 BayLibre, SAS
 %YAML 1.2
 ---
-$id: "http://devicetree.org/schemas/phy/amlogic,meson-g12a-usb2-phy.yaml#"
+$id: "http://devicetree.org/schemas/phy/amlogic,g12a-usb2-phy.yaml#"
 $schema: "http://devicetree.org/meta-schemas/core.yaml#"
 
 title: Amlogic G12A USB2 PHY

@@ -13,8 +13,8 @@ maintainers:
 properties:
   compatible:
     enum:
-      - amlogic,meson-g12a-usb2-phy
-      - amlogic,meson-a1-usb2-phy
+      - amlogic,g12a-usb2-phy
+      - amlogic,a1-usb2-phy
 
   reg:
     maxItems: 1

@@ -68,7 +68,7 @@ additionalProperties: false
 examples:
   - |
     phy@36000 {
-          compatible = "amlogic,meson-g12a-usb2-phy";
+          compatible = "amlogic,g12a-usb2-phy";
           reg = <0x36000 0x2000>;
           clocks = <&xtal>;
           clock-names = "xtal";