5 files changed, 16 insertions, 5 deletions

diff --git a/arch/arm/boot/dts/vf500.dtsi b/arch/arm/boot/dts/vf500.dtsi
index a3824e61bd72..d7fdb2a7d97b 100644
--- a/arch/arm/boot/dts/vf500.dtsi
+++ b/arch/arm/boot/dts/vf500.dtsi
@@ -70,7 +70,7 @@
                         global_timer: timer@40002200 {
                                 compatible = "arm,cortex-a9-global-timer";
                                 reg = <0x40002200 0x20>;
-                                interrupts = <GIC_PPI 11 IRQ_TYPE_LEVEL_HIGH>;
+                                interrupts = <GIC_PPI 11 IRQ_TYPE_EDGE_RISING>;
                                 interrupt-parent = <&intc>;
                                 clocks = <&clks VF610_CLK_PLATFORM_BUS>;
                         };
diff --git a/arch/arm/mach-imx/gpc.c b/arch/arm/mach-imx/gpc.c
index 0df062d8b2c9..b54db47f6f32 100644
--- a/arch/arm/mach-imx/gpc.c
+++ b/arch/arm/mach-imx/gpc.c
@@ -408,7 +408,7 @@ static struct genpd_onecell_data imx_gpc_onecell_data = {
 static int imx_gpc_genpd_init(struct device *dev, struct regulator *pu_reg)
 {
         struct clk *clk;
-        int i;
+        int i, ret;
 
         imx6q_pu_domain.reg = pu_reg;
 
@@ -430,13 +430,22 @@ static int imx_gpc_genpd_init(struct device *dev, struct regulator *pu_reg)
         if (!IS_ENABLED(CONFIG_PM_GENERIC_DOMAINS))
                 return 0;
 
-        pm_genpd_init(&imx6q_pu_domain.base, NULL, false);
-        return of_genpd_add_provider_onecell(dev->of_node,
+        for (i = 0; i < ARRAY_SIZE(imx_gpc_domains); i++)
+                pm_genpd_init(imx_gpc_domains[i], NULL, false);
+
+        ret =  of_genpd_add_provider_onecell(dev->of_node,
                                              &imx_gpc_onecell_data);
+        if (ret)
+                goto power_off;
+
+        return 0;
 
+power_off:
+        imx6q_pm_pu_power_off(&imx6q_pu_domain.base);
 clk_err:
         while (i--)
                 clk_put(imx6q_pu_domain.clk[i]);
+        imx6q_pu_domain.reg = NULL;
         return -EINVAL;
 }
 
diff --git a/arch/arm/mach-imx/mach-imx6q.c b/arch/arm/mach-imx/mach-imx6q.c
index 97fd25105e2c..45801b27ee5c 100644
--- a/arch/arm/mach-imx/mach-imx6q.c
+++ b/arch/arm/mach-imx/mach-imx6q.c
@@ -173,7 +173,7 @@ static void __init imx6q_enet_phy_init(void)
                                 ksz9021rn_phy_fixup);
                 phy_register_fixup_for_uid(PHY_ID_KSZ9031, MICREL_PHY_ID_MASK,
                                 ksz9031rn_phy_fixup);
-                phy_register_fixup_for_uid(PHY_ID_AR8031, 0xffffffff,
+                phy_register_fixup_for_uid(PHY_ID_AR8031, 0xffffffef,
                                 ar8031_phy_fixup);
                 phy_register_fixup_for_uid(PHY_ID_AR8035, 0xffffffef,
                                 ar8035_phy_fixup);
diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi
index 220ac7057d12..97d331ec2500 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi
@@ -123,6 +123,7 @@
                              <1 14 0xf08>, /* Physical Non-Secure PPI */
                              <1 11 0xf08>, /* Virtual PPI */
                              <1 10 0xf08>; /* Hypervisor PPI */
+                fsl,erratum-a008585;
         };
 
         pmu {
diff --git a/arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi
index 337da90bd7da..7f0dc13b4087 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi
@@ -195,6 +195,7 @@
                              <1 14 4>, /* Physical Non-Secure PPI, active-low */
                              <1 11 4>, /* Virtual PPI, active-low */
                              <1 10 4>; /* Hypervisor PPI, active-low */
+                fsl,erratum-a008585;
         };
 
         pmu {