Merge remote-tracking branch 'libata/for-next'

diff --combined arch/arm/boot/dts/stih407-family.dtsi
index 8b063ab10c19e9d2faff0f4e9b9a62421e091f45,36d40f0516a150fdd433a1c73c9a98106bf5e32c..9a12c78ca91647c24292dfcb088490cb38cb9599
--- 1/arch/arm/boot/dts/stih407-family.dtsi
--- 2/arch/arm/boot/dts/stih407-family.dtsi
+++ b/arch/arm/boot/dts/stih407-family.dtsi
@@@ -550,9 -550,8 +550,9 @@@
                        interrupt-names = "mmcirq";
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_mmc0>;
 -                      clock-names = "mmc";
 -                      clocks = <&clk_s_c0_flexgen CLK_MMC_0>;
 +                      clock-names = "mmc", "icn";
 +                      clocks = <&clk_s_c0_flexgen CLK_MMC_0>,
 +                               <&clk_s_c0_flexgen CLK_RX_ICN_HVA>;
                        bus-width = <8>;
                        non-removable;
                };
@@@ -566,9 -565,8 +566,9 @@@
                        interrupt-names = "mmcirq";
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_sd1>;
 -                      clock-names = "mmc";
 -                      clocks = <&clk_s_c0_flexgen CLK_MMC_1>;
 +                      clock-names = "mmc", "icn";
 +                      clocks = <&clk_s_c0_flexgen CLK_MMC_1>,
 +                               <&clk_s_c0_flexgen CLK_RX_ICN_HVA>;
                        resets = <&softreset STIH407_MMC1_SOFTRESET>;
                        bus-width = <4>;
                };
@@@ -610,6 -608,8 +610,8 @@@
                        clock-names = "ahci_clk";
                        clocks = <&clk_s_c0_flexgen CLK_ICN_REG>;
  
+                       ports-implemented = <0x1>;
+ 
                        status = "disabled";
                };
  
@@@ -633,6 -633,8 +635,8 @@@
                        clock-names = "ahci_clk";
                        clocks = <&clk_s_c0_flexgen CLK_ICN_REG>;
  
+                       ports-implemented = <0x1>;
+ 
                        status = "disabled";
                };
  

