diff for duplicates of <02fe01cf7344$c19d36f0$44d7a4d0$@samsung.com> diff --git a/a/1.txt b/N1/1.txt index 7b0f90d..fe34d99 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -4,9 +4,9 @@ Vivek Gautam wrote: > tree, to access System Register's registers using syscon driver. > > Signed-off-by: Kamil Debski <k.debski@samsung.com> -> [gautam.vivek@samsung.com: Split this syreg-syscon dts entry from +> [gautam.vivek at samsung.com: Split this syreg-syscon dts entry from > dts: Add usb2phy to Exynos 5250 patch] -> [gautam.vivek@samsung.com: added similar syscon entry for exynos5420] +> [gautam.vivek at samsung.com: added similar syscon entry for exynos5420] > Signed-off-by: Vivek Gautam <gautam.vivek@samsung.com> > --- > @@ -33,7 +33,7 @@ It cause very big confusing... > reg = <0x10040000 0x5000>; > }; > -> + sysreg_system_controller: syscon@10050000 { +> + sysreg_system_controller: syscon at 10050000 { > + compatible = "samsung,exynos5250-sys", "syscon"; Maybe exynos5250-sysreg? @@ -45,7 +45,7 @@ And need to add/modify binding doc? > + reg = <0x10050000 0x5000>; > + }; > + -> watchdog@101D0000 { +> watchdog at 101D0000 { > compatible = "samsung,exynos5250-wdt"; > reg = <0x101D0000 0x100>; > diff --git a/arch/arm/boot/dts/exynos5420.dtsi @@ -57,12 +57,12 @@ And need to add/modify binding doc? > reg = <0x10040000 0x5000>; > }; > -> + sysreg_system_controller: syscon@10050000 { +> + sysreg_system_controller: syscon at 10050000 { > + compatible = "samsung,exynos5420-sys", "syscon"; > + reg = <0x10050000 0x5000>; > + }; > + -> tmu_cpu0: tmu@10060000 { +> tmu_cpu0: tmu at 10060000 { > compatible = "samsung,exynos5420-tmu"; > reg = <0x10060000 0x100>; > -- diff --git a/a/content_digest b/N1/content_digest index eb1f0bc..8be94da 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,19 +1,9 @@ "ref\01399641784-10833-1-git-send-email-gautam.vivek@samsung.com\0" "ref\01399641784-10833-2-git-send-email-gautam.vivek@samsung.com\0" - "From\0Kukjin Kim <kgene.kim@samsung.com>\0" - "Subject\0RE: [PATCH v9 1/4] ARM: dts: Add sysreg sytem controller node to exynos5250 and exynos5420\0" + "From\0kgene.kim@samsung.com (Kukjin Kim)\0" + "Subject\0[PATCH v9 1/4] ARM: dts: Add sysreg sytem controller node to exynos5250 and exynos5420\0" "Date\0Mon, 19 May 2014 18:28:55 +0900\0" - "To\0'Vivek Gautam' <gautam.vivek@samsung.com>" - linux-usb@vger.kernel.org - " linux-samsung-soc@vger.kernel.org\0" - "Cc\0linux-kernel@vger.kernel.org" - devicetree@vger.kernel.org - linux-arm-kernel@lists.infradead.org - robh+dt@kernel.org - stern@rowland.harvard.edu - kishon@ti.com - k.debski@samsung.com - " jg1.han@samsung.com\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Vivek Gautam wrote:\n" @@ -22,9 +12,9 @@ "> tree, to access System Register's registers using syscon driver.\n" "> \n" "> Signed-off-by: Kamil Debski <k.debski@samsung.com>\n" - "> [gautam.vivek@samsung.com: Split this syreg-syscon dts entry from\n" + "> [gautam.vivek at samsung.com: Split this syreg-syscon dts entry from\n" "> dts: Add usb2phy to Exynos 5250 patch]\n" - "> [gautam.vivek@samsung.com: added similar syscon entry for exynos5420]\n" + "> [gautam.vivek at samsung.com: added similar syscon entry for exynos5420]\n" "> Signed-off-by: Vivek Gautam <gautam.vivek@samsung.com>\n" "> ---\n" "> \n" @@ -51,7 +41,7 @@ "> \t\treg = <0x10040000 0x5000>;\n" "> \t};\n" "> \n" - "> +\tsysreg_system_controller: syscon@10050000 {\n" + "> +\tsysreg_system_controller: syscon at 10050000 {\n" "> +\t\tcompatible = \"samsung,exynos5250-sys\", \"syscon\";\n" "\n" "Maybe exynos5250-sysreg?\n" @@ -63,7 +53,7 @@ "> +\t\treg = <0x10050000 0x5000>;\n" "> +\t};\n" "> +\n" - "> \twatchdog@101D0000 {\n" + "> \twatchdog at 101D0000 {\n" "> \t\tcompatible = \"samsung,exynos5250-wdt\";\n" "> \t\treg = <0x101D0000 0x100>;\n" "> diff --git a/arch/arm/boot/dts/exynos5420.dtsi\n" @@ -75,15 +65,15 @@ "> \t\treg = <0x10040000 0x5000>;\n" "> \t};\n" "> \n" - "> +\tsysreg_system_controller: syscon@10050000 {\n" + "> +\tsysreg_system_controller: syscon at 10050000 {\n" "> +\t\tcompatible = \"samsung,exynos5420-sys\", \"syscon\";\n" "> +\t\treg = <0x10050000 0x5000>;\n" "> +\t};\n" "> +\n" - "> \ttmu_cpu0: tmu@10060000 {\n" + "> \ttmu_cpu0: tmu at 10060000 {\n" "> \t\tcompatible = \"samsung,exynos5420-tmu\";\n" "> \t\treg = <0x10060000 0x100>;\n" "> --\n" > 1.7.10.4 -7c56f3fca94b28f0c10aeefe32aa1fbacab3babb9ef49f445492ac2f003eeee6 +7b92902e633c569fd8a546e94c3de433f04c0042d6554178664cd26571352eb0
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.