diff for duplicates of <20100510201717.GF16460@atomide.com> diff --git a/a/2.hdr b/a/2.hdr deleted file mode 100644 index 79b9793..0000000 --- a/a/2.hdr +++ /dev/null @@ -1,2 +0,0 @@ -Content-Type: text/x-diff; charset=us-ascii -Content-Disposition: inline; filename="board-omap3-emac-naming.patch" diff --git a/a/2.txt b/a/2.txt deleted file mode 100644 index f7eac44..0000000 --- a/a/2.txt +++ /dev/null @@ -1,31 +0,0 @@ ->From eba164add86ebeb389f636ffca8ab691956cfe01 Mon Sep 17 00:00:00 2001 -From: Sriram <srk@ti.com> -Date: Thu, 11 Mar 2010 15:13:41 +0000 -Subject: [PATCH] OMAP3 : clock data: Update name string for EMAC clocks - -The emac driver currently uses Davinci clock names for the module and phy -clocks. Updated the omap3xxx_clks table to match the names -used by the Davinci emac driver. - -Note that eventually the EMAC clocks should be renamed to be generic. - -Signed-off-by: Sriramakrishnan <srk@ti.com> -Acked-by: Paul Walmsley <paul@pwsan.com> -[tony@atomide.com: updated patch description to match the patch] -Signed-off-by: Tony Lindgren <tony@atomide.com> - -diff --git a/arch/arm/mach-omap2/clock3xxx_data.c b/arch/arm/mach-omap2/clock3xxx_data.c -index 9cba556..6905eb7 100644 ---- a/arch/arm/mach-omap2/clock3xxx_data.c -+++ b/arch/arm/mach-omap2/clock3xxx_data.c -@@ -3472,8 +3472,8 @@ static struct omap_clk omap3xxx_clks[] = { - CLK(NULL, "ipss_ick", &ipss_ick, CK_AM35XX), - CLK(NULL, "rmii_ck", &rmii_ck, CK_AM35XX), - CLK(NULL, "pclk_ck", &pclk_ck, CK_AM35XX), -- CLK("davinci_emac", "ick", &emac_ick, CK_AM35XX), -- CLK("davinci_emac", "fck", &emac_fck, CK_AM35XX), -+ CLK("davinci_emac", "emac_clk", &emac_ick, CK_AM35XX), -+ CLK("davinci_emac", "phy_clk", &emac_fck, CK_AM35XX), - CLK("vpfe-capture", "master", &vpfe_ick, CK_AM35XX), - CLK("vpfe-capture", "slave", &vpfe_fck, CK_AM35XX), - CLK("musb_hdrc", "ick", &hsotgusb_ick_am35xx, CK_AM35XX), diff --git a/a/content_digest b/N1/content_digest index b373230..273c8e3 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,15 +2,11 @@ "ref\020100505193308.21568.98880.stgit@baageli.muru.com\0" "ref\020100505194556.GB17678@n2100.arm.linux.org.uk\0" "ref\020100505200222.GC29604@atomide.com\0" - "From\0Tony Lindgren <tony@atomide.com>\0" - "Subject\0Re: [PATCH 12/18] OMAP3 : clock data: Update name string for EMAC clocks\0" + "From\0tony@atomide.com (Tony Lindgren)\0" + "Subject\0[PATCH 12/18] OMAP3 : clock data: Update name string for EMAC clocks\0" "Date\0Mon, 10 May 2010 13:17:17 -0700\0" - "To\0Russell King - ARM Linux <linux@arm.linux.org.uk>\0" - "Cc\0linux-arm-kernel@lists.infradead.org" - Sriramakrishnan <srk@ti.com> - Paul Walmsley <paul@pwsan.com> - " linux-omap@vger.kernel.org\0" - "\01:1\0" + "To\0linux-arm-kernel@lists.infradead.org\0" + "\00:1\0" "b\0" "* Tony Lindgren <tony@atomide.com> [100505 12:59]:\n" "> * Russell King - ARM Linux <linux@arm.linux.org.uk> [100505 12:41]:\n" @@ -43,39 +39,5 @@ "Added a note for that too.\n" "\n" Tony - "\01:2\0" - "fn\0board-omap3-emac-naming.patch\0" - "b\0" - ">From eba164add86ebeb389f636ffca8ab691956cfe01 Mon Sep 17 00:00:00 2001\n" - "From: Sriram <srk@ti.com>\n" - "Date: Thu, 11 Mar 2010 15:13:41 +0000\n" - "Subject: [PATCH] OMAP3 : clock data: Update name string for EMAC clocks\n" - "\n" - "The emac driver currently uses Davinci clock names for the module and phy\n" - "clocks. Updated the omap3xxx_clks table to match the names\n" - "used by the Davinci emac driver.\n" - "\n" - "Note that eventually the EMAC clocks should be renamed to be generic.\n" - "\n" - "Signed-off-by: Sriramakrishnan <srk@ti.com>\n" - "Acked-by: Paul Walmsley <paul@pwsan.com>\n" - "[tony@atomide.com: updated patch description to match the patch]\n" - "Signed-off-by: Tony Lindgren <tony@atomide.com>\n" - "\n" - "diff --git a/arch/arm/mach-omap2/clock3xxx_data.c b/arch/arm/mach-omap2/clock3xxx_data.c\n" - "index 9cba556..6905eb7 100644\n" - "--- a/arch/arm/mach-omap2/clock3xxx_data.c\n" - "+++ b/arch/arm/mach-omap2/clock3xxx_data.c\n" - "@@ -3472,8 +3472,8 @@ static struct omap_clk omap3xxx_clks[] = {\n" - " \tCLK(NULL,\t\"ipss_ick\",\t&ipss_ick,\tCK_AM35XX),\n" - " \tCLK(NULL,\t\"rmii_ck\",\t&rmii_ck,\tCK_AM35XX),\n" - " \tCLK(NULL,\t\"pclk_ck\",\t&pclk_ck,\tCK_AM35XX),\n" - "-\tCLK(\"davinci_emac\",\t\"ick\",\t\t&emac_ick,\tCK_AM35XX),\n" - "-\tCLK(\"davinci_emac\",\t\"fck\",\t\t&emac_fck,\tCK_AM35XX),\n" - "+\tCLK(\"davinci_emac\",\t\"emac_clk\",\t&emac_ick,\tCK_AM35XX),\n" - "+\tCLK(\"davinci_emac\",\t\"phy_clk\",\t&emac_fck,\tCK_AM35XX),\n" - " \tCLK(\"vpfe-capture\",\t\"master\",\t&vpfe_ick,\tCK_AM35XX),\n" - " \tCLK(\"vpfe-capture\",\t\"slave\",\t&vpfe_fck,\tCK_AM35XX),\n" - " \tCLK(\"musb_hdrc\",\t\"ick\",\t\t&hsotgusb_ick_am35xx,\tCK_AM35XX)," -4ae636e8a2a78684465ba3e73d2331f93c59531b72564adcf1dd1f872e8b17a9 +b904ff3a3943dbcef3b3462dbcfb6678000dbce400f6e4ffa6d1263b3364ed42
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.