Commit 51562cba authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev 

Pull libata changes from Jeff Garzik:
 "Minor libata updates, nothing notable.

   1) Apply -- and then revert -- the FUA feature.  Caused disk
      corruption in linux-next, proving it cannot be turned on by
      default.

      Net effect to upstream tree:  zero

   2) New AHCI platform driver sata_highbank

   3) Improve SCSI MODE SENSE handling; support MODE SELECT

   4) AHCI: support aggressive device sleep (power mgmt)

   5) sata_fsl: minor fix

   6) pata_arasan: clk support"

* tag 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  sata_mv: Fix warnings when no PCI
  [libata] Makefile: Fix build error in sata_highbank
  [libata] export ata_dev_set_feature()
  libata-core: use ATA_LBA in ata_build_rw_tf()
  ata/ahci_platform: Add clock framework support
  pata_arasan: add Device Tree probing capability
  pata_arasan: Add clk_{un}prepare() support
  ata: add platform driver for Calxeda AHCI controller
  sata_fsl: add workaround for data length mismatch on freescale V2 controller
  ahci: implement aggressive SATA device sleep support
  ata: define enum constants for IDENTIFY DEVICE
  Revert "libata: enable SATA disk fua detection on default"
  [libata] scsi: implement MODE SELECT command
  [libata] scsi: support MODE SENSE request for changeable and default parameters
  [libata] scsi: Remove unlikely() from FUA check
  libata: enable SATA disk fua detection on default
parents 7fe0b14b 13b74085

Documentation/devicetree/bindings/arm/calxeda/combophy.txt

0 → 100644
+17 −0
Original line number Diff line number Diff line 
Calxeda Highbank Combination Phys for SATA



Properties:

- compatible : Should be "calxeda,hb-combophy"

- #phy-cells: Should be 1.

- reg : Address and size for Combination Phy registers.

- phydev: device ID for programming the combophy.



Example:



	combophy5: combo-phy@fff5d000 {

		compatible = "calxeda,hb-combophy";

		#phy-cells = <1>;

		reg = <0xfff5d000 0x1000>;

		phydev = <31>;

	};

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

+8 −0
Original line number Diff line number Diff line
@@ -8,9 +8,17 @@ Required properties: 
- interrupts        : <interrupt mapping for SATA IRQ>

- reg               : <registers mapping>



Optional properties:

- calxeda,port-phys: phandle-combophy and lane assignment, which maps each

			SATA port to a combophy and a lane within that

			combophy



Example:

        sata@ffe08000 {

		compatible = "calxeda,hb-ahci";

                reg = <0xffe08000 0x1000>;

                interrupts = <115>;

		calxeda,port-phys = <&combophy5 0 &combophy0 0 &combophy0 1

					&combophy0 2 &combophy0 3>;



        };

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

0 → 100644
+17 −0
Original line number Diff line number Diff line 
* ARASAN PATA COMPACT FLASH CONTROLLER



Required properties:

- compatible: "arasan,cf-spear1340"

- reg: Address range of the CF registers

- interrupt-parent: Should be the phandle for the interrupt controller

  that services interrupts for this device

- interrupt: Should contain the CF interrupt number



Example:



	cf@fc000000 {

		compatible = "arasan,cf-spear1340";

		reg = <0xfc000000 0x1000>;

		interrupt-parent = <&vic1>;

		interrupts = <12>;

	};

arch/arm/boot/dts/highbank.dts

+17 −0
Original line number Diff line number Diff line
@@ -121,6 +121,9 @@ 
			compatible = "calxeda,hb-ahci";

			reg = <0xffe08000 0x10000>;

			interrupts = <0 83 4>;

			calxeda,port-phys = <&combophy5 0 &combophy0 0

					     &combophy0 1 &combophy0 2

					     &combophy0 3>;

		};



		sdhci@ffe0e000 {
@@ -306,5 +309,19 @@ 
			reg = <0xfff51000 0x1000>;

			interrupts = <0 80 4  0 81 4  0 82 4>;

		};



		combophy0: combo-phy@fff58000 {

			compatible = "calxeda,hb-combophy";

			#phy-cells = <1>;

			reg = <0xfff58000 0x1000>;

			phydev = <5>;

		};



		combophy5: combo-phy@fff5d000 {

			compatible = "calxeda,hb-combophy";

			#phy-cells = <1>;

			reg = <0xfff5d000 0x1000>;

			phydev = <31>;

		};

	};

};

drivers/ata/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -214,6 +214,14 @@ config SATA_DWC_VDEBUG 
	help

	  This option enables the taskfile dumping and NCQ debugging.



config SATA_HIGHBANK

	tristate "Calxeda Highbank SATA support"

	help

	  This option enables support for the Calxeda Highbank SoC's

	  onboard SATA.



	  If unsure, say N.



config SATA_MV

	tristate "Marvell SATA support"

	help

CRA Git | Maintained and supported by SUSTech CRA and CCSE