diff for duplicates of <2305896.xt7Ek2gLER@phil> diff --git a/a/1.txt b/N1/1.txt index 8e4f0a4..6b37e5f 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -34,7 +34,7 @@ index 0000000..80c878e + +Example: + -+ sram: sram at 10080000 { ++ sram: sram@10080000 { + compatible = "rockchip,rk3066-sram", "mmio-sram"; + reg = <0x10080000 0x10000>; + mmio-sram-reserved = <0x0 0x50>; @@ -47,13 +47,13 @@ index be5d2b0..0dfb680 100644 clock-names = "timer", "pclk"; }; -+ sram: sram at 10080000 { ++ sram: sram@10080000 { + compatible = "rockchip,rk3066-sram", "mmio-sram"; + reg = <0x10080000 0x10000>; + mmio-sram-reserved = <0x0 0x50>; + }; + - pinctrl at 20008000 { + pinctrl@20008000 { compatible = "rockchip,rk3066a-pinctrl"; reg = <0x20008000 0x150>; diff --git a/arch/arm/boot/dts/rk3188.dtsi b/arch/arm/boot/dts/rk3188.dtsi @@ -64,13 +64,13 @@ index 1a26b03..1fc7eda 100644 interrupts = <GIC_PPI 13 0xf04>; }; -+ sram: sram at 10080000 { ++ sram: sram@10080000 { + compatible = "rockchip,rk3066-sram", "mmio-sram"; + reg = <0x10080000 0x8000>; + mmio-sram-reserved = <0x0 0x50>; + }; + - pinctrl at 20008000 { + pinctrl@20008000 { compatible = "rockchip,rk3188-pinctrl"; reg = <0x20008000 0xa0>, -- diff --git a/a/content_digest b/N1/content_digest index 21fc8d2..5936ca0 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,19 @@ "ref\027256277.YJ687suYy5@phil\0" - "From\0heiko@sntech.de (Heiko St\303\274bner)\0" + "From\0Heiko St\303\274bner <heiko@sntech.de>\0" "Subject\0[PATCH v6 4/6] ARM: rockchip: add sram dt nodes and documentation\0" "Date\0Wed, 15 Jan 2014 22:42:35 +0100\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0linux-arm-kernel@lists.infradead.org <linux-arm-kernel@lists.infradead.org>\0" + "Cc\0arm@kernel.org" + Grant Likely <grant.likely@linaro.org> + Rob Herring <robherring2@gmail.com> + devicetree@vger.kernel.org + Philipp Zabel <p.zabel@pengutronix.de> + linux-kernel@vger.kernel.org + Greg Kroah-Hartman <gregkh@linuxfoundation.org> + Pawel Moll <pawel.moll@arm.com> + Mark Rutland <mark.rutland@arm.com> + Stephen Warren <swarren@wwwdotorg.org> + " Ian Campbell <ijc+devicetree@hellion.org.uk>\0" "\00:1\0" "b\0" "Add dt-nodes for the sram on rk3066 and rk3188 including the reserved section\n" @@ -41,7 +52,7 @@ "+\n" "+Example:\n" "+\n" - "+\tsram: sram at 10080000 {\n" + "+\tsram: sram@10080000 {\n" "+\t\tcompatible = \"rockchip,rk3066-sram\", \"mmio-sram\";\n" "+\t\treg = <0x10080000 0x10000>;\n" "+\t\tmmio-sram-reserved = <0x0 0x50>;\n" @@ -54,13 +65,13 @@ " \t\t\tclock-names = \"timer\", \"pclk\";\n" " \t\t};\n" " \n" - "+\t\tsram: sram at 10080000 {\n" + "+\t\tsram: sram@10080000 {\n" "+\t\t\tcompatible = \"rockchip,rk3066-sram\", \"mmio-sram\";\n" "+\t\t\treg = <0x10080000 0x10000>;\n" "+\t\t\tmmio-sram-reserved = <0x0 0x50>;\n" "+\t\t};\n" "+\n" - " \t\tpinctrl at 20008000 {\n" + " \t\tpinctrl@20008000 {\n" " \t\t\tcompatible = \"rockchip,rk3066a-pinctrl\";\n" " \t\t\treg = <0x20008000 0x150>;\n" "diff --git a/arch/arm/boot/dts/rk3188.dtsi b/arch/arm/boot/dts/rk3188.dtsi\n" @@ -71,16 +82,16 @@ " \t\t\tinterrupts = <GIC_PPI 13 0xf04>;\n" " \t\t};\n" " \n" - "+\t\tsram: sram at 10080000 {\n" + "+\t\tsram: sram@10080000 {\n" "+\t\t\tcompatible = \"rockchip,rk3066-sram\", \"mmio-sram\";\n" "+\t\t\treg = <0x10080000 0x8000>;\n" "+\t\t\tmmio-sram-reserved = <0x0 0x50>;\n" "+\t\t};\n" "+\n" - " \t\tpinctrl at 20008000 {\n" + " \t\tpinctrl@20008000 {\n" " \t\t\tcompatible = \"rockchip,rk3188-pinctrl\";\n" " \t\t\treg = <0x20008000 0xa0>,\n" "-- \n" 1.7.10.4 -53007fca22280ab7fa1df599bf80aacdf6c49981def20ada07ced08dbbe65dc5 +5c0fdcc4ae08a6133a01581f34d438dd479b86b09a36adcc3632842d407ce98f
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.