Blackfin arch: initial supporting for BF548-EZKIT

The ADSP-BF54x was specifically designed to meet the needs of convergent multimedia
applications where system performance and cost are essential ingredients. The
integration of multimedia, human interface, and connectivity peripherals combined
with increased system bandwidth and on-chip memory provides customers a platform to
design the most demanding applications.

Since now, ADSP-BF54x will be supported in the Linux kernel and bunch of related drivers
such as USB OTG, ATAPI, NAND flash controller, LCD framebuffer, sound, touch screen will
be submitted later.

Please enjoy the show.

Signed-off-by: Roy Huang <roy.huang@analog.com>
Signed-off-by: Bryan Wu <bryan.wu@analog.com>

3 files changed, 6 insertions, 207 deletions

diff --git a/arch/blackfin/kernel/Makefile b/arch/blackfin/kernel/Makefile
index f3b7d2f9d49c..93d21406cade 100644
--- a/arch/blackfin/kernel/Makefile
+++ b/arch/blackfin/kernel/Makefile
@@ -6,9 +6,10 @@ extra-y := init_task.o vmlinux.lds
 
 obj-y := \
         entry.o process.o bfin_ksyms.o ptrace.o setup.o signal.o \
-        sys_bfin.o time.o traps.o irqchip.o dma-mapping.o bfin_gpio.o \
-        flat.o
+        sys_bfin.o time.o traps.o irqchip.o dma-mapping.o flat.o
 
+obj-$(CONFIG_BF53x)                  += bfin_gpio.o
+obj-$(CONFIG_BF561)                  += bfin_gpio.o
 obj-$(CONFIG_MODULES)                += module.o
 obj-$(CONFIG_BFIN_DMA_5XX)           += bfin_dma_5xx.o
 obj-$(CONFIG_DUAL_CORE_TEST_MODULE)  += dualcore_test.o
diff --git a/arch/blackfin/kernel/bfin_dma_5xx.c b/arch/blackfin/kernel/bfin_dma_5xx.c
index 069a896a8f26..8a16c2bbec04 100644
--- a/arch/blackfin/kernel/bfin_dma_5xx.c
+++ b/arch/blackfin/kernel/bfin_dma_5xx.c
@@ -34,6 +34,7 @@
 #include <linux/kernel.h>
 #include <linux/param.h>
 
+#include <asm/blackfin.h>
 #include <asm/dma.h>
 #include <asm/cacheflush.h>
 
@@ -45,67 +46,6 @@
 ***************************************************************************/
 
 static struct dma_channel dma_ch[MAX_BLACKFIN_DMA_CHANNEL];
