|
@@ -53,6 +53,8 @@
|
|
|
#define D40_ALLOC_PHY (1 << 30)
|
|
|
#define D40_ALLOC_LOG_FREE 0
|
|
|
|
|
|
+#define MAX(a, b) (((a) < (b)) ? (b) : (a))
|
|
|
+
|
|
|
/**
|
|
|
* enum 40_command - The different commands and/or statuses.
|
|
|
*
|
|
@@ -100,8 +102,19 @@ static u32 d40_backup_regs[] = {
|
|
|
|
|
|
#define BACKUP_REGS_SZ ARRAY_SIZE(d40_backup_regs)
|
|
|
|
|
|
-/* TODO: Check if all these registers have to be saved/restored on dma40 v3 */
|
|
|
-static u32 d40_backup_regs_v3[] = {
|
|
|
+/*
|
|
|
+ * since 9540 and 8540 has the same HW revision
|
|
|
+ * use v4a for 9540 or ealier
|
|
|
+ * use v4b for 8540 or later
|
|
|
+ * HW revision:
|
|
|
+ * DB8500ed has revision 0
|
|
|
+ * DB8500v1 has revision 2
|
|
|
+ * DB8500v2 has revision 3
|
|
|
+ * AP9540v1 has revision 4
|
|
|
+ * DB8540v1 has revision 4
|
|
|
+ * TODO: Check if all these registers have to be saved/restored on dma40 v4a
|
|
|
+ */
|
|
|
+static u32 d40_backup_regs_v4a[] = {
|
|
|
D40_DREG_PSEG1,
|
|
|
D40_DREG_PSEG2,
|
|
|
D40_DREG_PSEG3,
|
|
@@ -120,7 +133,32 @@ static u32 d40_backup_regs_v3[] = {
|
|
|
D40_DREG_RCEG4,
|
|
|
};
|
|
|
|
|
|
-#define BACKUP_REGS_SZ_V3 ARRAY_SIZE(d40_backup_regs_v3)
|
|
|
+#define BACKUP_REGS_SZ_V4A ARRAY_SIZE(d40_backup_regs_v4a)
|
|
|
+
|
|
|
+static u32 d40_backup_regs_v4b[] = {
|
|
|
+ D40_DREG_CPSEG1,
|
|
|
+ D40_DREG_CPSEG2,
|
|
|
+ D40_DREG_CPSEG3,
|
|
|
+ D40_DREG_CPSEG4,
|
|
|
+ D40_DREG_CPSEG5,
|
|
|
+ D40_DREG_CPCEG1,
|
|
|
+ D40_DREG_CPCEG2,
|
|
|
+ D40_DREG_CPCEG3,
|
|
|
+ D40_DREG_CPCEG4,
|
|
|
+ D40_DREG_CPCEG5,
|
|
|
+ D40_DREG_CRSEG1,
|
|
|
+ D40_DREG_CRSEG2,
|
|
|
+ D40_DREG_CRSEG3,
|
|
|
+ D40_DREG_CRSEG4,
|
|
|
+ D40_DREG_CRSEG5,
|
|
|
+ D40_DREG_CRCEG1,
|
|
|
+ D40_DREG_CRCEG2,
|
|
|
+ D40_DREG_CRCEG3,
|
|
|
+ D40_DREG_CRCEG4,
|
|
|
+ D40_DREG_CRCEG5,
|
|
|
+};
|
|
|
+
|
|
|
+#define BACKUP_REGS_SZ_V4B ARRAY_SIZE(d40_backup_regs_v4b)
|
|
|
|
|
|
static u32 d40_backup_regs_chan[] = {
|
|
|
D40_CHAN_REG_SSCFG,
|
|
@@ -133,6 +171,102 @@ static u32 d40_backup_regs_chan[] = {
|
|
|
D40_CHAN_REG_SDLNK,
|
|
|
};
|
|
|
|
|
|
+/**
|
|
|
+ * struct d40_interrupt_lookup - lookup table for interrupt handler
|
|
|
+ *
|
|
|
+ * @src: Interrupt mask register.
|
|
|
+ * @clr: Interrupt clear register.
|
|
|
+ * @is_error: true if this is an error interrupt.
|
|
|
+ * @offset: start delta in the lookup_log_chans in d40_base. If equals to
|
|
|
+ * D40_PHY_CHAN, the lookup_phy_chans shall be used instead.
|
|
|
+ */
|
|
|
+struct d40_interrupt_lookup {
|
|
|
+ u32 src;
|
|
|
+ u32 clr;
|
|
|
+ bool is_error;
|
|
|
+ int offset;
|
|
|
+};
|
|
|
+
|
|
|
+
|
|
|
+static struct d40_interrupt_lookup il_v4a[] = {
|
|
|
+ {D40_DREG_LCTIS0, D40_DREG_LCICR0, false, 0},
|
|
|
+ {D40_DREG_LCTIS1, D40_DREG_LCICR1, false, 32},
|
|
|
+ {D40_DREG_LCTIS2, D40_DREG_LCICR2, false, 64},
|
|
|
+ {D40_DREG_LCTIS3, D40_DREG_LCICR3, false, 96},
|
|
|
+ {D40_DREG_LCEIS0, D40_DREG_LCICR0, true, 0},
|
|
|
+ {D40_DREG_LCEIS1, D40_DREG_LCICR1, true, 32},
|
|
|
+ {D40_DREG_LCEIS2, D40_DREG_LCICR2, true, 64},
|
|
|
+ {D40_DREG_LCEIS3, D40_DREG_LCICR3, true, 96},
|
|
|
+ {D40_DREG_PCTIS, D40_DREG_PCICR, false, D40_PHY_CHAN},
|
|
|
+ {D40_DREG_PCEIS, D40_DREG_PCICR, true, D40_PHY_CHAN},
|
|
|
+};
|
|
|
+
|
|
|
+static struct d40_interrupt_lookup il_v4b[] = {
|
|
|
+ {D40_DREG_CLCTIS1, D40_DREG_CLCICR1, false, 0},
|
|
|
+ {D40_DREG_CLCTIS2, D40_DREG_CLCICR2, false, 32},
|
|
|
+ {D40_DREG_CLCTIS3, D40_DREG_CLCICR3, false, 64},
|
|
|
+ {D40_DREG_CLCTIS4, D40_DREG_CLCICR4, false, 96},
|
|
|
+ {D40_DREG_CLCTIS5, D40_DREG_CLCICR5, false, 128},
|
|
|
+ {D40_DREG_CLCEIS1, D40_DREG_CLCICR1, true, 0},
|
|
|
+ {D40_DREG_CLCEIS2, D40_DREG_CLCICR2, true, 32},
|
|
|
+ {D40_DREG_CLCEIS3, D40_DREG_CLCICR3, true, 64},
|
|
|
+ {D40_DREG_CLCEIS4, D40_DREG_CLCICR4, true, 96},
|
|
|
+ {D40_DREG_CLCEIS5, D40_DREG_CLCICR5, true, 128},
|
|
|
+ {D40_DREG_CPCTIS, D40_DREG_CPCICR, false, D40_PHY_CHAN},
|
|
|
+ {D40_DREG_CPCEIS, D40_DREG_CPCICR, true, D40_PHY_CHAN},
|
|
|
+};
|
|
|
+
|
|
|
+/**
|
|
|
+ * struct d40_reg_val - simple lookup struct
|
|
|
+ *
|
|
|
+ * @reg: The register.
|
|
|
+ * @val: The value that belongs to the register in reg.
|
|
|
+ */
|
|
|
+struct d40_reg_val {
|
|
|
+ unsigned int reg;
|
|
|
+ unsigned int val;
|
|
|
+};
|
|
|
+
|
|
|
+static __initdata struct d40_reg_val dma_init_reg_v4a[] = {
|
|
|
+ /* Clock every part of the DMA block from start */
|
|
|
+ { .reg = D40_DREG_GCC, .val = D40_DREG_GCC_ENABLE_ALL},
|
|
|
+
|
|
|
+ /* Interrupts on all logical channels */
|
|
|
+ { .reg = D40_DREG_LCMIS0, .val = 0xFFFFFFFF},
|
|
|
+ { .reg = D40_DREG_LCMIS1, .val = 0xFFFFFFFF},
|
|
|
+ { .reg = D40_DREG_LCMIS2, .val = 0xFFFFFFFF},
|
|
|
+ { .reg = D40_DREG_LCMIS3, .val = 0xFFFFFFFF},
|
|
|
+ { .reg = D40_DREG_LCICR0, .val = 0xFFFFFFFF},
|
|
|
+ { .reg = D40_DREG_LCICR1, .val = 0xFFFFFFFF},
|
|
|
+ { .reg = D40_DREG_LCICR2, .val = 0xFFFFFFFF},
|
|
|
+ { .reg = D40_DREG_LCICR3, .val = 0xFFFFFFFF},
|
|
|
+ { .reg = D40_DREG_LCTIS0, .val = 0xFFFFFFFF},
|
|
|
+ { .reg = D40_DREG_LCTIS1, .val = 0xFFFFFFFF},
|
|
|
+ { .reg = D40_DREG_LCTIS2, .val = 0xFFFFFFFF},
|
|
|
+ { .reg = D40_DREG_LCTIS3, .val = 0xFFFFFFFF}
|
|
|
+};
|
|
|
+static __initdata struct d40_reg_val dma_init_reg_v4b[] = {
|
|
|
+ /* Clock every part of the DMA block from start */
|
|
|
+ { .reg = D40_DREG_GCC, .val = D40_DREG_GCC_ENABLE_ALL},
|
|
|
+
|
|
|
+ /* Interrupts on all logical channels */
|
|
|
+ { .reg = D40_DREG_CLCMIS1, .val = 0xFFFFFFFF},
|
|
|
+ { .reg = D40_DREG_CLCMIS2, .val = 0xFFFFFFFF},
|
|
|
+ { .reg = D40_DREG_CLCMIS3, .val = 0xFFFFFFFF},
|
|
|
+ { .reg = D40_DREG_CLCMIS4, .val = 0xFFFFFFFF},
|
|
|
+ { .reg = D40_DREG_CLCMIS5, .val = 0xFFFFFFFF},
|
|
|
+ { .reg = D40_DREG_CLCICR1, .val = 0xFFFFFFFF},
|
|
|
+ { .reg = D40_DREG_CLCICR2, .val = 0xFFFFFFFF},
|
|
|
+ { .reg = D40_DREG_CLCICR3, .val = 0xFFFFFFFF},
|
|
|
+ { .reg = D40_DREG_CLCICR4, .val = 0xFFFFFFFF},
|
|
|
+ { .reg = D40_DREG_CLCICR5, .val = 0xFFFFFFFF},
|
|
|
+ { .reg = D40_DREG_CLCTIS1, .val = 0xFFFFFFFF},
|
|
|
+ { .reg = D40_DREG_CLCTIS2, .val = 0xFFFFFFFF},
|
|
|
+ { .reg = D40_DREG_CLCTIS3, .val = 0xFFFFFFFF},
|
|
|
+ { .reg = D40_DREG_CLCTIS4, .val = 0xFFFFFFFF},
|
|
|
+ { .reg = D40_DREG_CLCTIS5, .val = 0xFFFFFFFF}
|
|
|
+};
|
|
|
+
|
|
|
/**
|
|
|
* struct d40_lli_pool - Structure for keeping LLIs in memory
|
|
|
*
|
|
@@ -288,6 +422,38 @@ struct d40_chan {
|
|
|
enum dma_transfer_direction runtime_direction;
|
|
|
};
|
|
|
|
|
|
+/**
|
|
|
+ * struct d40_gen_dmac - generic values to represent u8500/u8540 DMA
|
|
|
+ * controller
|
|
|
+ *
|
|
|
+ * @backup: the pointer to the registers address array for backup
|
|
|
+ * @backup_size: the size of the registers address array for backup
|
|
|
+ * @realtime_en: the realtime enable register
|
|
|
+ * @realtime_clear: the realtime clear register
|
|
|
+ * @high_prio_en: the high priority enable register
|
|
|
+ * @high_prio_clear: the high priority clear register
|
|
|
+ * @interrupt_en: the interrupt enable register
|
|
|
+ * @interrupt_clear: the interrupt clear register
|
|
|
+ * @il: the pointer to struct d40_interrupt_lookup
|
|
|
+ * @il_size: the size of d40_interrupt_lookup array
|
|
|
+ * @init_reg: the pointer to the struct d40_reg_val
|
|
|
+ * @init_reg_size: the size of d40_reg_val array
|
|
|
+ */
|
|
|
+struct d40_gen_dmac {
|
|
|
+ u32 *backup;
|
|
|
+ u32 backup_size;
|
|
|
+ u32 realtime_en;
|
|
|
+ u32 realtime_clear;
|
|
|
+ u32 high_prio_en;
|
|
|
+ u32 high_prio_clear;
|
|
|
+ u32 interrupt_en;
|
|
|
+ u32 interrupt_clear;
|
|
|
+ struct d40_interrupt_lookup *il;
|
|
|
+ u32 il_size;
|
|
|
+ struct d40_reg_val *init_reg;
|
|
|
+ u32 init_reg_size;
|
|
|
+};
|
|
|
+
|
|
|
/**
|
|
|
* struct d40_base - The big global struct, one for each probe'd instance.
|
|
|
*
|
|
@@ -326,11 +492,13 @@ struct d40_chan {
|
|
|
* @desc_slab: cache for descriptors.
|
|
|
* @reg_val_backup: Here the values of some hardware registers are stored
|
|
|
* before the DMA is powered off. They are restored when the power is back on.
|
|
|
- * @reg_val_backup_v3: Backup of registers that only exits on dma40 v3 and
|
|
|
- * later.
|
|
|
+ * @reg_val_backup_v4: Backup of registers that only exits on dma40 v3 and
|
|
|
+ * later
|
|
|
* @reg_val_backup_chan: Backup data for standard channel parameter registers.
|
|
|
* @gcc_pwr_off_mask: Mask to maintain the channels that can be turned off.
|
|
|
* @initialized: true if the dma has been initialized
|
|
|
+ * @gen_dmac: the struct for generic registers values to represent u8500/8540
|
|
|
+ * DMA controller
|
|
|
*/
|
|
|
struct d40_base {
|
|
|
spinlock_t interrupt_lock;
|
|
@@ -362,37 +530,11 @@ struct d40_base {
|
|
|
resource_size_t lcpa_size;
|
|
|
struct kmem_cache *desc_slab;
|
|
|
u32 reg_val_backup[BACKUP_REGS_SZ];
|
|
|
- u32 reg_val_backup_v3[BACKUP_REGS_SZ_V3];
|
|
|
+ u32 reg_val_backup_v4[MAX(BACKUP_REGS_SZ_V4A, BACKUP_REGS_SZ_V4B)];
|
|
|
u32 *reg_val_backup_chan;
|
|
|
u16 gcc_pwr_off_mask;
|
|
|
bool initialized;
|
|
|
-};
|
|
|
-
|
|
|
-/**
|
|
|
- * struct d40_interrupt_lookup - lookup table for interrupt handler
|
|
|
- *
|
|
|
- * @src: Interrupt mask register.
|
|
|
- * @clr: Interrupt clear register.
|
|
|
- * @is_error: true if this is an error interrupt.
|
|
|
- * @offset: start delta in the lookup_log_chans in d40_base. If equals to
|
|
|
- * D40_PHY_CHAN, the lookup_phy_chans shall be used instead.
|
|
|
- */
|
|
|
-struct d40_interrupt_lookup {
|
|
|
- u32 src;
|
|
|
- u32 clr;
|
|
|
- bool is_error;
|
|
|
- int offset;
|
|
|
-};
|
|
|
-
|
|
|
-/**
|
|
|
- * struct d40_reg_val - simple lookup struct
|
|
|
- *
|
|
|
- * @reg: The register.
|
|
|
- * @val: The value that belongs to the register in reg.
|
|
|
- */
|
|
|
-struct d40_reg_val {
|
|
|
- unsigned int reg;
|
|
|
- unsigned int val;
|
|
|
+ struct d40_gen_dmac gen_dmac;
|
|
|
};
|
|
|
|
|
|
static struct device *chan2dev(struct d40_chan *d40c)
|
|
@@ -875,11 +1017,11 @@ static void d40_save_restore_registers(struct d40_base *base, bool save)
|
|
|
save);
|
|
|
|
|
|
/* Save/Restore registers only existing on dma40 v3 and later */
|
|
|
- if (base->rev >= 3)
|
|
|
- dma40_backup(base->virtbase, base->reg_val_backup_v3,
|
|
|
- d40_backup_regs_v3,
|
|
|
- ARRAY_SIZE(d40_backup_regs_v3),
|
|
|
- save);
|
|
|
+ if (base->gen_dmac.backup)
|
|
|
+ dma40_backup(base->virtbase, base->reg_val_backup_v4,
|
|
|
+ base->gen_dmac.backup,
|
|
|
+ base->gen_dmac.backup_size,
|
|
|
+ save);
|
|
|
}
|
|
|
#else
|
|
|
static void d40_save_restore_registers(struct d40_base *base, bool save)
|
|
@@ -1470,41 +1612,30 @@ err:
|
|
|
|
|
|
static irqreturn_t d40_handle_interrupt(int irq, void *data)
|
|
|
{
|
|
|
- static const struct d40_interrupt_lookup il[] = {
|
|
|
- {D40_DREG_LCTIS0, D40_DREG_LCICR0, false, 0},
|
|
|
- {D40_DREG_LCTIS1, D40_DREG_LCICR1, false, 32},
|
|
|
- {D40_DREG_LCTIS2, D40_DREG_LCICR2, false, 64},
|
|
|
- {D40_DREG_LCTIS3, D40_DREG_LCICR3, false, 96},
|
|
|
- {D40_DREG_LCEIS0, D40_DREG_LCICR0, true, 0},
|
|
|
- {D40_DREG_LCEIS1, D40_DREG_LCICR1, true, 32},
|
|
|
- {D40_DREG_LCEIS2, D40_DREG_LCICR2, true, 64},
|
|
|
- {D40_DREG_LCEIS3, D40_DREG_LCICR3, true, 96},
|
|
|
- {D40_DREG_PCTIS, D40_DREG_PCICR, false, D40_PHY_CHAN},
|
|
|
- {D40_DREG_PCEIS, D40_DREG_PCICR, true, D40_PHY_CHAN},
|
|
|
- };
|
|
|
-
|
|
|
int i;
|
|
|
- u32 regs[ARRAY_SIZE(il)];
|
|
|
u32 idx;
|
|
|
u32 row;
|
|
|
long chan = -1;
|
|
|
struct d40_chan *d40c;
|
|
|
unsigned long flags;
|
|
|
struct d40_base *base = data;
|
|
|
+ u32 regs[base->gen_dmac.il_size];
|
|
|
+ struct d40_interrupt_lookup *il = base->gen_dmac.il;
|
|
|
+ u32 il_size = base->gen_dmac.il_size;
|
|
|
|
|
|
spin_lock_irqsave(&base->interrupt_lock, flags);
|
|
|
|
|
|
/* Read interrupt status of both logical and physical channels */
|
|
|
- for (i = 0; i < ARRAY_SIZE(il); i++)
|
|
|
+ for (i = 0; i < il_size; i++)
|
|
|
regs[i] = readl(base->virtbase + il[i].src);
|
|
|
|
|
|
for (;;) {
|
|
|
|
|
|
chan = find_next_bit((unsigned long *)regs,
|
|
|
- BITS_PER_LONG * ARRAY_SIZE(il), chan + 1);
|
|
|
+ BITS_PER_LONG * il_size, chan + 1);
|
|
|
|
|
|
/* No more set bits found? */
|
|
|
- if (chan == BITS_PER_LONG * ARRAY_SIZE(il))
|
|
|
+ if (chan == BITS_PER_LONG * il_size)
|
|
|
break;
|
|
|
|
|
|
row = chan / BITS_PER_LONG;
|
|
@@ -2189,12 +2320,14 @@ static void __d40_set_prio_rt(struct d40_chan *d40c, int dev_type, bool src)
|
|
|
{
|
|
|
bool realtime = d40c->dma_cfg.realtime;
|
|
|
bool highprio = d40c->dma_cfg.high_priority;
|
|
|
- u32 rtreg = realtime ? D40_DREG_RSEG1 : D40_DREG_RCEG1;
|
|
|
+ u32 rtreg;
|
|
|
u32 event = D40_TYPE_TO_EVENT(dev_type);
|
|
|
u32 group = D40_TYPE_TO_GROUP(dev_type);
|
|
|
u32 bit = 1 << event;
|
|
|
u32 prioreg;
|
|
|
+ struct d40_gen_dmac *dmac = &d40c->base->gen_dmac;
|
|
|
|
|
|
+ rtreg = realtime ? dmac->realtime_en : dmac->realtime_clear;
|
|
|
/*
|
|
|
* Due to a hardware bug, in some cases a logical channel triggered by
|
|
|
* a high priority destination event line can generate extra packet
|
|
@@ -2206,7 +2339,7 @@ static void __d40_set_prio_rt(struct d40_chan *d40c, int dev_type, bool src)
|
|
|
if (!src && chan_is_logical(d40c))
|
|
|
highprio = false;
|
|
|
|
|
|
- prioreg = highprio ? D40_DREG_PSEG1 : D40_DREG_PCEG1;
|
|
|
+ prioreg = highprio ? dmac->high_prio_en : dmac->high_prio_clear;
|
|
|
|
|
|
/* Destination event lines are stored in the upper halfword */
|
|
|
if (!src)
|
|
@@ -3056,6 +3189,36 @@ static struct d40_base * __init d40_hw_detect_init(struct platform_device *pdev)
|
|
|
base->phy_chans = ((void *)base) + ALIGN(sizeof(struct d40_base), 4);
|
|
|
base->log_chans = &base->phy_chans[num_phy_chans];
|
|
|
|
|
|
+ if (base->plat_data->num_of_phy_chans == 14) {
|
|
|
+ base->gen_dmac.backup = d40_backup_regs_v4b;
|
|
|
+ base->gen_dmac.backup_size = BACKUP_REGS_SZ_V4B;
|
|
|
+ base->gen_dmac.interrupt_en = D40_DREG_CPCMIS;
|
|
|
+ base->gen_dmac.interrupt_clear = D40_DREG_CPCICR;
|
|
|
+ base->gen_dmac.realtime_en = D40_DREG_CRSEG1;
|
|
|
+ base->gen_dmac.realtime_clear = D40_DREG_CRCEG1;
|
|
|
+ base->gen_dmac.high_prio_en = D40_DREG_CPSEG1;
|
|
|
+ base->gen_dmac.high_prio_clear = D40_DREG_CPCEG1;
|
|
|
+ base->gen_dmac.il = il_v4b;
|
|
|
+ base->gen_dmac.il_size = ARRAY_SIZE(il_v4b);
|
|
|
+ base->gen_dmac.init_reg = dma_init_reg_v4b;
|
|
|
+ base->gen_dmac.init_reg_size = ARRAY_SIZE(dma_init_reg_v4b);
|
|
|
+ } else {
|
|
|
+ if (base->rev >= 3) {
|
|
|
+ base->gen_dmac.backup = d40_backup_regs_v4a;
|
|
|
+ base->gen_dmac.backup_size = BACKUP_REGS_SZ_V4A;
|
|
|
+ }
|
|
|
+ base->gen_dmac.interrupt_en = D40_DREG_PCMIS;
|
|
|
+ base->gen_dmac.interrupt_clear = D40_DREG_PCICR;
|
|
|
+ base->gen_dmac.realtime_en = D40_DREG_RSEG1;
|
|
|
+ base->gen_dmac.realtime_clear = D40_DREG_RCEG1;
|
|
|
+ base->gen_dmac.high_prio_en = D40_DREG_PSEG1;
|
|
|
+ base->gen_dmac.high_prio_clear = D40_DREG_PCEG1;
|
|
|
+ base->gen_dmac.il = il_v4a;
|
|
|
+ base->gen_dmac.il_size = ARRAY_SIZE(il_v4a);
|
|
|
+ base->gen_dmac.init_reg = dma_init_reg_v4a;
|
|
|
+ base->gen_dmac.init_reg_size = ARRAY_SIZE(dma_init_reg_v4a);
|
|
|
+ }
|
|
|
+
|
|
|
base->phy_res = kzalloc(num_phy_chans * sizeof(struct d40_phy_res),
|
|
|
GFP_KERNEL);
|
|
|
if (!base->phy_res)
|
|
@@ -3127,31 +3290,15 @@ failure:
|
|
|
static void __init d40_hw_init(struct d40_base *base)
|
|
|
{
|
|
|
|
|
|
- static struct d40_reg_val dma_init_reg[] = {
|
|
|
- /* Clock every part of the DMA block from start */
|
|
|
- { .reg = D40_DREG_GCC, .val = D40_DREG_GCC_ENABLE_ALL},
|
|
|
-
|
|
|
- /* Interrupts on all logical channels */
|
|
|
- { .reg = D40_DREG_LCMIS0, .val = 0xFFFFFFFF},
|
|
|
- { .reg = D40_DREG_LCMIS1, .val = 0xFFFFFFFF},
|
|
|
- { .reg = D40_DREG_LCMIS2, .val = 0xFFFFFFFF},
|
|
|
- { .reg = D40_DREG_LCMIS3, .val = 0xFFFFFFFF},
|
|
|
- { .reg = D40_DREG_LCICR0, .val = 0xFFFFFFFF},
|
|
|
- { .reg = D40_DREG_LCICR1, .val = 0xFFFFFFFF},
|
|
|
- { .reg = D40_DREG_LCICR2, .val = 0xFFFFFFFF},
|
|
|
- { .reg = D40_DREG_LCICR3, .val = 0xFFFFFFFF},
|
|
|
- { .reg = D40_DREG_LCTIS0, .val = 0xFFFFFFFF},
|
|
|
- { .reg = D40_DREG_LCTIS1, .val = 0xFFFFFFFF},
|
|
|
- { .reg = D40_DREG_LCTIS2, .val = 0xFFFFFFFF},
|
|
|
- { .reg = D40_DREG_LCTIS3, .val = 0xFFFFFFFF}
|
|
|
- };
|
|
|
int i;
|
|
|
u32 prmseo[2] = {0, 0};
|
|
|
u32 activeo[2] = {0xFFFFFFFF, 0xFFFFFFFF};
|
|
|
u32 pcmis = 0;
|
|
|
u32 pcicr = 0;
|
|
|
+ struct d40_reg_val *dma_init_reg = base->gen_dmac.init_reg;
|
|
|
+ u32 reg_size = base->gen_dmac.init_reg_size;
|
|
|
|
|
|
- for (i = 0; i < ARRAY_SIZE(dma_init_reg); i++)
|
|
|
+ for (i = 0; i < reg_size; i++)
|
|
|
writel(dma_init_reg[i].val,
|
|
|
base->virtbase + dma_init_reg[i].reg);
|
|
|
|
|
@@ -3184,11 +3331,14 @@ static void __init d40_hw_init(struct d40_base *base)
|
|
|
writel(activeo[0], base->virtbase + D40_DREG_ACTIVO);
|
|
|
|
|
|
/* Write which interrupt to enable */
|
|
|
- writel(pcmis, base->virtbase + D40_DREG_PCMIS);
|
|
|
+ writel(pcmis, base->virtbase + base->gen_dmac.interrupt_en);
|
|
|
|
|
|
/* Write which interrupt to clear */
|
|
|
- writel(pcicr, base->virtbase + D40_DREG_PCICR);
|
|
|
+ writel(pcicr, base->virtbase + base->gen_dmac.interrupt_clear);
|
|
|
|
|
|
+ /* These are __initdata and cannot be accessed after init */
|
|
|
+ base->gen_dmac.init_reg = NULL;
|
|
|
+ base->gen_dmac.init_reg_size = 0;
|
|
|
}
|
|
|
|
|
|
static int __init d40_lcla_allocate(struct d40_base *base)
|