diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-03-10 10:12:46 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-03-10 10:12:46 +0300 |
| commit | 8e567ed9e244f6af2ecfd22a7204612ec361d334 (patch) | |
| tree | bf558612f56dcdd862ead3fefd1aa5abaac15688 /Documentation/devicetree/bindings/pinctrl/aspeed,ast2600-pinctrl.yaml | |
| parent | 6701adfa9693bd20b89f2cce57754ced2c18ed3b (diff) | |
| parent | 2c523b344dfa65a3738e7039832044aa133c75fb (diff) | |
| download | linux-8e567ed9e244f6af2ecfd22a7204612ec361d334.tar.xz | |
Merge 5.6-rc5 into usb-next
We need the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'Documentation/devicetree/bindings/pinctrl/aspeed,ast2600-pinctrl.yaml')
| -rw-r--r-- | Documentation/devicetree/bindings/pinctrl/aspeed,ast2600-pinctrl.yaml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/pinctrl/aspeed,ast2600-pinctrl.yaml b/Documentation/devicetree/bindings/pinctrl/aspeed,ast2600-pinctrl.yaml index 3749fa233e87..ac8d1c30a8ed 100644 --- a/Documentation/devicetree/bindings/pinctrl/aspeed,ast2600-pinctrl.yaml +++ b/Documentation/devicetree/bindings/pinctrl/aspeed,ast2600-pinctrl.yaml @@ -17,7 +17,7 @@ description: |+ "aspeed,ast2600-scu", "syscon", "simple-mfd" Refer to the the bindings described in - Documentation/devicetree/bindings/mfd/syscon.txt + Documentation/devicetree/bindings/mfd/syscon.yaml properties: compatible: |