Merge tag 'drivers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull ARM SoC driver updates from Arnd Bergmann:
 "These are changes for drivers that are intimately tied to some SoC and
  for some reason could not get merged through the respective subsystem
  maintainer tree.

  Most of the new code is for the Keystone Navigator driver, which is
  new base support that is going to be needed for their hardware
  accelerated network driver and other units.

  Most of the commits are for moving old code around from at91 and omap
  for things that are done in device drivers nowadays.

   - at91: move reset, poweroff, memory and clocksource code into
     drivers directories
   - socfpga: add edac driver (through arm-soc, as requested by Boris)
   - omap: move omap-intc code to drivers/irqchip
   - sunxi: added an RTC driver for sun6i
   - omap: mailbox driver related changes
   - keystone: support for the "Navigator" component
   - versatile: new reboot, led and soc drivers"

* tag 'drivers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (92 commits)
  bus: arm-ccn: Fix spurious warning message
  leds: add device tree bindings for register bit LEDs
  soc: add driver for the ARM RealView
  power: reset: driver for the Versatile syscon reboot
  leds: add a driver for syscon-based LEDs
  drivers/soc: ti: fix build break with modules
  MAINTAINERS: Add Keystone Multicore Navigator drivers entry
  soc: ti: add Keystone Navigator DMA support
  Documentation: dt: soc: add Keystone Navigator DMA bindings
  soc: ti: add Keystone Navigator QMSS driver
  Documentation: dt: soc: add Keystone Navigator QMSS bindings
  rtc: sunxi: Depend on platforms sun4i/sun7i that actually have the rtc
  rtc: sun6i: Add sun6i RTC driver
  irqchip: omap-intc: remove unnecessary comments
  irqchip: omap-intc: correct maximum number or MIR registers
  irqchip: omap-intc: enable TURBO idle mode
  irqchip: omap-intc: enable IP protection
  irqchip: omap-intc: remove unnecesary of_address_to_resource() call
  irqchip: omap-intc: comment style cleanup
  irqchip: omap-intc: minor improvement to omap_irq_pending()
  ...

3 files changed, 297 insertions, 0 deletions

