diff for duplicates of <51EFE1D4.8090307@ti.com>
diff --git a/a/1.txt b/N1/1.txt
index a535b26..da03fcd 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -26,4 +26,25 @@ Thanks to your hints, I was able to get this to work with 3.11-rc1 on omap5 uevm
using the following 3 patches. Please include them in your series. Thanks.
cheers,
--roger
\ No newline at end of file
+-roger
+-------------- next part --------------
+A non-text attachment was scrubbed...
+Name: 0001-ARM-dts-OMAP5-Provide-clock-tree-data.patch
+Type: text/x-patch
+Size: 802 bytes
+Desc: not available
+URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130724/2dbc50ae/attachment-0003.bin>
+-------------- next part --------------
+A non-text attachment was scrubbed...
+Name: 0002-CLK-omap5-Call-clock-init-function-at-boot.patch
+Type: text/x-patch
+Size: 1311 bytes
+Desc: not available
+URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130724/2dbc50ae/attachment-0004.bin>
+-------------- next part --------------
+A non-text attachment was scrubbed...
+Name: 0003-CLK-omap5-Initialize-USB_DPLL-at-boot.patch
+Type: text/x-patch
+Size: 1552 bytes
+Desc: not available
+URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130724/2dbc50ae/attachment-0005.bin>
\ No newline at end of file
diff --git a/a/2.hdr b/a/2.hdr
deleted file mode 100644
index 450682d..0000000
--- a/a/2.hdr
+++ /dev/null
@@ -1,5 +0,0 @@
-Content-Type: text/x-patch;
- name="0001-ARM-dts-OMAP5-Provide-clock-tree-data.patch"
-Content-Transfer-Encoding: 7bit
-Content-Disposition: attachment;
- filename="0001-ARM-dts-OMAP5-Provide-clock-tree-data.patch"
diff --git a/a/2.txt b/a/2.txt
deleted file mode 100644
index 3e9b130..0000000
--- a/a/2.txt
+++ /dev/null
@@ -1,32 +0,0 @@
->From f7e38deadead5f584c9de4f2f19bb5ab50a2641d Mon Sep 17 00:00:00 2001
-From: Roger Quadros <rogerq@ti.com>
-Date: Wed, 24 Jul 2013 17:02:56 +0300
-Subject: [PATCH 1/3] ARM: dts: OMAP5: Provide clock tree data
-
-Include the clock tree data for OMAP5
-
-Signed-off-by: Roger Quadros <rogerq@ti.com>
----
- arch/arm/boot/dts/omap5.dtsi | 7 +++++++
- 1 files changed, 7 insertions(+), 0 deletions(-)
-
-diff --git a/arch/arm/boot/dts/omap5.dtsi b/arch/arm/boot/dts/omap5.dtsi
-index e643620..bc31022 100644
---- a/arch/arm/boot/dts/omap5.dtsi
-+++ b/arch/arm/boot/dts/omap5.dtsi
-@@ -45,6 +45,13 @@
- };
- };
-
-+ clocks {
-+ #address-cells = <1>;
-+ #size-cells = <1>;
-+ ranges;
-+ /include/ "omap54xx-clocks.dtsi"
-+ };
-+
- timer {
- compatible = "arm,armv7-timer";
- /* PPI secure/nonsecure IRQ */
---
-1.7.4.1
\ No newline at end of file
diff --git a/a/3.hdr b/a/3.hdr
deleted file mode 100644
index 339594e..0000000
--- a/a/3.hdr
+++ /dev/null
@@ -1,5 +0,0 @@
-Content-Type: text/x-patch;
- name="0002-CLK-omap5-Call-clock-init-function-at-boot.patch"
-Content-Transfer-Encoding: 7bit
-Content-Disposition: attachment;
- filename="0002-CLK-omap5-Call-clock-init-function-at-boot.patch"
diff --git a/a/3.txt b/a/3.txt
deleted file mode 100644
index 1480082..0000000
--- a/a/3.txt
+++ /dev/null
@@ -1,40 +0,0 @@
->From 810920058782e4d51c0aab5694fc7cffc53e9758 Mon Sep 17 00:00:00 2001
-From: Roger Quadros <rogerq@ti.com>
-Date: Wed, 24 Jul 2013 17:05:00 +0300
-Subject: [PATCH 2/3] CLK: omap5: Call clock init function at boot
-
-omap5xxx_clk_init() needs to be called at boot.
-
-Signed-off-by: Roger Quadros <rogerq@ti.com>
----
- arch/arm/mach-omap2/io.c | 1 +
- include/linux/clk/omap.h | 2 ++
- 2 files changed, 3 insertions(+), 0 deletions(-)
-
-diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c
-index f3b7876..7d42e26 100644
---- a/arch/arm/mach-omap2/io.c
-+++ b/arch/arm/mach-omap2/io.c
-@@ -653,6 +653,7 @@ void __init omap5_init_early(void)
- omap54xx_clockdomains_init();
- omap54xx_hwmod_init();
- omap_hwmod_init_postsetup();
-+ omap_clk_init = omap5xxx_clk_init;
- }
- #endif
-
-diff --git a/include/linux/clk/omap.h b/include/linux/clk/omap.h
-index 0d70cd1..4b82485 100644
---- a/include/linux/clk/omap.h
-+++ b/include/linux/clk/omap.h
-@@ -197,6 +197,8 @@ void omap2_clk_enable_init_clocks(const char **clk_names, u8 num_clocks);
-
- void omap3_clk_lock_dpll5(void);
-
-+int omap5xxx_clk_init(void);
-+
- extern const struct clk_hw_omap_ops clkhwops_omap3_dpll;
- extern const struct clk_hw_omap_ops clkhwops_omap4_dpllmx;
- extern const struct clk_hw_omap_ops clkhwops_omap3430es2_dss_usbhost_wait;
---
-1.7.4.1
\ No newline at end of file
diff --git a/a/4.hdr b/a/4.hdr
deleted file mode 100644
index ef093a6..0000000
--- a/a/4.hdr
+++ /dev/null
@@ -1,5 +0,0 @@
-Content-Type: text/x-patch;
- name="0003-CLK-omap5-Initialize-USB_DPLL-at-boot.patch"
-Content-Transfer-Encoding: 7bit
-Content-Disposition: attachment;
- filename="0003-CLK-omap5-Initialize-USB_DPLL-at-boot.patch"
diff --git a/a/4.txt b/a/4.txt
deleted file mode 100644
index 0611a16..0000000
--- a/a/4.txt
+++ /dev/null
@@ -1,52 +0,0 @@
->From 8836bc00aea3c97206244c3f8a66e2726c835854 Mon Sep 17 00:00:00 2001
-From: Roger Quadros <rogerq@ti.com>
-Date: Wed, 24 Jul 2013 16:30:55 +0300
-Subject: [PATCH 3/3] CLK: omap5: Initialize USB_DPLL at boot
-
-USB_DPLL must be initialized and locked at boot so that
-USB modules can work.
-
-Signed-off-by: Roger Quadros <rogerq@ti.com>
----
- drivers/clk/omap/clk-54xx.c | 13 ++++++++++++-
- 1 files changed, 12 insertions(+), 1 deletions(-)
-
-diff --git a/drivers/clk/omap/clk-54xx.c b/drivers/clk/omap/clk-54xx.c
-index ade0481..a0b3c14 100644
---- a/drivers/clk/omap/clk-54xx.c
-+++ b/drivers/clk/omap/clk-54xx.c
-@@ -19,6 +19,12 @@
-
- #define OMAP5_DPLL_ABE_DEFFREQ 98304000
-
-+/*
-+ * OMAP543x TRM, section "3.6.3.9.5 DPLL_USB Preferred Settings"
-+ * states it must be at 960MHz
-+ */
-+#define OMAP5_DPLL_USB_DEFFREQ 960000000
-+
- static struct omap_dt_clk omap54xx_clks[] = {
- DT_CLK(NULL, "timer_32k_ck", "sys_32k_ck"),
- DT_CLK("omap_timer.1", "sys_ck", "sys_clkin"),
-@@ -37,7 +43,7 @@ static struct omap_dt_clk omap54xx_clks[] = {
- int __init omap5xxx_clk_init(void)
- {
- int rc;
-- struct clk *abe_dpll_ref, *abe_dpll, *sys_32k_ck;
-+ struct clk *abe_dpll_ref, *abe_dpll, *sys_32k_ck, *usb_dpll;
-
- dt_omap_clk_init();
-
-@@ -54,5 +60,10 @@ int __init omap5xxx_clk_init(void)
- if (rc)
- pr_err("%s: failed to configure ABE DPLL!\n", __func__);
-
-+ usb_dpll = clk_get_sys(NULL, "dpll_usb_ck");
-+ rc = clk_set_rate(usb_dpll, OMAP5_DPLL_USB_DEFFREQ);
-+ if (rc)
-+ pr_err("%s: failed to configure USB DPLL!\n", __func__);
-+
- return 0;
- }
---
-1.7.4.1
\ No newline at end of file
diff --git a/a/content_digest b/N1/content_digest
index 9ea4724..1209f32 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,30 +2,19 @@
"ref\0001374564028-11352-1-git-send-email-t-kristo\@ti.com\0"
]
[
- "From\0Roger Quadros <rogerq\@ti.com>\0"
+ "From\0rogerq\@ti.com (Roger Quadros)\0"
]
[
- "Subject\0Re: [PATCHv4 00/33] ARM: OMAP: clock conversion to DT\0"
+ "Subject\0[PATCHv4 00/33] ARM: OMAP: clock conversion to DT\0"
]
[
"Date\0Wed, 24 Jul 2013 17:16:52 +0300\0"
]
[
- "To\0Tero Kristo <t-kristo\@ti.com>\0"
+ "To\0linux-arm-kernel\@lists.infradead.org\0"
]
[
- "Cc\0linux-omap\@vger.kernel.org",
- " paul\@pwsan.com",
- " khilman\@linaro.org",
- " tony\@atomide.com",
- " mturquette\@linaro.org",
- " nm\@ti.com",
- " rnayak\@ti.com",
- " linux-arm-kernel\@lists.infradead.org",
- " devicetree-discuss\@lists.ozlabs.org\0"
-]
-[
- "\0001:1\0"
+ "\0000:1\0"
]
[
"b\0"
@@ -59,164 +48,28 @@
"using the following 3 patches. Please include them in your series. Thanks.\n",
"\n",
"cheers,\n",
- "-roger"
-]
-[
- "\0001:2\0"
-]
-[
- "fn\0000001-ARM-dts-OMAP5-Provide-clock-tree-data.patch\0"
-]
-[
- "b\0"
-]
-[
- ">From f7e38deadead5f584c9de4f2f19bb5ab50a2641d Mon Sep 17 00:00:00 2001\n",
- "From: Roger Quadros <rogerq\@ti.com>\n",
- "Date: Wed, 24 Jul 2013 17:02:56 +0300\n",
- "Subject: [PATCH 1/3] ARM: dts: OMAP5: Provide clock tree data\n",
- "\n",
- "Include the clock tree data for OMAP5\n",
- "\n",
- "Signed-off-by: Roger Quadros <rogerq\@ti.com>\n",
- "---\n",
- " arch/arm/boot/dts/omap5.dtsi | 7 +++++++\n",
- " 1 files changed, 7 insertions(+), 0 deletions(-)\n",
- "\n",
- "diff --git a/arch/arm/boot/dts/omap5.dtsi b/arch/arm/boot/dts/omap5.dtsi\n",
- "index e643620..bc31022 100644\n",
- "--- a/arch/arm/boot/dts/omap5.dtsi\n",
- "+++ b/arch/arm/boot/dts/omap5.dtsi\n",
- "\@\@ -45,6 +45,13 \@\@\n",
- " \t\t};\n",
- " \t};\n",
- " \n",
- "+\tclocks {\n",
- "+\t\t#address-cells = <1>;\n",
- "+\t\t#size-cells = <1>;\n",
- "+\t\tranges;\n",
- "+\t\t/include/ \"omap54xx-clocks.dtsi\"\n",
- "+\t};\n",
- "+\n",
- " \ttimer {\n",
- " \t\tcompatible = \"arm,armv7-timer\";\n",
- " \t\t/* PPI secure/nonsecure IRQ */\n",
- "-- \n",
- "1.7.4.1"
-]
-[
- "\0001:3\0"
-]
-[
- "fn\0000002-CLK-omap5-Call-clock-init-function-at-boot.patch\0"
-]
-[
- "b\0"
-]
-[
- ">From 810920058782e4d51c0aab5694fc7cffc53e9758 Mon Sep 17 00:00:00 2001\n",
- "From: Roger Quadros <rogerq\@ti.com>\n",
- "Date: Wed, 24 Jul 2013 17:05:00 +0300\n",
- "Subject: [PATCH 2/3] CLK: omap5: Call clock init function at boot\n",
- "\n",
- "omap5xxx_clk_init() needs to be called at boot.\n",
- "\n",
- "Signed-off-by: Roger Quadros <rogerq\@ti.com>\n",
- "---\n",
- " arch/arm/mach-omap2/io.c | 1 +\n",
- " include/linux/clk/omap.h | 2 ++\n",
- " 2 files changed, 3 insertions(+), 0 deletions(-)\n",
- "\n",
- "diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c\n",
- "index f3b7876..7d42e26 100644\n",
- "--- a/arch/arm/mach-omap2/io.c\n",
- "+++ b/arch/arm/mach-omap2/io.c\n",
- "\@\@ -653,6 +653,7 \@\@ void __init omap5_init_early(void)\n",
- " \tomap54xx_clockdomains_init();\n",
- " \tomap54xx_hwmod_init();\n",
- " \tomap_hwmod_init_postsetup();\n",
- "+\tomap_clk_init = omap5xxx_clk_init;\n",
- " }\n",
- " #endif\n",
- " \n",
- "diff --git a/include/linux/clk/omap.h b/include/linux/clk/omap.h\n",
- "index 0d70cd1..4b82485 100644\n",
- "--- a/include/linux/clk/omap.h\n",
- "+++ b/include/linux/clk/omap.h\n",
- "\@\@ -197,6 +197,8 \@\@ void omap2_clk_enable_init_clocks(const char **clk_names, u8 num_clocks);\n",
- " \n",
- " void omap3_clk_lock_dpll5(void);\n",
- " \n",
- "+int omap5xxx_clk_init(void);\n",
- "+\n",
- " extern const struct clk_hw_omap_ops clkhwops_omap3_dpll;\n",
- " extern const struct clk_hw_omap_ops clkhwops_omap4_dpllmx;\n",
- " extern const struct clk_hw_omap_ops clkhwops_omap3430es2_dss_usbhost_wait;\n",
- "-- \n",
- "1.7.4.1"
-]
-[
- "\0001:4\0"
-]
-[
- "fn\0000003-CLK-omap5-Initialize-USB_DPLL-at-boot.patch\0"
-]
-[
- "b\0"
-]
-[
- ">From 8836bc00aea3c97206244c3f8a66e2726c835854 Mon Sep 17 00:00:00 2001\n",
- "From: Roger Quadros <rogerq\@ti.com>\n",
- "Date: Wed, 24 Jul 2013 16:30:55 +0300\n",
- "Subject: [PATCH 3/3] CLK: omap5: Initialize USB_DPLL at boot\n",
- "\n",
- "USB_DPLL must be initialized and locked at boot so that\n",
- "USB modules can work.\n",
- "\n",
- "Signed-off-by: Roger Quadros <rogerq\@ti.com>\n",
- "---\n",
- " drivers/clk/omap/clk-54xx.c | 13 ++++++++++++-\n",
- " 1 files changed, 12 insertions(+), 1 deletions(-)\n",
- "\n",
- "diff --git a/drivers/clk/omap/clk-54xx.c b/drivers/clk/omap/clk-54xx.c\n",
- "index ade0481..a0b3c14 100644\n",
- "--- a/drivers/clk/omap/clk-54xx.c\n",
- "+++ b/drivers/clk/omap/clk-54xx.c\n",
- "\@\@ -19,6 +19,12 \@\@\n",
- " \n",
- " #define OMAP5_DPLL_ABE_DEFFREQ\t\t\t\t98304000\n",
- " \n",
- "+/*\n",
- "+ * OMAP543x TRM, section \"3.6.3.9.5 DPLL_USB Preferred Settings\"\n",
- "+ * states it must be at 960MHz\n",
- "+ */\n",
- "+#define OMAP5_DPLL_USB_DEFFREQ\t\t\t\t960000000\n",
- "+\n",
- " static struct omap_dt_clk omap54xx_clks[] = {\n",
- " \tDT_CLK(NULL, \"timer_32k_ck\", \"sys_32k_ck\"),\n",
- " \tDT_CLK(\"omap_timer.1\", \"sys_ck\", \"sys_clkin\"),\n",
- "\@\@ -37,7 +43,7 \@\@ static struct omap_dt_clk omap54xx_clks[] = {\n",
- " int __init omap5xxx_clk_init(void)\n",
- " {\n",
- " \tint rc;\n",
- "-\tstruct clk *abe_dpll_ref, *abe_dpll, *sys_32k_ck;\n",
- "+\tstruct clk *abe_dpll_ref, *abe_dpll, *sys_32k_ck, *usb_dpll;\n",
- " \n",
- " \tdt_omap_clk_init();\n",
- " \n",
- "\@\@ -54,5 +60,10 \@\@ int __init omap5xxx_clk_init(void)\n",
- " \tif (rc)\n",
- " \t\tpr_err(\"%s: failed to configure ABE DPLL!\\n\", __func__);\n",
- " \n",
- "+\tusb_dpll = clk_get_sys(NULL, \"dpll_usb_ck\");\n",
- "+\trc = clk_set_rate(usb_dpll, OMAP5_DPLL_USB_DEFFREQ);\n",
- "+\tif (rc)\n",
- "+\t\tpr_err(\"%s: failed to configure USB DPLL!\\n\", __func__);\n",
- "+\n",
- " \treturn 0;\n",
- " }\n",
- "-- \n",
- "1.7.4.1"
+ "-roger\n",
+ "-------------- next part --------------\n",
+ "A non-text attachment was scrubbed...\n",
+ "Name: 0001-ARM-dts-OMAP5-Provide-clock-tree-data.patch\n",
+ "Type: text/x-patch\n",
+ "Size: 802 bytes\n",
+ "Desc: not available\n",
+ "URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130724/2dbc50ae/attachment-0003.bin>\n",
+ "-------------- next part --------------\n",
+ "A non-text attachment was scrubbed...\n",
+ "Name: 0002-CLK-omap5-Call-clock-init-function-at-boot.patch\n",
+ "Type: text/x-patch\n",
+ "Size: 1311 bytes\n",
+ "Desc: not available\n",
+ "URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130724/2dbc50ae/attachment-0004.bin>\n",
+ "-------------- next part --------------\n",
+ "A non-text attachment was scrubbed...\n",
+ "Name: 0003-CLK-omap5-Initialize-USB_DPLL-at-boot.patch\n",
+ "Type: text/x-patch\n",
+ "Size: 1552 bytes\n",
+ "Desc: not available\n",
+ "URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130724/2dbc50ae/attachment-0005.bin>"
]
-1c3fe975d3fce6a9840ad50c85b38856796fd32b24224d8f94b7743a3f1c1378
+733753d6dbaeb67d1802cb3d325a26343f60b0de08120171e9eb2d9b4ad3fafb
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.