diff for duplicates of <20100519001612.GZ5818@atomide.com> diff --git a/a/1.txt b/N1/1.txt index e7e284d..41edd1c 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -6,3 +6,10 @@ Below is this one rebased to apply on current for-next. Regards, Tony +-------------- next part -------------- +A non-text attachment was scrubbed... +Name: omap-i2c-omap4.patch +Type: text/x-diff +Size: 2900 bytes +Desc: not available +URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20100518/943d4a32/attachment.bin> diff --git a/a/2.hdr b/a/2.hdr deleted file mode 100644 index 836d760..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-omap4.patch" diff --git a/a/2.txt b/a/2.txt deleted file mode 100644 index 099b4fa..0000000 --- a/a/2.txt +++ /dev/null @@ -1,95 +0,0 @@ -From: Tony Lindgren <tony@atomide.com> -Date: Tue, 18 May 2010 16:19:16 -0700 -Subject: [PATCH] omap4: Add support for i2c init - -Add support for i2c init for omap4. - -This patch is based on and earlier patch by -Santosh Shilimkar <santosh.shilimkar@ti.com>. - -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 78d1cea..eec2b49 100644 ---- a/arch/arm/plat-omap/i2c.c -+++ b/arch/arm/plat-omap/i2c.c -@@ -38,6 +38,7 @@ - #define OMAP2_I2C_BASE1 0x48070000 - #define OMAP2_I2C_BASE2 0x48072000 - #define OMAP2_I2C_BASE3 0x48060000 -+#define OMAP4_I2C_BASE4 0x48350000 - - static const char name[] = "i2c_omap"; - -@@ -54,11 +55,14 @@ static const char name[] = "i2c_omap"; - - static struct resource i2c_resources[][2] = { - { I2C_RESOURCE_BUILDER(0, 0) }, --#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3) -- { I2C_RESOURCE_BUILDER(OMAP2_I2C_BASE2, INT_24XX_I2C2_IRQ) }, -+#if defined(CONFIG_ARCH_OMAP2PLUS) -+ { I2C_RESOURCE_BUILDER(OMAP2_I2C_BASE2, 0) }, - #endif --#if defined(CONFIG_ARCH_OMAP3) -- { I2C_RESOURCE_BUILDER(OMAP2_I2C_BASE3, INT_34XX_I2C3_IRQ) }, -+#if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_ARCH_OMAP4) -+ { I2C_RESOURCE_BUILDER(OMAP2_I2C_BASE3, 0) }, -+#endif -+#if defined(CONFIG_ARCH_OMAP4) -+ { I2C_RESOURCE_BUILDER(OMAP4_I2C_BASE4, 0) }, - #endif - }; - -@@ -76,12 +80,15 @@ static struct resource i2c_resources[][2] = { - static struct omap_i2c_bus_platform_data i2c_pdata[ARRAY_SIZE(i2c_resources)]; - static struct platform_device omap_i2c_devices[] = { - I2C_DEV_BUILDER(1, i2c_resources[0], &i2c_pdata[0]), --#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3) -+#if defined(CONFIG_ARCH_OMAP2PLUS) - I2C_DEV_BUILDER(2, i2c_resources[1], &i2c_pdata[1]), - #endif --#if defined(CONFIG_ARCH_OMAP3) -+#if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_ARCH_OMAP4) - I2C_DEV_BUILDER(3, i2c_resources[2], &i2c_pdata[2]), - #endif -+#if defined(CONFIG_ARCH_OMAP4) -+ I2C_DEV_BUILDER(4, i2c_resources[3], &i2c_pdata[3]), -+#endif - }; - - #define OMAP_I2C_CMDLINE_SETUP (BIT(31)) -@@ -96,6 +103,8 @@ static int __init omap_i2c_nr_ports(void) - ports = 2; - else if (cpu_is_omap34xx()) - ports = 3; -+ else if (cpu_is_omap44xx()) -+ ports = 4; - - return ports; - } -@@ -107,6 +116,13 @@ static resource_size_t omap2_i2c_irq[3] __initdata = { - INT_34XX_I2C3_IRQ, - }; - -+static resource_size_t omap4_i2c_irq[4] __initdata = { -+ OMAP44XX_IRQ_I2C1, -+ OMAP44XX_IRQ_I2C2, -+ OMAP44XX_IRQ_I2C3, -+ OMAP44XX_IRQ_I2C4, -+}; -+ - static inline int omap1_i2c_add_bus(struct platform_device *pdev, int bus_id) - { - struct omap_i2c_bus_platform_data *pd; -@@ -129,7 +145,10 @@ static inline int omap2_i2c_add_bus(struct platform_device *pdev, int bus_id) - - res = pdev->resource; - -- irq = omap2_i2c_irq; -+ if (!cpu_is_omap44xx()) -+ irq = omap2_i2c_irq; -+ else -+ irq = omap4_i2c_irq; - - if (bus_id == 1) { - res[0].start = OMAP2_I2C_BASE1; diff --git a/a/content_digest b/N1/content_digest index ac6b380..fbcc434 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,11 +1,10 @@ "ref\020100518023707.21705.26205.stgit@baageli.muru.com\0" "ref\020100518024246.21705.71913.stgit@baageli.muru.com\0" - "From\0Tony Lindgren <tony@atomide.com>\0" - "Subject\0Re: [PATCH 02/13] omap4: Add support for i2c init\0" + "From\0tony@atomide.com (Tony Lindgren)\0" + "Subject\0[PATCH 02/13] omap4: Add support for i2c init\0" "Date\0Tue, 18 May 2010 17:16:12 -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 support for i2c init for omap4.\n" @@ -14,104 +13,13 @@ "\n" "Regards,\n" "\n" - Tony - "\01:2\0" - "fn\0omap-i2c-omap4.patch\0" - "b\0" - "From: Tony Lindgren <tony@atomide.com>\n" - "Date: Tue, 18 May 2010 16:19:16 -0700\n" - "Subject: [PATCH] omap4: Add support for i2c init\n" - "\n" - "Add support for i2c init for omap4.\n" - "\n" - "This patch is based on and earlier patch by\n" - "Santosh Shilimkar <santosh.shilimkar@ti.com>.\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 78d1cea..eec2b49 100644\n" - "--- a/arch/arm/plat-omap/i2c.c\n" - "+++ b/arch/arm/plat-omap/i2c.c\n" - "@@ -38,6 +38,7 @@\n" - " #define OMAP2_I2C_BASE1\t\t0x48070000\n" - " #define OMAP2_I2C_BASE2\t\t0x48072000\n" - " #define OMAP2_I2C_BASE3\t\t0x48060000\n" - "+#define OMAP4_I2C_BASE4\t\t0x48350000\n" - " \n" - " static const char name[] = \"i2c_omap\";\n" - " \n" - "@@ -54,11 +55,14 @@ static const char name[] = \"i2c_omap\";\n" - " \n" - " static struct resource i2c_resources[][2] = {\n" - " \t{ I2C_RESOURCE_BUILDER(0, 0) },\n" - "-#if\tdefined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)\n" - "-\t{ I2C_RESOURCE_BUILDER(OMAP2_I2C_BASE2, INT_24XX_I2C2_IRQ) },\n" - "+#if\tdefined(CONFIG_ARCH_OMAP2PLUS)\n" - "+\t{ I2C_RESOURCE_BUILDER(OMAP2_I2C_BASE2, 0) },\n" - " #endif\n" - "-#if\tdefined(CONFIG_ARCH_OMAP3)\n" - "-\t{ I2C_RESOURCE_BUILDER(OMAP2_I2C_BASE3, INT_34XX_I2C3_IRQ) },\n" - "+#if\tdefined(CONFIG_ARCH_OMAP3) || defined(CONFIG_ARCH_OMAP4)\n" - "+\t{ I2C_RESOURCE_BUILDER(OMAP2_I2C_BASE3, 0) },\n" - "+#endif\n" - "+#if\tdefined(CONFIG_ARCH_OMAP4)\n" - "+\t{ I2C_RESOURCE_BUILDER(OMAP4_I2C_BASE4, 0) },\n" - " #endif\n" - " };\n" - " \n" - "@@ -76,12 +80,15 @@ static struct resource i2c_resources[][2] = {\n" - " static struct omap_i2c_bus_platform_data i2c_pdata[ARRAY_SIZE(i2c_resources)];\n" - " static struct platform_device omap_i2c_devices[] = {\n" - " \tI2C_DEV_BUILDER(1, i2c_resources[0], &i2c_pdata[0]),\n" - "-#if\tdefined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)\n" - "+#if\tdefined(CONFIG_ARCH_OMAP2PLUS)\n" - " \tI2C_DEV_BUILDER(2, i2c_resources[1], &i2c_pdata[1]),\n" - " #endif\n" - "-#if\tdefined(CONFIG_ARCH_OMAP3)\n" - "+#if\tdefined(CONFIG_ARCH_OMAP3) || defined(CONFIG_ARCH_OMAP4)\n" - " \tI2C_DEV_BUILDER(3, i2c_resources[2], &i2c_pdata[2]),\n" - " #endif\n" - "+#if\tdefined(CONFIG_ARCH_OMAP4)\n" - "+\tI2C_DEV_BUILDER(4, i2c_resources[3], &i2c_pdata[3]),\n" - "+#endif\n" - " };\n" - " \n" - " #define OMAP_I2C_CMDLINE_SETUP\t(BIT(31))\n" - "@@ -96,6 +103,8 @@ static int __init omap_i2c_nr_ports(void)\n" - " \t\tports = 2;\n" - " \telse if (cpu_is_omap34xx())\n" - " \t\tports = 3;\n" - "+\telse if (cpu_is_omap44xx())\n" - "+\t\tports = 4;\n" - " \n" - " \treturn ports;\n" - " }\n" - "@@ -107,6 +116,13 @@ static resource_size_t omap2_i2c_irq[3] __initdata = {\n" - " \tINT_34XX_I2C3_IRQ,\n" - " };\n" - " \n" - "+static resource_size_t omap4_i2c_irq[4] __initdata = {\n" - "+\tOMAP44XX_IRQ_I2C1,\n" - "+\tOMAP44XX_IRQ_I2C2,\n" - "+\tOMAP44XX_IRQ_I2C3,\n" - "+\tOMAP44XX_IRQ_I2C4,\n" - "+};\n" - "+\n" - " static inline int omap1_i2c_add_bus(struct platform_device *pdev, int bus_id)\n" - " {\n" - " \tstruct omap_i2c_bus_platform_data *pd;\n" - "@@ -129,7 +145,10 @@ static inline int omap2_i2c_add_bus(struct platform_device *pdev, int bus_id)\n" - " \n" - " \tres = pdev->resource;\n" - " \n" - "-\tirq = omap2_i2c_irq;\n" - "+\tif (!cpu_is_omap44xx())\n" - "+\t\tirq = omap2_i2c_irq;\n" - "+\telse\n" - "+\t\tirq = omap4_i2c_irq;\n" - " \n" - " \tif (bus_id == 1) {\n" - " \t\tres[0].start = OMAP2_I2C_BASE1;" + "Tony\n" + "-------------- next part --------------\n" + "A non-text attachment was scrubbed...\n" + "Name: omap-i2c-omap4.patch\n" + "Type: text/x-diff\n" + "Size: 2900 bytes\n" + "Desc: not available\n" + URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20100518/943d4a32/attachment.bin> -a29ac85a14946aca74223a9f64212ebd5cce2e0e4e6e14f0f6d7dc542ccb76d4 +cb76ffcdb99a68fed9a6d65425a24a40740b08e5654add241c69d9478709f39e
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.