diff for duplicates of <54AEB384.2040005@collabora.co.uk> diff --git a/a/1.txt b/N1/1.txt index dd67804..02b3836 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -110,18 +110,18 @@ index 517e50f6760b..9966fe7bb0ec 100644 clock-names = "oscclk", "pclk0", "clk0"; }; -+ disp_pd: power-domain@100440C0 { ++ disp_pd: power-domain at 100440C0 { + compatible = "samsung,exynos4210-pd"; + reg = <0x100440C0 0x20>; + }; + - msc_pd: power-domain@10044120 { + msc_pd: power-domain at 10044120 { compatible = "samsung,exynos4210-pd"; reg = <0x10044120 0x20>; @@ -535,6 +540,7 @@ }; - fimd: fimd@14400000 { + fimd: fimd at 14400000 { + samsung,power-domain = <&disp_pd>; clocks = <&clock CLK_SCLK_FIMD1>, <&clock CLK_FIMD1>; clock-names = "sclk_fimd", "fimd"; @@ -133,7 +133,7 @@ index 517e50f6760b..9966fe7bb0ec 100644 + samsung,power-domain = <&disp_pd>; }; - hdmiphy: hdmiphy@145D0000 { + hdmiphy: hdmiphy at 145D0000 { @@ -722,6 +729,7 @@ interrupts = <0 94 0>; clocks = <&clock CLK_MIXER>, <&clock CLK_SCLK_HDMI>; @@ -141,7 +141,7 @@ index 517e50f6760b..9966fe7bb0ec 100644 + samsung,power-domain = <&disp_pd>; }; - gsc_0: video-scaler@13e00000 { + gsc_0: video-scaler at 13e00000 { [1]: diff --git a/a/content_digest b/N1/content_digest index 1c6c27c..36ab868 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -5,31 +5,10 @@ "ref\054AC93E0.8010705@samsung.com\0" "ref\054ACFD69.1020500@collabora.co.uk\0" "ref\054AD0293.70909@samsung.com\0" - "ref\054AD0293.70909-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org\0" - "From\0Javier Martinez Canillas <javier.martinez-ZGY8ohtN/8pPYcu2f3hruQ@public.gmane.org>\0" - "Subject\0Re: [PATCH v3 00/19] Exynos SYSMMU (IOMMU) integration with DT and DMA-mapping subsystem\0" + "From\0javier.martinez@collabora.co.uk (Javier Martinez Canillas)\0" + "Subject\0[PATCH v3 00/19] Exynos SYSMMU (IOMMU) integration with DT and DMA-mapping subsystem\0" "Date\0Thu, 08 Jan 2015 17:42:44 +0100\0" - "To\0Joonyoung Shim <jy0922.shim-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>" - Javier Martinez Canillas <javier-0uQlZySMnqxg9hUCZPvPmw@public.gmane.org> - " Marek Szyprowski <m.szyprowski-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>\0" - "Cc\0linaro-mm-sig-cunTk1MwBs8s++Sfvej+rw@public.gmane.org" - linux-samsung-soc-u79uwXL29TY76Z2rM5mHXA@public.gmane.org <linux-samsung-soc-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> - Shaik Ameer Basha <shaik.ameer-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org> - Arnd Bergmann <arnd-r2nGTMty4D4@public.gmane.org> - Rob Herring <robh-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> - Gustavo Padovan <gustavo.padovan-ZGY8ohtN/8pPYcu2f3hruQ@public.gmane.org> - Will Deacon <will.deacon-5wv7dgnIgG8@public.gmane.org> - iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org - Tomasz Figa <tomasz.figa-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> - Inki Dae <inki.dae-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org> - Sjoerd Simons <sjoerd.simons-ZGY8ohtN/8pPYcu2f3hruQ@public.gmane.org> - Kukjin Kim <kgene.kim-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org> - Laurent Pinchart <laurent.pinchart-ryLnwIuWjnjg/C1BVhZhaw@public.gmane.org> - Kyungmin Park <kyungmin.park-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org> - Thierry Reding <treding-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org> - Cho KyongHo <pullip.cho-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org> - David Wodhouse <dwmw2-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org> - " linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org <linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Hello Joonyoung,\n" @@ -144,18 +123,18 @@ " \t\tclock-names = \"oscclk\", \"pclk0\", \"clk0\";\n" " \t};\n" " \n" - "+\tdisp_pd: power-domain@100440C0 {\n" + "+\tdisp_pd: power-domain at 100440C0 {\n" "+\t\tcompatible = \"samsung,exynos4210-pd\";\n" "+\t\treg = <0x100440C0 0x20>;\n" "+\t};\n" "+\n" - " \tmsc_pd: power-domain@10044120 {\n" + " \tmsc_pd: power-domain at 10044120 {\n" " \t\tcompatible = \"samsung,exynos4210-pd\";\n" " \t\treg = <0x10044120 0x20>;\n" "@@ -535,6 +540,7 @@\n" " \t};\n" " \n" - " \tfimd: fimd@14400000 {\n" + " \tfimd: fimd at 14400000 {\n" "+\t\tsamsung,power-domain = <&disp_pd>;\n" " \t\tclocks = <&clock CLK_SCLK_FIMD1>, <&clock CLK_FIMD1>;\n" " \t\tclock-names = \"sclk_fimd\", \"fimd\";\n" @@ -167,7 +146,7 @@ "+\t\tsamsung,power-domain = <&disp_pd>;\n" " \t};\n" " \n" - " \thdmiphy: hdmiphy@145D0000 {\n" + " \thdmiphy: hdmiphy at 145D0000 {\n" "@@ -722,6 +729,7 @@\n" " \t\tinterrupts = <0 94 0>;\n" " \t\tclocks = <&clock CLK_MIXER>, <&clock CLK_SCLK_HDMI>;\n" @@ -175,7 +154,7 @@ "+\t\tsamsung,power-domain = <&disp_pd>;\n" " \t};\n" " \n" - " \tgsc_0: video-scaler@13e00000 {\n" + " \tgsc_0: video-scaler at 13e00000 {\n" "\n" "\n" "[1]:\n" @@ -186,4 +165,4 @@ "exynos-dp 145b0000.dp-controller: Timeout of video streamclk ok\n" exynos-dp 145b0000.dp-controller: unable to config video -7ceb7dfa30db3d98c31ca3e245225a6c880f6db52ec879f837fbe25ff1cbc801 +c3b4e1e7d72f8a8f043ab50a894e48fc26c2746767ae553fa7c984733613643b
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.