diff for duplicates of <20111005010550.GX6324@atomide.com> diff --git a/a/1.txt b/N1/1.txt index 230471d..d264183 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -118,3 +118,10 @@ Tony Lindgren (1): create mode 100644 arch/arm/boot/dts/omap4-panda.dts create mode 100644 arch/arm/boot/dts/omap4-sdp.dts create mode 100644 arch/arm/boot/dts/omap4.dtsi +-------------- next part -------------- +A non-text attachment was scrubbed... +Name: merge.patch +Type: text/x-diff +Size: 2136 bytes +Desc: not available +URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20111004/30d6c319/attachment-0001.bin> diff --git a/a/2.hdr b/a/2.hdr deleted file mode 100644 index db8e261..0000000 --- a/a/2.hdr +++ /dev/null @@ -1,2 +0,0 @@ -Content-Type: text/x-diff; charset=us-ascii -Content-Disposition: inline; filename="merge.patch" diff --git a/a/2.txt b/a/2.txt deleted file mode 100644 index 5b36bbb..0000000 --- a/a/2.txt +++ /dev/null @@ -1,65 +0,0 @@ ---- a/arch/arm/mach-omap2/timer.c -+++ b/arch/arm/mach-omap2/timer.c -@@ -434,7 +434,7 @@ static int __init omap_timer_init(struct omap_hwmod *oh, void *unused) - int ret = 0; - char *name = "omap_timer"; - struct dmtimer_platform_data *pdata; -- struct omap_device *od; -+ struct platform_device *pdev; - struct omap_timer_capability_dev_attr *timer_dev_attr; - struct powerdomain *pwrdm; - -@@ -476,12 +476,12 @@ static int __init omap_timer_init(struct omap_hwmod *oh, void *unused) - #ifdef CONFIG_PM - pdata->get_context_loss_count = omap_pm_get_dev_context_loss_count; - #endif -- od = omap_device_build(name, id, oh, pdata, sizeof(*pdata), -+ pdev = omap_device_build(name, id, oh, pdata, sizeof(*pdata), - omap2_dmtimer_latency, - ARRAY_SIZE(omap2_dmtimer_latency), - 0); - -- if (IS_ERR(od)) { -+ if (IS_ERR(pdev)) { - pr_err("%s: Can't build omap_device for %s: %s.\n", - __func__, name, oh->name); - ret = -EINVAL; ---- a/arch/arm/mach-omap2/usb-musb.c -+++ b/arch/arm/mach-omap2/usb-musb.c -@@ -115,7 +115,6 @@ static struct omap_musb_board_data musb_default_board_data = { - void __init usb_musb_init(struct omap_musb_board_data *musb_board_data) - { - struct omap_hwmod *oh; -- struct omap_device *od; - struct platform_device *pdev; - struct device *dev; - int bus_id = -1; -@@ -145,22 +144,20 @@ void __init usb_musb_init(struct omap_musb_board_data *musb_board_data) - name = "musb-omap2430"; - } - -- oh = omap_hwmod_lookup(oh_name); -- if (!oh) { -- pr_err("Could not look up %s\n", oh_name); -- return; -- } -+ oh = omap_hwmod_lookup(oh_name); -+ if (WARN(!oh, "%s: could not find omap_hwmod for %s\n", -+ __func__, oh_name)) -+ return; - -- od = omap_device_build(name, bus_id, oh, &musb_plat, -+ pdev = omap_device_build(name, bus_id, oh, &musb_plat, - sizeof(musb_plat), omap_musb_latency, - ARRAY_SIZE(omap_musb_latency), false); -- if (IS_ERR(od)) { -+ if (IS_ERR(pdev)) { - pr_err("Could not build omap_device for %s %s\n", - name, oh_name); - return; - } - -- pdev = &od->pdev; - dev = &pdev->dev; - get_device(dev); - dev->dma_mask = &musb_dmamask; diff --git a/a/content_digest b/N1/content_digest index db0ad12..4392544 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,18 +2,11 @@ "ref\0201110040944.13205.arnd@arndb.de\0" "ref\020111004155752.GT6324@atomide.com\0" "ref\02340307.S2RzXdHlIz@wuerfel\0" - "From\0Tony Lindgren <tony@atomide.com>\0" + "From\0tony@atomide.com (Tony Lindgren)\0" "Subject\0[GIT PULL] initial omap DT support for v3.2 merge window (Re: [PATCH 26/30] ARM: omap: add board autoselection)\0" "Date\0Tue, 4 Oct 2011 18:05:50 -0700\0" - "To\0Arnd Bergmann <arnd@arndb.de>\0" - "Cc\0linux-arm-kernel@lists.infradead.org" - linux-omap@vger.kernel.org <linux-omap@vger.kernel.org> - Shilimkar - Santosh <santosh.shilimkar@ti.com> - Cousson - Benoit <b-cousson@ti.com> - " linux-kernel@vger.kernel.org <linux-kernel@vger.kernel.org>\0" - "\01:1\0" + "To\0linux-arm-kernel@lists.infradead.org\0" + "\00:1\0" "b\0" "* Arnd Bergmann <arnd@arndb.de> [111004 11:55]:\n" "> On Tuesday 04 October 2011 08:57:52 Tony Lindgren wrote:\n" @@ -134,74 +127,13 @@ " create mode 100644 arch/arm/boot/dts/omap3.dtsi\n" " create mode 100644 arch/arm/boot/dts/omap4-panda.dts\n" " create mode 100644 arch/arm/boot/dts/omap4-sdp.dts\n" - create mode 100644 arch/arm/boot/dts/omap4.dtsi - "\01:2\0" - "fn\0merge.patch\0" - "b\0" - "--- a/arch/arm/mach-omap2/timer.c\n" - "+++ b/arch/arm/mach-omap2/timer.c\n" - "@@ -434,7 +434,7 @@ static int __init omap_timer_init(struct omap_hwmod *oh, void *unused)\n" - " \tint ret = 0;\n" - " \tchar *name = \"omap_timer\";\n" - " \tstruct dmtimer_platform_data *pdata;\n" - "-\tstruct omap_device *od;\n" - "+\tstruct platform_device *pdev;\n" - " \tstruct omap_timer_capability_dev_attr *timer_dev_attr;\n" - " \tstruct powerdomain *pwrdm;\n" - " \n" - "@@ -476,12 +476,12 @@ static int __init omap_timer_init(struct omap_hwmod *oh, void *unused)\n" - " #ifdef CONFIG_PM\n" - " \tpdata->get_context_loss_count = omap_pm_get_dev_context_loss_count;\n" - " #endif\n" - "-\tod = omap_device_build(name, id, oh, pdata, sizeof(*pdata),\n" - "+\tpdev = omap_device_build(name, id, oh, pdata, sizeof(*pdata),\n" - " \t\t\tomap2_dmtimer_latency,\n" - " \t\t\tARRAY_SIZE(omap2_dmtimer_latency),\n" - " \t\t\t0);\n" - " \n" - "-\tif (IS_ERR(od)) {\n" - "+\tif (IS_ERR(pdev)) {\n" - " \t\tpr_err(\"%s: Can't build omap_device for %s: %s.\\n\",\n" - " \t\t\t__func__, name, oh->name);\n" - " \t\tret = -EINVAL;\n" - "--- a/arch/arm/mach-omap2/usb-musb.c\n" - "+++ b/arch/arm/mach-omap2/usb-musb.c\n" - "@@ -115,7 +115,6 @@ static struct omap_musb_board_data musb_default_board_data = {\n" - " void __init usb_musb_init(struct omap_musb_board_data *musb_board_data)\n" - " {\n" - " \tstruct omap_hwmod\t\t*oh;\n" - "-\tstruct omap_device\t\t*od;\n" - " \tstruct platform_device\t\t*pdev;\n" - " \tstruct device\t\t\t*dev;\n" - " \tint\t\t\t\tbus_id = -1;\n" - "@@ -145,22 +144,20 @@ void __init usb_musb_init(struct omap_musb_board_data *musb_board_data)\n" - " \t\tname = \"musb-omap2430\";\n" - " \t}\n" - " \n" - "-\toh = omap_hwmod_lookup(oh_name);\n" - "-\tif (!oh) {\n" - "-\t\tpr_err(\"Could not look up %s\\n\", oh_name);\n" - "-\t\treturn;\n" - "-\t}\n" - "+ oh = omap_hwmod_lookup(oh_name);\n" - "+ if (WARN(!oh, \"%s: could not find omap_hwmod for %s\\n\",\n" - "+ __func__, oh_name))\n" - "+ return;\n" - " \n" - "-\tod = omap_device_build(name, bus_id, oh, &musb_plat,\n" - "+\tpdev = omap_device_build(name, bus_id, oh, &musb_plat,\n" - " \t\t\t sizeof(musb_plat), omap_musb_latency,\n" - " \t\t\t ARRAY_SIZE(omap_musb_latency), false);\n" - "-\tif (IS_ERR(od)) {\n" - "+\tif (IS_ERR(pdev)) {\n" - " \t\tpr_err(\"Could not build omap_device for %s %s\\n\",\n" - " \t\t\t\t\t\tname, oh_name);\n" - " \t\treturn;\n" - " \t}\n" - " \n" - "-\tpdev = &od->pdev;\n" - " \tdev = &pdev->dev;\n" - " \tget_device(dev);\n" - " \tdev->dma_mask = &musb_dmamask;" + " create mode 100644 arch/arm/boot/dts/omap4.dtsi\n" + "-------------- next part --------------\n" + "A non-text attachment was scrubbed...\n" + "Name: merge.patch\n" + "Type: text/x-diff\n" + "Size: 2136 bytes\n" + "Desc: not available\n" + URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20111004/30d6c319/attachment-0001.bin> -ad6c17782541b0892e6be719e5e1b0dc2c4ef2c8463ef4a5ac5dff96d867435b +11635d83df4045ee39e5d699f41a0f51a50e65b793631780eebc792923dcfe7b
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.