Commit 36006b1d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'ata-6.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata 

Pull ata updates from Damien Le Moal:

 - Many cleanups of the pata_parport driver and of its protocol modules
   (Ondrej)

 - Remove unused code (ata_id_xxx() functions) (Sergey)

 - Add Add UniPhier SATA controller DT bindings (Kunihiko)

 - Fix dependencies for the Freescale QorIQ AHCI SATA controller driver
   (Geert)

 - DT property handling improvements (Rob)

* tag 'ata-6.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata: (57 commits)
  ata: pata_parport-bpck6: Declare mode_map as static
  ata: pata_parport-bpck6: Remove dependency on 64BIT
  ata: pata_parport-bpck6: reduce indents in bpck6_open
  ata: pata_parport-bpck6: delete ppc6lnx.c
  ata: pata_parport-bpck6: move defines and mode_map to bpck6.c
  ata: pata_parport-bpck6: move ppc6_wr_data_byte to bpck6.c and rename
  ata: pata_parport-bpck6: move ppc6_rd_data_byte to bpck6.c and rename
  ata: pata_parport-bpck6: move ppc6_send_cmd to bpck6.c and rename
  ata: pata_parport-bpck6: move ppc6_deselect to bpck6.c and rename
  ata: pata_parport-bpck6: merge ppc6_select into bpck6_open
  ata: pata_parport-bpck6: move ppc6_open to bpck6.c and rename
  ata: pata_parport-bpck6: move ppc6_wr_extout to bpck6.c and rename
  ata: pata_parport-bpck6: move ppc6_wait_for_fifo to bpck6.c and rename
  ata: pata_parport-bpck6: merge ppc6_wr_data_blk into bpck6_write_block
  ata: pata_parport-bpck6: merge ppc6_rd_data_blk into bpck6_read_block
  ata: pata_parport-bpck6: merge ppc6_wr_port16_blk into bpck6_write_block
  ata: pata_parport-bpck6: merge ppc6_rd_port16_blk into bpck6_read_block
  ata: pata_parport-bpck6: merge ppc6_wr_port into bpck6_write_regr
  ata: pata_parport-bpck6: merge ppc6_rd_port into bpck6_read_regr
  ata: pata_parport-bpck6: remove ppc6_close
  ...
parents 48dc8100 140b2603

Documentation/devicetree/bindings/ata/ahci-platform.yaml

+45 −4
Original line number Diff line number Diff line
@@ -30,12 +30,12 @@ select: 
          - marvell,armada-3700-ahci

          - marvell,armada-8k-ahci

          - marvell,berlin2q-ahci

          - socionext,uniphier-pro4-ahci

          - socionext,uniphier-pxs2-ahci

          - socionext,uniphier-pxs3-ahci

  required:

    - compatible



allOf:

  - $ref: "ahci-common.yaml#"



properties:

  compatible:

    oneOf:
@@ -45,6 +45,9 @@ properties: 
              - marvell,armada-8k-ahci

              - marvell,berlin2-ahci

              - marvell,berlin2q-ahci

              - socionext,uniphier-pro4-ahci

              - socionext,uniphier-pxs2-ahci

              - socionext,uniphier-pxs3-ahci

          - const: generic-ahci

      - enum:

          - cavium,octeon-7130-ahci
@@ -74,7 +77,8 @@ properties: 
    maxItems: 1



  resets:

    maxItems: 1

    minItems: 1

    maxItems: 3



patternProperties:

  "^sata-port@[0-9a-f]+$":
@@ -91,6 +95,43 @@ required: 
  - reg

  - interrupts



allOf:

  - $ref: ahci-common.yaml#

  - if:

      properties:

        compatible:

          contains:

            const: socionext,uniphier-pro4-ahci

    then:

      properties:

        resets:

          items:

            - description: reset line for the parent

            - description: reset line for the glue logic

            - description: reset line for the controller

      required:

        - resets

    else:

      if:

        properties:

          compatible:

            contains:

              enum:

                - socionext,uniphier-pxs2-ahci

                - socionext,uniphier-pxs3-ahci

      then:

        properties:

          resets:

            items:

              - description: reset for the glue logic

              - description: reset for the controller

        required:

          - resets

      else:

        properties:

          resets:

            maxItems: 1



unevaluatedProperties: false



examples:

drivers/ata/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -276,6 +276,7 @@ config AHCI_XGENE 
config AHCI_QORIQ

	tristate "Freescale QorIQ AHCI SATA support"

	depends on OF

	depends on SOC_LS1021A || ARCH_LAYERSCAPE || COMPILE_TEST

	select SATA_HOST

	help

	  This option enables support for the Freescale QorIQ AHCI SoC's

drivers/ata/ahci_mtk.c

+1 −1
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ static int mtk_ahci_parse_property(struct ahci_host_priv *hpriv, 
	struct device_node *np = dev->of_node;



	/* enable SATA function if needed */

	if (of_find_property(np, "mediatek,phy-mode", NULL)) {

	if (of_property_present(np, "mediatek,phy-mode")) {

		plat->mode = syscon_regmap_lookup_by_phandle(

					np, "mediatek,phy-mode");

		if (IS_ERR(plat->mode)) {

drivers/ata/libahci_platform.c

+1 −1
Original line number Diff line number Diff line
@@ -363,7 +363,7 @@ static int ahci_platform_get_phy(struct ahci_host_priv *hpriv, u32 port, 
	switch (rc) {

	case -ENOSYS:

		/* No PHY support. Check if PHY is required. */

		if (of_find_property(node, "phys", NULL)) {

		if (of_property_present(node, "phys")) {

			dev_err(dev,

				"couldn't get PHY in node %pOFn: ENOSYS\n",

				node);

drivers/ata/pata_parport/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ config PATA_PARPORT_BPCK 


config PATA_PARPORT_BPCK6

	tristate "MicroSolutions backpack (Series 6) protocol"

	depends on (PATA_PARPORT) && !64BIT

	depends on PATA_PARPORT

	help

	  This option enables support for the Micro Solutions BACKPACK

	  parallel port Series 6 IDE protocol.  (Most BACKPACK drives made