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
  ...

5 files changed, 84 insertions, 64 deletions

diff --git a/arch/arm/mach-ixp4xx/common-pci.c b/arch/arm/mach-ixp4xx/common-pci.c
index 200970d56f6d..4977296f0c78 100644
--- a/arch/arm/mach-ixp4xx/common-pci.c
+++ b/arch/arm/mach-ixp4xx/common-pci.c
@@ -315,33 +315,6 @@ static int abort_handler(unsigned long addr, unsigned int fsr, struct pt_regs *r
         return 0;
 }
 
-
-static int ixp4xx_needs_bounce(struct device *dev, dma_addr_t dma_addr, size_t size)
-{
-        return (dma_addr + size) >= SZ_64M;
-}
-
-/*
- * Setup DMA mask to 64MB on PCI devices. Ignore all other devices.
- */
-static int ixp4xx_pci_platform_notify(struct device *dev)
-{
-        if (dev_is_pci(dev)) {
-                *dev->dma_mask =  SZ_64M - 1;
-                dev->coherent_dma_mask = SZ_64M - 1;
-                dmabounce_register_dev(dev, 2048, 4096, ixp4xx_needs_bounce);
-        }
-        return 0;
-}
-
-static int ixp4xx_pci_platform_notify_remove(struct device *dev)
-{
-        if (dev_is_pci(dev))
-                dmabounce_unregister_dev(dev);
-
-        return 0;
-}
-
 void __init ixp4xx_pci_preinit(void)
 {
         unsigned long cpuid = read_cpuid_id();
@@ -475,20 +448,8 @@ int ixp4xx_setup(int nr, struct pci_sys_data *sys)
         pci_add_resource_offset(&sys->resources, &res[0], sys->io_offset);
         pci_add_resource_offset(&sys->resources, &res[1], sys->mem_offset);
 
-        platform_notify = ixp4xx_pci_platform_notify;
-        platform_notify_remove = ixp4xx_pci_platform_notify_remove;
-
         return 1;
 }
 
-int dma_set_coherent_mask(struct device *dev, u64 mask)
-{
-        if (mask >= SZ_64M - 1)
-                return 0;
-
-        return -EIO;
-}
-
 EXPORT_SYMBOL(ixp4xx_pci_read);
 EXPORT_SYMBOL(ixp4xx_pci_write);
-EXPORT_SYMBOL(dma_set_coherent_mask);
diff --git a/arch/arm/mach-ixp4xx/common.c b/arch/arm/mach-ixp4xx/common.c
index a465f27bc263..be882c95bd36 100644
--- a/arch/arm/mach-ixp4xx/common.c
+++ b/arch/arm/mach-ixp4xx/common.c
@@ -30,8 +30,8 @@
 #include <linux/export.h>
 #include <linux/gpio.h>
 #include <linux/cpu.h>
+#include <linux/pci.h>
 #include <linux/sched_clock.h>
-
 #include <mach/udc.h>
 #include <mach/hardware.h>
 #include <mach/io.h>
@@ -40,7 +40,6 @@
 #include <asm/page.h>
 #include <asm/irq.h>
 #include <asm/system_misc.h>
-
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 #include <asm/mach/time.h>
@@ -578,6 +577,54 @@ void ixp4xx_restart(enum reboot_mode mode, const char *cmd)
         }
 }
 
