diff for duplicates of <51CB1C29.80908@samsung.com> diff --git a/a/1.txt b/N1/1.txt index d496539..3cf817f 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -24,7 +24,7 @@ On 06/25/2013 10:24 AM, Phil Carmody wrote: > + fimc-lite1 = &fimc_lite_1; > }; > -> pd_isp: isp-power-domain@10023CA0 { +> pd_isp: isp-power-domain at 10023CA0 { > @@ -78,4 +80,120 @@ > clock-names = "sclk_fimg2d", "fimg2d"; > status = "disabled"; @@ -36,7 +36,7 @@ On 06/25/2013 10:24 AM, Phil Carmody wrote: > + clock-names = "sclk_cam0", "sclk_cam1", "pxl_async0", > + "pxl_async1", "mux_cam0", "mux_cam1", "parent"; > + -> + fimc_0: fimc@11800000 { +> + fimc_0: fimc at 11800000 { > + compatible = "samsung,exynos4212-fimc"; > + clocks = <&clock 256>, <&clock 128>, <&clock 384>, <&clock 17>; > + clock-names = "fimc", "sclk_fimc", "mux", "parent"; @@ -46,7 +46,7 @@ On 06/25/2013 10:24 AM, Phil Carmody wrote: > + samsung,cam-if; > + }; > + -> + fimc_1: fimc@11810000 { +> + fimc_1: fimc at 11810000 { > + compatible = "samsung,exynos4212-fimc"; > + clocks = <&clock 257>, <&clock 129>, <&clock 385>, <&clock 17>; > + clock-names = "fimc", "sclk_fimc", "mux", "parent"; @@ -56,7 +56,7 @@ On 06/25/2013 10:24 AM, Phil Carmody wrote: > + samsung,cam-if; > + }; > + -> + fimc_2: fimc@11820000 { +> + fimc_2: fimc at 11820000 { > + compatible = "samsung,exynos4212-fimc"; > + clocks = <&clock 258>, <&clock 130>, <&clock 386>, <&clock 17>; > + clock-names = "fimc", "sclk_fimc", "mux", "parent"; @@ -67,7 +67,7 @@ On 06/25/2013 10:24 AM, Phil Carmody wrote: > + samsung,cam-if; > + }; > + -> + fimc_3: fimc@11830000 { +> + fimc_3: fimc at 11830000 { > + compatible = "samsung,exynos4212-fimc"; > + clocks = <&clock 259>, <&clock 131>, <&clock 387>, <&clock 17>; > + clock-names = "fimc", "sclk_fimc", "mux", "parent"; @@ -78,17 +78,17 @@ On 06/25/2013 10:24 AM, Phil Carmody wrote: > + samsung,lcd-wb; > + }; > + -> + csis_0: csis@11880000 { +> + csis_0: csis at 11880000 { > + clocks = <&clock 260>, <&clock 134>, <&clock 390>, <&clock 17>; > + clock-names = "csis", "sclk_csis", "mux", "parent"; > + }; > + -> + csis_1: csis@11890000 { +> + csis_1: csis at 11890000 { > + clocks = <&clock 261>, <&clock 135>, <&clock 391>, <&clock 17>; > + clock-names = "csis", "sclk_csis", "mux", "parent"; > + }; > + -> + fimc_lite_0: fimc-lite@12390000 { +> + fimc_lite_0: fimc-lite at 12390000 { > + compatible = "samsung,exynos4212-fimc-lite"; > + reg = <0x12390000 0x1000>; > + interrupts = <0 105 0>; @@ -98,7 +98,7 @@ On 06/25/2013 10:24 AM, Phil Carmody wrote: > + status = "disabled"; > + }; > + -> + fimc_lite_1: fimc-lite@123A0000 { +> + fimc_lite_1: fimc-lite at 123A0000 { > + compatible = "samsung,exynos4212-fimc-lite"; > + reg = <0x123A0000 0x1000>; > + interrupts = <0 106 0>; @@ -108,7 +108,7 @@ On 06/25/2013 10:24 AM, Phil Carmody wrote: > + status = "disabled"; > + }; > + -> + fimc_is: fimc-is@12000000 { +> + fimc_is: fimc-is at 12000000 { > + compatible = "samsung,exynos4212-fimc-is", "simple-bus"; > + reg = <0x12000000 0x260000>; > + interrupts = <0 90 0>, <0 95 0>; @@ -163,7 +163,7 @@ http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/drivers/me > + reg = <0x10020000 0x3000>; > + }; > + -> + i2c1_isp: i2c-isp@12140000 { +> + i2c1_isp: i2c-isp at 12140000 { > + compatible = "samsung,exynos4212-i2c-isp"; > + reg = <0x12130000 0x100>; > diff --git a/a/content_digest b/N1/content_digest index 6d0b90c..38abbd8 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,19 +1,10 @@ "ref\01372097151-18122-1-git-send-email-s.nawrocki@samsung.com\0" "ref\01372097151-18122-7-git-send-email-s.nawrocki@samsung.com\0" "ref\019E27FB8C8BBCC47BD08BAF8EB69E51E0FFD8601@ex1.seri.co.uk\0" - "From\0Sylwester Nawrocki <s.nawrocki@samsung.com>\0" - "Subject\0Re: [PATCH v2 6/8] ARM: dts: Add camera subsystem nodes to exynos4x12.dtsi\0" + "From\0s.nawrocki@samsung.com (Sylwester Nawrocki)\0" + "Subject\0[PATCH v2 6/8] ARM: dts: Add camera subsystem nodes to exynos4x12.dtsi\0" "Date\0Wed, 26 Jun 2013 18:51:53 +0200\0" - "To\0Phil Carmody <phil.carmody@partner.samsung.com>\0" - "Cc\0kgene.kim@samsung.com <kgene.kim@samsung.com>" - t.figa@samsung.com <t.figa@samsung.com> - linux-arm-kernel@lists.infradead.org <linux-arm-kernel@lists.infradead.org> - linux-samsung-soc@vger.kernel.org <linux-samsung-soc@vger.kernel.org> - myungjoo.ham@samsung.com <myungjoo.ham@samsung.com> - m.szyprowski@samsung.com <m.szyprowski@samsung.com> - j.anaszewski@samsung.com <j.anaszewski@samsung.com> - kyungmin.park@samsung.com <kyungmin.park@samsung.com> - " devicetree-discuss@lists.ozlabs.org <devicetree-discuss@lists.ozlabs.org>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Hi,\n" @@ -42,7 +33,7 @@ "> + fimc-lite1 = &fimc_lite_1;\n" "> };\n" "> \n" - "> pd_isp: isp-power-domain@10023CA0 {\n" + "> pd_isp: isp-power-domain at 10023CA0 {\n" "> @@ -78,4 +80,120 @@\n" "> clock-names = \"sclk_fimg2d\", \"fimg2d\";\n" "> status = \"disabled\";\n" @@ -54,7 +45,7 @@ "> + clock-names = \"sclk_cam0\", \"sclk_cam1\", \"pxl_async0\",\n" "> + \"pxl_async1\", \"mux_cam0\", \"mux_cam1\", \"parent\";\n" "> +\n" - "> + fimc_0: fimc@11800000 {\n" + "> + fimc_0: fimc at 11800000 {\n" "> + compatible = \"samsung,exynos4212-fimc\";\n" "> + clocks = <&clock 256>, <&clock 128>, <&clock 384>, <&clock 17>;\n" "> + clock-names = \"fimc\", \"sclk_fimc\", \"mux\", \"parent\";\n" @@ -64,7 +55,7 @@ "> + samsung,cam-if;\n" "> + };\n" "> +\n" - "> + fimc_1: fimc@11810000 {\n" + "> + fimc_1: fimc at 11810000 {\n" "> + compatible = \"samsung,exynos4212-fimc\";\n" "> + clocks = <&clock 257>, <&clock 129>, <&clock 385>, <&clock 17>;\n" "> + clock-names = \"fimc\", \"sclk_fimc\", \"mux\", \"parent\";\n" @@ -74,7 +65,7 @@ "> + samsung,cam-if;\n" "> + };\n" "> +\n" - "> + fimc_2: fimc@11820000 {\n" + "> + fimc_2: fimc at 11820000 {\n" "> + compatible = \"samsung,exynos4212-fimc\";\n" "> + clocks = <&clock 258>, <&clock 130>, <&clock 386>, <&clock 17>;\n" "> + clock-names = \"fimc\", \"sclk_fimc\", \"mux\", \"parent\";\n" @@ -85,7 +76,7 @@ "> + samsung,cam-if;\n" "> + };\n" "> +\n" - "> + fimc_3: fimc@11830000 {\n" + "> + fimc_3: fimc at 11830000 {\n" "> + compatible = \"samsung,exynos4212-fimc\";\n" "> + clocks = <&clock 259>, <&clock 131>, <&clock 387>, <&clock 17>;\n" "> + clock-names = \"fimc\", \"sclk_fimc\", \"mux\", \"parent\";\n" @@ -96,17 +87,17 @@ "> + samsung,lcd-wb;\n" "> + };\n" "> +\n" - "> + csis_0: csis@11880000 {\n" + "> + csis_0: csis at 11880000 {\n" "> + clocks = <&clock 260>, <&clock 134>, <&clock 390>, <&clock 17>;\n" "> + clock-names = \"csis\", \"sclk_csis\", \"mux\", \"parent\";\n" "> + };\n" "> +\n" - "> + csis_1: csis@11890000 {\n" + "> + csis_1: csis at 11890000 {\n" "> + clocks = <&clock 261>, <&clock 135>, <&clock 391>, <&clock 17>;\n" "> + clock-names = \"csis\", \"sclk_csis\", \"mux\", \"parent\";\n" "> + };\n" "> +\n" - "> + fimc_lite_0: fimc-lite@12390000 {\n" + "> + fimc_lite_0: fimc-lite at 12390000 {\n" "> + compatible = \"samsung,exynos4212-fimc-lite\";\n" "> + reg = <0x12390000 0x1000>;\n" "> + interrupts = <0 105 0>;\n" @@ -116,7 +107,7 @@ "> + status = \"disabled\";\n" "> + };\n" "> +\n" - "> + fimc_lite_1: fimc-lite@123A0000 {\n" + "> + fimc_lite_1: fimc-lite at 123A0000 {\n" "> + compatible = \"samsung,exynos4212-fimc-lite\";\n" "> + reg = <0x123A0000 0x1000>;\n" "> + interrupts = <0 106 0>;\n" @@ -126,7 +117,7 @@ "> + status = \"disabled\";\n" "> + };\n" "> +\n" - "> + fimc_is: fimc-is@12000000 {\n" + "> + fimc_is: fimc-is at 12000000 {\n" "> + compatible = \"samsung,exynos4212-fimc-is\", \"simple-bus\";\n" "> + reg = <0x12000000 0x260000>;\n" "> + interrupts = <0 90 0>, <0 95 0>;\n" @@ -181,7 +172,7 @@ "> + reg = <0x10020000 0x3000>;\n" "> + };\n" "> +\n" - "> + i2c1_isp: i2c-isp@12140000 {\n" + "> + i2c1_isp: i2c-isp at 12140000 {\n" "> + compatible = \"samsung,exynos4212-i2c-isp\";\n" "> + reg = <0x12130000 0x100>;\n" "> \n" @@ -202,4 +193,4 @@ "Thanks,\n" Sylwester -1b293309e0ebeb381d937d90eb3dc1127a364d34029f896ae8fdf576add6f1be +8ce7f7ee8628faea80480d5b4042dc669a15e7873037d616b28241aabf949340
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.