diff for duplicates of <54AD0293.70909@samsung.com> diff --git a/a/1.txt b/N1/1.txt index b15c56e..1ac07a5 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -85,7 +85,7 @@ index 8617a03..ff9ad4a 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,7 +93,7 @@ index 8617a03..ff9ad4a 100644 + clock-names = "oscclk", "pclk0", "clk0"; + }; + - pinctrl_0: pinctrl@13400000 { + pinctrl_0: pinctrl at 13400000 { compatible = "samsung,exynos5420-pinctrl"; reg = <0x13400000 0x1000>; @@ -704,6 +712,7 @@ @@ -111,7 +111,7 @@ index 8617a03..ff9ad4a 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 848d602..52ba0e6 100644 --- a/drivers/clk/samsung/clk-exynos5420.c diff --git a/a/content_digest b/N1/content_digest index d11bae7..7d514c9 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -4,32 +4,10 @@ "ref\0CABxcv=n=eNqbyBbOk1Wb87tCnnLZAJQurmCdeTOSqMZMbNaSHw@mail.gmail.com\0" "ref\054AC93E0.8010705@samsung.com\0" "ref\054ACFD69.1020500@collabora.co.uk\0" - "From\0Joonyoung Shim <jy0922.shim@samsung.com>\0" - "Subject\0Re: [PATCH v3 00/19] Exynos SYSMMU (IOMMU) integration with DT and DMA-mapping subsystem\0" + "From\0jy0922.shim@samsung.com (Joonyoung Shim)\0" + "Subject\0[PATCH v3 00/19] Exynos SYSMMU (IOMMU) integration with DT and DMA-mapping subsystem\0" "Date\0Wed, 07 Jan 2015 18:55:31 +0900\0" - "To\0Javier Martinez Canillas <javier.martinez@collabora.co.uk>" - Javier Martinez Canillas <javier@dowhile0.org> - " Marek Szyprowski <m.szyprowski@samsung.com>\0" - "Cc\0linaro-mm-sig@lists.linaro.org" - linux-samsung-soc@vger.kernel.org <linux-samsung-soc@vger.kernel.org> - Shaik Ameer Basha <shaik.ameer@samsung.com> - Arnd Bergmann <arnd@arndb.de> - Rob Herring <robh@kernel.org> - Gustavo Padovan <gustavo.padovan@collabora.co.uk> - Joerg Roedel <joro@8bytes.org> - Will Deacon <will.deacon@arm.com> - iommu@lists.linux-foundation.org - Tomasz Figa <tomasz.figa@gmail.com> - Inki Dae <inki.dae@samsung.com> - Sjoerd Simons <sjoerd.simons@collabora.co.uk> - Kukjin Kim <kgene.kim@samsung.com> - Laurent Pinchart <laurent.pinchart@ideasonboard.com> - Olof Johansson <olof@lixom.net> - Kyungmin Park <kyungmin.park@samsung.com> - Thierry Reding <treding@nvidia.com> - Cho KyongHo <pullip.cho@samsung.com> - David Wodhouse <dwmw2@infradead.org> - " linux-arm-kernel@lists.infradead.org <linux-arm-kernel@lists.infradead.org>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Hi Javier,\n" @@ -119,7 +97,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" @@ -127,7 +105,7 @@ "+\t\tclock-names = \"oscclk\", \"pclk0\", \"clk0\";\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" "@@ -704,6 +712,7 @@\n" @@ -145,7 +123,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 848d602..52ba0e6 100644\n" "--- a/drivers/clk/samsung/clk-exynos5420.c\n" @@ -210,4 +188,4 @@ "-- \n" 1.9.1 -107c874dcfea7c1d07705642201ab8935b2b37608c6c17208adcd97f1d91a479 +9c8467242cf991ea9ac4fdd53a9d32341f443aab4da91b4a7fc38e5be8529fd1
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.