diff --git a/include/linux/irqchip/irq-omap-intc.h b/include/linux/irqchip/irq-omap-intc.h
new file mode 100644
index 000000000000..e06b370cfc0d
--- /dev/null
+++ b/include/linux/irqchip/irq-omap-intc.h
@@ -0,0 +1,32 @@
+/**
+ * irq-omap-intc.h - INTC Idle Functions
+ *
+ * Copyright (C) 2014 Texas Instruments Incorporated - http://www.ti.com
+ *
+ * Author: Felipe Balbi <balbi@ti.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2  of
+ * the License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#ifndef __INCLUDE_LINUX_IRQCHIP_IRQ_OMAP_INTC_H
+#define __INCLUDE_LINUX_IRQCHIP_IRQ_OMAP_INTC_H
+
+void omap2_init_irq(void);
+void omap3_init_irq(void);
+void ti81xx_init_irq(void);
+
+int omap_irq_pending(void);
+void omap_intc_save_context(void);
+void omap_intc_restore_context(void);
+void omap3_intc_suspend(void);
+void omap3_intc_prepare_idle(void);
+void omap3_intc_resume_idle(void);
+
+#endif /* __INCLUDE_LINUX_IRQCHIP_IRQ_OMAP_INTC_H */
diff --git a/include/linux/soc/ti/knav_dma.h b/include/linux/soc/ti/knav_dma.h
new file mode 100644
index 000000000000..dad035c16d94
--- /dev/null
+++ b/include/linux/soc/ti/knav_dma.h
@@ -0,0 +1,175 @@
+/*
+ * Copyright (C) 2014 Texas Instruments Incorporated
+ * Authors:     Sandeep Nair <sandeep_n@ti.com
+ *              Cyril Chemparathy <cyril@ti.com
+                Santosh Shilimkar <santosh.shilimkar@ti.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation version 2.
+ *
+ * This program is distributed "as is" WITHOUT ANY WARRANTY of any
+ * kind, whether express or implied; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#ifndef __SOC_TI_KEYSTONE_NAVIGATOR_DMA_H__
+#define __SOC_TI_KEYSTONE_NAVIGATOR_DMA_H__
+
+/*
+ * PKTDMA descriptor manipulation macros for host packet descriptor
+ */
+#define MASK(x)                                 (BIT(x) - 1)
+#define KNAV_DMA_DESC_PKT_LEN_MASK              MASK(22)
+#define KNAV_DMA_DESC_PKT_LEN_SHIFT             0
+#define KNAV_DMA_DESC_PS_INFO_IN_SOP            BIT(22)
+#define KNAV_DMA_DESC_PS_INFO_IN_DESC           0
+#define KNAV_DMA_DESC_TAG_MASK                  MASK(8)
+#define KNAV_DMA_DESC_SAG_HI_SHIFT              24
+#define KNAV_DMA_DESC_STAG_LO_SHIFT             16
+#define KNAV_DMA_DESC_DTAG_HI_SHIFT             8
+#define KNAV_DMA_DESC_DTAG_LO_SHIFT             0
+#define KNAV_DMA_DESC_HAS_EPIB                  BIT(31)
+#define KNAV_DMA_DESC_NO_EPIB                   0
+#define KNAV_DMA_DESC_PSLEN_SHIFT               24
+#define KNAV_DMA_DESC_PSLEN_MASK                MASK(6)
+#define KNAV_DMA_DESC_ERR_FLAG_SHIFT            20
+#define KNAV_DMA_DESC_ERR_FLAG_MASK             MASK(4)
+#define KNAV_DMA_DESC_PSFLAG_SHIFT              16
+#define KNAV_DMA_DESC_PSFLAG_MASK               MASK(4)
+#define KNAV_DMA_DESC_RETQ_SHIFT                0
+#define KNAV_DMA_DESC_RETQ_MASK                 MASK(14)
+#define KNAV_DMA_DESC_BUF_LEN_MASK              MASK(22)
+
+#define KNAV_DMA_NUM_EPIB_WORDS                 4
+#define KNAV_DMA_NUM_PS_WORDS                   16
+#define KNAV_DMA_FDQ_PER_CHAN                   4
+
+/* Tx channel scheduling priority */
+enum knav_dma_tx_priority {
+        DMA_PRIO_HIGH   = 0,
+        DMA_PRIO_MED_H,
+        DMA_PRIO_MED_L,
+        DMA_PRIO_LOW
+};
+
+/* Rx channel error handling mode during buffer starvation */
+enum knav_dma_rx_err_mode {
+        DMA_DROP = 0,
+        DMA_RETRY
+};
+
+/* Rx flow size threshold configuration */
+enum knav_dma_rx_thresholds {
+        DMA_THRESH_NONE         = 0,
+        DMA_THRESH_0            = 1,
+        DMA_THRESH_0_1          = 3,
+        DMA_THRESH_0_1_2        = 7
+};
+
+/* Descriptor type */
+enum knav_dma_desc_type {
+        DMA_DESC_HOST = 0,
+        DMA_DESC_MONOLITHIC = 2
+};
+
+/**
+ * struct knav_dma_tx_cfg:      Tx channel configuration
+ * @filt_einfo:                 Filter extended packet info
+ * @filt_pswords:               Filter PS words present
+ * @knav_dma_tx_priority:       Tx channel scheduling priority
+ */
+struct knav_dma_tx_cfg {
+        bool                            filt_einfo;
+        bool                            filt_pswords;
+        enum knav_dma_tx_priority       priority;
+};
+
+/**
+ * struct knav_dma_rx_cfg:      Rx flow configuration
+ * @einfo_present:              Extended packet info present
+ * @psinfo_present:             PS words present
+ * @knav_dma_rx_err_mode:       Error during buffer starvation
+ * @knav_dma_desc_type: Host or Monolithic desc
+ * @psinfo_at_sop:              PS word located at start of packet
+ * @sop_offset:                 Start of packet offset
+ * @dst_q:                      Destination queue for a given flow
+ * @thresh:                     Rx flow size threshold
+ * @fdq[]:                      Free desc Queue array
+ * @sz_thresh0:                 RX packet size threshold 0
+ * @sz_thresh1:                 RX packet size threshold 1
+ * @sz_thresh2:                 RX packet size threshold 2
+ */
+struct knav_dma_rx_cfg {
+        bool                            einfo_present;
+        bool                            psinfo_present;
+        enum knav_dma_rx_err_mode       err_mode;
+        enum knav_dma_desc_type         desc_type;
+        bool                            psinfo_at_sop;
+        unsigned int                    sop_offset;
+        unsigned int                    dst_q;
+        enum knav_dma_rx_thresholds     thresh;
+        unsigned int                    fdq[KNAV_DMA_FDQ_PER_CHAN];
+        unsigned int                    sz_thresh0;
+        unsigned int                    sz_thresh1;
+        unsigned int                    sz_thresh2;
+};
+
+/**
+ * struct knav_dma_cfg: Pktdma channel configuration
+ * @sl_cfg:                     Slave configuration
+ * @tx:                         Tx channel configuration
+ * @rx:                         Rx flow configuration
+ */
+struct knav_dma_cfg {
+        enum dma_transfer_direction direction;
+        union {
+                struct knav_dma_tx_cfg  tx;
+                struct knav_dma_rx_cfg  rx;
+        } u;
+};
+
+/**
+ * struct knav_dma_desc:        Host packet descriptor layout
+ * @desc_info:                  Descriptor information like id, type, length
+ * @tag_info:                   Flow tag info written in during RX
+ * @packet_info:                Queue Manager, policy, flags etc
+ * @buff_len:                   Buffer length in bytes
+ * @buff:                       Buffer pointer
+ * @next_desc:                  For chaining the descriptors
+ * @orig_len:                   length since 'buff_len' can be overwritten
+ * @orig_buff:                  buff pointer since 'buff' can be overwritten
+ * @epib:                       Extended packet info block
+ * @psdata:                     Protocol specific
+ */
+struct knav_dma_desc {
+        u32     desc_info;
+        u32     tag_info;
+        u32     packet_info;
+        u32     buff_len;
+        u32     buff;
+        u32     next_desc;
+        u32     orig_len;
+        u32     orig_buff;
+        u32     epib[KNAV_DMA_NUM_EPIB_WORDS];
+        u32     psdata[KNAV_DMA_NUM_PS_WORDS];
+        u32     pad[4];
+} ____cacheline_aligned;
+
+#if IS_ENABLED(CONFIG_KEYSTONE_NAVIGATOR_DMA)
+void *knav_dma_open_channel(struct device *dev, const char *name,
+                                struct knav_dma_cfg *config);
+void knav_dma_close_channel(void *channel);
+#else
+static inline void *knav_dma_open_channel(struct device *dev, const char *name,
+                                struct knav_dma_cfg *config)
+{
+        return (void *) NULL;
+}
+static inline void knav_dma_close_channel(void *channel)
+{}
+
+#endif
+
+#endif /* __SOC_TI_KEYSTONE_NAVIGATOR_DMA_H__ */
diff --git a/include/linux/soc/ti/knav_qmss.h b/include/linux/soc/ti/knav_qmss.h
new file mode 100644
index 000000000000..9f0ebb3bad27
--- /dev/null
+++ b/include/linux/soc/ti/knav_qmss.h
@@ -0,0 +1,90 @@
+/*
+ * Keystone Navigator Queue Management Sub-System header
+ *
+ * Copyright (C) 2014 Texas Instruments Incorporated - http://www.ti.com
+ * Author:      Sandeep Nair <sandeep_n@ti.com>
+ *              Cyril Chemparathy <cyril@ti.com>
+ *              Santosh Shilimkar <santosh.shilimkar@ti.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation version 2.
+ *
+ * This program is distributed "as is" WITHOUT ANY WARRANTY of any
+ * kind, whether express or implied; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#ifndef __SOC_TI_KNAV_QMSS_H__
+#define __SOC_TI_KNAV_QMSS_H__
+
+#include <linux/err.h>
+#include <linux/time.h>
+#include <linux/atomic.h>
+#include <linux/device.h>
+#include <linux/fcntl.h>
+#include <linux/dma-mapping.h>
+
+/* queue types */
+#define KNAV_QUEUE_QPEND        ((unsigned)-2) /* interruptible qpend queue */
+#define KNAV_QUEUE_ACC          ((unsigned)-3) /* Accumulated queue */
+#define KNAV_QUEUE_GP           ((unsigned)-4) /* General purpose queue */
+
+/* queue flags */
+#define KNAV_QUEUE_SHARED       0x0001          /* Queue can be shared */
+
+/**
+ * enum knav_queue_ctrl_cmd -   queue operations.
+ * @KNAV_QUEUE_GET_ID:          Get the ID number for an open queue
+ * @KNAV_QUEUE_FLUSH:           forcibly empty a queue if possible
+ * @KNAV_QUEUE_SET_NOTIFIER:    Set a notifier callback to a queue handle.
+ * @KNAV_QUEUE_ENABLE_NOTIFY:   Enable notifier callback for a queue handle.
+ * @KNAV_QUEUE_DISABLE_NOTIFY:  Disable notifier callback for a queue handle.
+ * @KNAV_QUEUE_GET_COUNT:       Get number of queues.
+ */
+enum knav_queue_ctrl_cmd {
+        KNAV_QUEUE_GET_ID,
+        KNAV_QUEUE_FLUSH,
+        KNAV_QUEUE_SET_NOTIFIER,
+        KNAV_QUEUE_ENABLE_NOTIFY,
+        KNAV_QUEUE_DISABLE_NOTIFY,
+        KNAV_QUEUE_GET_COUNT
+};
+
+/* Queue notifier callback prototype */
+typedef void (*knav_queue_notify_fn)(void *arg);
+
+/**
+ * struct knav_queue_notify_config:     Notifier configuration
+ * @fn:                                 Notifier function
+ * @fn_arg:                             Notifier function arguments
+ */
+struct knav_queue_notify_config {
+        knav_queue_notify_fn fn;
+        void *fn_arg;
+};
+
+void *knav_queue_open(const char *name, unsigned id,
+                                        unsigned flags);
+void knav_queue_close(void *qhandle);
+int knav_queue_device_control(void *qhandle,
+                                enum knav_queue_ctrl_cmd cmd,
+                                unsigned long arg);
+dma_addr_t knav_queue_pop(void *qhandle, unsigned *size);
+int knav_queue_push(void *qhandle, dma_addr_t dma,
+                                unsigned size, unsigned flags);
+
+void *knav_pool_create(const char *name,
+                                int num_desc, int region_id);
+void knav_pool_destroy(void *ph);
+int knav_pool_count(void *ph);
+void *knav_pool_desc_get(void *ph);
+void knav_pool_desc_put(void *ph, void *desc);
+int knav_pool_desc_map(void *ph, void *desc, unsigned size,
+                                        dma_addr_t *dma, unsigned *dma_sz);
+void *knav_pool_desc_unmap(void *ph, dma_addr_t dma, unsigned dma_sz);
+dma_addr_t knav_pool_desc_virt_to_dma(void *ph, void *virt);
+void *knav_pool_desc_dma_to_virt(void *ph, dma_addr_t dma);
+
+#endif /* __SOC_TI_KNAV_QMSS_H__ */