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

Commit f8d1a939 authored by Tejun Heo's avatar Tejun Heo
Browse files

Merge branch 'for-4.6-fixes' into for-4.7

parents 26f58830 535dac4a

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

+4 −0
Original line number Diff line number Diff line
@@ -32,6 +32,10 @@ Optional properties: 
- target-supply     : regulator for SATA target power

- phys              : reference to the SATA PHY node

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

- ports-implemented : Mask that indicates which ports that the HBA supports

		      are available for software to use. Useful if PORTS_IMPL

		      is not programmed by the BIOS, which is true with

		      some embedded SOC's.



Required properties when using sub-nodes:

- #address-cells    : number of cells to encode an address

arch/arm/boot/dts/qcom-apq8064.dtsi

+2 −1
Original line number Diff line number Diff line
@@ -666,7 +666,7 @@ 
		};



		sata0: sata@29000000 {

			compatible		= "generic-ahci";

			compatible		= "qcom,apq8064-ahci", "generic-ahci";

			status			= "disabled";

			reg			= <0x29000000 0x180>;

			interrupts		= <GIC_SPI 209 IRQ_TYPE_NONE>;
@@ -688,6 +688,7 @@ 


			phys			= <&sata_phy0>;

			phy-names		= "sata-phy";

			ports-implemented	= <0x1>;

		};



		/* Temporary fixed regulator */

drivers/ata/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -202,6 +202,14 @@ config SATA_FSL 


	  If unsure, say N.



config SATA_AHCI_SEATTLE

	tristate "AMD Seattle 6.0Gbps AHCI SATA host controller support"

	depends on ARCH_SEATTLE

	help

	 This option enables support for AMD Seattle SATA host controller.



	 If unsure, say N



config SATA_INIC162X

	tristate "Initio 162x SATA support (Very Experimental)"

	depends on PCI

drivers/ata/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ obj-$(CONFIG_ATA) += libata.o 
# non-SFF interface

obj-$(CONFIG_SATA_AHCI)		+= ahci.o libahci.o

obj-$(CONFIG_SATA_ACARD_AHCI)	+= acard-ahci.o libahci.o

obj-$(CONFIG_SATA_AHCI_SEATTLE)	+= ahci_seattle.o libahci.o libahci_platform.o

obj-$(CONFIG_SATA_AHCI_PLATFORM) += ahci_platform.o libahci.o libahci_platform.o

obj-$(CONFIG_SATA_FSL)		+= sata_fsl.o

obj-$(CONFIG_SATA_INIC162X)	+= sata_inic162x.o

drivers/ata/ahci_platform.c

+3 −0
Original line number Diff line number Diff line
@@ -51,6 +51,9 @@ static int ahci_probe(struct platform_device *pdev) 
	if (rc)

		return rc;



	of_property_read_u32(dev->of_node,

			     "ports-implemented", &hpriv->force_port_map);



	if (of_device_is_compatible(dev->of_node, "hisilicon,hisi-ahci"))

		hpriv->flags |= AHCI_HFLAG_NO_FBS | AHCI_HFLAG_NO_NCQ;