+#ifdef CONFIG_PCI
+static int ixp4xx_needs_bounce(struct device *dev, dma_addr_t dma_addr, size_t size)
+{
+        return (dma_addr + size) > SZ_64M;
+}
+
+static int ixp4xx_platform_notify_remove(struct device *dev)
+{
+        if (dev_is_pci(dev))
+                dmabounce_unregister_dev(dev);
+
+        return 0;
+}
+#endif
+
+/*
+ * Setup DMA mask to 64MB on PCI devices and 4 GB on all other things.
+ */
+static int ixp4xx_platform_notify(struct device *dev)
+{
+        dev->dma_mask = &dev->coherent_dma_mask;
+
+#ifdef CONFIG_PCI
+        if (dev_is_pci(dev)) {
+                dev->coherent_dma_mask = DMA_BIT_MASK(28); /* 64 MB */
+                dmabounce_register_dev(dev, 2048, 4096, ixp4xx_needs_bounce);
+                return 0;
+        }
+#endif
+
+        dev->coherent_dma_mask = DMA_BIT_MASK(32);
+        return 0;
+}
+
+int dma_set_coherent_mask(struct device *dev, u64 mask)
+{
+        if (dev_is_pci(dev))
+                mask &= DMA_BIT_MASK(28); /* 64 MB */
+
+        if ((mask & DMA_BIT_MASK(28)) == DMA_BIT_MASK(28)) {
+                dev->coherent_dma_mask = mask;
+                return 0;
+        }
+
+        return -EIO;            /* device wanted sub-64MB mask */
+}
+EXPORT_SYMBOL(dma_set_coherent_mask);
+
 #ifdef CONFIG_IXP4XX_INDIRECT_PCI
 /*
  * In the case of using indirect PCI, we simply return the actual PCI
@@ -600,12 +647,16 @@ static void ixp4xx_iounmap(void __iomem *addr)
         if (!is_pci_memory((__force u32)addr))
                 __iounmap(addr);
 }
+#endif
 
 void __init ixp4xx_init_early(void)
 {
+        platform_notify = ixp4xx_platform_notify;
+#ifdef CONFIG_PCI
+        platform_notify_remove = ixp4xx_platform_notify_remove;
+#endif
+#ifdef CONFIG_IXP4XX_INDIRECT_PCI
         arch_ioremap_caller = ixp4xx_ioremap_caller;
         arch_iounmap = ixp4xx_iounmap;
-}
-#else
-void __init ixp4xx_init_early(void) {}
 #endif
+}
diff --git a/arch/arm/mach-ixp4xx/goramo_mlr.c b/arch/arm/mach-ixp4xx/goramo_mlr.c
index e54ff491c105..80bd9d6d04de 100644
--- a/arch/arm/mach-ixp4xx/goramo_mlr.c
+++ b/arch/arm/mach-ixp4xx/goramo_mlr.c
@@ -4,6 +4,7 @@
  */
 
 #include <linux/delay.h>
+#include <linux/gpio.h>
 #include <linux/hdlc.h>
 #include <linux/i2c-gpio.h>
 #include <linux/io.h>
@@ -79,19 +80,19 @@ static u8 control_value;
 
 static void set_scl(u8 value)
 {
-        gpio_line_set(GPIO_SCL, !!value);
+        gpio_set_value(GPIO_SCL, !!value);
         udelay(3);
 }
 
 static void set_sda(u8 value)
 {
-        gpio_line_set(GPIO_SDA, !!value);
+        gpio_set_value(GPIO_SDA, !!value);
         udelay(3);
 }
 
 static void set_str(u8 value)
 {
-        gpio_line_set(GPIO_STR, !!value);
+        gpio_set_value(GPIO_STR, !!value);
         udelay(3);
 }
 
