diff for duplicates of <537CB7A6.3050202@samsung.com> diff --git a/a/1.txt b/N1/1.txt index 2b77d28..44d6e85 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -28,13 +28,13 @@ Sylwester > fimc3 = &fimc_3; > }; > -> + clock_audss: clock-controller@03810000 { +> + clock_audss: clock-controller at 03810000 { > + compatible = "samsung,exynos4210-audss-clock"; > + reg = <0x03810000 0x0C>; > + #clock-cells = <1>; > + }; > + -> + i2s0: i2s@03830000 { +> + i2s0: i2s at 03830000 { > + compatible = "samsung,s5pv210-i2s"; > + reg = <0x03830000 0x100>; > + clocks = <&clock_audss EXYNOS_I2S_BUS>; @@ -45,14 +45,14 @@ Sylwester > + status = "disabled"; > + }; > + -> chipid@10000000 { +> chipid at 10000000 { > compatible = "samsung,exynos4210-chipid"; > reg = <0x10000000 0x100>; > @@ -289,6 +307,26 @@ > status = "disabled"; > }; > -> + i2s1: i2s@13960000 { +> + i2s1: i2s at 13960000 { > + compatible = "samsung,s5pv210-i2s"; > + reg = <0x13960000 0x100>; > + clocks = <&clock CLK_I2S1>; @@ -62,7 +62,7 @@ Sylwester > + status = "disabled"; > + }; > + -> + i2s2: i2s@13970000 { +> + i2s2: i2s at 13970000 { > + compatible = "samsung,s5pv210-i2s"; > + reg = <0x13970000 0x100>; > + clocks = <&clock CLK_I2S2>; @@ -72,7 +72,7 @@ Sylwester > + status = "disabled"; > + }; > + -> mfc: codec@13400000 { +> mfc: codec at 13400000 { > compatible = "samsung,mfc-v5"; > reg = <0x13400000 0x10000>; > -- diff --git a/a/content_digest b/N1/content_digest index a6477ef..bfa0218 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,11 +1,8 @@ "ref\01400239733-11782-1-git-send-email-s.nawrocki@samsung.com\0" - "From\0Sylwester Nawrocki <s.nawrocki@samsung.com>\0" - "Subject\0Re: [PATCH] ARM: dts: Add audio subsystem nodes to exynos4.dtsi\0" + "From\0s.nawrocki@samsung.com (Sylwester Nawrocki)\0" + "Subject\0[PATCH] ARM: dts: Add audio subsystem nodes to exynos4.dtsi\0" "Date\0Wed, 21 May 2014 16:26:46 +0200\0" - "To\0kgene.kim@samsung.com\0" - "Cc\0linux-arm-kernel@lists.infradead.org" - linux-samsung-soc@vger.kernel.org - " kyungmin.park@samsung.com\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On 16/05/14 13:28, Sylwester Nawrocki wrote:\n" @@ -38,13 +35,13 @@ "> \t\tfimc3 = &fimc_3;\n" "> \t};\n" "> \n" - "> +\tclock_audss: clock-controller@03810000 {\n" + "> +\tclock_audss: clock-controller at 03810000 {\n" "> +\t\tcompatible = \"samsung,exynos4210-audss-clock\";\n" "> +\t\treg = <0x03810000 0x0C>;\n" "> +\t\t#clock-cells = <1>;\n" "> +\t};\n" "> +\n" - "> +\ti2s0: i2s@03830000 {\n" + "> +\ti2s0: i2s at 03830000 {\n" "> +\t\tcompatible = \"samsung,s5pv210-i2s\";\n" "> +\t\treg = <0x03830000 0x100>;\n" "> +\t\tclocks = <&clock_audss EXYNOS_I2S_BUS>;\n" @@ -55,14 +52,14 @@ "> +\t\tstatus = \"disabled\";\n" "> +\t};\n" "> +\n" - "> \tchipid@10000000 {\n" + "> \tchipid at 10000000 {\n" "> \t\tcompatible = \"samsung,exynos4210-chipid\";\n" "> \t\treg = <0x10000000 0x100>;\n" "> @@ -289,6 +307,26 @@\n" "> \t\tstatus = \"disabled\";\n" "> \t};\n" "> \n" - "> +\ti2s1: i2s@13960000 {\n" + "> +\ti2s1: i2s at 13960000 {\n" "> +\t\tcompatible = \"samsung,s5pv210-i2s\";\n" "> +\t\treg = <0x13960000 0x100>;\n" "> +\t\tclocks = <&clock CLK_I2S1>;\n" @@ -72,7 +69,7 @@ "> +\t\tstatus = \"disabled\";\n" "> +\t};\n" "> +\n" - "> +\ti2s2: i2s@13970000 {\n" + "> +\ti2s2: i2s at 13970000 {\n" "> +\t\tcompatible = \"samsung,s5pv210-i2s\";\n" "> +\t\treg = <0x13970000 0x100>;\n" "> +\t\tclocks = <&clock CLK_I2S2>;\n" @@ -82,10 +79,10 @@ "> +\t\tstatus = \"disabled\";\n" "> +\t};\n" "> +\n" - "> \tmfc: codec@13400000 {\n" + "> \tmfc: codec at 13400000 {\n" "> \t\tcompatible = \"samsung,mfc-v5\";\n" "> \t\treg = <0x13400000 0x10000>;\n" "> --\n" > 1.7.9.5 -a11a0d9ddaf157574c79ad002b13ffbcf410525f09b093bdad748c2b055ecfd2 +1396c325c1e5b0632e355b75dfd7b26db9a59081915269f0454d635902f48b96
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.