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

Pull libata updates from Tejun Heo:
 "libata saw quite a bit of activities in this cycle:

   - SMR drive support still being worked on

   - bug fixes and improvements to misc SCSI command emulation

   - some low level driver updates"

* 'for-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata: (39 commits)
  libata-scsi: better style in ata_msense_*()
  AHCI: Clear GHC.IS to prevent unexpectly asserting INTx
  ata: sata_dwc_460ex: remove redundant dev_err call
  ata: define ATA_PROT_* in terms of ATA_PROT_FLAG_*
  libata: remove ATA_PROT_FLAG_DATA
  libata: remove ata_is_nodata
  ata: make lba_{28,48}_ok() use ATA_MAX_SECTORS{,_LBA48}
  libata-scsi: minor cleanup for ata_scsi_zbc_out_xlat
  libata-scsi: Fix ZBC management out command translation
  libata-scsi: Fix translation of REPORT ZONES command
  ata: Handle ATA NCQ NO-DATA commands correctly
  libata-eh: decode all taskfile protocols
  ata: fixup ATA_PROT_NODATA
  libsas: use ata_is_ncq() and ata_has_dma() accessors
  libata: use ata_is_ncq() accessors
  libata: return boolean values from ata_is_*
  libata-scsi: avoid repeated calculation of number of TRIM ranges
  libata-scsi: reject WRITE SAME (16) with n_block that exceeds limit
  libata-scsi: rename ata_msense_ctl_mode() to ata_msense_control()
  libata-scsi: fix D_SENSE bit relection in control mode page
  ...

24 files changed, 314 insertions, 153 deletions

diff --git a/Documentation/devicetree/bindings/ata/brcm,sata-brcmstb.txt b/Documentation/devicetree/bindings/ata/brcm,sata-brcm.txt
index 60872838f1ad..0a5b3b47f217 100644
--- a/Documentation/devicetree/bindings/ata/brcm,sata-brcmstb.txt
+++ b/Documentation/devicetree/bindings/ata/brcm,sata-brcm.txt
@@ -1,13 +1,14 @@
-* Broadcom SATA3 AHCI Controller for STB
+* Broadcom SATA3 AHCI Controller
 
 SATA nodes are defined to describe on-chip Serial ATA controllers.
 Each SATA controller should have its own node.
 
 Required properties:
 - compatible         : should be one or more of
-                       "brcm,bcm7425-ahci"
-                       "brcm,bcm7445-ahci"
-                       "brcm,sata3-ahci"
+                        "brcm,bcm7425-ahci"
+                        "brcm,bcm7445-ahci"
+                        "brcm,bcm-nsp-ahci"
+                        "brcm,sata3-ahci"
 - reg                : register mappings for AHCI and SATA_TOP_CTRL
 - reg-names          : "ahci" and "top-ctrl"
 - interrupts         : interrupt mapping for SATA IRQ
diff --git a/Documentation/devicetree/bindings/phy/brcm-sata-phy.txt b/Documentation/devicetree/bindings/phy/brcm-sata-phy.txt
index d0231209d846..6ccce09d8bbf 100644
--- a/Documentation/devicetree/bindings/phy/brcm-sata-phy.txt
+++ b/Documentation/devicetree/bindings/phy/brcm-sata-phy.txt
@@ -5,6 +5,7 @@ Required properties:
      "brcm,bcm7425-sata-phy"
      "brcm,bcm7445-sata-phy"
      "brcm,iproc-ns2-sata-phy"
+     "brcm,iproc-nsp-sata-phy"
      "brcm,phy-sata3"
 - address-cells: should be 1
 - size-cells: should be 0
@@ -22,7 +23,8 @@ Sub-nodes required properties:
 
 Sub-nodes optional properties:
 - brcm,enable-ssc: use spread spectrum clocking (SSC) on this port
