Merge tag 'pxa-for-4.9' of https://github.com/rjarzmik/linux into next/soc

Pull "This is the pxa changes for v4.9 cycle" from Robert Jarzmik:

This cycle is covering :
 - the removal of the legacy DMA API
   This is the major contributor to the negative diffstat, as dmaengine
   have taken over in this area.
 - IDE subsystem defconfig fixes
 - preparation for pxa25x to be device-tree compliant
 - various irq related fixes

* tag 'pxa-for-4.9' of https://github.com/rjarzmik/linux:
  ARM: pxa: pxa_cplds: fix interrupt handling
  ARM: pxa: remove irq init from dt machines
  ARM: pxa: Use kmalloc_array() in pxa_pm_init()
  ARM: pxa: magician: Remove duplicated I2C pins declaration
  ARM: pxa: fix GPIO double shifts
  arm: trizeps4_defconfig: disable IDE subsystem
  arm: pxa255-idp_defconfig: disable IDE subsystem
  arm: lpda270_defconfig: disable IDE subsystem
  arm: colibri_pxa270_defconfig: disable IDE subsystem
  ARM: pxa: add pxa25x device-tree support
  ARM: pxa: prepare pxa25x interrupts for device-tree platforms
  ARM: pxa: remove platform dma code
  ARM: pxa: remove devicetree boards from pxa_defconfig

16 files changed, 95 insertions, 68 deletions

diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig
index cd894d69e766..76fbc115ec33 100644
--- a/arch/arm/mach-pxa/Kconfig
+++ b/arch/arm/mach-pxa/Kconfig
@@ -4,6 +4,17 @@ menu "Intel PXA2xx/PXA3xx Implementations"
 
 comment "Intel/Marvell Dev Platforms (sorted by hardware release time)"
 
+config MACH_PXA25X_DT
+        bool "Support PXA25x platforms from device tree"
+        select PINCTRL
+        select POWER_SUPPLY
+        select PXA25x
+        select USE_OF
+        help
+          Include support for Marvell PXA25x based platforms using
+          the device tree. Needn't select any other machine while
+          MACH_PXA25x_DT is enabled.
+
 config MACH_PXA27X_DT
         bool "Support PXA27x platforms from device tree"
         select PINCTRL
diff --git a/arch/arm/mach-pxa/Makefile b/arch/arm/mach-pxa/Makefile
index 2ceed407eda9..ef25dc597f30 100644
--- a/arch/arm/mach-pxa/Makefile
+++ b/arch/arm/mach-pxa/Makefile
@@ -19,8 +19,9 @@ obj-$(CONFIG_CPU_PXA930)	+= pxa930.o
 # NOTE: keep the order of boards in accordance to their order in Kconfig
 
 # Device Tree support
-obj-$(CONFIG_MACH_PXA3XX_DT)    += pxa-dt.o
+obj-$(CONFIG_MACH_PXA25X_DT)    += pxa-dt.o
 obj-$(CONFIG_MACH_PXA27X_DT)    += pxa-dt.o
+obj-$(CONFIG_MACH_PXA3XX_DT)    += pxa-dt.o
 
 # Intel/Marvell Dev Platforms
 obj-$(CONFIG_ARCH_LUBBOCK)      += lubbock.o
diff --git a/arch/arm/mach-pxa/corgi_pm.c b/arch/arm/mach-pxa/corgi_pm.c
index d9206811be9b..c71c483f410e 100644
--- a/arch/arm/mach-pxa/corgi_pm.c
+++ b/arch/arm/mach-pxa/corgi_pm.c
@@ -131,16 +131,11 @@ static int corgi_should_wakeup(unsigned int resume_on_alarm)
         return is_resume;
 }
 
-static unsigned long corgi_charger_wakeup(void)
+static bool corgi_charger_wakeup(void)
 {
-        unsigned long ret;
-
-        ret = (!gpio_get_value(CORGI_GPIO_AC_IN) << GPIO_bit(CORGI_GPIO_AC_IN))
-                | (!gpio_get_value(CORGI_GPIO_KEY_INT)
-                << GPIO_bit(CORGI_GPIO_KEY_INT))
-                | (!gpio_get_value(CORGI_GPIO_WAKEUP)
-                << GPIO_bit(CORGI_GPIO_WAKEUP));
-        return ret;
+        return !gpio_get_value(CORGI_GPIO_AC_IN) ||
+                !gpio_get_value(CORGI_GPIO_KEY_INT) ||
+                !gpio_get_value(CORGI_GPIO_WAKEUP);
 }
 
 unsigned long corgipm_read_devdata(int type)
