diff for duplicates of <53578E85.9000906@redhat.com> diff --git a/a/1.txt b/N1/1.txt index 0bfa97d..46dfb23 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -2,12 +2,12 @@ Hi, On 04/23/2014 11:48 AM, Maxime Ripard wrote: > On Tue, Apr 22, 2014 at 01:01:27PM +0200, Hans de Goede wrote: ->> From: David Lanzendörfer <david.lanzendoerfer@o2s.ch> +>> From: David Lanzend?rfer <david.lanzendoerfer@o2s.ch> >> >> Add nodes for the 3 mmc controllers found on A10s SoCs and for the 2 mmc >> controllers found on A13 SoCs. >> ->> Signed-off-by: David Lanzendörfer <david.lanzendoerfer@o2s.ch> +>> Signed-off-by: David Lanzend?rfer <david.lanzendoerfer@o2s.ch> >> Signed-off-by: Hans de Goede <hdegoede@redhat.com> >> --- >> arch/arm/boot/dts/sun5i-a10s.dtsi | 27 +++++++++++++++++++++++++++ @@ -22,7 +22,7 @@ On 04/23/2014 11:48 AM, Maxime Ripard wrote: >> #size-cells = <0>; >> }; >> ->> + mmc0: mmc@01c0f000 { +>> + mmc0: mmc at 01c0f000 { >> + compatible = "allwinner,sun5i-a13-mmc"; >> + reg = <0x01c0f000 0x1000>; >> + clocks = <&ahb_gates 8>, <&mmc0_clk>; @@ -31,7 +31,7 @@ On 04/23/2014 11:48 AM, Maxime Ripard wrote: >> + status = "disabled"; >> + }; >> + ->> + mmc1: mmc@01c10000 { +>> + mmc1: mmc at 01c10000 { >> + compatible = "allwinner,sun5i-a13-mmc"; >> + reg = <0x01c10000 0x1000>; >> + clocks = <&ahb_gates 9>, <&mmc1_clk>; @@ -40,7 +40,7 @@ On 04/23/2014 11:48 AM, Maxime Ripard wrote: >> + status = "disabled"; >> + }; >> + ->> + mmc2: mmc@01c11000 { +>> + mmc2: mmc at 01c11000 { >> + compatible = "allwinner,sun5i-a13-mmc"; >> + reg = <0x01c11000 0x1000>; >> + clocks = <&ahb_gates 10>, <&mmc2_clk>; @@ -49,7 +49,7 @@ On 04/23/2014 11:48 AM, Maxime Ripard wrote: >> + status = "disabled"; >> + }; >> + ->> usbphy: phy@01c13400 { +>> usbphy: phy at 01c13400 { >> #phy-cells = <1>; >> compatible = "allwinner,sun5i-a13-usb-phy"; >> diff --git a/arch/arm/boot/dts/sun5i-a13.dtsi b/arch/arm/boot/dts/sun5i-a13.dtsi @@ -60,7 +60,7 @@ On 04/23/2014 11:48 AM, Maxime Ripard wrote: >> #size-cells = <0>; >> }; >> ->> + mmc0: mmc@01c0f000 { +>> + mmc0: mmc at 01c0f000 { >> + compatible = "allwinner,sun5i-a13-mmc"; >> + reg = <0x01c0f000 0x1000>; >> + clocks = <&ahb_gates 8>, <&mmc0_clk>; @@ -69,7 +69,7 @@ On 04/23/2014 11:48 AM, Maxime Ripard wrote: >> + status = "disabled"; >> + }; >> + ->> + mmc2: mmc@01c11000 { +>> + mmc2: mmc at 01c11000 { >> + compatible = "allwinner,sun5i-a13-mmc"; >> + reg = <0x01c11000 0x1000>; >> + clocks = <&ahb_gates 10>, <&mmc2_clk>; diff --git a/a/content_digest b/N1/content_digest index d0e5068..94e9d05 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,31 +1,22 @@ "ref\01398164497-14212-1-git-send-email-hdegoede@redhat.com\0" "ref\01398164497-14212-8-git-send-email-hdegoede@redhat.com\0" "ref\020140423094840.GL24905@lukather\0" - "From\0Hans de Goede <hdegoede@redhat.com>\0" - "Subject\0Re: [linux-sunxi] Re: [PATCH v8 07/17] ARM: dts: sun5i: Add mmc controller nodes\0" + "From\0hdegoede@redhat.com (Hans de Goede)\0" + "Subject\0[linux-sunxi] Re: [PATCH v8 07/17] ARM: dts: sun5i: Add mmc controller nodes\0" "Date\0Wed, 23 Apr 2014 11:57:25 +0200\0" - "To\0linux-sunxi@googlegroups.com" - " Hans de Goede <hdegoede@redhat.com>\0" - "Cc\0Chris Ball <chris@printf.net>" - Ulf Hansson <ulf.hansson@linaro.org> - Emilio Lopez <emilio@elopez.com.ar> - Mike Turquette <mturquette@linaro.org> - " David Lanzend\303\266rfer <david.lanzendoerfer@o2s.ch>" - linux-mmc@vger.kernel.org - linux-arm-kernel@lists.infradead.org - " devicetree <devicetree@vger.kernel.org>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Hi,\n" "\n" "On 04/23/2014 11:48 AM, Maxime Ripard wrote:\n" "> On Tue, Apr 22, 2014 at 01:01:27PM +0200, Hans de Goede wrote:\n" - ">> From: David Lanzend\303\266rfer <david.lanzendoerfer@o2s.ch>\n" + ">> From: David Lanzend?rfer <david.lanzendoerfer@o2s.ch>\n" ">>\n" ">> Add nodes for the 3 mmc controllers found on A10s SoCs and for the 2 mmc\n" ">> controllers found on A13 SoCs.\n" ">>\n" - ">> Signed-off-by: David Lanzend\303\266rfer <david.lanzendoerfer@o2s.ch>\n" + ">> Signed-off-by: David Lanzend?rfer <david.lanzendoerfer@o2s.ch>\n" ">> Signed-off-by: Hans de Goede <hdegoede@redhat.com>\n" ">> ---\n" ">> arch/arm/boot/dts/sun5i-a10s.dtsi | 27 +++++++++++++++++++++++++++\n" @@ -40,7 +31,7 @@ ">> \t\t\t#size-cells = <0>;\n" ">> \t\t};\n" ">> \n" - ">> +\t\tmmc0: mmc@01c0f000 {\n" + ">> +\t\tmmc0: mmc at 01c0f000 {\n" ">> +\t\t\tcompatible = \"allwinner,sun5i-a13-mmc\";\n" ">> +\t\t\treg = <0x01c0f000 0x1000>;\n" ">> +\t\t\tclocks = <&ahb_gates 8>, <&mmc0_clk>;\n" @@ -49,7 +40,7 @@ ">> +\t\t\tstatus = \"disabled\";\n" ">> +\t\t};\n" ">> +\n" - ">> +\t\tmmc1: mmc@01c10000 {\n" + ">> +\t\tmmc1: mmc at 01c10000 {\n" ">> +\t\t\tcompatible = \"allwinner,sun5i-a13-mmc\";\n" ">> +\t\t\treg = <0x01c10000 0x1000>;\n" ">> +\t\t\tclocks = <&ahb_gates 9>, <&mmc1_clk>;\n" @@ -58,7 +49,7 @@ ">> +\t\t\tstatus = \"disabled\";\n" ">> +\t\t};\n" ">> +\n" - ">> +\t\tmmc2: mmc@01c11000 {\n" + ">> +\t\tmmc2: mmc at 01c11000 {\n" ">> +\t\t\tcompatible = \"allwinner,sun5i-a13-mmc\";\n" ">> +\t\t\treg = <0x01c11000 0x1000>;\n" ">> +\t\t\tclocks = <&ahb_gates 10>, <&mmc2_clk>;\n" @@ -67,7 +58,7 @@ ">> +\t\t\tstatus = \"disabled\";\n" ">> +\t\t};\n" ">> +\n" - ">> \t\tusbphy: phy@01c13400 {\n" + ">> \t\tusbphy: phy at 01c13400 {\n" ">> \t\t\t#phy-cells = <1>;\n" ">> \t\t\tcompatible = \"allwinner,sun5i-a13-usb-phy\";\n" ">> diff --git a/arch/arm/boot/dts/sun5i-a13.dtsi b/arch/arm/boot/dts/sun5i-a13.dtsi\n" @@ -78,7 +69,7 @@ ">> \t\t\t#size-cells = <0>;\n" ">> \t\t};\n" ">> \n" - ">> +\t\tmmc0: mmc@01c0f000 {\n" + ">> +\t\tmmc0: mmc at 01c0f000 {\n" ">> +\t\t\tcompatible = \"allwinner,sun5i-a13-mmc\";\n" ">> +\t\t\treg = <0x01c0f000 0x1000>;\n" ">> +\t\t\tclocks = <&ahb_gates 8>, <&mmc0_clk>;\n" @@ -87,7 +78,7 @@ ">> +\t\t\tstatus = \"disabled\";\n" ">> +\t\t};\n" ">> +\n" - ">> +\t\tmmc2: mmc@01c11000 {\n" + ">> +\t\tmmc2: mmc at 01c11000 {\n" ">> +\t\t\tcompatible = \"allwinner,sun5i-a13-mmc\";\n" ">> +\t\t\treg = <0x01c11000 0x1000>;\n" ">> +\t\t\tclocks = <&ahb_gates 10>, <&mmc2_clk>;\n" @@ -107,4 +98,4 @@ "\n" Hans -0a2ac935779c99a4febaaa3a91ce22a8470023a5ea839470f7ea507ebb6a8f90 +84b3fece28a24e18b5d10f8647633b168033528da84c190b75783165e41d2070
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.