diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2022-05-27 16:40:01 -0700 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2022-05-27 16:40:01 -0700 |
commit | 690e179059e7e89040d1cd564e39761567a8d5dc (patch) | |
tree | b6a64fc5ca4fd862e17559c46676258ae17c87d5 /Documentation/devicetree/bindings/phy/allwinner,sun50i-a64-usb-phy.yaml | |
parent | 5f76955ab1e43e5795a9631b22ca4f918a0ae986 (diff) | |
parent | 4b0986a3613c92f4ec1bdc7f60ec66fea135991f (diff) |
Merge tag 'v5.18' into next
Sync up with mainline to get updates to OMAP4 keypad driver and other
upstream goodies.
Diffstat (limited to 'Documentation/devicetree/bindings/phy/allwinner,sun50i-a64-usb-phy.yaml')
-rw-r--r-- | Documentation/devicetree/bindings/phy/allwinner,sun50i-a64-usb-phy.yaml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/phy/allwinner,sun50i-a64-usb-phy.yaml b/Documentation/devicetree/bindings/phy/allwinner,sun50i-a64-usb-phy.yaml index 078af52b16ed..0fa4b32b097e 100644 --- a/Documentation/devicetree/bindings/phy/allwinner,sun50i-a64-usb-phy.yaml +++ b/Documentation/devicetree/bindings/phy/allwinner,sun50i-a64-usb-phy.yaml @@ -15,7 +15,9 @@ properties: const: 1 compatible: - const: allwinner,sun50i-a64-usb-phy + enum: + - allwinner,sun20i-d1-usb-phy + - allwinner,sun50i-a64-usb-phy reg: items: |