diff for duplicates of <1345707346-9035-10-git-send-email-linux@prisktech.co.nz> diff --git a/a/1.txt b/N1/1.txt index 7e91df1..9acb705 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -2,7 +2,7 @@ This patch adds common clock framework support for arch-vt8500. Support for PLL and device clocks on VT8500, WM8505 and WM8650 are included. -Signed-off-by: Tony Prisk <linux@prisktech.co.nz> +Signed-off-by: Tony Prisk <linux-ci5G2KO2hbZ+pU9mqzGVBQ@public.gmane.org> --- drivers/clk/Makefile | 1 + drivers/clk/clk-vt8500.c | 511 ++++++++++++++++++++++++++++++++++++++++++++++ @@ -29,7 +29,7 @@ index 0000000..2f7c77d @@ -0,0 +1,511 @@ +/* drivers/clk/clk-vt8500.c + * -+ * Copyright (C) 2012 Tony Prisk <linux@prisktech.co.nz> ++ * Copyright (C) 2012 Tony Prisk <linux-ci5G2KO2hbZ+pU9mqzGVBQ@public.gmane.org> + * + * This software is licensed under the terms of the GNU General Public + * License version 2, as published by the Free Software Foundation, and @@ -137,11 +137,11 @@ index 0000000..2f7c77d + u32 div = readl(cdev->div_reg) & cdev->div_mask; + + /* Special case for SDMMC devices */ -+ if ((cdev->div_mask = 0x3F) && (div & BIT(5))) ++ if ((cdev->div_mask == 0x3F) && (div & BIT(5))) + div = 64 * (div & 0x1f); + -+ /* div = 0 is actually the highest divisor */ -+ if (div = 0) ++ /* div == 0 is actually the highest divisor */ ++ if (div == 0) + div = (cdev->div_mask + 1); + + return parent_rate / div; @@ -162,7 +162,7 @@ index 0000000..2f7c77d + u32 divisor = rate / parent_rate; + unsigned long flags = 0; + -+ if (divisor = cdev->div_mask + 1) ++ if (divisor == cdev->div_mask + 1) + divisor = 0; + + if (divisor > cdev->div_mask) { @@ -298,7 +298,7 @@ index 0000000..2f7c77d + ((r / d) * m) + +#define VT8500_BITS_TO_VAL(m, d) \ -+ ((d = 2 ? 0 : 0x100) | ((m >> 1) & 0x1F)) ++ ((d == 2 ? 0 : 0x100) | ((m >> 1) & 0x1F)) + +/* Helper macros for PLL_WM8650 */ +#define WM8650_PLL_MUL(x) (x & 0x3FF) @@ -355,7 +355,7 @@ index 0000000..2f7c77d + continue; + /* error will always be +ve */ + rate_err = rate - tclk; -+ if (rate_err = 0) { ++ if (rate_err == 0) { + *multiplier = mul; + *divisor1 = div1; + *divisor2 = div2; @@ -540,3 +540,8 @@ index 0000000..2f7c77d +} -- 1.7.9.5 + +-- +To unsubscribe from this list: send the line "unsubscribe linux-usb" in +the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/a/content_digest b/N1/content_digest index 9b1fcba..9c52c29 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,15 +1,36 @@ "ref\01345707346-9035-1-git-send-email-linux@prisktech.co.nz\0" - "From\0Tony Prisk <linux@prisktech.co.nz>\0" + "ref\01345707346-9035-1-git-send-email-linux-ci5G2KO2hbZ+pU9mqzGVBQ@public.gmane.org\0" + "From\0Tony Prisk <linux-ci5G2KO2hbZ+pU9mqzGVBQ@public.gmane.org>\0" "Subject\0[PATCHv4 9/9] arm: vt8500: clk: Add Common Clock Framework support\0" - "Date\0Thu, 23 Aug 2012 07:35:45 +0000\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "Date\0Thu, 23 Aug 2012 19:35:45 +1200\0" + "To\0vt8500-wm8505-linux-kernel-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org\0" + "Cc\0Tony Prisk <linux-ci5G2KO2hbZ+pU9mqzGVBQ@public.gmane.org>" + Russell King <linux-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org> + Alessandro Zummo <a.zummo-BfzFCNDTiLLj+vYz1yj4TQ@public.gmane.org> + Alan Cox <alan-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> + Greg Kroah-Hartman <gregkh-hQyY1W1yCW8ekmWlsbkhG0B+6BGkLq7r@public.gmane.org> + Florian Tobias Schandinat <FlorianSchandinat-Mmb7MZpHnFY@public.gmane.org> + Arnd Bergmann <arnd-r2nGTMty4D4@public.gmane.org> + Grant Likely <grant.likely-s3s/WqlpOiPyB63q8FvJNQ@public.gmane.org> + Rob Herring <rob.herring-bsGFqQB8/DxBDgjK7y7TUQ@public.gmane.org> + Rob Landley <rob-VoJi6FS/r0vR7s880joybQ@public.gmane.org> + Linus Walleij <linus.walleij-0IS4wlFg1OjSUeElwK9/Pw@public.gmane.org> + Mike Turquette <mturquette-l0cyMroinI0@public.gmane.org> + Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org> + linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org + linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + linux-fbdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + linux-usb-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + linux-serial-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + rtc-linux-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org + " devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org\0" "\00:1\0" "b\0" "This patch adds common clock framework support for arch-vt8500.\n" "Support for PLL and device clocks on VT8500, WM8505 and WM8650\n" "are included.\n" "\n" - "Signed-off-by: Tony Prisk <linux@prisktech.co.nz>\n" + "Signed-off-by: Tony Prisk <linux-ci5G2KO2hbZ+pU9mqzGVBQ@public.gmane.org>\n" "---\n" " drivers/clk/Makefile | 1 +\n" " drivers/clk/clk-vt8500.c | 511 ++++++++++++++++++++++++++++++++++++++++++++++\n" @@ -36,7 +57,7 @@ "@@ -0,0 +1,511 @@\n" "+/* drivers/clk/clk-vt8500.c\n" "+ *\n" - "+ * Copyright (C) 2012 Tony Prisk <linux@prisktech.co.nz>\n" + "+ * Copyright (C) 2012 Tony Prisk <linux-ci5G2KO2hbZ+pU9mqzGVBQ@public.gmane.org>\n" "+ *\n" "+ * This software is licensed under the terms of the GNU General Public\n" "+ * License version 2, as published by the Free Software Foundation, and\n" @@ -144,11 +165,11 @@ "+\tu32 div = readl(cdev->div_reg) & cdev->div_mask;\n" "+\n" "+\t/* Special case for SDMMC devices */\n" - "+\tif ((cdev->div_mask = 0x3F) && (div & BIT(5)))\n" + "+\tif ((cdev->div_mask == 0x3F) && (div & BIT(5)))\n" "+\t\tdiv = 64 * (div & 0x1f);\n" "+\n" - "+\t/* div = 0 is actually the highest divisor */\n" - "+\tif (div = 0)\n" + "+\t/* div == 0 is actually the highest divisor */\n" + "+\tif (div == 0)\n" "+\t\tdiv = (cdev->div_mask + 1);\n" "+\n" "+\treturn parent_rate / div;\n" @@ -169,7 +190,7 @@ "+\tu32 divisor = rate / parent_rate;\n" "+\tunsigned long flags = 0;\n" "+\n" - "+\tif (divisor = cdev->div_mask + 1)\n" + "+\tif (divisor == cdev->div_mask + 1)\n" "+\t\tdivisor = 0;\n" "+\n" "+\tif (divisor > cdev->div_mask) {\n" @@ -305,7 +326,7 @@ "+\t\t\t\t((r / d) * m)\n" "+\n" "+#define VT8500_BITS_TO_VAL(m, d)\t\t\t\t\t\\\n" - "+\t\t\t\t((d = 2 ? 0 : 0x100) | ((m >> 1) & 0x1F))\n" + "+\t\t\t\t((d == 2 ? 0 : 0x100) | ((m >> 1) & 0x1F))\n" "+\n" "+/* Helper macros for PLL_WM8650 */\n" "+#define WM8650_PLL_MUL(x)\t(x & 0x3FF)\n" @@ -362,7 +383,7 @@ "+\t\t\t\t\tcontinue;\n" "+\t\t\t\t/* error will always be +ve */\n" "+\t\t\t\trate_err = rate - tclk;\n" - "+\t\t\t\tif (rate_err = 0) {\n" + "+\t\t\t\tif (rate_err == 0) {\n" "+\t\t\t\t\t*multiplier = mul;\n" "+\t\t\t\t\t*divisor1 = div1;\n" "+\t\t\t\t\t*divisor2 = div2;\n" @@ -546,6 +567,11 @@ "+\tof_clk_init(clk_match);\n" "+}\n" "-- \n" - 1.7.9.5 + "1.7.9.5\n" + "\n" + "--\n" + "To unsubscribe from this list: send the line \"unsubscribe linux-usb\" in\n" + "the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\n" + More majordomo info at http://vger.kernel.org/majordomo-info.html -f0760035d8997c773f183c136a171f56fa077ad3d303f7498f49b39f1793bbdb +c33b674d3da6b39aeb53a68d2926fca6f50bd12490acfa1d7b414313c858ff61
diff --git a/a/1.txt b/N2/1.txt index 7e91df1..bb698c3 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -137,11 +137,11 @@ index 0000000..2f7c77d + u32 div = readl(cdev->div_reg) & cdev->div_mask; + + /* Special case for SDMMC devices */ -+ if ((cdev->div_mask = 0x3F) && (div & BIT(5))) ++ if ((cdev->div_mask == 0x3F) && (div & BIT(5))) + div = 64 * (div & 0x1f); + -+ /* div = 0 is actually the highest divisor */ -+ if (div = 0) ++ /* div == 0 is actually the highest divisor */ ++ if (div == 0) + div = (cdev->div_mask + 1); + + return parent_rate / div; @@ -162,7 +162,7 @@ index 0000000..2f7c77d + u32 divisor = rate / parent_rate; + unsigned long flags = 0; + -+ if (divisor = cdev->div_mask + 1) ++ if (divisor == cdev->div_mask + 1) + divisor = 0; + + if (divisor > cdev->div_mask) { @@ -298,7 +298,7 @@ index 0000000..2f7c77d + ((r / d) * m) + +#define VT8500_BITS_TO_VAL(m, d) \ -+ ((d = 2 ? 0 : 0x100) | ((m >> 1) & 0x1F)) ++ ((d == 2 ? 0 : 0x100) | ((m >> 1) & 0x1F)) + +/* Helper macros for PLL_WM8650 */ +#define WM8650_PLL_MUL(x) (x & 0x3FF) @@ -355,7 +355,7 @@ index 0000000..2f7c77d + continue; + /* error will always be +ve */ + rate_err = rate - tclk; -+ if (rate_err = 0) { ++ if (rate_err == 0) { + *multiplier = mul; + *divisor1 = div1; + *divisor2 = div2; diff --git a/a/content_digest b/N2/content_digest index 9b1fcba..bf293e1 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,7 +1,7 @@ "ref\01345707346-9035-1-git-send-email-linux@prisktech.co.nz\0" - "From\0Tony Prisk <linux@prisktech.co.nz>\0" + "From\0linux@prisktech.co.nz (Tony Prisk)\0" "Subject\0[PATCHv4 9/9] arm: vt8500: clk: Add Common Clock Framework support\0" - "Date\0Thu, 23 Aug 2012 07:35:45 +0000\0" + "Date\0Thu, 23 Aug 2012 19:35:45 +1200\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -144,11 +144,11 @@ "+\tu32 div = readl(cdev->div_reg) & cdev->div_mask;\n" "+\n" "+\t/* Special case for SDMMC devices */\n" - "+\tif ((cdev->div_mask = 0x3F) && (div & BIT(5)))\n" + "+\tif ((cdev->div_mask == 0x3F) && (div & BIT(5)))\n" "+\t\tdiv = 64 * (div & 0x1f);\n" "+\n" - "+\t/* div = 0 is actually the highest divisor */\n" - "+\tif (div = 0)\n" + "+\t/* div == 0 is actually the highest divisor */\n" + "+\tif (div == 0)\n" "+\t\tdiv = (cdev->div_mask + 1);\n" "+\n" "+\treturn parent_rate / div;\n" @@ -169,7 +169,7 @@ "+\tu32 divisor = rate / parent_rate;\n" "+\tunsigned long flags = 0;\n" "+\n" - "+\tif (divisor = cdev->div_mask + 1)\n" + "+\tif (divisor == cdev->div_mask + 1)\n" "+\t\tdivisor = 0;\n" "+\n" "+\tif (divisor > cdev->div_mask) {\n" @@ -305,7 +305,7 @@ "+\t\t\t\t((r / d) * m)\n" "+\n" "+#define VT8500_BITS_TO_VAL(m, d)\t\t\t\t\t\\\n" - "+\t\t\t\t((d = 2 ? 0 : 0x100) | ((m >> 1) & 0x1F))\n" + "+\t\t\t\t((d == 2 ? 0 : 0x100) | ((m >> 1) & 0x1F))\n" "+\n" "+/* Helper macros for PLL_WM8650 */\n" "+#define WM8650_PLL_MUL(x)\t(x & 0x3FF)\n" @@ -362,7 +362,7 @@ "+\t\t\t\t\tcontinue;\n" "+\t\t\t\t/* error will always be +ve */\n" "+\t\t\t\trate_err = rate - tclk;\n" - "+\t\t\t\tif (rate_err = 0) {\n" + "+\t\t\t\tif (rate_err == 0) {\n" "+\t\t\t\t\t*multiplier = mul;\n" "+\t\t\t\t\t*divisor1 = div1;\n" "+\t\t\t\t\t*divisor2 = div2;\n" @@ -548,4 +548,4 @@ "-- \n" 1.7.9.5 -f0760035d8997c773f183c136a171f56fa077ad3d303f7498f49b39f1793bbdb +8685500d90e858161ac94840fed93150585fe975bc21aa54d6924f606d5ac127
diff --git a/a/1.txt b/N3/1.txt index 7e91df1..bb698c3 100644 --- a/a/1.txt +++ b/N3/1.txt @@ -137,11 +137,11 @@ index 0000000..2f7c77d + u32 div = readl(cdev->div_reg) & cdev->div_mask; + + /* Special case for SDMMC devices */ -+ if ((cdev->div_mask = 0x3F) && (div & BIT(5))) ++ if ((cdev->div_mask == 0x3F) && (div & BIT(5))) + div = 64 * (div & 0x1f); + -+ /* div = 0 is actually the highest divisor */ -+ if (div = 0) ++ /* div == 0 is actually the highest divisor */ ++ if (div == 0) + div = (cdev->div_mask + 1); + + return parent_rate / div; @@ -162,7 +162,7 @@ index 0000000..2f7c77d + u32 divisor = rate / parent_rate; + unsigned long flags = 0; + -+ if (divisor = cdev->div_mask + 1) ++ if (divisor == cdev->div_mask + 1) + divisor = 0; + + if (divisor > cdev->div_mask) { @@ -298,7 +298,7 @@ index 0000000..2f7c77d + ((r / d) * m) + +#define VT8500_BITS_TO_VAL(m, d) \ -+ ((d = 2 ? 0 : 0x100) | ((m >> 1) & 0x1F)) ++ ((d == 2 ? 0 : 0x100) | ((m >> 1) & 0x1F)) + +/* Helper macros for PLL_WM8650 */ +#define WM8650_PLL_MUL(x) (x & 0x3FF) @@ -355,7 +355,7 @@ index 0000000..2f7c77d + continue; + /* error will always be +ve */ + rate_err = rate - tclk; -+ if (rate_err = 0) { ++ if (rate_err == 0) { + *multiplier = mul; + *divisor1 = div1; + *divisor2 = div2; diff --git a/a/content_digest b/N3/content_digest index 9b1fcba..163999d 100644 --- a/a/content_digest +++ b/N3/content_digest @@ -1,8 +1,28 @@ "ref\01345707346-9035-1-git-send-email-linux@prisktech.co.nz\0" "From\0Tony Prisk <linux@prisktech.co.nz>\0" "Subject\0[PATCHv4 9/9] arm: vt8500: clk: Add Common Clock Framework support\0" - "Date\0Thu, 23 Aug 2012 07:35:45 +0000\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "Date\0Thu, 23 Aug 2012 19:35:45 +1200\0" + "To\0vt8500-wm8505-linux-kernel@googlegroups.com\0" + "Cc\0Tony Prisk <linux@prisktech.co.nz>" + Russell King <linux@arm.linux.org.uk> + Alessandro Zummo <a.zummo@towertech.it> + Alan Cox <alan@linux.intel.com> + Greg Kroah-Hartman <gregkh@linuxfoundation.org> + Florian Tobias Schandinat <FlorianSchandinat@gmx.de> + Arnd Bergmann <arnd@arndb.de> + Grant Likely <grant.likely@secretlab.ca> + Rob Herring <rob.herring@calxeda.com> + Rob Landley <rob@landley.net> + Linus Walleij <linus.walleij@stericsson.com> + Mike Turquette <mturquette@ti.com> + Stephen Warren <swarren@nvidia.com> + linux-arm-kernel@lists.infradead.org + linux-kernel@vger.kernel.org + linux-fbdev@vger.kernel.org + linux-usb@vger.kernel.org + linux-serial@vger.kernel.org + rtc-linux@googlegroups.com + " devicetree-discuss@lists.ozlabs.org\0" "\00:1\0" "b\0" "This patch adds common clock framework support for arch-vt8500.\n" @@ -144,11 +164,11 @@ "+\tu32 div = readl(cdev->div_reg) & cdev->div_mask;\n" "+\n" "+\t/* Special case for SDMMC devices */\n" - "+\tif ((cdev->div_mask = 0x3F) && (div & BIT(5)))\n" + "+\tif ((cdev->div_mask == 0x3F) && (div & BIT(5)))\n" "+\t\tdiv = 64 * (div & 0x1f);\n" "+\n" - "+\t/* div = 0 is actually the highest divisor */\n" - "+\tif (div = 0)\n" + "+\t/* div == 0 is actually the highest divisor */\n" + "+\tif (div == 0)\n" "+\t\tdiv = (cdev->div_mask + 1);\n" "+\n" "+\treturn parent_rate / div;\n" @@ -169,7 +189,7 @@ "+\tu32 divisor = rate / parent_rate;\n" "+\tunsigned long flags = 0;\n" "+\n" - "+\tif (divisor = cdev->div_mask + 1)\n" + "+\tif (divisor == cdev->div_mask + 1)\n" "+\t\tdivisor = 0;\n" "+\n" "+\tif (divisor > cdev->div_mask) {\n" @@ -305,7 +325,7 @@ "+\t\t\t\t((r / d) * m)\n" "+\n" "+#define VT8500_BITS_TO_VAL(m, d)\t\t\t\t\t\\\n" - "+\t\t\t\t((d = 2 ? 0 : 0x100) | ((m >> 1) & 0x1F))\n" + "+\t\t\t\t((d == 2 ? 0 : 0x100) | ((m >> 1) & 0x1F))\n" "+\n" "+/* Helper macros for PLL_WM8650 */\n" "+#define WM8650_PLL_MUL(x)\t(x & 0x3FF)\n" @@ -362,7 +382,7 @@ "+\t\t\t\t\tcontinue;\n" "+\t\t\t\t/* error will always be +ve */\n" "+\t\t\t\trate_err = rate - tclk;\n" - "+\t\t\t\tif (rate_err = 0) {\n" + "+\t\t\t\tif (rate_err == 0) {\n" "+\t\t\t\t\t*multiplier = mul;\n" "+\t\t\t\t\t*divisor1 = div1;\n" "+\t\t\t\t\t*divisor2 = div2;\n" @@ -548,4 +568,4 @@ "-- \n" 1.7.9.5 -f0760035d8997c773f183c136a171f56fa077ad3d303f7498f49b39f1793bbdb +1b988386ac359fd794a53f01cf702eea2107f48b1681bab4a39d04f92d2659a8
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.