From 0bda624fc7068c5090c97a6cacd0f9617d9c57b5 Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Wed, 1 Jul 2009 21:00:41 +0000 Subject: [PATCH] add the infrastructure to use a MPI/GPIO connected VoIP DSP SVN-Revision: 16650 --- .../brcm63xx/files/arch/mips/bcm63xx/Makefile | 1 + .../arch/mips/bcm63xx/boards/board_bcm963xx.c | 23 +++++++- .../files/arch/mips/bcm63xx/dev-dsp.c | 56 +++++++++++++++++++ .../asm-mips/mach-bcm63xx/bcm63xx_dev_dsp.h | 13 +++++ .../asm-mips/mach-bcm63xx/board_bcm963xx.h | 5 ++ 5 files changed, 97 insertions(+), 1 deletion(-) create mode 100644 target/linux/brcm63xx/files/arch/mips/bcm63xx/dev-dsp.c create mode 100644 target/linux/brcm63xx/files/include/asm-mips/mach-bcm63xx/bcm63xx_dev_dsp.h diff --git a/target/linux/brcm63xx/files/arch/mips/bcm63xx/Makefile b/target/linux/brcm63xx/files/arch/mips/bcm63xx/Makefile index d121274cc3..b9343a8d6c 100644 --- a/target/linux/brcm63xx/files/arch/mips/bcm63xx/Makefile +++ b/target/linux/brcm63xx/files/arch/mips/bcm63xx/Makefile @@ -7,6 +7,7 @@ obj-y += dev-usb-udc.o obj-y += dev-enet.o obj-y += dev-wdt.o obj-y += dev-spi.o +obj-y += dev-dsp.o obj-$(CONFIG_EARLY_PRINTK) += early_printk.o obj-y += boards/ diff --git a/target/linux/brcm63xx/files/arch/mips/bcm63xx/boards/board_bcm963xx.c b/target/linux/brcm63xx/files/arch/mips/bcm63xx/boards/board_bcm963xx.c index 18389983a7..b9ff9759eb 100644 --- a/target/linux/brcm63xx/files/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/target/linux/brcm63xx/files/arch/mips/bcm63xx/boards/board_bcm963xx.c @@ -24,6 +24,7 @@ #include #include #include +#include #include #include #include @@ -114,6 +115,14 @@ static struct board_info __initdata board_96348gw_10 = { .has_ohci0 = 1, .has_pccard = 1, .has_ehci0 = 1, + + .has_dsp = 1, + .dsp = { + .gpio_rst = 6, + .gpio_int = 34, + .cs = 2, + .ext_irq = 2, + }, }; static struct board_info __initdata board_96348gw_11 = { @@ -157,7 +166,15 @@ static struct board_info __initdata board_96348gw = { .force_duplex_full = 1, }, - .has_ohci0 = 1, + .has_ohci0 = 1, + .has_dsp = 1, + + .dsp = { + .gpio_rst = 6, + .gpio_int = 34, + .ext_irq = 2, + .cs = 2, + }, }; static struct board_info __initdata board_FAST2404 = { @@ -559,6 +576,10 @@ int __init board_register_devices(void) if (board.has_udc0) bcm63xx_udc_register(); + + if (board.has_dsp) + bcm63xx_dsp_register(&board.dsp); + /* Generate MAC address for WLAN and * register our SPROM */ #ifdef CONFIG_PCI diff --git a/target/linux/brcm63xx/files/arch/mips/bcm63xx/dev-dsp.c b/target/linux/brcm63xx/files/arch/mips/bcm63xx/dev-dsp.c new file mode 100644 index 0000000000..08a2f75c2a --- /dev/null +++ b/target/linux/brcm63xx/files/arch/mips/bcm63xx/dev-dsp.c @@ -0,0 +1,56 @@ +/* + * Broadcom BCM63xx VoIP DSP registration + * + * This file is subject to the terms and conditions of the GNU General Public + * License. See the file "COPYING" in the main directory of this archive + * for more details. + * + * Copyright (C) 2009 Florian Fainelli + */ + +#include +#include +#include + +#include +#include +#include +#include + +static struct resource voip_dsp_resources[] = { + { + .start = -1, /* filled at runtime */ + .end = -1, /* filled at runtime */ + .flags = IORESOURCE_MEM, + }, + { + .start = -1, /* filled at runtime */ + .flags = IORESOURCE_IRQ, + }, +}; + +static struct platform_device bcm63xx_voip_dsp_device = { + .name = "bcm63xx-voip-dsp", + .id = 0, + .num_resources = ARRAY_SIZE(voip_dsp_resources), + .resource = voip_dsp_resources, +}; + +int __init bcm63xx_dsp_register(const struct bcm63xx_dsp_platform_data *pd) +{ + struct bcm63xx_dsp_platform_data *dpd; + u32 val; + + /* Get the memory window */ + val = bcm_mpi_readl(MPI_CSBASE_REG(pd->cs - 1)); + val &= MPI_CSBASE_BASE_MASK; + voip_dsp_resources[0].start = val; + voip_dsp_resources[0].end = val + 0xFFFFFFF; + voip_dsp_resources[1].start = pd->ext_irq; + + /* copy given platform data */ + dpd = bcm63xx_voip_dsp_device.dev.platform_data; + memcpy(dpd, pd, sizeof (*pd)); + + return platform_device_register(&bcm63xx_voip_dsp_device); +} diff --git a/target/linux/brcm63xx/files/include/asm-mips/mach-bcm63xx/bcm63xx_dev_dsp.h b/target/linux/brcm63xx/files/include/asm-mips/mach-bcm63xx/bcm63xx_dev_dsp.h new file mode 100644 index 0000000000..b587d45c30 --- /dev/null +++ b/target/linux/brcm63xx/files/include/asm-mips/mach-bcm63xx/bcm63xx_dev_dsp.h @@ -0,0 +1,13 @@ +#ifndef __BCM63XX_DSP_H +#define __BCM63XX_DSP_H + +struct bcm63xx_dsp_platform_data { + unsigned gpio_rst; + unsigned gpio_int; + unsigned cs; + unsigned ext_irq; +}; + +int __init bcm63xx_dsp_register(const struct bcm63xx_dsp_platform_data *pd); + +#endif /* __BCM63XX_DSP_H */ diff --git a/target/linux/brcm63xx/files/include/asm-mips/mach-bcm63xx/board_bcm963xx.h b/target/linux/brcm63xx/files/include/asm-mips/mach-bcm63xx/board_bcm963xx.h index 2f357fa87e..85d1e5f418 100644 --- a/target/linux/brcm63xx/files/include/asm-mips/mach-bcm63xx/board_bcm963xx.h +++ b/target/linux/brcm63xx/files/include/asm-mips/mach-bcm63xx/board_bcm963xx.h @@ -3,6 +3,7 @@ #include #include +#include /* * flash mapping @@ -42,10 +43,14 @@ struct board_info { unsigned int has_ohci0:1; unsigned int has_ehci0:1; unsigned int has_udc0:1; + unsigned int has_dsp:1; /* ethernet config */ struct bcm63xx_enet_platform_data enet0; struct bcm63xx_enet_platform_data enet1; + + /* DSP config */ + struct bcm63xx_dsp_platform_data dsp; }; #endif /* ! BOARD_BCM963XX_H_ */