diff --combined arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi
index 58635f7f4668abbc8ebfd52ba96abafe63d817db,e8e4c3ed1b7ec9784e95aa8102162d711f7aa804..220ac7057d1284fa97d5ccf1787e09a2aafd60a4
--- 1/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi
--- 2/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi
@@@ -119,10 -119,10 +119,10 @@@
  
        timer {
                compatible = "arm,armv8-timer";
 -              interrupts = <1 13 0x1>, /* Physical Secure PPI */
 -                           <1 14 0x1>, /* Physical Non-Secure PPI */
 -                           <1 11 0x1>, /* Virtual PPI */
 -                           <1 10 0x1>; /* Hypervisor PPI */
 +              interrupts = <1 13 0xf08>, /* Physical Secure PPI */
 +                           <1 14 0xf08>, /* Physical Non-Secure PPI */
 +                           <1 11 0xf08>, /* Virtual PPI */
 +                           <1 10 0xf08>; /* Hypervisor PPI */
        };
  
        pmu {
@@@ -247,13 -247,6 +247,13 @@@
                        bus-width = <4>;
                };
  
 +              ddr: memory-controller@1080000 {
 +                      compatible = "fsl,qoriq-memory-controller";
 +                      reg = <0x0 0x1080000 0x0 0x1000>;
 +                      interrupts = <0 144 0x4>;
 +                      big-endian;
 +              };
 +
                dspi0: dspi@2100000 {
                        compatible = "fsl,ls1043a-dspi", "fsl,ls1021a-v1.0-dspi";
                        #address-cells = <1>;
@@@ -502,10 -495,11 +502,11 @@@
                };
  
                sata: sata@3200000 {
-                       compatible = "fsl,ls1043a-ahci", "fsl,ls1021a-ahci";
+                       compatible = "fsl,ls1043a-ahci";
                        reg = <0x0 0x3200000 0x0 0x10000>;
                        interrupts = <0 69 0x4>;
                        clocks = <&clockgen 4 0>;
+                       dma-coherent;
                };
  
                msi1: msi-controller1@1571000 {

diff --combined arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi
index d1059765dfee4ac41831ff5faf1f2d71df9fc241,5ead17c05bb832cbaae063da289e69342b3486ee..337da90bd7dade6df0d74d49a9794b6b20cc8510
--- 1/arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi
--- 2/arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi
@@@ -191,10 -191,10 +191,10 @@@
  
        timer {
                compatible = "arm,armv8-timer";
 -              interrupts = <1 13 0x8>, /* Physical Secure PPI, active-low */
 -                           <1 14 0x8>, /* Physical Non-Secure PPI, active-low */
 -                           <1 11 0x8>, /* Virtual PPI, active-low */
 -                           <1 10 0x8>; /* Hypervisor PPI, active-low */
 +              interrupts = <1 13 4>, /* Physical Secure PPI, active-low */
 +                           <1 14 4>, /* Physical Non-Secure PPI, active-low */
 +                           <1 11 4>, /* Virtual PPI, active-low */
 +                           <1 10 4>; /* Hypervisor PPI, active-low */
        };
  
        pmu {
@@@ -588,7 -588,6 +588,7 @@@
                        #address-cells = <3>;
                        #size-cells = <2>;
                        device_type = "pci";
 +                      dma-coherent;
                        num-lanes = <4>;
                        bus-range = <0x0 0xff>;
                        ranges = <0x81000000 0x0 0x00000000 0x10 0x00010000 0x0 0x00010000   /* downstream I/O */
@@@ -613,7 -612,6 +613,7 @@@
                        #address-cells = <3>;
                        #size-cells = <2>;
                        device_type = "pci";
 +                      dma-coherent;
                        num-lanes = <4>;
                        bus-range = <0x0 0xff>;
                        ranges = <0x81000000 0x0 0x00000000 0x12 0x00010000 0x0 0x00010000   /* downstream I/O */
@@@ -638,7 -636,6 +638,7 @@@
                        #address-cells = <3>;
                        #size-cells = <2>;
                        device_type = "pci";
 +                      dma-coherent;
                        num-lanes = <8>;
                        bus-range = <0x0 0xff>;
                        ranges = <0x81000000 0x0 0x00000000 0x14 0x00010000 0x0 0x00010000   /* downstream I/O */
@@@ -663,7 -660,6 +663,7 @@@
                        #address-cells = <3>;
                        #size-cells = <2>;
                        device_type = "pci";
 +                      dma-coherent;
                        num-lanes = <4>;
                        bus-range = <0x0 0xff>;
                        ranges = <0x81000000 0x0 0x00000000 0x16 0x00010000 0x0 0x00010000   /* downstream I/O */
@@@ -683,6 -679,7 +683,7 @@@
                        reg = <0x0 0x3200000 0x0 0x10000>;
                        interrupts = <0 133 0x4>; /* Level high type */
                        clocks = <&clockgen 4 3>;
+                       dma-coherent;
                };
  
                sata1: sata@3210000 {
@@@ -691,6 -688,7 +692,7 @@@
                        reg = <0x0 0x3210000 0x0 0x10000>;
                        interrupts = <0 136 0x4>; /* Level high type */
                        clocks = <&clockgen 4 3>;
+                       dma-coherent;
                };
  
                usb0: usb3@3100000 {
@@@ -719,18 -717,4 +721,18 @@@
                        interrupts = <0 12 4>;
                };
        };
 +
 +      ddr1: memory-controller@1080000 {
 +              compatible = "fsl,qoriq-memory-controller";
 +              reg = <0x0 0x1080000 0x0 0x1000>;
 +              interrupts = <0 17 0x4>;
 +              little-endian;
 +      };
 +
 +      ddr2: memory-controller@1090000 {
 +              compatible = "fsl,qoriq-memory-controller";
 +              reg = <0x0 0x1090000 0x0 0x1000>;
 +              interrupts = <0 18 0x4>;
 +              little-endian;
 +      };
  };