diff for duplicates of <201312101619.53144.heiko@sntech.de> diff --git a/a/1.txt b/N1/1.txt index bad2178..24c85d3 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -28,7 +28,7 @@ index 59594cf..ea92fd6 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 @@ -47,22 +47,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"; @@ -70,7 +70,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"; @@ -78,7 +78,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"; @@ -86,7 +86,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>; @@ -119,19 +119,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"; diff --git a/a/content_digest b/N1/content_digest index 687bb46..cc74325 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,19 +1,8 @@ "ref\0201312101614.29781.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 v4 6/7] ARM: dt: add clock data for s3c2416\0" "Date\0Tue, 10 Dec 2013 16:19:52 +0100\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 - Rob Herring <rob.herring@calxeda.com> - Pawel Moll <pawel.moll@arm.com> - Mark Rutland <mark.rutland@arm.com> - Stephen Warren <swarren@wwwdotorg.org> - Ian Campbell <ijc+devicetree@hellion.org.uk> - " devicetree@vger.kernel.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "This adds the clock controller itself, the xti clock on the smdk2416\n" @@ -46,7 +35,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" @@ -65,22 +54,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" @@ -88,7 +77,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" @@ -96,7 +85,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" @@ -104,7 +93,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" @@ -137,19 +126,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" @@ -158,4 +147,4 @@ "-- \n" 1.7.10.4 -55f71f6f16b6de8adcce4b711bf9856a7c90b47903ba29dda36de0c7ce463950 +b0efdf4a94d2e4163f03128c5f9fe8116c6840e1a37f850f61ff6ba8fddfc19b
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.