commit: http://blackfin.uclinux.org/git/?p=linux-kernel;a=commitdiff;h=76d38a1adc135e16234f665d5f8220e8e57aa7cb branch: http://blackfin.uclinux.org/git/?p=linux-kernel;a=shortlog;h=refs/heads/2012R1
Move message queue and debug buffer macro out of machine head. Signed-off-by: Sonic Zhang <[email protected]> --- arch/blackfin/mach-bf561/boards/ezkit.c | 24 +++++++++++++----------- arch/blackfin/mach-bf561/include/mach/icc.h | 11 ----------- 2 files changed, 13 insertions(+), 22 deletions(-) diff --git a/arch/blackfin/mach-bf561/boards/ezkit.c b/arch/blackfin/mach-bf561/boards/ezkit.c index a6c0309..3f4c7f4 100644 --- a/arch/blackfin/mach-bf561/boards/ezkit.c +++ b/arch/blackfin/mach-bf561/boards/ezkit.c @@ -330,26 +330,28 @@ static struct platform_device bfin_spi0_device = { #endif #if defined(CONFIG_ICC) +#include <asm/icc.h> #define BFIN_ICC_NAME "icc" +#define ICC_SLAVE_COUNT 1 -static struct resource bfin_icc_resources[] = { +static struct icc_slave_platform_data bfin_icc_slave_data[ICC_SLAVE_COUNT] = { { - .start = IRQ_SUPPLE_0, /* ICC Low receive IRQ */ - .end = IRQ_SUPPLE_0, - .flags = IORESOURCE_IRQ, - }, - { - .start = IRQ_SUPPLE_1, /* ICC High receive IRQ */ - .end = IRQ_SUPPLE_1, - .flags = IORESOURCE_IRQ, + .irq = IRQ_SUPPLE_0, + .notify = IRQ_SUPPLE_0, }, }; +static struct icc_platform_data bfin_icc_data = { + .slave_count = ICC_SLAVE_COUNT, + .slave_info = bfin_icc_slave_data, +}; + static struct platform_device bfin_icc_device = { .name = BFIN_ICC_NAME, .id = 0, - .num_resources = ARRAY_SIZE(bfin_icc_resources), - .resource = bfin_icc_resources, + .dev = { + .platform_data = &bfin_icc_data, + }, }; #endif diff --git a/arch/blackfin/mach-bf561/include/mach/icc.h b/arch/blackfin/mach-bf561/include/mach/icc.h index 827830c..68ff25c 100644 --- a/arch/blackfin/mach-bf561/include/mach/icc.h +++ b/arch/blackfin/mach-bf561/include/mach/icc.h @@ -12,21 +12,10 @@ #define sm_atomic_read(v) bfin_read16(v) #define sm_atomic_write(v, i) bfin_write16(v, i) -#define MSGQ_START_ADDR 0xFEB18000 -#define MSGQ_SIZE 0x4000 -#define DEBUG_MSG_BUF_ADDR 0xFEB1F000 - #define COREB_TASK_START 0x3C00000 #define COREB_MEMPOOL_START 0x3D00000 #define ICC_CODE_START 0xFEB0000 -#define ICC_LOW_SEND IRQ_SUPPLE_0 -#define ICC_LOW_RECV IRQ_SUPPLE_0 -#define ICC_HIGH_SEND IRQ_SUPPLE_1 -#define ICC_HIGH_RECV IRQ_SUPPLE_1 - #define COREB_ICC_LOW_SEND IRQ_SUPPLE_0 #define COREB_ICC_LOW_RECV IRQ_SUPPLE_0 -#define COREB_ICC_HIGH_SEND IRQ_SUPPLE_1 -#define COREB_ICC_HIGH_RECV IRQ_SUPPLE_1 #endif
_______________________________________________ Linux-kernel-commits mailing list [email protected] https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