@@ -108,8 +109,8 @@ static void output_control(void)
 {
         int i;
 
-        gpio_line_config(GPIO_SCL, IXP4XX_GPIO_OUT);
-        gpio_line_config(GPIO_SDA, IXP4XX_GPIO_OUT);
+        gpio_direction_output(GPIO_SCL, 1);
+        gpio_direction_output(GPIO_SDA, 1);
 
         for (i = 0; i < 8; i++) {
                 set_scl(0);
@@ -151,8 +152,8 @@ static int hss_set_clock(int port, unsigned int clock_type)
 
 static irqreturn_t hss_dcd_irq(int irq, void *pdev)
 {
-        int i, port = (irq == IXP4XX_GPIO_IRQ(GPIO_HSS1_DCD_N));
-        gpio_line_get(port ? GPIO_HSS1_DCD_N : GPIO_HSS0_DCD_N, &i);
+        int port = (irq == IXP4XX_GPIO_IRQ(GPIO_HSS1_DCD_N));
+        int i = gpio_get_value(port ? GPIO_HSS1_DCD_N : GPIO_HSS0_DCD_N);
         set_carrier_cb_tab[port](pdev, !i);
         return IRQ_HANDLED;
 }
@@ -168,7 +169,7 @@ static int hss_open(int port, void *pdev,
         else
                 irq = IXP4XX_GPIO_IRQ(GPIO_HSS1_DCD_N);
 
-        gpio_line_get(port ? GPIO_HSS1_DCD_N : GPIO_HSS0_DCD_N, &i);
+        i = gpio_get_value(port ? GPIO_HSS1_DCD_N : GPIO_HSS0_DCD_N);
         set_carrier_cb(pdev, !i);
 
         set_carrier_cb_tab[!!port] = set_carrier_cb;
@@ -181,7 +182,7 @@ static int hss_open(int port, void *pdev,
 
         set_control(port ? CONTROL_HSS1_DTR_N : CONTROL_HSS0_DTR_N, 0);
         output_control();
-        gpio_line_set(port ? GPIO_HSS1_RTS_N : GPIO_HSS0_RTS_N, 0);
+        gpio_set_value(port ? GPIO_HSS1_RTS_N : GPIO_HSS0_RTS_N, 0);
         return 0;
 }
 
@@ -193,7 +194,7 @@ static void hss_close(int port, void *pdev)
 
         set_control(port ? CONTROL_HSS1_DTR_N : CONTROL_HSS0_DTR_N, 1);
         output_control();
-        gpio_line_set(port ? GPIO_HSS1_RTS_N : GPIO_HSS0_RTS_N, 1);
+        gpio_set_value(port ? GPIO_HSS1_RTS_N : GPIO_HSS0_RTS_N, 1);
 }
 
 
@@ -413,13 +414,21 @@ static void __init gmlr_init(void)
         if (hw_bits & CFG_HW_HAS_EEPROM)
                 device_tab[devices++] = &device_i2c; /* max index 6 */
 
-        gpio_line_config(GPIO_SCL, IXP4XX_GPIO_OUT);
-        gpio_line_config(GPIO_SDA, IXP4XX_GPIO_OUT);
-        gpio_line_config(GPIO_STR, IXP4XX_GPIO_OUT);
-        gpio_line_config(GPIO_HSS0_RTS_N, IXP4XX_GPIO_OUT);
-        gpio_line_config(GPIO_HSS1_RTS_N, IXP4XX_GPIO_OUT);
-        gpio_line_config(GPIO_HSS0_DCD_N, IXP4XX_GPIO_IN);
-        gpio_line_config(GPIO_HSS1_DCD_N, IXP4XX_GPIO_IN);
+        gpio_request(GPIO_SCL, "SCL/clock");
+        gpio_request(GPIO_SDA, "SDA/data");
+        gpio_request(GPIO_STR, "strobe");
+        gpio_request(GPIO_HSS0_RTS_N, "HSS0 RTS");
+        gpio_request(GPIO_HSS1_RTS_N, "HSS1 RTS");
+        gpio_request(GPIO_HSS0_DCD_N, "HSS0 DCD");
+        gpio_request(GPIO_HSS1_DCD_N, "HSS1 DCD");
+
+        gpio_direction_output(GPIO_SCL, 1);
+        gpio_direction_output(GPIO_SDA, 1);
+        gpio_direction_output(GPIO_STR, 0);
+        gpio_direction_output(GPIO_HSS0_RTS_N, 1);
+        gpio_direction_output(GPIO_HSS1_RTS_N, 1);
+        gpio_direction_input(GPIO_HSS0_DCD_N);
+        gpio_direction_input(GPIO_HSS1_DCD_N);
         irq_set_irq_type(IXP4XX_GPIO_IRQ(GPIO_HSS0_DCD_N), IRQ_TYPE_EDGE_BOTH);
         irq_set_irq_type(IXP4XX_GPIO_IRQ(GPIO_HSS1_DCD_N), IRQ_TYPE_EDGE_BOTH);
 
diff --git a/arch/arm/mach-ixp4xx/include/mach/io.h b/arch/arm/mach-ixp4xx/include/mach/io.h
index 5cf30d1b78d2..559c69a47731 100644
--- a/arch/arm/mach-ixp4xx/include/mach/io.h
+++ b/arch/arm/mach-ixp4xx/include/mach/io.h
@@ -48,9 +48,10 @@ extern int ixp4xx_pci_write(u32 addr, u32 cmd, u32 data);
  * fallback to the default.
  */
 
+extern unsigned long pcibios_min_mem;
 static inline int is_pci_memory(u32 addr)
 {
-        return (addr >= PCIBIOS_MIN_MEM) && (addr <= 0x4FFFFFFF);
+        return (addr >= pcibios_min_mem) && (addr <= 0x4FFFFFFF);
 }
 
 #define writeb(v, p)                    __indirect_writeb(v, p)
diff --git a/arch/arm/mach-ixp4xx/omixp-setup.c b/arch/arm/mach-ixp4xx/omixp-setup.c
index 75ef03dc9964..2d494b454376 100644
--- a/arch/arm/mach-ixp4xx/omixp-setup.c
+++ b/arch/arm/mach-ixp4xx/omixp-setup.c
@@ -17,9 +17,7 @@
 #include <linux/serial_8250.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
-#ifdef CONFIG_LEDS_CLASS
 #include <linux/leds.h>
-#endif
 
 #include <asm/setup.h>
 #include <asm/memory.h>