-     This property is not applicable for "brcm,iproc-ns2-sata-phy".
+     This property is not applicable for "brcm,iproc-ns2-sata-phy" and
+     "brcm,iproc-nsp-sata-phy".
 
 Example:
         sata-phy@f0458100 {
diff --git a/MAINTAINERS b/MAINTAINERS
index 531c600b8b93..9987f8491c55 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6768,6 +6768,7 @@ S:	Maintained
 F:      drivers/ata/
 F:      include/linux/ata.h
 F:      include/linux/libata.h
+F:      Documentation/devicetree/bindings/ata/
 
 LIBATA PATA ARASAN COMPACT FLASH CONTROLLER
 M:      Viresh Kumar <vireshk@kernel.org>
diff --git a/arch/arm/boot/dts/bcm-nsp.dtsi b/arch/arm/boot/dts/bcm-nsp.dtsi
index 1ed829e699d4..6a40ed7d0502 100644
--- a/arch/arm/boot/dts/bcm-nsp.dtsi
+++ b/arch/arm/boot/dts/bcm-nsp.dtsi
@@ -271,6 +271,48 @@
                               <0x30028 0x04>,
                               <0x3f408 0x04>;
                 };
+
+                sata_phy: sata_phy@40100 {
+                        compatible = "brcm,iproc-nsp-sata-phy";
+                        reg = <0x40100 0x340>;
+                        reg-names = "phy";
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+
+                        sata_phy0: sata-phy@0 {
+                                reg = <0>;
+                                #phy-cells = <0>;
+                                status = "disabled";
+                        };
+
+                        sata_phy1: sata-phy@1 {
+                                reg = <1>;
+                                #phy-cells = <0>;
+                                status = "disabled";
+                        };
+                };
+
+                sata: ahci@41000 {
+                        compatible = "brcm,bcm-nsp-ahci";
+                        reg-names = "ahci", "top-ctrl";
+                        reg = <0x41000 0x1000>, <0x40020 0x1c>;
+                        interrupts = <GIC_SPI 159 IRQ_TYPE_LEVEL_HIGH>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        status = "disabled";
+
+                        sata0: sata-port@0 {
+                                reg = <0>;
+                                phys = <&sata_phy0>;
+                                phy-names = "sata-phy";
+                        };
+
+                        sata1: sata-port@1 {
+                                reg = <1>;
+                                phys = <&sata_phy1>;
+                                phy-names = "sata-phy";
+                        };
+                };
         };
 
         pcie0: pcie@18012000 {
diff --git a/arch/arm/boot/dts/bcm958625k.dts b/arch/arm/boot/dts/bcm958625k.dts
index e298450b49b2..2d8422632b2b 100644
--- a/arch/arm/boot/dts/bcm958625k.dts
+++ b/arch/arm/boot/dts/bcm958625k.dts
@@ -68,6 +68,18 @@
         status = "okay";
 };
 
+&sata_phy0 {
+        status = "okay";
+};
+
+&sata_phy1 {
+        status = "okay";
+};
+
+&sata {
+        status = "okay";
+};
+
 &nand {
         nandcs@0 {
                 compatible = "brcm,nandcs";
diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
index e2dc4c045146..2c8be74f401d 100644
--- a/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
@@ -98,12 +98,12 @@ config SATA_AHCI_PLATFORM
 
           If unsure, say N.
 
-config AHCI_BRCMSTB
-        tristate "Broadcom STB AHCI SATA support"
-        depends on ARCH_BRCMSTB || BMIPS_GENERIC
+config AHCI_BRCM
+        tristate "Broadcom AHCI SATA support"
+        depends on ARCH_BRCMSTB || BMIPS_GENERIC || ARCH_BCM_NSP
         help
           This option enables support for the AHCI SATA3 controller found on
-          STB SoC's.
+          Broadcom SoC's.
 
           If unsure, say N.
 
diff --git a/drivers/ata/Makefile b/drivers/ata/Makefile
index 0b2afb7e5f35..a46e6b784bda 100644
--- a/drivers/ata/Makefile
+++ b/drivers/ata/Makefile
@@ -11,7 +11,7 @@ obj-$(CONFIG_SATA_INIC162X)	+= sata_inic162x.o
 obj-$(CONFIG_SATA_SIL24)        += sata_sil24.o