diff for duplicates of <5942E77A.8080500@hisilicon.com> diff --git a/a/1.txt b/N1/1.txt index bd8346f..a8ad5dc 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -24,7 +24,7 @@ On 2017/5/22 5:52, Leo Yan wrote: > #clock-cells = <1>; > }; > -> + dual_timer0: timer@fff14000 { +> + dual_timer0: timer at fff14000 { > + compatible = "arm,sp804", "arm,primecell"; > + reg = <0x0 0xfff14000 0x0 0x1000>; > + interrupts = <GIC_SPI 48 IRQ_TYPE_LEVEL_HIGH>, @@ -35,7 +35,7 @@ On 2017/5/22 5:52, Leo Yan wrote: > + clock-names = "timer1", "timer2", "apb_pclk"; > + }; > + -> ufs: ufs@ff3b0000 { +> ufs: ufs at ff3b0000 { > compatible = "jedec,ufs-1.1", "hisilicon,hi3660-ufs"; > reg = <0x0 0xff3b0000 0x0 0x1000>, /* 0: HCI standard */ > diff --git a/a/content_digest b/N1/content_digest index 689068a..e802622 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,22 +1,9 @@ "ref\01495428748-11153-1-git-send-email-leo.yan@linaro.org\0" "ref\01495428748-11153-3-git-send-email-leo.yan@linaro.org\0" - "From\0Wei Xu <xuwei5@hisilicon.com>\0" - "Subject\0Re: [PATCH v3 2/2] arm64: dts: add sp804 timer node for Hi3660\0" + "From\0xuwei5@hisilicon.com (Wei Xu)\0" + "Subject\0[PATCH v3 2/2] arm64: dts: add sp804 timer node for Hi3660\0" "Date\0Thu, 15 Jun 2017 21:00:58 +0100\0" - "To\0Leo Yan <leo.yan@linaro.org>" - Rob Herring <robh+dt@kernel.org> - Mark Rutland <mark.rutland@arm.com> - Catalin Marinas <catalin.marinas@arm.com> - Will Deacon <will.deacon@arm.com> - Michael Turquette <mturquette@baylibre.com> - Stephen Boyd <sboyd@codeaurora.org> - Zhangfei Gao <zhangfei.gao@linaro.org> - <linux-arm-kernel@lists.infradead.org> - <devicetree@vger.kernel.org> - <linux-kernel@vger.kernel.org> - <linux-clk@vger.kernel.org> - Guodong Xu <guodong.xu@linaro.org> - " Haojian Zhuang <haojian.zhuang@linaro.org>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Hi Leo,\n" @@ -45,7 +32,7 @@ "> \t\t\t#clock-cells = <1>;\n" "> \t\t};\n" "> \n" - "> +\t\tdual_timer0: timer@fff14000 {\n" + "> +\t\tdual_timer0: timer at fff14000 {\n" "> +\t\t\tcompatible = \"arm,sp804\", \"arm,primecell\";\n" "> +\t\t\treg = <0x0 0xfff14000 0x0 0x1000>;\n" "> +\t\t\tinterrupts = <GIC_SPI 48 IRQ_TYPE_LEVEL_HIGH>,\n" @@ -56,7 +43,7 @@ "> +\t\t\tclock-names = \"timer1\", \"timer2\", \"apb_pclk\";\n" "> +\t\t};\n" "> +\n" - "> \t\tufs: ufs@ff3b0000 {\n" + "> \t\tufs: ufs at ff3b0000 {\n" "> \t\t\tcompatible = \"jedec,ufs-1.1\", \"hisilicon,hi3660-ufs\";\n" "> \t\t\treg = <0x0 0xff3b0000 0x0 0x1000>, /* 0: HCI standard */\n" "> \n" @@ -70,4 +57,4 @@ "BR,\n" Wei -b63f8a6bf6f2d1e63faa43ffb870217c177457b1d75e25225648c4fc39873ef2 +c0dbf2c667d0afcd4c6d9956d8e6dd4cccacb64da30287f997b8ae8135b21c8d
diff --git a/a/content_digest b/N2/content_digest index 689068a..303c384 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -11,10 +11,10 @@ Michael Turquette <mturquette@baylibre.com> Stephen Boyd <sboyd@codeaurora.org> Zhangfei Gao <zhangfei.gao@linaro.org> - <linux-arm-kernel@lists.infradead.org> - <devicetree@vger.kernel.org> - <linux-kernel@vger.kernel.org> - <linux-clk@vger.kernel.org> + linux-arm-kernel@lists.infradead.org + devicetree@vger.kernel.org + linux-kernel@vger.kernel.org + linux-clk@vger.kernel.org Guodong Xu <guodong.xu@linaro.org> " Haojian Zhuang <haojian.zhuang@linaro.org>\0" "\00:1\0" @@ -70,4 +70,4 @@ "BR,\n" Wei -b63f8a6bf6f2d1e63faa43ffb870217c177457b1d75e25225648c4fc39873ef2 +8d86e14f219d735ab9dee338a894f292e2628b80e9a704cd3a3c10db752ba4c3
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.