diff for duplicates of <20100527130337.925751129@mandriva.com> diff --git a/a/1.txt b/N1/1.txt index dc5c96a..d7a2360 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,118 +1,3 @@ -This patch add audio related definitions and functions - - -Signed-off-by: Arnaud Patard <apatard@mandriva.com> - -Index: sound-2.6/arch/arm/mach-kirkwood/common.c -=================================================================== ---- sound-2.6.orig/arch/arm/mach-kirkwood/common.c 2010-05-27 14:09:33.244174174 +0200 -+++ sound-2.6/arch/arm/mach-kirkwood/common.c 2010-05-27 14:09:35.840194356 +0200 -@@ -25,6 +25,7 @@ - #include <asm/mach/time.h> - #include <mach/kirkwood.h> - #include <mach/bridge-regs.h> -+#include <plat/audio.h> - #include <plat/cache-feroceon-l2.h> - #include <plat/ehci-orion.h> - #include <plat/mvsdio.h> -@@ -855,6 +856,42 @@ struct sys_timer kirkwood_timer = { - .init = kirkwood_timer_init, - }; - -+/***************************************************************************** -+ * Audio -+ ****************************************************************************/ -+static struct resource kirkwood_i2s_resources[] = { -+ [0] = { -+ .start = AUDIO_PHYS_BASE, -+ .end = AUDIO_PHYS_BASE + SZ_16K - 1, -+ .flags = IORESOURCE_MEM, -+ }, -+ [1] = { -+ .start = IRQ_KIRKWOOD_I2S, -+ .end = IRQ_KIRKWOOD_I2S, -+ .flags = IORESOURCE_IRQ, -+ }, -+}; -+ -+static struct kirkwood_asoc_platform_data kirkwood_i2s_data = { -+ .dram = &kirkwood_mbus_dram_info, -+ .burst = 128, -+}; -+ -+static struct platform_device kirkwood_i2s_device = { -+ .name = "kirkwood-i2s", -+ .id = -1, -+ .num_resources = ARRAY_SIZE(kirkwood_i2s_resources), -+ .resource = kirkwood_i2s_resources, -+ .dev = { -+ .platform_data = &kirkwood_i2s_data, -+ }, -+}; -+ -+void __init kirkwood_audio_init(void) -+{ -+ kirkwood_clk_ctrl |= CGC_AUDIO; -+ platform_device_register(&kirkwood_i2s_device); -+} - - /***************************************************************************** - * General -@@ -914,6 +951,7 @@ void __init kirkwood_init(void) - kirkwood_spi_plat_data.tclk = kirkwood_tclk; - kirkwood_uart0_data[0].uartclk = kirkwood_tclk; - kirkwood_uart1_data[0].uartclk = kirkwood_tclk; -+ kirkwood_i2s_data.tclk = kirkwood_tclk; - - /* - * Disable propagation of mbus errors to the CPU local bus, -Index: sound-2.6/arch/arm/mach-kirkwood/common.h -=================================================================== ---- sound-2.6.orig/arch/arm/mach-kirkwood/common.h 2010-05-27 14:09:33.204173835 +0200 -+++ sound-2.6/arch/arm/mach-kirkwood/common.h 2010-05-27 14:09:35.883694381 +0200 -@@ -16,6 +16,7 @@ struct mv643xx_eth_platform_data; - struct mv_sata_platform_data; - struct mvsdio_platform_data; - struct mtd_partition; -+struct kirkwood_asoc_platform_data; - - /* - * Basic Kirkwood init functions used early by machine-setup. -@@ -41,6 +42,7 @@ void kirkwood_i2c_init(void); - void kirkwood_uart0_init(void); - void kirkwood_uart1_init(void); - void kirkwood_nand_init(struct mtd_partition *parts, int nr_parts, int delay); -+void kirkwood_audio_init(void); - - extern int kirkwood_tclk; - extern struct sys_timer kirkwood_timer; -Index: sound-2.6/arch/arm/mach-kirkwood/include/mach/kirkwood.h -=================================================================== ---- sound-2.6.orig/arch/arm/mach-kirkwood/include/mach/kirkwood.h 2010-05-27 14:09:33.188174747 +0200 -+++ sound-2.6/arch/arm/mach-kirkwood/include/mach/kirkwood.h 2010-05-27 14:09:35.895694344 +0200 -@@ -96,6 +96,9 @@ - - #define SDIO_PHYS_BASE (KIRKWOOD_REGS_PHYS_BASE | 0x90000) - -+#define AUDIO_PHYS_BASE (KIRKWOOD_REGS_PHYS_BASE | 0xA0000) -+#define AUDIO_VIRT_BASE (KIRKWOOD_REGS_VIRT_BASE | 0xA0000) -+ - /* - * Supported devices and revisions. - */ -Index: sound-2.6/arch/arm/plat-orion/include/plat/audio.h -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ sound-2.6/arch/arm/plat-orion/include/plat/audio.h 2010-05-27 14:09:35.895694344 +0200 -@@ -0,0 +1,11 @@ -+#ifndef __PLAT_AUDIO_H -+#define __PLAT_AUDIO_H -+ -+#include <linux/mbus.h> -+ -+struct kirkwood_asoc_platform_data { -+ u32 tclk; -+ struct mbus_dram_target_info *dram; -+ int burst; -+}; -+#endif +An embedded and charset-unspecified text was scrubbed... +Name: kirkwood_add_audio_dev.patch +URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20100527/86aa58b8/attachment.el> diff --git a/a/content_digest b/N1/content_digest index 21328c8..5512d95 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,135 +1,12 @@ "ref\020100527125737.524554667@mandriva.com\0" - "From\0apatard@mandriva.com\0" + "From\0apatard@mandriva.com (apatard at mandriva.com)\0" "Subject\0[patch 1/6] orion/kirkwood: add audio functions.\0" "Date\0Thu, 27 May 2010 14:57:38 +0200\0" - "To\0alsa-devel@alsa-project.org\0" - "Cc\0nico@fluxnic.net" - broonie@opensource.wolfsonmicro.com - saeed@marvell.com - Arnaud Patard <apatard@mandriva.com> - tbm@cyrius.com - linux-arm-kernel@lists.infradead.org - " lrg@slimlogic.co.uk\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" - "fn\0kirkwood_add_audio_dev.patch\0" "b\0" - "This patch add audio related definitions and functions\n" - "\n" - "\n" - "Signed-off-by: Arnaud Patard <apatard@mandriva.com>\n" - "\n" - "Index: sound-2.6/arch/arm/mach-kirkwood/common.c\n" - "===================================================================\n" - "--- sound-2.6.orig/arch/arm/mach-kirkwood/common.c\t2010-05-27 14:09:33.244174174 +0200\n" - "+++ sound-2.6/arch/arm/mach-kirkwood/common.c\t2010-05-27 14:09:35.840194356 +0200\n" - "@@ -25,6 +25,7 @@\n" - " #include <asm/mach/time.h>\n" - " #include <mach/kirkwood.h>\n" - " #include <mach/bridge-regs.h>\n" - "+#include <plat/audio.h>\n" - " #include <plat/cache-feroceon-l2.h>\n" - " #include <plat/ehci-orion.h>\n" - " #include <plat/mvsdio.h>\n" - "@@ -855,6 +856,42 @@ struct sys_timer kirkwood_timer = {\n" - " \t.init = kirkwood_timer_init,\n" - " };\n" - " \n" - "+/*****************************************************************************\n" - "+ * Audio\n" - "+ ****************************************************************************/\n" - "+static struct resource kirkwood_i2s_resources[] = {\n" - "+\t[0] = {\n" - "+\t\t.start = AUDIO_PHYS_BASE,\n" - "+\t\t.end = AUDIO_PHYS_BASE + SZ_16K - 1,\n" - "+\t\t.flags = IORESOURCE_MEM,\n" - "+\t},\n" - "+\t[1] = {\n" - "+\t\t.start = IRQ_KIRKWOOD_I2S,\n" - "+\t\t.end = IRQ_KIRKWOOD_I2S,\n" - "+\t\t.flags = IORESOURCE_IRQ,\n" - "+\t},\n" - "+};\n" - "+\n" - "+static struct kirkwood_asoc_platform_data kirkwood_i2s_data = {\n" - "+\t.dram = &kirkwood_mbus_dram_info,\n" - "+\t.burst = 128,\n" - "+};\n" - "+\n" - "+static struct platform_device kirkwood_i2s_device = {\n" - "+\t.name\t\t= \"kirkwood-i2s\",\n" - "+\t.id\t\t= -1,\n" - "+\t.num_resources\t= ARRAY_SIZE(kirkwood_i2s_resources),\n" - "+\t.resource\t= kirkwood_i2s_resources,\n" - "+\t.dev\t\t= {\n" - "+\t\t.platform_data\t= &kirkwood_i2s_data,\n" - "+\t},\n" - "+};\n" - "+\n" - "+void __init kirkwood_audio_init(void)\n" - "+{\n" - "+\tkirkwood_clk_ctrl |= CGC_AUDIO;\n" - "+\tplatform_device_register(&kirkwood_i2s_device);\n" - "+}\n" - " \n" - " /*****************************************************************************\n" - " * General\n" - "@@ -914,6 +951,7 @@ void __init kirkwood_init(void)\n" - " \tkirkwood_spi_plat_data.tclk = kirkwood_tclk;\n" - " \tkirkwood_uart0_data[0].uartclk = kirkwood_tclk;\n" - " \tkirkwood_uart1_data[0].uartclk = kirkwood_tclk;\n" - "+\tkirkwood_i2s_data.tclk = kirkwood_tclk;\n" - " \n" - " \t/*\n" - " \t * Disable propagation of mbus errors to the CPU local bus,\n" - "Index: sound-2.6/arch/arm/mach-kirkwood/common.h\n" - "===================================================================\n" - "--- sound-2.6.orig/arch/arm/mach-kirkwood/common.h\t2010-05-27 14:09:33.204173835 +0200\n" - "+++ sound-2.6/arch/arm/mach-kirkwood/common.h\t2010-05-27 14:09:35.883694381 +0200\n" - "@@ -16,6 +16,7 @@ struct mv643xx_eth_platform_data;\n" - " struct mv_sata_platform_data;\n" - " struct mvsdio_platform_data;\n" - " struct mtd_partition;\n" - "+struct kirkwood_asoc_platform_data;\n" - " \n" - " /*\n" - " * Basic Kirkwood init functions used early by machine-setup.\n" - "@@ -41,6 +42,7 @@ void kirkwood_i2c_init(void);\n" - " void kirkwood_uart0_init(void);\n" - " void kirkwood_uart1_init(void);\n" - " void kirkwood_nand_init(struct mtd_partition *parts, int nr_parts, int delay);\n" - "+void kirkwood_audio_init(void);\n" - " \n" - " extern int kirkwood_tclk;\n" - " extern struct sys_timer kirkwood_timer;\n" - "Index: sound-2.6/arch/arm/mach-kirkwood/include/mach/kirkwood.h\n" - "===================================================================\n" - "--- sound-2.6.orig/arch/arm/mach-kirkwood/include/mach/kirkwood.h\t2010-05-27 14:09:33.188174747 +0200\n" - "+++ sound-2.6/arch/arm/mach-kirkwood/include/mach/kirkwood.h\t2010-05-27 14:09:35.895694344 +0200\n" - "@@ -96,6 +96,9 @@\n" - " \n" - " #define SDIO_PHYS_BASE\t\t(KIRKWOOD_REGS_PHYS_BASE | 0x90000)\n" - " \n" - "+#define AUDIO_PHYS_BASE\t\t(KIRKWOOD_REGS_PHYS_BASE | 0xA0000)\n" - "+#define AUDIO_VIRT_BASE\t\t(KIRKWOOD_REGS_VIRT_BASE | 0xA0000)\n" - "+\n" - " /*\n" - " * Supported devices and revisions.\n" - " */\n" - "Index: sound-2.6/arch/arm/plat-orion/include/plat/audio.h\n" - "===================================================================\n" - "--- /dev/null\t1970-01-01 00:00:00.000000000 +0000\n" - "+++ sound-2.6/arch/arm/plat-orion/include/plat/audio.h\t2010-05-27 14:09:35.895694344 +0200\n" - "@@ -0,0 +1,11 @@\n" - "+#ifndef __PLAT_AUDIO_H\n" - "+#define __PLAT_AUDIO_H\n" - "+\n" - "+#include <linux/mbus.h>\n" - "+\n" - "+struct kirkwood_asoc_platform_data {\n" - "+\tu32 tclk;\n" - "+\tstruct mbus_dram_target_info *dram;\n" - "+\tint burst;\n" - "+};\n" - +#endif + "An embedded and charset-unspecified text was scrubbed...\n" + "Name: kirkwood_add_audio_dev.patch\n" + URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20100527/86aa58b8/attachment.el> -88f2a3ed8c6cc58f4855e8a97734f42c15237c4bca41f3490e7fe489beca9752 +814c2955b8e6a6eb5c013c4d60d794a64057766f4e8b9cb1b1a4ff6f5f2cc08d
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.