diff --git a/arch/arm/mach-pxa/devices.h b/arch/arm/mach-pxa/devices.h
index 4a13c32fb705..04580c407276 100644
--- a/arch/arm/mach-pxa/devices.h
+++ b/arch/arm/mach-pxa/devices.h
@@ -54,3 +54,4 @@ extern struct platform_device pxa3xx_device_gpio;
 extern struct platform_device pxa93x_device_gpio;
 
 void __init pxa_register_device(struct platform_device *dev, void *data);
+void __init pxa2xx_set_dmac_info(int nb_channels, int nb_requestors);
diff --git a/arch/arm/mach-pxa/generic.h b/arch/arm/mach-pxa/generic.h
index 0b1dbb54871a..75e3f611e5d8 100644
--- a/arch/arm/mach-pxa/generic.h
+++ b/arch/arm/mach-pxa/generic.h
@@ -33,14 +33,12 @@ extern void __init pxa26x_init_irq(void);
 
 #define pxa27x_handle_irq ichp_handle_irq
 extern int __init pxa27x_clocks_init(void);
-extern void __init pxa27x_dt_init_irq(void);
 extern unsigned pxa27x_get_clk_frequency_khz(int);
 extern void __init pxa27x_init_irq(void);
 extern void __init pxa27x_map_io(void);
 
 #define pxa3xx_handle_irq ichp_handle_irq
 extern int __init pxa3xx_clocks_init(void);
-extern void __init pxa3xx_dt_init_irq(void);
 extern void __init pxa3xx_init_irq(void);
 extern void __init pxa3xx_map_io(void);
 
diff --git a/arch/arm/mach-pxa/include/mach/dma.h b/arch/arm/mach-pxa/include/mach/dma.h
index 5bd55894a48d..20026bdc6b24 100644
--- a/arch/arm/mach-pxa/include/mach/dma.h
+++ b/arch/arm/mach-pxa/include/mach/dma.h
@@ -17,5 +17,4 @@
 /* DMA Controller Registers Definitions */
 #define DMAC_REGS_VIRT  io_p2v(0x40000000)
 
-#include <plat/dma.h>
 #endif /* _ASM_ARCH_DMA_H */
