diff for duplicates of <1369722012-6915-4-git-send-email-b32955@freescale.com> diff --git a/a/1.txt b/N1/1.txt index 34488b5..19ff9fa 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,7 +1,7 @@ Add the clock and compatible information for the weim. Also adds the weim label. -Signed-off-by: Huang Shijie <b32955@freescale.com> +Signed-off-by: Huang Shijie <b32955-KZfg59tc24xl57MIdRCFDg@public.gmane.org> --- arch/arm/boot/dts/imx6qdl.dtsi | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) @@ -14,14 +14,14 @@ index 42e461c..f21d259 100644 reg = <0x021b4000 0x4000>; }; -- weim at 021b8000 { -+ weim: weim at 021b8000 { +- weim@021b8000 { ++ weim: weim@021b8000 { + compatible = "fsl,imx6q-weim"; reg = <0x021b8000 0x4000>; interrupts = <0 14 0x04>; + clocks = <&clks 196>; }; - ocotp at 021bc000 { + ocotp@021bc000 { -- 1.7.1 diff --git a/a/content_digest b/N1/content_digest index 15783a3..a47fcaa 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,14 +1,22 @@ "ref\01369722012-6915-1-git-send-email-b32955@freescale.com\0" - "From\0b32955@freescale.com (Huang Shijie)\0" + "ref\01369722012-6915-1-git-send-email-b32955-KZfg59tc24xl57MIdRCFDg@public.gmane.org\0" + "From\0Huang Shijie <b32955-KZfg59tc24xl57MIdRCFDg@public.gmane.org>\0" "Subject\0[PATCH v4 3/6] ARM: dts: imx6qdl: add more information for WEIM\0" "Date\0Tue, 28 May 2013 14:20:09 +0800\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0grant.likely-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org\0" + "Cc\0shc_work-JGs/UdohzUI@public.gmane.org" + devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org + rob.herring-bsGFqQB8/DxBDgjK7y7TUQ@public.gmane.org + Alison_Chaiken-nmGgyN9QBj3QT0dZR+AlfA@public.gmane.org + Huang Shijie <b32955-KZfg59tc24xl57MIdRCFDg@public.gmane.org> + s.hauer-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org + " linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org\0" "\00:1\0" "b\0" "Add the clock and compatible information for the weim.\n" "Also adds the weim label.\n" "\n" - "Signed-off-by: Huang Shijie <b32955@freescale.com>\n" + "Signed-off-by: Huang Shijie <b32955-KZfg59tc24xl57MIdRCFDg@public.gmane.org>\n" "---\n" " arch/arm/boot/dts/imx6qdl.dtsi | 4 +++-\n" " 1 files changed, 3 insertions(+), 1 deletions(-)\n" @@ -21,16 +29,16 @@ " \t\t\t\treg = <0x021b4000 0x4000>;\n" " \t\t\t};\n" " \n" - "-\t\t\tweim at 021b8000 {\n" - "+\t\t\tweim: weim at 021b8000 {\n" + "-\t\t\tweim@021b8000 {\n" + "+\t\t\tweim: weim@021b8000 {\n" "+\t\t\t\tcompatible = \"fsl,imx6q-weim\";\n" " \t\t\t\treg = <0x021b8000 0x4000>;\n" " \t\t\t\tinterrupts = <0 14 0x04>;\n" "+\t\t\t\tclocks = <&clks 196>;\n" " \t\t\t};\n" " \n" - " \t\t\tocotp at 021bc000 {\n" + " \t\t\tocotp@021bc000 {\n" "-- \n" 1.7.1 -d7c27136374f7124a2f07fb2473f77b4f1d3e806ffdee849bca66b5616b39e8b +60574fe643a65d52b06d17b669c879707c8ff2080e8c9cd6e218476312b10d2a
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.