-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge tag 'ata-6.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel…
…/git/libata/linux Pull ata updates from Damien Le Moal: - Convert the bindings for the imx-pata and ahci-da850 drivers to DT schemas (from Animesh) - Correct the code to handle HAS_IOPORT dependencies and conditionally compile drivers as needed (from Niklas) - Correct the legacy_exit() function in the pata_legacy driver to properly handle cleanups on driver exit (from Sergey) - Small code simplification removing the ata_exec_internal_sg() function and folding it into its only caller (from me) * tag 'ata-6.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/libata/linux: ata: pata_legacy: make legacy_exit() work again ata: libata-core: Remove ata_exec_internal_sg() ata: add HAS_IOPORT dependencies dt-bindings: ata: ahci-da850: Convert to dtschema dt-bindings: ata: imx-pata: Convert to dtschema
- Loading branch information
Showing
9 changed files
with
139 additions
and
132 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| # SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) | ||
| %YAML 1.2 | ||
| --- | ||
| $id: http://devicetree.org/schemas/ata/fsl,imx-pata.yaml# | ||
| $schema: http://devicetree.org/meta-schemas/core.yaml# | ||
|
|
||
| title: Freescale i.MX PATA Controller | ||
|
|
||
| maintainers: | ||
| - Animesh Agarwal <animeshagarwal28@gmail.com> | ||
|
|
||
| properties: | ||
| compatible: | ||
| oneOf: | ||
| - items: | ||
| - enum: | ||
| - fsl,imx31-pata | ||
| - fsl,imx51-pata | ||
| - const: fsl,imx27-pata | ||
| - const: fsl,imx27-pata | ||
|
|
||
| reg: | ||
| maxItems: 1 | ||
|
|
||
| interrupts: | ||
| items: | ||
| - description: PATA Controller interrupts | ||
|
|
||
| clocks: | ||
| items: | ||
| - description: PATA Controller clocks | ||
|
|
||
| additionalProperties: false | ||
|
|
||
| examples: | ||
| - | | ||
| pata: pata@83fe0000 { | ||
| compatible = "fsl,imx51-pata", "fsl,imx27-pata"; | ||
| reg = <0x83fe0000 0x4000>; | ||
| interrupts = <70>; | ||
| clocks = <&clks 161>; | ||
| }; |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| # SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) | ||
| %YAML 1.2 | ||
| --- | ||
| $id: http://devicetree.org/schemas/ata/ti,da850-ahci.yaml# | ||
| $schema: http://devicetree.org/meta-schemas/core.yaml# | ||
|
|
||
| title: TI DA850 AHCI SATA Controller | ||
|
|
||
| maintainers: | ||
| - Animesh Agarwal <animeshagarwal28@gmail.com> | ||
|
|
||
| properties: | ||
| compatible: | ||
| const: ti,da850-ahci | ||
|
|
||
| reg: | ||
| items: | ||
| - description: Address and size of the register map as defined by the AHCI 1.1 standard. | ||
| - description: | ||
| Address and size of Power Down Control Register (PWRDN) for enabling/disabling the SATA clock | ||
| receiver. | ||
|
|
||
| interrupts: | ||
| maxItems: 1 | ||
|
|
||
| required: | ||
| - compatible | ||
| - reg | ||
| - interrupts | ||
|
|
||
| additionalProperties: false | ||
|
|
||
| examples: | ||
| - | | ||
| sata@218000 { | ||
| compatible = "ti,da850-ahci"; | ||
| reg = <0x218000 0x2000>, <0x22c018 0x4>; | ||
| interrupts = <67>; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.