diff --git a/arch/arm/mach-pxa/magician.c b/arch/arm/mach-pxa/magician.c
index abc918169367..6f8837ebbf91 100644
--- a/arch/arm/mach-pxa/magician.c
+++ b/arch/arm/mach-pxa/magician.c
@@ -121,10 +121,6 @@ static unsigned long magician_pin_config[] __initdata = {
         GPIO107_GPIO,   /* DS1WM_IRQ */
         GPIO108_GPIO,   /* GSM_READY */
         GPIO115_GPIO,   /* nPEN_IRQ */
-
-        /* I2C */
-        GPIO117_I2C_SCL,
-        GPIO118_I2C_SDA,
 };
 
 /*
diff --git a/arch/arm/mach-pxa/pm.c b/arch/arm/mach-pxa/pm.c
index 388463b99090..e7450fb49d24 100644
--- a/arch/arm/mach-pxa/pm.c
+++ b/arch/arm/mach-pxa/pm.c
@@ -104,8 +104,9 @@ static int __init pxa_pm_init(void)
                 return -EINVAL;
         }
 
-        sleep_save = kmalloc(pxa_cpu_pm_fns->save_count * sizeof(unsigned long),
-                             GFP_KERNEL);
+        sleep_save = kmalloc_array(pxa_cpu_pm_fns->save_count,
+                                   sizeof(*sleep_save),
+                                   GFP_KERNEL);
         if (!sleep_save) {
                 printk(KERN_ERR "failed to alloc memory for pm save\n");
                 return -ENOMEM;
diff --git a/arch/arm/mach-pxa/pxa-dt.c b/arch/arm/mach-pxa/pxa-dt.c
index f128133a8f30..aa9b255f5570 100644
--- a/arch/arm/mach-pxa/pxa-dt.c
+++ b/arch/arm/mach-pxa/pxa-dt.c
@@ -18,20 +18,16 @@
 
 #include "generic.h"
 
-#ifdef CONFIG_PXA3xx
-static const char *const pxa3xx_dt_board_compat[] __initconst = {
-        "marvell,pxa300",
-        "marvell,pxa310",
-        "marvell,pxa320",
+#ifdef CONFIG_PXA25x
+static const char * const pxa25x_dt_board_compat[] __initconst = {
+        "marvell,pxa250",
         NULL,
 };
 
-DT_MACHINE_START(PXA_DT, "Marvell PXA3xx (Device Tree Support)")
-        .map_io         = pxa3xx_map_io,
-        .init_irq       = pxa3xx_dt_init_irq,
-        .handle_irq     = pxa3xx_handle_irq,
+DT_MACHINE_START(PXA25X_DT, "Marvell PXA25x (Device Tree Support)")
+        .map_io         = pxa25x_map_io,
         .restart        = pxa_restart,
-        .dt_compat      = pxa3xx_dt_board_compat,
+        .dt_compat      = pxa25x_dt_board_compat,
 MACHINE_END
 #endif
 
@@ -41,11 +37,24 @@ static const char * const pxa27x_dt_board_compat[] __initconst = {
         NULL,
 };
 
-DT_MACHINE_START(PXA27X_DT, "Marvell PXA2xx (Device Tree Support)")
+DT_MACHINE_START(PXA27X_DT, "Marvell PXA27x (Device Tree Support)")
         .map_io         = pxa27x_map_io,
-        .init_irq       = pxa27x_dt_init_irq,
-        .handle_irq     = pxa27x_handle_irq,
         .restart        = pxa_restart,
         .dt_compat      = pxa27x_dt_board_compat,
 MACHINE_END
 #endif
+
+#ifdef CONFIG_PXA3xx
+static const char *const pxa3xx_dt_board_compat[] __initconst = {
+        "marvell,pxa300",
+        "marvell,pxa310",
+        "marvell,pxa320",
+        NULL,
+};
+
+DT_MACHINE_START(PXA_DT, "Marvell PXA3xx (Device Tree Support)")
+        .map_io         = pxa3xx_map_io,
+        .restart        = pxa_restart,
+        .dt_compat      = pxa3xx_dt_board_compat,
+MACHINE_END
+#endif
diff --git a/arch/arm/mach-pxa/pxa25x.c b/arch/arm/mach-pxa/pxa25x.c
index 823504f48f80..12b94357fbc1 100644
--- a/arch/arm/mach-pxa/pxa25x.c
+++ b/arch/arm/mach-pxa/pxa25x.c
@@ -25,6 +25,7 @@
 #include <linux/suspend.h>
 #include <linux/syscore_ops.h>
 #include <linux/irq.h>
+#include <linux/irqchip.h>
 
 #include <asm/mach/map.h>
 #include <asm/suspend.h>
@@ -151,6 +152,16 @@ void __init pxa26x_init_irq(void)
 }
 #endif
 
+static int __init __init
+pxa25x_dt_init_irq(struct device_node *node, struct device_node *parent)
+{
+        pxa_dt_irq_init(pxa25x_set_wake);
+        set_handle_irq(ichp_handle_irq);
+
+        return 0;
+}
+IRQCHIP_DECLARE(pxa25x_intc, "marvell,pxa-intc", pxa25x_dt_init_irq);
+
 static struct map_desc pxa25x_io_desc[] __initdata = {
         {       /* Mem Ctl */
                 .virtual        = (unsigned long)SMEMC_VIRT,
@@ -198,20 +209,17 @@ static int __init pxa25x_init(void)
 
                 reset_status = RCSR;
 
-                if ((ret = pxa_init_dma(IRQ_DMA, 16)))
-                        return ret;
-
                 pxa25x_init_pm();
 
                 register_syscore_ops(&pxa_irq_syscore_ops);
                 register_syscore_ops(&pxa2xx_mfp_syscore_ops);
 
-                pxa2xx_set_dmac_info(16, 40);
-                pxa_register_device(&pxa25x_device_gpio, &pxa25x_gpio_info);
-                ret = platform_add_devices(pxa25x_devices,
-                                           ARRAY_SIZE(pxa25x_devices));
-                if (ret)
-                        return ret;
+                if (!of_have_populated_dt()) {
+                        pxa2xx_set_dmac_info(16, 40);
+                        pxa_register_device(&pxa25x_device_gpio, &pxa25x_gpio_info);
+                        ret = platform_add_devices(pxa25x_devices,
+                                                   ARRAY_SIZE(pxa25x_devices));
+                }
         }
 
         return ret;
diff --git a/arch/arm/mach-pxa/pxa27x.c b/arch/arm/mach-pxa/pxa27x.c
index 2eaa341dd3f8..c0185c5c5a08 100644
--- a/arch/arm/mach-pxa/pxa27x.c
+++ b/arch/arm/mach-pxa/pxa27x.c
@@ -16,6 +16,7 @@
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
+#include <linux/irqchip.h>
 #include <linux/suspend.h>
 #include <linux/platform_device.h>
 #include <linux/syscore_ops.h>
