diff for duplicates of <201307100100.28992.heiko@sntech.de> diff --git a/a/1.txt b/N1/1.txt index 1f66d06..4778921 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -37,7 +37,7 @@ index 59594cf..9caeb89 100644 + }; + }; + - serial@50000000 { + serial at 50000000 { status = "okay"; pinctrl-names = "default"; diff --git a/arch/arm/boot/dts/s3c2416.dtsi b/arch/arm/boot/dts/s3c2416.dtsi @@ -56,22 +56,22 @@ index e6555bd..c19d99c 100644 compatible = "samsung,s3c2416-irq"; }; -+ clocks: clock-controller@0x4c000000 { ++ clocks: clock-controller at 0x4c000000 { + compatible = "samsung,s3c2416-clock"; + reg = <0x4c000000 0x40>; + #clock-cells = <1>; + }; + - pinctrl@56000000 { + pinctrl at 56000000 { compatible = "samsung,s3c2416-pinctrl"; }; -+ timer@51000000 { ++ timer at 51000000 { + clocks = <&clocks PCLK_PWM>; + clock-names = "timers"; + }; + - serial@50000000 { + serial at 50000000 { compatible = "samsung,s3c2440-uart"; + clock-names = "uart", "clk_uart_baud2", + "clk_uart_baud3"; @@ -79,7 +79,7 @@ index e6555bd..c19d99c 100644 + <&clocks SCLK_UART>; }; - serial@50004000 { + serial at 50004000 { compatible = "samsung,s3c2440-uart"; + clock-names = "uart", "clk_uart_baud2", + "clk_uart_baud3"; @@ -87,7 +87,7 @@ index e6555bd..c19d99c 100644 + <&clocks SCLK_UART>; }; - serial@50008000 { + serial at 50008000 { compatible = "samsung,s3c2440-uart"; + clock-names = "uart", "clk_uart_baud2", + "clk_uart_baud3"; @@ -95,7 +95,7 @@ index e6555bd..c19d99c 100644 + <&clocks SCLK_UART>; }; - serial@5000C000 { + serial at 5000C000 { compatible = "samsung,s3c2440-uart"; reg = <0x5000C000 0x4000>; interrupts = <1 18 24 4>, <1 18 25 4>; @@ -128,19 +128,19 @@ index e6555bd..c19d99c 100644 status = "disabled"; }; - watchdog@53000000 { + watchdog at 53000000 { interrupts = <1 9 27 3>; + clocks = <&clocks PCLK_WDT>; + clock-names = "watchdog"; }; - rtc@57000000 { + rtc at 57000000 { compatible = "samsung,s3c2416-rtc"; + clocks = <&clocks PCLK_RTC>; + clock-names = "rtc"; }; - i2c@54000000 { + i2c at 54000000 { compatible = "samsung,s3c2440-i2c"; + clocks = <&clocks PCLK_I2C0>; + clock-names = "i2c"; @@ -1287,7 +1287,7 @@ index b5bbeb7..0000000 - s3c_register_clksrc(clksrc_clks, ARRAY_SIZE(clksrc_clks)); - s3c_register_clocks(init_clocks, ARRAY_SIZE(init_clocks)); - -- /* See s3c2443/etc notes on disabling clocks at init time */ +- /* See s3c2443/etc notes on disabling clocks@init time */ - s3c_register_clocks(init_clocks_off, ARRAY_SIZE(init_clocks_off)); - s3c_disable_clocks(init_clocks_off, ARRAY_SIZE(init_clocks_off)); - clkdev_add_table(s3c2443_clk_lookup, ARRAY_SIZE(s3c2443_clk_lookup)); diff --git a/a/content_digest b/N1/content_digest index a8d0ba9..8cf81f2 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,14 +1,8 @@ "ref\0201307100057.06061.heiko@sntech.de\0" - "From\0Heiko St\303\274bner <heiko@sntech.de>\0" + "From\0heiko@sntech.de (Heiko St\303\274bner)\0" "Subject\0[PATCH v2 6/6] ARM: S3C24XX: Convert s3c2416 and s3c2443 to common clock framework\0" "Date\0Wed, 10 Jul 2013 01:00:28 +0200\0" - "To\0Kukjin Kim <kgene.kim@samsung.com>\0" - "Cc\0mturquette@linaro.org" - linux-arm-kernel@lists.infradead.org - linux-samsung-soc@vger.kernel.org - Thomas Abraham <thomas.abraham@linaro.org> - t.figa@samsung.com - " Russell King <linux@arm.linux.org.uk>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "This converts the mentioned platforms to use the newly introduced driver\n" @@ -50,7 +44,7 @@ "+\t\t};\n" "+\t};\n" "+\n" - " \tserial@50000000 {\n" + " \tserial at 50000000 {\n" " \t\tstatus = \"okay\";\n" " \t\tpinctrl-names = \"default\";\n" "diff --git a/arch/arm/boot/dts/s3c2416.dtsi b/arch/arm/boot/dts/s3c2416.dtsi\n" @@ -69,22 +63,22 @@ " \t\tcompatible = \"samsung,s3c2416-irq\";\n" " \t};\n" " \n" - "+\tclocks: clock-controller@0x4c000000 {\n" + "+\tclocks: clock-controller at 0x4c000000 {\n" "+\t\tcompatible = \"samsung,s3c2416-clock\";\n" "+\t\treg = <0x4c000000 0x40>;\n" "+\t\t#clock-cells = <1>;\n" "+\t};\n" "+\n" - " \tpinctrl@56000000 {\n" + " \tpinctrl at 56000000 {\n" " \t\tcompatible = \"samsung,s3c2416-pinctrl\";\n" " \t};\n" " \n" - "+\ttimer@51000000 {\n" + "+\ttimer at 51000000 {\n" "+\t\tclocks = <&clocks PCLK_PWM>;\n" "+\t\tclock-names = \"timers\";\n" "+\t};\n" "+\n" - " \tserial@50000000 {\n" + " \tserial at 50000000 {\n" " \t\tcompatible = \"samsung,s3c2440-uart\";\n" "+\t\tclock-names = \"uart\", \"clk_uart_baud2\",\n" "+\t\t\t\t\"clk_uart_baud3\";\n" @@ -92,7 +86,7 @@ "+\t\t\t\t<&clocks SCLK_UART>;\n" " \t};\n" " \n" - " \tserial@50004000 {\n" + " \tserial at 50004000 {\n" " \t\tcompatible = \"samsung,s3c2440-uart\";\n" "+\t\tclock-names = \"uart\", \"clk_uart_baud2\",\n" "+\t\t\t\t\"clk_uart_baud3\";\n" @@ -100,7 +94,7 @@ "+\t\t\t\t<&clocks SCLK_UART>;\n" " \t};\n" " \n" - " \tserial@50008000 {\n" + " \tserial at 50008000 {\n" " \t\tcompatible = \"samsung,s3c2440-uart\";\n" "+\t\tclock-names = \"uart\", \"clk_uart_baud2\",\n" "+\t\t\t\t\"clk_uart_baud3\";\n" @@ -108,7 +102,7 @@ "+\t\t\t\t<&clocks SCLK_UART>;\n" " \t};\n" " \n" - " \tserial@5000C000 {\n" + " \tserial at 5000C000 {\n" " \t\tcompatible = \"samsung,s3c2440-uart\";\n" " \t\treg = <0x5000C000 0x4000>;\n" " \t\tinterrupts = <1 18 24 4>, <1 18 25 4>;\n" @@ -141,19 +135,19 @@ " \t\tstatus = \"disabled\";\n" " \t};\n" " \n" - " \twatchdog@53000000 {\n" + " \twatchdog at 53000000 {\n" " \t\tinterrupts = <1 9 27 3>;\n" "+\t\tclocks = <&clocks PCLK_WDT>;\n" "+\t\tclock-names = \"watchdog\";\n" " \t};\n" " \n" - " \trtc@57000000 {\n" + " \trtc at 57000000 {\n" " \t\tcompatible = \"samsung,s3c2416-rtc\";\n" "+\t\tclocks = <&clocks PCLK_RTC>;\n" "+\t\tclock-names = \"rtc\";\n" " \t};\n" " \n" - " \ti2c@54000000 {\n" + " \ti2c at 54000000 {\n" " \t\tcompatible = \"samsung,s3c2440-i2c\";\n" "+\t\tclocks = <&clocks PCLK_I2C0>;\n" "+\t\tclock-names = \"i2c\";\n" @@ -1300,7 +1294,7 @@ "-\ts3c_register_clksrc(clksrc_clks, ARRAY_SIZE(clksrc_clks));\n" "-\ts3c_register_clocks(init_clocks, ARRAY_SIZE(init_clocks));\n" "-\n" - "-\t/* See s3c2443/etc notes on disabling clocks at init time */\n" + "-\t/* See s3c2443/etc notes on disabling clocks@init time */\n" "-\ts3c_register_clocks(init_clocks_off, ARRAY_SIZE(init_clocks_off));\n" "-\ts3c_disable_clocks(init_clocks_off, ARRAY_SIZE(init_clocks_off));\n" "-\tclkdev_add_table(s3c2443_clk_lookup, ARRAY_SIZE(s3c2443_clk_lookup));\n" @@ -1503,4 +1497,4 @@ "-- \n" 1.7.10.4 -8f7043bca04600624573df0535c4f4e61536bf26b1afe56876d08d2746c96582 +4bd00aebb8b9d8580230fab922dc53055aebd6626060caaa3482b9c9c7f86f45
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.