diff for duplicates of <20170224151122.12142-4-krzk@kernel.org> diff --git a/a/1.txt b/N1/1.txt index 35a59e9..3223411 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -25,7 +25,7 @@ index 18def1c774d5..71e2cdae6068 100644 }; }; -- watchdog: watchdog@10060000 { +- watchdog: watchdog at 10060000 { - compatible = "samsung,s3c2410-wdt"; - reg = <0x10060000 0x100>; - interrupts = <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>; @@ -34,7 +34,7 @@ index 18def1c774d5..71e2cdae6068 100644 - status = "disabled"; - }; - - rtc: rtc@10070000 { + rtc: rtc at 10070000 { compatible = "samsung,s3c6410-rtc"; reg = <0x10070000 0x100>; diff --git a/arch/arm/boot/dts/exynos4210.dtsi b/arch/arm/boot/dts/exynos4210.dtsi @@ -45,7 +45,7 @@ index f9408188f97f..e126357aba9a 100644 }; }; -+ watchdog: watchdog@10060000 { ++ watchdog: watchdog at 10060000 { + compatible = "samsung,s3c6410-wdt"; + reg = <0x10060000 0x100>; + interrupts = <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>; @@ -54,7 +54,7 @@ index f9408188f97f..e126357aba9a 100644 + status = "disabled"; + }; + - clock: clock-controller@10030000 { + clock: clock-controller at 10030000 { compatible = "samsung,exynos4210-clock"; reg = <0x10030000 0x20000>; diff --git a/arch/arm/boot/dts/exynos4412.dtsi b/arch/arm/boot/dts/exynos4412.dtsi @@ -65,7 +65,7 @@ index 235bbb69ad7c..6f47988a1ab5 100644 }; }; -+ watchdog: watchdog@10060000 { ++ watchdog: watchdog at 10060000 { + compatible = "samsung,exynos5250-wdt"; + reg = <0x10060000 0x100>; + interrupts = <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>; @@ -75,7 +75,7 @@ index 235bbb69ad7c..6f47988a1ab5 100644 + status = "disabled"; + }; + - adc: adc@126C0000 { + adc: adc at 126C0000 { compatible = "samsung,exynos-adc-v1"; reg = <0x126C0000 0x100>; -- diff --git a/a/content_digest b/N1/content_digest index cb1257f..4852a2d 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,17 +1,8 @@ "ref\020170224151122.12142-1-krzk@kernel.org\0" - "From\0Krzysztof Kozlowski <krzk@kernel.org>\0" + "From\0krzk@kernel.org (Krzysztof Kozlowski)\0" "Subject\0[PATCH 3/8] ARM: dts: exynos: Fix watchdog reset on Exynos4412\0" "Date\0Fri, 24 Feb 2017 17:11:17 +0200\0" - "To\0Wim Van Sebroeck <wim@iguana.be>" - Guenter Roeck <linux@roeck-us.net> - Kukjin Kim <kgene@kernel.org> - Krzysztof Kozlowski <krzk@kernel.org> - Javier Martinez Canillas <javier@osg.samsung.com> - linux-watchdog@vger.kernel.org - devicetree@vger.kernel.org - linux-kernel@vger.kernel.org - linux-arm-kernel@lists.infradead.org - " linux-samsung-soc@vger.kernel.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "The Exynos4412 has the same watchdog as newer SoCs (e.g. Exynos5250).\n" @@ -41,7 +32,7 @@ " \t\t};\n" " \t};\n" " \n" - "-\twatchdog: watchdog@10060000 {\n" + "-\twatchdog: watchdog at 10060000 {\n" "-\t\tcompatible = \"samsung,s3c2410-wdt\";\n" "-\t\treg = <0x10060000 0x100>;\n" "-\t\tinterrupts = <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>;\n" @@ -50,7 +41,7 @@ "-\t\tstatus = \"disabled\";\n" "-\t};\n" "-\n" - " \trtc: rtc@10070000 {\n" + " \trtc: rtc at 10070000 {\n" " \t\tcompatible = \"samsung,s3c6410-rtc\";\n" " \t\treg = <0x10070000 0x100>;\n" "diff --git a/arch/arm/boot/dts/exynos4210.dtsi b/arch/arm/boot/dts/exynos4210.dtsi\n" @@ -61,7 +52,7 @@ " \t\t};\n" " \t};\n" " \n" - "+\twatchdog: watchdog@10060000 {\n" + "+\twatchdog: watchdog at 10060000 {\n" "+\t\tcompatible = \"samsung,s3c6410-wdt\";\n" "+\t\treg = <0x10060000 0x100>;\n" "+\t\tinterrupts = <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>;\n" @@ -70,7 +61,7 @@ "+\t\tstatus = \"disabled\";\n" "+\t};\n" "+\n" - " \tclock: clock-controller@10030000 {\n" + " \tclock: clock-controller at 10030000 {\n" " \t\tcompatible = \"samsung,exynos4210-clock\";\n" " \t\treg = <0x10030000 0x20000>;\n" "diff --git a/arch/arm/boot/dts/exynos4412.dtsi b/arch/arm/boot/dts/exynos4412.dtsi\n" @@ -81,7 +72,7 @@ " \t\t};\n" " \t};\n" " \n" - "+\twatchdog: watchdog@10060000 {\n" + "+\twatchdog: watchdog at 10060000 {\n" "+\t\tcompatible = \"samsung,exynos5250-wdt\";\n" "+\t\treg = <0x10060000 0x100>;\n" "+\t\tinterrupts = <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>;\n" @@ -91,10 +82,10 @@ "+\t\tstatus = \"disabled\";\n" "+\t};\n" "+\n" - " \tadc: adc@126C0000 {\n" + " \tadc: adc at 126C0000 {\n" " \t\tcompatible = \"samsung,exynos-adc-v1\";\n" " \t\treg = <0x126C0000 0x100>;\n" "-- \n" 2.9.3 -efd7af54ce39f401f0bea317944c3d6575604a4d04a82cb39b5b4f9d83809079 +2965cbb4f1f2ffc9e86a4ef4f58f20cdf46c8b2a00d53a9c04375d8c78d9b051
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.