diff for duplicates of <1492374441-23336-25-git-send-email-daniel.lezcano@linaro.org> diff --git a/a/1.txt b/N1/1.txt index f9c0b9b..1ca48c5 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -25,7 +25,7 @@ index cf91254..8428fae 100644 }; }; -+ timer3: timer@2000e000 { ++ timer3: timer at 2000e000 { + compatible = "rockchip,rk3188-timer", "rockchip,rk3288-timer"; + reg = <0x2000e000 0x20>; + interrupts = <GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH>; @@ -33,7 +33,7 @@ index cf91254..8428fae 100644 + clock-names = "timer", "pclk"; + }; + -+ timer6: timer@200380a0 { ++ timer6: timer at 200380a0 { + compatible = "rockchip,rk3188-timer", "rockchip,rk3288-timer"; + reg = <0x200380a0 0x20>; + interrupts = <GIC_SPI 64 IRQ_TYPE_LEVEL_HIGH>; @@ -41,7 +41,7 @@ index cf91254..8428fae 100644 + clock-names = "timer", "pclk"; + }; + - i2s0: i2s@1011a000 { + i2s0: i2s at 1011a000 { compatible = "rockchip,rk3188-i2s", "rockchip,rk3066-i2s"; reg = <0x1011a000 0x2000>; -- diff --git a/a/content_digest b/N1/content_digest index 5e12b3d..6863435 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,18 +1,9 @@ "ref\020170416202542.GV2078@mai\0" "ref\01492374441-23336-1-git-send-email-daniel.lezcano@linaro.org\0" - "From\0Daniel Lezcano <daniel.lezcano@linaro.org>\0" + "From\0daniel.lezcano@linaro.org (Daniel Lezcano)\0" "Subject\0[PATCH 25/29] ARM: dts: rockchip: Add timer entries to rk3188 SoC\0" "Date\0Sun, 16 Apr 2017 22:27:15 +0200\0" - "To\0tglx@linutronix.de\0" - "Cc\0linux-kernel@vger.kernel.org" - Alexander Kochetkov <al.kochet@gmail.com> - Heiko Stuebner <heiko@sntech.de> - Rob Herring <robh+dt@kernel.org> - Mark Rutland <mark.rutland@arm.com> - Russell King <linux@armlinux.org.uk> - moderated list:ARM/Rockchip SoC support <linux-arm-kernel@lists.infradead.org> - open list:ARM/Rockchip SoC support <linux-rockchip@lists.infradead.org> - " open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS <devicetree@vger.kernel.org>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "From: Alexander Kochetkov <al.kochet@gmail.com>\n" @@ -42,7 +33,7 @@ " \t\t};\n" " \t};\n" " \n" - "+\ttimer3: timer@2000e000 {\n" + "+\ttimer3: timer at 2000e000 {\n" "+\t\tcompatible = \"rockchip,rk3188-timer\", \"rockchip,rk3288-timer\";\n" "+\t\treg = <0x2000e000 0x20>;\n" "+\t\tinterrupts = <GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH>;\n" @@ -50,7 +41,7 @@ "+\t\tclock-names = \"timer\", \"pclk\";\n" "+\t};\n" "+\n" - "+\ttimer6: timer@200380a0 {\n" + "+\ttimer6: timer at 200380a0 {\n" "+\t\tcompatible = \"rockchip,rk3188-timer\", \"rockchip,rk3288-timer\";\n" "+\t\treg = <0x200380a0 0x20>;\n" "+\t\tinterrupts = <GIC_SPI 64 IRQ_TYPE_LEVEL_HIGH>;\n" @@ -58,10 +49,10 @@ "+\t\tclock-names = \"timer\", \"pclk\";\n" "+\t};\n" "+\n" - " \ti2s0: i2s@1011a000 {\n" + " \ti2s0: i2s at 1011a000 {\n" " \t\tcompatible = \"rockchip,rk3188-i2s\", \"rockchip,rk3066-i2s\";\n" " \t\treg = <0x1011a000 0x2000>;\n" "-- \n" 2.7.4 -78616534538444b59641df17ac9bef6c7bfdd95e6bcda29886eaaf893961ff4a +743baed6423bcad1180ac008defcaf0479b8e5ec84ee45ca0d3fc14ed854a9d8
diff --git a/a/content_digest b/N2/content_digest index 5e12b3d..4087537 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -10,9 +10,9 @@ Rob Herring <robh+dt@kernel.org> Mark Rutland <mark.rutland@arm.com> Russell King <linux@armlinux.org.uk> - moderated list:ARM/Rockchip SoC support <linux-arm-kernel@lists.infradead.org> - open list:ARM/Rockchip SoC support <linux-rockchip@lists.infradead.org> - " open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS <devicetree@vger.kernel.org>\0" + linux-arm-kernel@lists.infradead.org (moderated list:ARM/Rockchip SoC support) + linux-rockchip@lists.infradead.org (open list:ARM/Rockchip SoC support) + " devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS)\0" "\00:1\0" "b\0" "From: Alexander Kochetkov <al.kochet@gmail.com>\n" @@ -64,4 +64,4 @@ "-- \n" 2.7.4 -78616534538444b59641df17ac9bef6c7bfdd95e6bcda29886eaaf893961ff4a +febfb5752cddab41422d70c43b50b1862d72da02c981a176afa8489872b639da
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.