diff for duplicates of <54B3F1B7.7090307@collabora.co.uk> diff --git a/a/1.txt b/N1/1.txt index 0b000ba..454d12f 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -80,7 +80,7 @@ index 0ac5e0810e97..53b0a03843f2 100644 reg = <0x10044120 0x20>; }; -+ disp1_pd: power-domain@100440C0 { ++ disp1_pd: power-domain at 100440C0 { + compatible = "samsung,exynos4210-pd"; + reg = <0x100440C0 0x20>; + clocks = <&clock CLK_FIN_PLL>, <&clock CLK_MOUT_SW_ACLK200>, @@ -93,17 +93,17 @@ index 0ac5e0810e97..53b0a03843f2 100644 + "pclk1", "clk1", "pclk2", "clk2"; + }; + - pinctrl_0: pinctrl@13400000 { + pinctrl_0: pinctrl at 13400000 { compatible = "samsung,exynos5420-pinctrl"; reg = <0x13400000 0x1000>; @@ -537,6 +550,7 @@ - fimd: fimd@14400000 { + fimd: fimd at 14400000 { clocks = <&clock CLK_SCLK_FIMD1>, <&clock CLK_FIMD1>; clock-names = "sclk_fimd", "fimd"; + samsung,power-domain = <&disp1_pd>; }; - adc: adc@12D10000 { + adc: adc at 12D10000 { @@ -710,6 +724,7 @@ phy = <&hdmiphy>; samsung,syscon-phandle = <&pmu_system_controller>; @@ -111,7 +111,7 @@ index 0ac5e0810e97..53b0a03843f2 100644 + samsung,power-domain = <&disp1_pd>; }; - hdmiphy: hdmiphy@145D0000 { + hdmiphy: hdmiphy at 145D0000 { @@ -722,6 +737,7 @@ interrupts = <0 94 0>; clocks = <&clock CLK_MIXER>, <&clock CLK_SCLK_HDMI>; @@ -119,7 +119,7 @@ index 0ac5e0810e97..53b0a03843f2 100644 + samsung,power-domain = <&disp1_pd>; }; - gsc_0: video-scaler@13e00000 { + gsc_0: video-scaler at 13e00000 { diff --git a/drivers/clk/samsung/clk-exynos5420.c b/drivers/clk/samsung/clk-exynos5420.c index 848d602efc06..07d666cc6a29 100644 --- a/drivers/clk/samsung/clk-exynos5420.c diff --git a/a/content_digest b/N1/content_digest index 4460b6c..9110e94 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -7,31 +7,10 @@ "ref\054AD0293.70909@samsung.com\0" "ref\054AEB384.2040005@collabora.co.uk\0" "ref\054B36C5A.6050109@samsung.com\0" - "ref\054B36C5A.6050109-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\0Mon, 12 Jan 2015 17:09:27 +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\0Rob Herring <robh-DgEjT+Ai2ygdnm+yROfE0A@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> - Inki Dae <inki.dae-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org> - David Wodhouse <dwmw2-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org> - Will Deacon <will.deacon-5wv7dgnIgG8@public.gmane.org> - Tomasz Figa <tomasz.figa-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> - Sjoerd Simons <sjoerd.simons-ZGY8ohtN/8pPYcu2f3hruQ@public.gmane.org> - linaro-mm-sig-cunTk1MwBs8s++Sfvej+rw@public.gmane.org - iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@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> - Gustavo Padovan <gustavo.padovan-ZGY8ohtN/8pPYcu2f3hruQ@public.gmane.org> - Cho KyongHo <pullip.cho-Sze3O3UU22JBDgjK7y7TUQ@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" @@ -116,7 +95,7 @@ " \t\treg = <0x10044120 0x20>;\n" " \t};\n" " \n" - "+\tdisp1_pd: power-domain@100440C0 {\n" + "+\tdisp1_pd: power-domain at 100440C0 {\n" "+\t\tcompatible = \"samsung,exynos4210-pd\";\n" "+\t\treg = <0x100440C0 0x20>;\n" "+\t\tclocks = <&clock CLK_FIN_PLL>, <&clock CLK_MOUT_SW_ACLK200>,\n" @@ -129,17 +108,17 @@ "+\t\t\t \"pclk1\", \"clk1\", \"pclk2\", \"clk2\";\n" "+\t};\n" "+\n" - " \tpinctrl_0: pinctrl@13400000 {\n" + " \tpinctrl_0: pinctrl at 13400000 {\n" " \t\tcompatible = \"samsung,exynos5420-pinctrl\";\n" " \t\treg = <0x13400000 0x1000>;\n" "@@ -537,6 +550,7 @@\n" - " \tfimd: fimd@14400000 {\n" + " \tfimd: fimd at 14400000 {\n" " \t\tclocks = <&clock CLK_SCLK_FIMD1>, <&clock CLK_FIMD1>;\n" " \t\tclock-names = \"sclk_fimd\", \"fimd\";\n" "+\t\tsamsung,power-domain = <&disp1_pd>;\n" " \t};\n" " \n" - " \tadc: adc@12D10000 {\n" + " \tadc: adc at 12D10000 {\n" "@@ -710,6 +724,7 @@\n" " \t\tphy = <&hdmiphy>;\n" " \t\tsamsung,syscon-phandle = <&pmu_system_controller>;\n" @@ -147,7 +126,7 @@ "+\t\tsamsung,power-domain = <&disp1_pd>;\n" " \t};\n" " \n" - " \thdmiphy: hdmiphy@145D0000 {\n" + " \thdmiphy: hdmiphy at 145D0000 {\n" "@@ -722,6 +737,7 @@\n" " \t\tinterrupts = <0 94 0>;\n" " \t\tclocks = <&clock CLK_MIXER>, <&clock CLK_SCLK_HDMI>;\n" @@ -155,7 +134,7 @@ "+\t\tsamsung,power-domain = <&disp1_pd>;\n" " \t};\n" " \n" - " \tgsc_0: video-scaler@13e00000 {\n" + " \tgsc_0: video-scaler at 13e00000 {\n" "diff --git a/drivers/clk/samsung/clk-exynos5420.c b/drivers/clk/samsung/clk-exynos5420.c\n" "index 848d602efc06..07d666cc6a29 100644\n" "--- a/drivers/clk/samsung/clk-exynos5420.c\n" @@ -243,4 +222,4 @@ " /* divider clocks */\n" " #define CLK_DOUT_PIXEL\t\t768" -d6384cc2d0849ab8748aa1ae5c84136606dc7626f5cd82e5c6472737f57b60df +900dd002beec3292ead2b26ec4d10d8c7d4cb8a49517784a36ac237ec45e1e28
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.