Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge branch 'for-4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata 

Pull libata updates from Tejun Heo:
 "Nothing too interesting.

  The biggest change is refcnting fix for ata_host - the bug is recent
  and can only be triggered on controller hotplug, so very few are
  hitting it.

  There also are a number of trivial license / error message changes and
  some hardware specific changes"

* 'for-4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata: (23 commits)
  ahci: imx: add the imx8qm ahci sata support
  libata: ensure host is free'd on error exit paths
  ata: ahci-platform: add reset control support
  ahci: imx: fix the build warning
  ata: add Amiga Gayle PATA controller driver
  ahci: imx: add the imx6qp ahci sata support
  ata: change Tegra124 to Tegra
  ata: ahci_tegra: Add AHCI support for Tegra210
  ata: ahci_tegra: disable DIPM
  ata: ahci_tegra: disable devslp for Tegra124
  ata: ahci_tegra: initialize regulators from soc struct
  ata: ahci_tegra: Update initialization sequence
  dt-bindings: Tegra210: add binding documentation
  libata: add refcounting to ata_host
  pata_bk3710: clarify license version and use SPDX header
  pata_falcon: clarify license version and use SPDX header
  pata_it821x: Delete an error message for a failed memory allocation in it821x_firmware_command()
  pata_macio: Delete an error message for a failed memory allocation in two functions
  pata_mpc52xx: Delete an error message for a failed memory allocation in mpc52xx_ata_probe()
  sata_dwc_460ex: Delete an error message for a failed memory allocation in sata_dwc_port_start()
  ...
parents ef1c4a6f 027fa4de

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -30,6 +30,7 @@ compatible: 
Optional properties:

Optional properties:

- dma-coherent      : Present if dma operations are coherent

- dma-coherent      : Present if dma operations are coherent

- clocks            : a list of phandle + clock specifier pairs

- clocks            : a list of phandle + clock specifier pairs

- resets            : a list of phandle + reset specifier pairs

- target-supply     : regulator for SATA target power

- target-supply     : regulator for SATA target power

- phys              : reference to the SATA PHY node

- phys              : reference to the SATA PHY node

- phy-names         : must be "sata-phy"

- phy-names         : must be "sata-phy"

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -7,6 +7,7 @@ Required properties: 
- compatible : should be one of the following:

- compatible : should be one of the following:

   - "fsl,imx53-ahci" for i.MX53 SATA controller

   - "fsl,imx53-ahci" for i.MX53 SATA controller

   - "fsl,imx6q-ahci" for i.MX6Q SATA controller

   - "fsl,imx6q-ahci" for i.MX6Q SATA controller

   - "fsl,imx6qp-ahci" for i.MX6QP SATA controller

- interrupts : interrupt mapping for SATA IRQ

- interrupts : interrupt mapping for SATA IRQ

- reg : registers mapping

- reg : registers mapping

- clocks : list of clock specifiers, must contain an entry for each

- clocks : list of clock specifiers, must contain an entry for each

Documentation/devicetree/bindings/ata/nvidia,tegra124-ahci.txt

+24 −12
Original line number Original line Diff line number Diff line 
Tegra124 SoC SATA AHCI controller

Tegra SoC SATA AHCI controller





Required properties :

Required properties :

- compatible : For Tegra124, must contain "nvidia,tegra124-ahci".  Otherwise,

- compatible : Must be one of:

  must contain '"nvidia,<chip>-ahci", "nvidia,tegra124-ahci"', where <chip>

  - Tegra124 : "nvidia,tegra124-ahci"

  is tegra132.

  - Tegra132 : "nvidia,tegra132-ahci", "nvidia,tegra124-ahci"

  - Tegra210 : "nvidia,tegra210-ahci"

- reg : Should contain 2 entries:

- reg : Should contain 2 entries:

  - AHCI register set (SATA BAR5)

  - AHCI register set (SATA BAR5)

  - SATA register set

  - SATA register set
@@ -13,8 +14,6 @@ Required properties : 
- clock-names : Must include the following entries:

- clock-names : Must include the following entries:

  - sata

  - sata

  - sata-oob

  - sata-oob

  - cml1

  - pll_e

- resets : Must contain an entry for each entry in reset-names.

- resets : Must contain an entry for each entry in reset-names.

  See ../reset/reset.txt for details.

  See ../reset/reset.txt for details.