-#if defined (CONFIG_BF561)
-static struct dma_register *base_addr[MAX_BLACKFIN_DMA_CHANNEL] = {
-        (struct dma_register *) DMA1_0_NEXT_DESC_PTR,
-        (struct dma_register *) DMA1_1_NEXT_DESC_PTR,
-        (struct dma_register *) DMA1_2_NEXT_DESC_PTR,
-        (struct dma_register *) DMA1_3_NEXT_DESC_PTR,
-        (struct dma_register *) DMA1_4_NEXT_DESC_PTR,
-        (struct dma_register *) DMA1_5_NEXT_DESC_PTR,
-        (struct dma_register *) DMA1_6_NEXT_DESC_PTR,
-        (struct dma_register *) DMA1_7_NEXT_DESC_PTR,
-        (struct dma_register *) DMA1_8_NEXT_DESC_PTR,
-        (struct dma_register *) DMA1_9_NEXT_DESC_PTR,
-        (struct dma_register *) DMA1_10_NEXT_DESC_PTR,
-        (struct dma_register *) DMA1_11_NEXT_DESC_PTR,
-        (struct dma_register *) DMA2_0_NEXT_DESC_PTR,
-        (struct dma_register *) DMA2_1_NEXT_DESC_PTR,
-        (struct dma_register *) DMA2_2_NEXT_DESC_PTR,
-        (struct dma_register *) DMA2_3_NEXT_DESC_PTR,
-        (struct dma_register *) DMA2_4_NEXT_DESC_PTR,
-        (struct dma_register *) DMA2_5_NEXT_DESC_PTR,
-        (struct dma_register *) DMA2_6_NEXT_DESC_PTR,
-        (struct dma_register *) DMA2_7_NEXT_DESC_PTR,
-        (struct dma_register *) DMA2_8_NEXT_DESC_PTR,
-        (struct dma_register *) DMA2_9_NEXT_DESC_PTR,
-        (struct dma_register *) DMA2_10_NEXT_DESC_PTR,
-        (struct dma_register *) DMA2_11_NEXT_DESC_PTR,
-        (struct dma_register *) MDMA1_D0_NEXT_DESC_PTR,
-        (struct dma_register *) MDMA1_S0_NEXT_DESC_PTR,
-        (struct dma_register *) MDMA1_D1_NEXT_DESC_PTR,
-        (struct dma_register *) MDMA1_S1_NEXT_DESC_PTR,
-        (struct dma_register *) MDMA2_D0_NEXT_DESC_PTR,
-        (struct dma_register *) MDMA2_S0_NEXT_DESC_PTR,
-        (struct dma_register *) MDMA2_D1_NEXT_DESC_PTR,
-        (struct dma_register *) MDMA2_S1_NEXT_DESC_PTR,
-        (struct dma_register *) IMDMA_D0_NEXT_DESC_PTR,
-        (struct dma_register *) IMDMA_S0_NEXT_DESC_PTR,
-        (struct dma_register *) IMDMA_D1_NEXT_DESC_PTR,
-        (struct dma_register *) IMDMA_S1_NEXT_DESC_PTR,
-};
-#else
-static struct dma_register *base_addr[MAX_BLACKFIN_DMA_CHANNEL] = {
-        (struct dma_register *) DMA0_NEXT_DESC_PTR,
-        (struct dma_register *) DMA1_NEXT_DESC_PTR,
-        (struct dma_register *) DMA2_NEXT_DESC_PTR,
-        (struct dma_register *) DMA3_NEXT_DESC_PTR,
-        (struct dma_register *) DMA4_NEXT_DESC_PTR,
-        (struct dma_register *) DMA5_NEXT_DESC_PTR,
-        (struct dma_register *) DMA6_NEXT_DESC_PTR,
-        (struct dma_register *) DMA7_NEXT_DESC_PTR,
-#if (defined(CONFIG_BF537) || defined(CONFIG_BF534) || defined(CONFIG_BF536))
-        (struct dma_register *) DMA8_NEXT_DESC_PTR,
-        (struct dma_register *) DMA9_NEXT_DESC_PTR,
-        (struct dma_register *) DMA10_NEXT_DESC_PTR,
-        (struct dma_register *) DMA11_NEXT_DESC_PTR,
-#endif
-        (struct dma_register *) MDMA_D0_NEXT_DESC_PTR,
-        (struct dma_register *) MDMA_S0_NEXT_DESC_PTR,
-        (struct dma_register *) MDMA_D1_NEXT_DESC_PTR,
-        (struct dma_register *) MDMA_S1_NEXT_DESC_PTR,
-};
-#endif
 
 /*------------------------------------------------------------------------------
  *       Set the Buffer Clear bit in the Configuration register of specific DMA
@@ -138,149 +78,6 @@ static int __init blackfin_dma_init(void)
 
 arch_initcall(blackfin_dma_init);
 
-/*
- *      Form the channel find the irq number for that channel.
- */
-#if !defined(CONFIG_BF561)
-
-static int bf533_channel2irq(unsigned int channel)
-{
-        int ret_irq = -1;
-
-        switch (channel) {
-        case CH_PPI:
-                ret_irq = IRQ_PPI;
-                break;
-
-#if (defined(CONFIG_BF537) || defined(CONFIG_BF534) || defined(CONFIG_BF536))
-        case CH_EMAC_RX:
-                ret_irq = IRQ_MAC_RX;
-                break;
-
-        case CH_EMAC_TX:
-                ret_irq = IRQ_MAC_TX;
-                break;
-
-        case CH_UART1_RX:
-                ret_irq = IRQ_UART1_RX;
-                break;
-
-        case CH_UART1_TX:
-                ret_irq = IRQ_UART1_TX;
-                break;
-#endif
-
-        case CH_SPORT0_RX:
-                ret_irq = IRQ_SPORT0_RX;
-                break;
-
-        case CH_SPORT0_TX:
-                ret_irq = IRQ_SPORT0_TX;
-                break;
-
-        case CH_SPORT1_RX:
-                ret_irq = IRQ_SPORT1_RX;
-                break;
-
-        case CH_SPORT1_TX:
-                ret_irq = IRQ_SPORT1_TX;
-                break;
-
-        case CH_SPI:
-                ret_irq = IRQ_SPI;
-                break;
-
-        case CH_UART_RX:
-                ret_irq = IRQ_UART_RX;
-                break;
-
-        case CH_UART_TX:
-                ret_irq = IRQ_UART_TX;
-                break;
-
-        case CH_MEM_STREAM0_SRC:
-        case CH_MEM_STREAM0_DEST:
-                ret_irq = IRQ_MEM_DMA0;
-                break;
-
-        case CH_MEM_STREAM1_SRC:
-        case CH_MEM_STREAM1_DEST:
-                ret_irq = IRQ_MEM_DMA1;
-                break;
-        }
-        return ret_irq;
-}
-
-# define channel2irq(channel) bf533_channel2irq(channel)
-
-#else
-
-static int bf561_channel2irq(unsigned int channel)
-{
-        int ret_irq = -1;
-
-        switch (channel) {
-        case CH_PPI0:
-                ret_irq = IRQ_PPI0;
-                break;
-        case CH_PPI1:
-                ret_irq = IRQ_PPI1;
-                break;
-        case CH_SPORT0_RX:
-                ret_irq = IRQ_SPORT0_RX;
-                break;
-        case CH_SPORT0_TX:
-                ret_irq = IRQ_SPORT0_TX;
-                break;
-        case CH_SPORT1_RX:
-                ret_irq = IRQ_SPORT1_RX;
-                break;
-        case CH_SPORT1_TX:
-                ret_irq = IRQ_SPORT1_TX;
-                break;
-        case CH_SPI:
-                ret_irq = IRQ_SPI;
-                break;
-        case CH_UART_RX:
-                ret_irq = IRQ_UART_RX;
-                break;
-        case CH_UART_TX:
-                ret_irq = IRQ_UART_TX;
-                break;
-
-        case CH_MEM_STREAM0_SRC:
-        case CH_MEM_STREAM0_DEST:
-                ret_irq = IRQ_MEM_DMA0;
-                break;
-        case CH_MEM_STREAM1_SRC:
-        case CH_MEM_STREAM1_DEST:
-                ret_irq = IRQ_MEM_DMA1;
-                break;
-        case CH_MEM_STREAM2_SRC:
-        case CH_MEM_STREAM2_DEST:
-                ret_irq = IRQ_MEM_DMA2;
-                break;
-        case CH_MEM_STREAM3_SRC:
-        case CH_MEM_STREAM3_DEST:
-                ret_irq = IRQ_MEM_DMA3;
-                break;
-
-        case CH_IMEM_STREAM0_SRC:
-        case CH_IMEM_STREAM0_DEST:
-                ret_irq = IRQ_IMEM_DMA0;
-                break;
-        case CH_IMEM_STREAM1_SRC:
-        case CH_IMEM_STREAM1_DEST:
-                ret_irq = IRQ_IMEM_DMA1;
-                break;
-        }
-        return ret_irq;
-}
-
-# define channel2irq(channel) bf561_channel2irq(channel)
-
-#endif
-
 /*------------------------------------------------------------------------------
  *      Request the specific DMA channel from the system.
  *-----------------------------------------------------------------------------*/
diff --git a/arch/blackfin/kernel/setup.c b/arch/blackfin/kernel/setup.c
index 83060f98d15d..76bf2cea61d7 100644
--- a/arch/blackfin/kernel/setup.c
+++ b/arch/blackfin/kernel/setup.c
@@ -500,8 +500,9 @@ static void __fill_code_cplbtab(struct cplb_tab *t, int i,
                                         cplb_data[i].end,
                                         SIZE_4M,
                                         cplb_data[i].i_conf);
-                } else {
+                } else
 #endif
+                {
                         fill_cplbtab(t,
                                         cplb_data[i].start,
                                         a_start,