Skip to content

Commit b2665fe

Browse files
committed
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
2 parents b47c182 + d4a8933 commit b2665fe

File tree

9 files changed

+139
-132
lines changed

9 files changed

+139
-132
lines changed

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

Lines changed: 0 additions & 18 deletions
This file was deleted.
Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/ata/fsl,imx-pata.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Freescale i.MX PATA Controller
8+
9+
maintainers:
10+
- Animesh Agarwal <[email protected]>
11+
12+
properties:
13+
compatible:
14+
oneOf:
15+
- items:
16+
- enum:
17+
- fsl,imx31-pata
18+
- fsl,imx51-pata
19+
- const: fsl,imx27-pata
20+
- const: fsl,imx27-pata
21+
22+
reg:
23+
maxItems: 1
24+
25+
interrupts:
26+
items:
27+
- description: PATA Controller interrupts
28+
29+
clocks:
30+
items:
31+
- description: PATA Controller clocks
32+
33+
additionalProperties: false
34+
35+
examples:
36+
- |
37+
pata: pata@83fe0000 {
38+
compatible = "fsl,imx51-pata", "fsl,imx27-pata";
39+
reg = <0x83fe0000 0x4000>;
40+
interrupts = <70>;
41+
clocks = <&clks 161>;
42+
};

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

Lines changed: 0 additions & 16 deletions
This file was deleted.
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/ata/ti,da850-ahci.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: TI DA850 AHCI SATA Controller
8+
9+
maintainers:
10+
- Animesh Agarwal <[email protected]>
11+
12+
properties:
13+
compatible:
14+
const: ti,da850-ahci
15+
16+
reg:
17+
items:
18+
- description: Address and size of the register map as defined by the AHCI 1.1 standard.
19+
- description:
20+
Address and size of Power Down Control Register (PWRDN) for enabling/disabling the SATA clock
21+
receiver.
22+
23+
interrupts:
24+
maxItems: 1
25+
26+
required:
27+
- compatible
28+
- reg
29+
- interrupts
30+
31+
additionalProperties: false
32+
33+
examples:
34+
- |
35+
sata@218000 {
36+
compatible = "ti,da850-ahci";
37+
reg = <0x218000 0x2000>, <0x22c018 0x4>;
38+
interrupts = <67>;
39+
};

drivers/ata/Kconfig

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -556,7 +556,7 @@ comment "PATA SFF controllers with BMDMA"
556556

557557
config PATA_ALI
558558
tristate "ALi PATA support"
559-
depends on PCI
559+
depends on PCI && HAS_IOPORT
560560
select PATA_TIMINGS
561561
help
562562
This option enables support for the ALi ATA interfaces
@@ -566,7 +566,7 @@ config PATA_ALI
566566

567567
config PATA_AMD
568568
tristate "AMD/NVidia PATA support"
569-
depends on PCI
569+
depends on PCI && HAS_IOPORT
570570
select PATA_TIMINGS
571571
help
572572
This option enables support for the AMD and NVidia PATA
@@ -584,7 +584,7 @@ config PATA_ARASAN_CF
584584

585585
config PATA_ARTOP
586586
tristate "ARTOP 6210/6260 PATA support"
587-
depends on PCI
587+
depends on PCI && HAS_IOPORT
588588
help
589589
This option enables support for ARTOP PATA controllers.
590590

@@ -611,7 +611,7 @@ config PATA_ATP867X
611611

612612
config PATA_CMD64X
613613
tristate "CMD64x PATA support"
614-
depends on PCI
614+
depends on PCI && HAS_IOPORT
615615
select PATA_TIMINGS
616616
help
617617
This option enables support for the CMD64x series chips
@@ -658,7 +658,7 @@ config PATA_CS5536
658658

659659
config PATA_CYPRESS
660660
tristate "Cypress CY82C693 PATA support (Very Experimental)"
661-
depends on PCI
661+
depends on PCI && HAS_IOPORT
662662
select PATA_TIMINGS
663663
help
664664
This option enables support for the Cypress/Contaq CY82C693
@@ -706,7 +706,7 @@ config PATA_HPT366
706706

707707
config PATA_HPT37X
708708
tristate "HPT 370/370A/371/372/374/302 PATA support"
709-
depends on PCI
709+
depends on PCI && HAS_IOPORT
710710
help
711711
This option enables support for the majority of the later HPT
712712
PATA controllers via the new ATA layer.
@@ -715,7 +715,7 @@ config PATA_HPT37X
715715

716716
config PATA_HPT3X2N
717717
tristate "HPT 371N/372N/302N PATA support"
718-
depends on PCI
718+
depends on PCI && HAS_IOPORT
719719
help
720720
This option enables support for the N variant HPT PATA
721721
controllers via the new ATA layer.
@@ -818,7 +818,7 @@ config PATA_MPC52xx
818818

819819
config PATA_NETCELL
820820
tristate "NETCELL Revolution RAID support"
821-
depends on PCI
821+
depends on PCI && HAS_IOPORT
822822
help
823823
This option enables support for the Netcell Revolution RAID
824824
PATA controller.
@@ -854,7 +854,7 @@ config PATA_OLDPIIX
854854

855855
config PATA_OPTIDMA
856856
tristate "OPTI FireStar PATA support (Very Experimental)"
857-
depends on PCI
857+
depends on PCI && HAS_IOPORT
858858
help
859859
This option enables DMA/PIO support for the later OPTi
860860
controllers found on some old motherboards and in some
@@ -864,15 +864,15 @@ config PATA_OPTIDMA
864864

865865
config PATA_PDC2027X
866866
tristate "Promise PATA 2027x support"
867-
depends on PCI
867+
depends on PCI && HAS_IOPORT
868868
help
869869
This option enables support for Promise PATA pdc20268 to pdc20277 host adapters.
870870

871871
If unsure, say N.
872872

873873
config PATA_PDC_OLD
874874
tristate "Older Promise PATA controller support"
875-
depends on PCI
875+
depends on PCI && HAS_IOPORT
876876
help
877877
This option enables support for the Promise 20246, 20262, 20263,
878878
20265 and 20267 adapters.
@@ -900,7 +900,7 @@ config PATA_RDC
900900

901901
config PATA_SC1200
902902
tristate "SC1200 PATA support"
903-
depends on PCI && (X86_32 || COMPILE_TEST)
903+
depends on PCI && (X86_32 || COMPILE_TEST) && HAS_IOPORT
904904
help
905905
This option enables support for the NatSemi/AMD SC1200 SoC
906906
companion chip used with the Geode processor family.
@@ -918,7 +918,7 @@ config PATA_SCH
918918

919919
config PATA_SERVERWORKS
920920
tristate "SERVERWORKS OSB4/CSB5/CSB6/HT1000 PATA support"
921-
depends on PCI
921+
depends on PCI && HAS_IOPORT
922922
help
923923
This option enables support for the Serverworks OSB4/CSB5/CSB6 and
924924
HT1000 PATA controllers, via the new ATA layer.
@@ -1182,7 +1182,7 @@ config ATA_GENERIC
11821182

11831183
config PATA_LEGACY
11841184
tristate "Legacy ISA PATA support (Experimental)"
1185-
depends on (ISA || PCI)
1185+
depends on (ISA || PCI) && HAS_IOPORT
11861186
select PATA_TIMINGS
11871187
help
11881188
This option enables support for ISA/VLB/PCI bus legacy PATA

0 commit comments

Comments
 (0)