Commit b2665fe6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents b47c1823 d4a89339

Documentation/devicetree/bindings/ata/ahci-da850.txt

deleted100644 → 0
+0 −18
Original line number Diff line number Diff line 
Device tree binding for the TI DA850 AHCI SATA Controller

---------------------------------------------------------



Required properties:

  - compatible: must be "ti,da850-ahci"

  - reg: physical base addresses and sizes of the two register regions

         used by the controller: the register map as defined by the

         AHCI 1.1 standard and the Power Down Control Register (PWRDN)

         for enabling/disabling the SATA clock receiver

  - interrupts: interrupt specifier (refer to the interrupt binding)



Example:



	sata: sata@218000 {

		compatible = "ti,da850-ahci";

		reg = <0x218000 0x2000>, <0x22c018 0x4>;

		interrupts = <67>;

	};

Documentation/devicetree/bindings/ata/fsl,imx-pata.yaml

0 → 100644
+42 −0
Original line number Diff line number Diff line 
# 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>;

    };

Documentation/devicetree/bindings/ata/imx-pata.txt

deleted100644 → 0
+0 −16
Original line number Diff line number Diff line 
* Freescale i.MX PATA Controller



Required properties:

- compatible: "fsl,imx27-pata"

- reg: Address range of the PATA Controller

- interrupts: The interrupt of the PATA Controller

- clocks: the clocks for the PATA Controller



Example:



	pata: pata@83fe0000 {

		compatible = "fsl,imx51-pata", "fsl,imx27-pata";

		reg = <0x83fe0000 0x4000>;

		interrupts = <70>;

		clocks = <&clks 161>;

	};

Documentation/devicetree/bindings/ata/ti,da850-ahci.yaml

0 → 100644
+39 −0
Original line number Diff line number Diff line 
# 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>;

    };

drivers/ata/Kconfig

+14 −14
Original line number Diff line number Diff line
@@ -556,7 +556,7 @@ comment "PATA SFF controllers with BMDMA" 


config PATA_ALI

	tristate "ALi PATA support"

	depends on PCI

	depends on PCI && HAS_IOPORT

	select PATA_TIMINGS

	help

	  This option enables support for the ALi ATA interfaces
@@ -566,7 +566,7 @@ config PATA_ALI 


config PATA_AMD

	tristate "AMD/NVidia PATA support"

	depends on PCI

	depends on PCI && HAS_IOPORT

	select PATA_TIMINGS

	help

	  This option enables support for the AMD and NVidia PATA
@@ -584,7 +584,7 @@ config PATA_ARASAN_CF 


config PATA_ARTOP

	tristate "ARTOP 6210/6260 PATA support"

	depends on PCI

	depends on PCI && HAS_IOPORT

	help

	  This option enables support for ARTOP PATA controllers.
@@ -611,7 +611,7 @@ config PATA_ATP867X 


config PATA_CMD64X

	tristate "CMD64x PATA support"

	depends on PCI

	depends on PCI && HAS_IOPORT

	select PATA_TIMINGS

	help

	  This option enables support for the CMD64x series chips
@@ -658,7 +658,7 @@ config PATA_CS5536 


config PATA_CYPRESS

	tristate "Cypress CY82C693 PATA support (Very Experimental)"

	depends on PCI

	depends on PCI && HAS_IOPORT

	select PATA_TIMINGS

	help

	  This option enables support for the Cypress/Contaq CY82C693
@@ -706,7 +706,7 @@ config PATA_HPT366 


config PATA_HPT37X

	tristate "HPT 370/370A/371/372/374/302 PATA support"

	depends on PCI

	depends on PCI && HAS_IOPORT

	help

	  This option enables support for the majority of the later HPT

	  PATA controllers via the new ATA layer.
@@ -715,7 +715,7 @@ config PATA_HPT37X 


config PATA_HPT3X2N

	tristate "HPT 371N/372N/302N PATA support"

	depends on PCI

	depends on PCI && HAS_IOPORT

	help

	  This option enables support for the N variant HPT PATA

	  controllers via the new ATA layer.
@@ -818,7 +818,7 @@ config PATA_MPC52xx 


config PATA_NETCELL

	tristate "NETCELL Revolution RAID support"

	depends on PCI

	depends on PCI && HAS_IOPORT

	help

	  This option enables support for the Netcell Revolution RAID

	  PATA controller.
@@ -854,7 +854,7 @@ config PATA_OLDPIIX 


config PATA_OPTIDMA

	tristate "OPTI FireStar PATA support (Very Experimental)"

	depends on PCI

	depends on PCI && HAS_IOPORT

	help

	  This option enables DMA/PIO support for the later OPTi

	  controllers found on some old motherboards and in some
@@ -864,7 +864,7 @@ config PATA_OPTIDMA 


config PATA_PDC2027X

	tristate "Promise PATA 2027x support"

	depends on PCI

	depends on PCI && HAS_IOPORT

	help

	  This option enables support for Promise PATA pdc20268 to pdc20277 host adapters.
@@ -872,7 +872,7 @@ config PATA_PDC2027X 


config PATA_PDC_OLD

	tristate "Older Promise PATA controller support"

	depends on PCI

	depends on PCI && HAS_IOPORT

	help

	  This option enables support for the Promise 20246, 20262, 20263,

	  20265 and 20267 adapters.
@@ -900,7 +900,7 @@ config PATA_RDC 


config PATA_SC1200

	tristate "SC1200 PATA support"

	depends on PCI && (X86_32 || COMPILE_TEST)

	depends on PCI && (X86_32 || COMPILE_TEST) && HAS_IOPORT

	help

	  This option enables support for the NatSemi/AMD SC1200 SoC

	  companion chip used with the Geode processor family.
@@ -918,7 +918,7 @@ config PATA_SCH 


config PATA_SERVERWORKS

	tristate "SERVERWORKS OSB4/CSB5/CSB6/HT1000 PATA support"

	depends on PCI

	depends on PCI && HAS_IOPORT

	help

	  This option enables support for the Serverworks OSB4/CSB5/CSB6 and

	  HT1000 PATA controllers, via the new ATA layer.
@@ -1182,7 +1182,7 @@ config ATA_GENERIC 


config PATA_LEGACY

	tristate "Legacy ISA PATA support (Experimental)"

	depends on (ISA || PCI)

	depends on (ISA || PCI) && HAS_IOPORT

	select PATA_TIMINGS

	help

	  This option enables support for ISA/VLB/PCI bus legacy PATA