diff for duplicates of <2291940.YGoWa0tBhA@phil> diff --git a/a/1.txt b/N1/1.txt index 139cda3..1140f0c 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,7 +1,7 @@ Add the core device nodes for the SARADC found on both the Cortex-A9 series (rk3066 and rk3188) as well as the newer rk3288. -Signed-off-by: Heiko Stuebner <heiko@sntech.de> +Signed-off-by: Heiko Stuebner <heiko-4mtYJXux2i+zQB+pC5nmwQ@public.gmane.org> --- if nobody complains I'll queue this into my v3.18-next/dts branch @@ -17,7 +17,7 @@ index 36be7bb..431f384 100644 status = "disabled"; }; -+ saradc: saradc at ff100000 { ++ saradc: saradc@ff100000 { + compatible = "rockchip,saradc"; + reg = <0xff100000 0x100>; + interrupts = <GIC_SPI 36 IRQ_TYPE_LEVEL_HIGH>; @@ -27,7 +27,7 @@ index 36be7bb..431f384 100644 + status = "disabled"; + }; + - i2c1: i2c at ff140000 { + i2c1: i2c@ff140000 { compatible = "rockchip,rk3288-i2c"; reg = <0xff140000 0x1000>; diff --git a/arch/arm/boot/dts/rk3xxx.dtsi b/arch/arm/boot/dts/rk3xxx.dtsi @@ -39,7 +39,7 @@ index 8caf85d..cce4a07 100644 status = "disabled"; }; + -+ saradc: saradc at 2006c000 { ++ saradc: saradc@2006c000 { + compatible = "rockchip,saradc"; + reg = <0x2006c000 0x100>; + interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>; @@ -51,3 +51,9 @@ index 8caf85d..cce4a07 100644 }; -- 1.9.0 + + +-- +To unsubscribe from this list: send the line "unsubscribe devicetree" in +the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/a/content_digest b/N1/content_digest index 0024a71..dd71692 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,14 +1,18 @@ "ref\02306550.nl6CA81PdX@phil\0" - "From\0heiko@sntech.de (Heiko St\303\274bner)\0" + "From\0Heiko St\303\274bner <heiko-4mtYJXux2i+zQB+pC5nmwQ@public.gmane.org>\0" "Subject\0[PATCH 2/2] ARM: dts: rockchip: add saradc nodes\0" "Date\0Wed, 20 Aug 2014 21:09:24 +0200\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org\0" + "Cc\0linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org" + olof-nZhT3qVonbNeoWH0uzbU5w@public.gmane.org + arnd-r2nGTMty4D4@public.gmane.org + " devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\0" "\00:1\0" "b\0" "Add the core device nodes for the SARADC found on both the Cortex-A9 series\n" "(rk3066 and rk3188) as well as the newer rk3288.\n" "\n" - "Signed-off-by: Heiko Stuebner <heiko@sntech.de>\n" + "Signed-off-by: Heiko Stuebner <heiko-4mtYJXux2i+zQB+pC5nmwQ@public.gmane.org>\n" "---\n" "if nobody complains I'll queue this into my v3.18-next/dts branch\n" "\n" @@ -24,7 +28,7 @@ " \t\tstatus = \"disabled\";\n" " \t};\n" " \n" - "+\tsaradc: saradc at ff100000 {\n" + "+\tsaradc: saradc@ff100000 {\n" "+\t\tcompatible = \"rockchip,saradc\";\n" "+\t\treg = <0xff100000 0x100>;\n" "+\t\tinterrupts = <GIC_SPI 36 IRQ_TYPE_LEVEL_HIGH>;\n" @@ -34,7 +38,7 @@ "+\t\tstatus = \"disabled\";\n" "+\t};\n" "+\n" - " \ti2c1: i2c at ff140000 {\n" + " \ti2c1: i2c@ff140000 {\n" " \t\tcompatible = \"rockchip,rk3288-i2c\";\n" " \t\treg = <0xff140000 0x1000>;\n" "diff --git a/arch/arm/boot/dts/rk3xxx.dtsi b/arch/arm/boot/dts/rk3xxx.dtsi\n" @@ -46,7 +50,7 @@ " \t\tstatus = \"disabled\";\n" " \t};\n" "+\n" - "+\tsaradc: saradc at 2006c000 {\n" + "+\tsaradc: saradc@2006c000 {\n" "+\t\tcompatible = \"rockchip,saradc\";\n" "+\t\treg = <0x2006c000 0x100>;\n" "+\t\tinterrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>;\n" @@ -57,6 +61,12 @@ "+\t};\n" " };\n" "-- \n" - 1.9.0 + "1.9.0\n" + "\n" + "\n" + "--\n" + "To unsubscribe from this list: send the line \"unsubscribe devicetree\" in\n" + "the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\n" + More majordomo info at http://vger.kernel.org/majordomo-info.html -b625a6ff5790f7fb86ef324e3e12ad237807f14d804a70bc41607158c4591fcb +5c1402a1b3df4361b676ed4e62f798f559a8a6e88d6357955e97a434b162c92a
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.