@@ -233,11 +234,15 @@ void __init pxa27x_init_irq(void)
         pxa_init_irq(34, pxa27x_set_wake);
 }
 
-void __init pxa27x_dt_init_irq(void)
+static int __init
+pxa27x_dt_init_irq(struct device_node *node, struct device_node *parent)
 {
-        if (IS_ENABLED(CONFIG_OF))
-                pxa_dt_irq_init(pxa27x_set_wake);
+        pxa_dt_irq_init(pxa27x_set_wake);
+        set_handle_irq(ichp_handle_irq);
+
+        return 0;
 }
+IRQCHIP_DECLARE(pxa27x_intc, "marvell,pxa-intc", pxa27x_dt_init_irq);
 
 static struct map_desc pxa27x_io_desc[] __initdata = {
         {       /* Mem Ctl */
@@ -300,9 +305,6 @@ static int __init pxa27x_init(void)
 
                 reset_status = RCSR;
 
-                if ((ret = pxa_init_dma(IRQ_DMA, 32)))
-                        return ret;
-
                 pxa27x_init_pm();
 
                 register_syscore_ops(&pxa_irq_syscore_ops);
diff --git a/arch/arm/mach-pxa/pxa3xx.c b/arch/arm/mach-pxa/pxa3xx.c
index 3c9184d1d6b9..87acc96388c7 100644
--- a/arch/arm/mach-pxa/pxa3xx.c
+++ b/arch/arm/mach-pxa/pxa3xx.c
@@ -19,6 +19,7 @@
 #include <linux/pm.h>
 #include <linux/platform_device.h>
 #include <linux/irq.h>
+#include <linux/irqchip.h>
 #include <linux/io.h>
 #include <linux/of.h>
 #include <linux/syscore_ops.h>
@@ -356,11 +357,16 @@ void __init pxa3xx_init_irq(void)
 }
 
 #ifdef CONFIG_OF
-void __init pxa3xx_dt_init_irq(void)
+static int __init __init
+pxa3xx_dt_init_irq(struct device_node *node, struct device_node *parent)
 {
         __pxa3xx_init_irq();
         pxa_dt_irq_init(pxa3xx_set_wake);
+        set_handle_irq(ichp_handle_irq);
+
+        return 0;
 }
+IRQCHIP_DECLARE(pxa3xx_intc, "marvell,pxa-intc", pxa3xx_dt_init_irq);
 #endif  /* CONFIG_OF */
 
 static struct map_desc pxa3xx_io_desc[] __initdata = {
@@ -438,9 +444,6 @@ static int __init pxa3xx_init(void)
                  */
                 NDCR = (NDCR & ~NDCR_ND_ARB_EN) | NDCR_ND_ARB_CNTL;
 
-                if ((ret = pxa_init_dma(IRQ_DMA, 32)))
-                        return ret;
-
                 pxa3xx_init_pm();
 
                 register_syscore_ops(&pxa_irq_syscore_ops);
diff --git a/arch/arm/mach-pxa/pxa_cplds_irqs.c b/arch/arm/mach-pxa/pxa_cplds_irqs.c
index 2385052b0ce1..e362f865fcd2 100644
--- a/arch/arm/mach-pxa/pxa_cplds_irqs.c
+++ b/arch/arm/mach-pxa/pxa_cplds_irqs.c
@@ -41,30 +41,35 @@ static irqreturn_t cplds_irq_handler(int in_irq, void *d)
         unsigned long pending;
         unsigned int bit;
 
-        pending = readl(fpga->base + FPGA_IRQ_SET_CLR) & fpga->irq_mask;
-        for_each_set_bit(bit, &pending, CPLDS_NB_IRQ)
-                generic_handle_irq(irq_find_mapping(fpga->irqdomain, bit));
+        do {
+                pending = readl(fpga->base + FPGA_IRQ_SET_CLR) & fpga->irq_mask;
+                for_each_set_bit(bit, &pending, CPLDS_NB_IRQ) {
+                        generic_handle_irq(irq_find_mapping(fpga->irqdomain,
+                                                            bit));
+                }
+        } while (pending);
 
         return IRQ_HANDLED;
 }
 
-static void cplds_irq_mask_ack(struct irq_data *d)
+static void cplds_irq_mask(struct irq_data *d)
 {
         struct cplds *fpga = irq_data_get_irq_chip_data(d);
         unsigned int cplds_irq = irqd_to_hwirq(d);
-        unsigned int set, bit = BIT(cplds_irq);
+        unsigned int bit = BIT(cplds_irq);
 
         fpga->irq_mask &= ~bit;
         writel(fpga->irq_mask, fpga->base + FPGA_IRQ_MASK_EN);
-        set = readl(fpga->base + FPGA_IRQ_SET_CLR);
-        writel(set & ~bit, fpga->base + FPGA_IRQ_SET_CLR);
 }
 
 static void cplds_irq_unmask(struct irq_data *d)
 {
         struct cplds *fpga = irq_data_get_irq_chip_data(d);
         unsigned int cplds_irq = irqd_to_hwirq(d);
-        unsigned int bit = BIT(cplds_irq);
+        unsigned int set, bit = BIT(cplds_irq);
+
+        set = readl(fpga->base + FPGA_IRQ_SET_CLR);
+        writel(set & ~bit, fpga->base + FPGA_IRQ_SET_CLR);
 
         fpga->irq_mask |= bit;
         writel(fpga->irq_mask, fpga->base + FPGA_IRQ_MASK_EN);
@@ -72,7 +77,8 @@ static void cplds_irq_unmask(struct irq_data *d)
 
 static struct irq_chip cplds_irq_chip = {
         .name           = "pxa_cplds",
-        .irq_mask_ack   = cplds_irq_mask_ack,
+        .irq_ack        = cplds_irq_mask,
+        .irq_mask       = cplds_irq_mask,
         .irq_unmask     = cplds_irq_unmask,
         .flags          = IRQCHIP_MASK_ON_SUSPEND | IRQCHIP_SKIP_SET_WAKE,
 };
diff --git a/arch/arm/mach-pxa/sharpsl_pm.c b/arch/arm/mach-pxa/sharpsl_pm.c
index b80eab9993c5..249b7bd5fbc4 100644
--- a/arch/arm/mach-pxa/sharpsl_pm.c
+++ b/arch/arm/mach-pxa/sharpsl_pm.c
@@ -744,7 +744,7 @@ static int sharpsl_off_charge_battery(void)
                 time = RCNR;
                 while (1) {
                         /* Check if any wakeup event had occurred */
-                        if (sharpsl_pm.machinfo->charger_wakeup() != 0)
+                        if (sharpsl_pm.machinfo->charger_wakeup())
                                 return 0;
                         /* Check for timeout */
                         if ((RCNR - time) > SHARPSL_WAIT_CO_TIME)
diff --git a/arch/arm/mach-pxa/sharpsl_pm.h b/arch/arm/mach-pxa/sharpsl_pm.h
index 905be6755f04..fa75b6df8134 100644
--- a/arch/arm/mach-pxa/sharpsl_pm.h
+++ b/arch/arm/mach-pxa/sharpsl_pm.h
@@ -34,7 +34,7 @@ struct sharpsl_charger_machinfo {
 #define SHARPSL_STATUS_LOCK     5
 #define SHARPSL_STATUS_CHRGFULL 6
 #define SHARPSL_STATUS_FATAL    7
-        unsigned long (*charger_wakeup)(void);
+        bool (*charger_wakeup)(void);
         int (*should_wakeup)(unsigned int resume_on_alarm);
         void (*backlight_limit)(int);
         int (*backlight_get_status) (void);
diff --git a/arch/arm/mach-pxa/spitz_pm.c b/arch/arm/mach-pxa/spitz_pm.c
index ea9f9034cb54..4e64a140252e 100644
--- a/arch/arm/mach-pxa/spitz_pm.c
+++ b/arch/arm/mach-pxa/spitz_pm.c
@@ -165,13 +165,10 @@ static int spitz_should_wakeup(unsigned int resume_on_alarm)
         return is_resume;
 }
 
-static unsigned long spitz_charger_wakeup(void)
+static bool spitz_charger_wakeup(void)
 {
-        unsigned long ret;
-        ret = ((!gpio_get_value(SPITZ_GPIO_KEY_INT)
-                << GPIO_bit(SPITZ_GPIO_KEY_INT))
-                | gpio_get_value(SPITZ_GPIO_SYNC));
-        return ret;
+        return !gpio_get_value(SPITZ_GPIO_KEY_INT) ||
+                gpio_get_value(SPITZ_GPIO_SYNC);
 }
 
 unsigned long spitzpm_read_devdata(int type)