Merge tag 'fixes-non-critical-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull ARM SoC non-critical bug fixes from Arnd Bergmann:
 "Lots of isolated bug fixes that were not found to be important enough
  to be submitted before the merge window or backported into stable
  kernels.

  The vast majority of these came out of Arnd's randconfig testing and
  just prevents running into build-time bugs in configurations that we
  do not care about in practice"

* tag 'fixes-non-critical-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (75 commits)
  ARM: at91: fix a typo
  ARM: moxart: fix CPU selection
  ARM: tegra: fix board DT pinmux setup
  ARM: nspire: Fix compiler warning
  IXP4xx: Fix DMA masks.
  Revert "ARM: ixp4xx: Make dma_set_coherent_mask common, correct implementation"
  IXP4xx: Fix Goramo Multilink GPIO conversion.
  Revert "ARM: ixp4xx: fix gpio rework"
  ARM: tegra: make debug_ll code build for ARMv6
  ARM: sunxi: fix build for THUMB2_KERNEL
  ARM: exynos: add missing include of linux/module.h
  ARM: exynos: fix l2x0 saved regs handling
  ARM: samsung: select CRC32 for SAMSUNG_PM_CHECK
  ARM: samsung: select ATAGS where necessary
  ARM: samsung: fix SAMSUNG_PM_DEBUG Kconfig logic
  ARM: samsung: allow serial driver to be disabled
  ARM: s5pv210: enable IDE support in MACH_TORBRECK
  ARM: s5p64x0: fix building with only one soc type
  ARM: s3c64xx: select power domains only when used
  ARM: s3c64xx: MACH_SMDK6400 needs HSMMC1
  ...

4 files changed, 2 insertions, 5 deletions

diff --git a/drivers/clk/ti/clk-44xx.c b/drivers/clk/ti/clk-44xx.c
index ae00218b5da3..02517a8206bd 100644
--- a/drivers/clk/ti/clk-44xx.c
+++ b/drivers/clk/ti/clk-44xx.c
@@ -222,7 +222,6 @@ static struct ti_dt_clk omap44xx_clks[] = {
         DT_CLK(NULL, "auxclk5_src_ck", "auxclk5_src_ck"),
         DT_CLK(NULL, "auxclk5_ck", "auxclk5_ck"),
         DT_CLK(NULL, "auxclkreq5_ck", "auxclkreq5_ck"),
-        DT_CLK("50000000.gpmc", "fck", "dummy_ck"),
         DT_CLK("omap_i2c.1", "ick", "dummy_ck"),
         DT_CLK("omap_i2c.2", "ick", "dummy_ck"),
         DT_CLK("omap_i2c.3", "ick", "dummy_ck"),
diff --git a/drivers/clk/ti/clk-54xx.c b/drivers/clk/ti/clk-54xx.c
index 0ef9f581286b..08f3d1b915b3 100644
--- a/drivers/clk/ti/clk-54xx.c
+++ b/drivers/clk/ti/clk-54xx.c
@@ -182,7 +182,6 @@ static struct ti_dt_clk omap54xx_clks[] = {
         DT_CLK(NULL, "auxclk3_src_ck", "auxclk3_src_ck"),
         DT_CLK(NULL, "auxclk3_ck", "auxclk3_ck"),
         DT_CLK(NULL, "auxclkreq3_ck", "auxclkreq3_ck"),
-        DT_CLK(NULL, "gpmc_ck", "dummy_ck"),
         DT_CLK("omap_i2c.1", "ick", "dummy_ck"),
         DT_CLK("omap_i2c.2", "ick", "dummy_ck"),
         DT_CLK("omap_i2c.3", "ick", "dummy_ck"),
diff --git a/drivers/clk/ti/clk-7xx.c b/drivers/clk/ti/clk-7xx.c
index 9977653f2d63..f7e40734c819 100644
--- a/drivers/clk/ti/clk-7xx.c
+++ b/drivers/clk/ti/clk-7xx.c
@@ -262,7 +262,6 @@ static struct ti_dt_clk dra7xx_clks[] = {
         DT_CLK(NULL, "vip1_gclk_mux", "vip1_gclk_mux"),
         DT_CLK(NULL, "vip2_gclk_mux", "vip2_gclk_mux"),
         DT_CLK(NULL, "vip3_gclk_mux", "vip3_gclk_mux"),
-        DT_CLK(NULL, "gpmc_ck", "dummy_ck"),
         DT_CLK("omap_i2c.1", "ick", "dummy_ck"),
         DT_CLK("omap_i2c.2", "ick", "dummy_ck"),
         DT_CLK("omap_i2c.3", "ick", "dummy_ck"),
diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c
index 531769b2433a..63922b9ba6b7 100644
--- a/drivers/irqchip/irq-gic.c
+++ b/drivers/irqchip/irq-gic.c
@@ -661,9 +661,9 @@ static void gic_raise_softirq(const struct cpumask *mask, unsigned int irq)
 
         /*
          * Ensure that stores to Normal memory are visible to the
-         * other CPUs before issuing the IPI.
+         * other CPUs before they observe us issuing the IPI.
          */
-        dsb();
+        dmb(ishst);
 
         /* this always happens on GIC0 */
         writel_relaxed(map << 16 | irq, gic_data_dist_base(&gic_data[0]) + GIC_DIST_SOFTINT);