- reset-names : Must include the following entries:

- reset-names : Must include the following entries:
@@ -24,9 +23,22 @@ Required properties : 
- phys : Must contain an entry for each entry in phy-names.

- phys : Must contain an entry for each entry in phy-names.

  See ../phy/phy-bindings.txt for details.

  See ../phy/phy-bindings.txt for details.

- phy-names : Must include the following entries:

- phy-names : Must include the following entries:

  - For Tegra124 and Tegra132:

    - sata-phy : XUSB PADCTL SATA PHY

    - sata-phy : XUSB PADCTL SATA PHY

- For Tegra124 and Tegra132:

  - hvdd-supply : Defines the SATA HVDD regulator

  - hvdd-supply : Defines the SATA HVDD regulator

  - vddio-supply : Defines the SATA VDDIO regulator

  - vddio-supply : Defines the SATA VDDIO regulator

  - avdd-supply : Defines the SATA AVDD regulator

  - avdd-supply : Defines the SATA AVDD regulator

  - target-5v-supply : Defines the SATA 5V power regulator

  - target-5v-supply : Defines the SATA 5V power regulator

  - target-12v-supply : Defines the SATA 12V power regulator

  - target-12v-supply : Defines the SATA 12V power regulator



Optional properties:

- reg :

  - AUX register set

- clock-names :

  - cml1 :

    cml1 clock should be defined here if the PHY driver

    doesn't manage them. If it does, they should not be.

- phy-names :

  - For T210:

    - sata-phy

drivers/ata/Kconfig

+14 −2
Original line number Original line Diff line number Diff line
@@ -211,10 +211,10 @@ config AHCI_SUNXI 
	  If unsure, say N.

	  If unsure, say N.





config AHCI_TEGRA

config AHCI_TEGRA

	tristate "NVIDIA Tegra124 AHCI SATA support"

	tristate "NVIDIA Tegra AHCI SATA support"

	depends on ARCH_TEGRA

	depends on ARCH_TEGRA

	help

	help

	  This option enables support for the NVIDIA Tegra124 SoC's

	  This option enables support for the NVIDIA Tegra SoC's

	  onboard AHCI SATA.

	  onboard AHCI SATA.





	  If unsure, say N.

	  If unsure, say N.
@@ -954,6 +954,18 @@ config PATA_FALCON 




	  If unsure, say N.

	  If unsure, say N.





config PATA_GAYLE

	tristate "Amiga Gayle PATA support"

	depends on M68K && AMIGA

	help

	  This option enables support for the on-board IDE

	  interfaces on some Amiga models (A600, A1200,

	  A4000 and A4000T) and also for IDE interfaces on

	  the Zorro expansion bus (M-Tech E-Matrix 530

	  expansion card).



	  If unsure, say N.



config PATA_ISAPNP

config PATA_ISAPNP

	tristate "ISA Plug and Play PATA support"

	tristate "ISA Plug and Play PATA support"

	depends on ISAPNP

	depends on ISAPNP

drivers/ata/Makefile

+1 −0
Original line number Original line Diff line number Diff line
@@ -97,6 +97,7 @@ obj-$(CONFIG_PATA_WINBOND) += pata_sl82c105.o 
# SFF PIO only

# SFF PIO only

obj-$(CONFIG_PATA_CMD640_PCI)	+= pata_cmd640.o

obj-$(CONFIG_PATA_CMD640_PCI)	+= pata_cmd640.o

obj-$(CONFIG_PATA_FALCON)	+= pata_falcon.o

obj-$(CONFIG_PATA_FALCON)	+= pata_falcon.o

obj-$(CONFIG_PATA_GAYLE)	+= pata_gayle.o

obj-$(CONFIG_PATA_ISAPNP)	+= pata_isapnp.o

obj-$(CONFIG_PATA_ISAPNP)	+= pata_isapnp.o

obj-$(CONFIG_PATA_IXP4XX_CF)	+= pata_ixp4xx_cf.o

obj-$(CONFIG_PATA_IXP4XX_CF)	+= pata_ixp4xx_cf.o

obj-$(CONFIG_PATA_MPIIX)	+= pata_mpiix.o

obj-$(CONFIG_PATA_MPIIX)	+= pata_mpiix.o