diff for duplicates of <20100519001533.GY5818@atomide.com> diff --git a/a/1.txt b/N1/1.txt index c536090..9a0954e 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -14,3 +14,10 @@ rebased on what's in for-next. Regards, Tony +-------------- next part -------------- +A non-text attachment was scrubbed... +Name: omap-i2c-multiboot.patch +Type: text/x-diff +Size: 2971 bytes +Desc: not available +URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20100518/1de7ff10/attachment-0001.bin> diff --git a/a/2.hdr b/a/2.hdr deleted file mode 100644 index e30cee2..0000000 --- a/a/2.hdr +++ /dev/null @@ -1,2 +0,0 @@ -Content-Type: text/x-diff; charset=us-ascii -Content-Disposition: inline; filename="omap-i2c-multiboot.patch" diff --git a/a/2.txt b/a/2.txt deleted file mode 100644 index ca8f860..0000000 --- a/a/2.txt +++ /dev/null @@ -1,112 +0,0 @@ -From: Tony Lindgren <tony@atomide.com> -Date: Tue, 18 May 2010 16:19:15 -0700 -Subject: [PATCH] omap: Fix i2c platform init code for omap4 - -Add separate omap_i2c_add_bus functions for mach-omap1 -and mach-omap2. Make the mach-omap2 init set the interrupt -dynamically to support. - -This is needed to add support for omap4 in a way that -works with multi-omap builds. This will eventually get -fixed in a generic way with the omap hwmods. - -Signed-off-by: Tony Lindgren <tony@atomide.com> - -diff --git a/arch/arm/plat-omap/i2c.c b/arch/arm/plat-omap/i2c.c -index f044b59..78d1cea 100644 ---- a/arch/arm/plat-omap/i2c.c -+++ b/arch/arm/plat-omap/i2c.c -@@ -100,33 +100,44 @@ static int __init omap_i2c_nr_ports(void) - return ports; - } - --static int __init omap_i2c_add_bus(int bus_id) -+/* Shared between omap2 and 3 */ -+static resource_size_t omap2_i2c_irq[3] __initdata = { -+ INT_24XX_I2C1_IRQ, -+ INT_24XX_I2C2_IRQ, -+ INT_34XX_I2C3_IRQ, -+}; -+ -+static inline int omap1_i2c_add_bus(struct platform_device *pdev, int bus_id) - { -- struct platform_device *pdev; - struct omap_i2c_bus_platform_data *pd; - struct resource *res; -- resource_size_t base, irq; - -- pdev = &omap_i2c_devices[bus_id - 1]; - pd = pdev->dev.platform_data; -+ res = pdev->resource; -+ res[0].start = OMAP1_I2C_BASE; -+ res[0].end = res[0].start + OMAP_I2C_SIZE; -+ res[1].start = INT_I2C; -+ omap1_i2c_mux_pins(bus_id); -+ -+ return platform_device_register(pdev); -+} -+ -+static inline int omap2_i2c_add_bus(struct platform_device *pdev, int bus_id) -+{ -+ struct resource *res; -+ resource_size_t *irq; -+ -+ res = pdev->resource; -+ -+ irq = omap2_i2c_irq; -+ - if (bus_id == 1) { -- res = pdev->resource; -- if (cpu_class_is_omap1()) { -- base = OMAP1_I2C_BASE; -- irq = INT_I2C; -- } else { -- base = OMAP2_I2C_BASE1; -- irq = INT_24XX_I2C1_IRQ; -- } -- res[0].start = base; -- res[0].end = base + OMAP_I2C_SIZE; -- res[1].start = irq; -+ res[0].start = OMAP2_I2C_BASE1; -+ res[0].end = res[0].start + OMAP_I2C_SIZE; - } - -- if (cpu_class_is_omap1()) -- omap1_i2c_mux_pins(bus_id); -- if (cpu_class_is_omap2()) -- omap2_i2c_mux_pins(bus_id); -+ res[1].start = irq[bus_id - 1]; -+ omap2_i2c_mux_pins(bus_id); - - /* - * When waiting for completion of a i2c transfer, we need to -@@ -134,12 +145,28 @@ static int __init omap_i2c_add_bus(int bus_id) - * ensure quick enough wakeup from idle, when transfer - * completes. - */ -- if (cpu_is_omap34xx()) -+ if (cpu_is_omap34xx()) { -+ struct omap_i2c_bus_platform_data *pd; -+ -+ pd = pdev->dev.platform_data; - pd->set_mpu_wkup_lat = omap_pm_set_max_mpu_wakeup_lat; -+ } - - return platform_device_register(pdev); - } - -+static int __init omap_i2c_add_bus(int bus_id) -+{ -+ struct platform_device *pdev; -+ -+ pdev = &omap_i2c_devices[bus_id - 1]; -+ -+ if (cpu_class_is_omap1()) -+ return omap1_i2c_add_bus(pdev, bus_id); -+ else -+ return omap2_i2c_add_bus(pdev, bus_id); -+} -+ - /** - * omap_i2c_bus_setup - Process command line options for the I2C bus speed - * @str: String of options diff --git a/a/content_digest b/N1/content_digest index e8b88b1..eba17a3 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,11 +1,10 @@ "ref\020100518023707.21705.26205.stgit@baageli.muru.com\0" "ref\020100518024243.21705.45209.stgit@baageli.muru.com\0" - "From\0Tony Lindgren <tony@atomide.com>\0" - "Subject\0Re: [PATCH 01/13] omap: Fix i2c platform init code for omap4\0" + "From\0tony@atomide.com (Tony Lindgren)\0" + "Subject\0[PATCH 01/13] omap: Fix i2c platform init code for omap4\0" "Date\0Tue, 18 May 2010 17:15:33 -0700\0" "To\0linux-arm-kernel@lists.infradead.org\0" - "Cc\0linux-omap@vger.kernel.org\0" - "\01:1\0" + "\00:1\0" "b\0" "* Tony Lindgren <tony@atomide.com> [100517 19:37]:\n" "> Add separate omap_i2c_add_bus functions for mach-omap1\n" @@ -22,121 +21,13 @@ "\n" "Regards,\n" "\n" - Tony - "\01:2\0" - "fn\0omap-i2c-multiboot.patch\0" - "b\0" - "From: Tony Lindgren <tony@atomide.com>\n" - "Date: Tue, 18 May 2010 16:19:15 -0700\n" - "Subject: [PATCH] omap: Fix i2c platform init code for omap4\n" - "\n" - "Add separate omap_i2c_add_bus functions for mach-omap1\n" - "and mach-omap2. Make the mach-omap2 init set the interrupt\n" - "dynamically to support.\n" - "\n" - "This is needed to add support for omap4 in a way that\n" - "works with multi-omap builds. This will eventually get\n" - "fixed in a generic way with the omap hwmods.\n" - "\n" - "Signed-off-by: Tony Lindgren <tony@atomide.com>\n" - "\n" - "diff --git a/arch/arm/plat-omap/i2c.c b/arch/arm/plat-omap/i2c.c\n" - "index f044b59..78d1cea 100644\n" - "--- a/arch/arm/plat-omap/i2c.c\n" - "+++ b/arch/arm/plat-omap/i2c.c\n" - "@@ -100,33 +100,44 @@ static int __init omap_i2c_nr_ports(void)\n" - " \treturn ports;\n" - " }\n" - " \n" - "-static int __init omap_i2c_add_bus(int bus_id)\n" - "+/* Shared between omap2 and 3 */\n" - "+static resource_size_t omap2_i2c_irq[3] __initdata = {\n" - "+\tINT_24XX_I2C1_IRQ,\n" - "+\tINT_24XX_I2C2_IRQ,\n" - "+\tINT_34XX_I2C3_IRQ,\n" - "+};\n" - "+\n" - "+static inline int omap1_i2c_add_bus(struct platform_device *pdev, int bus_id)\n" - " {\n" - "-\tstruct platform_device *pdev;\n" - " \tstruct omap_i2c_bus_platform_data *pd;\n" - " \tstruct resource *res;\n" - "-\tresource_size_t base, irq;\n" - " \n" - "-\tpdev = &omap_i2c_devices[bus_id - 1];\n" - " \tpd = pdev->dev.platform_data;\n" - "+\tres = pdev->resource;\n" - "+\tres[0].start = OMAP1_I2C_BASE;\n" - "+\tres[0].end = res[0].start + OMAP_I2C_SIZE;\n" - "+\tres[1].start = INT_I2C;\n" - "+\tomap1_i2c_mux_pins(bus_id);\n" - "+\n" - "+\treturn platform_device_register(pdev);\n" - "+}\n" - "+\n" - "+static inline int omap2_i2c_add_bus(struct platform_device *pdev, int bus_id)\n" - "+{\n" - "+\tstruct resource *res;\n" - "+\tresource_size_t *irq;\n" - "+\n" - "+\tres = pdev->resource;\n" - "+\n" - "+\tirq = omap2_i2c_irq;\n" - "+\n" - " \tif (bus_id == 1) {\n" - "-\t\tres = pdev->resource;\n" - "-\t\tif (cpu_class_is_omap1()) {\n" - "-\t\t\tbase = OMAP1_I2C_BASE;\n" - "-\t\t\tirq = INT_I2C;\n" - "-\t\t} else {\n" - "-\t\t\tbase = OMAP2_I2C_BASE1;\n" - "-\t\t\tirq = INT_24XX_I2C1_IRQ;\n" - "-\t\t}\n" - "-\t\tres[0].start = base;\n" - "-\t\tres[0].end = base + OMAP_I2C_SIZE;\n" - "-\t\tres[1].start = irq;\n" - "+\t\tres[0].start = OMAP2_I2C_BASE1;\n" - "+\t\tres[0].end = res[0].start + OMAP_I2C_SIZE;\n" - " \t}\n" - " \n" - "-\tif (cpu_class_is_omap1())\n" - "-\t\tomap1_i2c_mux_pins(bus_id);\n" - "-\tif (cpu_class_is_omap2())\n" - "-\t\tomap2_i2c_mux_pins(bus_id);\n" - "+\tres[1].start = irq[bus_id - 1];\n" - "+\tomap2_i2c_mux_pins(bus_id);\n" - " \n" - " \t/*\n" - " \t * When waiting for completion of a i2c transfer, we need to\n" - "@@ -134,12 +145,28 @@ static int __init omap_i2c_add_bus(int bus_id)\n" - " \t * ensure quick enough wakeup from idle, when transfer\n" - " \t * completes.\n" - " \t */\n" - "-\tif (cpu_is_omap34xx())\n" - "+\tif (cpu_is_omap34xx()) {\n" - "+\t\tstruct omap_i2c_bus_platform_data *pd;\n" - "+\n" - "+\t\tpd = pdev->dev.platform_data;\n" - " \t\tpd->set_mpu_wkup_lat = omap_pm_set_max_mpu_wakeup_lat;\n" - "+\t}\n" - " \n" - " \treturn platform_device_register(pdev);\n" - " }\n" - " \n" - "+static int __init omap_i2c_add_bus(int bus_id)\n" - "+{\n" - "+\tstruct platform_device *pdev;\n" - "+\n" - "+\tpdev = &omap_i2c_devices[bus_id - 1];\n" - "+\n" - "+\tif (cpu_class_is_omap1())\n" - "+\t\treturn omap1_i2c_add_bus(pdev, bus_id);\n" - "+\telse\n" - "+\t\treturn omap2_i2c_add_bus(pdev, bus_id);\n" - "+}\n" - "+\n" - " /**\n" - " * omap_i2c_bus_setup - Process command line options for the I2C bus speed\n" - * @str: String of options + "Tony\n" + "-------------- next part --------------\n" + "A non-text attachment was scrubbed...\n" + "Name: omap-i2c-multiboot.patch\n" + "Type: text/x-diff\n" + "Size: 2971 bytes\n" + "Desc: not available\n" + URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20100518/1de7ff10/attachment-0001.bin> -23e2a69594d64475b210e6cb97792fbed0eb9cebb5b4bc91590fb5914b400fa2 +ae81d718379f0f9c555c7d3c9c808ff4d42d5479e452439046e5142648cb4dc6
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.