diff for duplicates of <528CDFFB.1020601@overkiz.com> diff --git a/a/1.txt b/N1/1.txt index 142f9bd..252bc8f 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -53,13 +53,13 @@ http://lxr.free-electrons.com/source/Documentation/devicetree/bindings/pinctrl/p >> + }; >> }; >> ->> dbgu: serial at fffff200 { +>> dbgu: serial@fffff200 { >> @@ -84,6 +101,24 @@ >> reg = <0>; >> }; >> }; >> + ->> + mmc0: mmc at fffb4000 { +>> + mmc0: mmc@fffb4000 { >> + #address-cells = <1>; >> + #size-cells = <0>; >> + pinctrl-0 = <&pinctrl_mmc0_clk @@ -69,7 +69,7 @@ http://lxr.free-electrons.com/source/Documentation/devicetree/bindings/pinctrl/p >> + &pinctrl_mmc0_slot0_write_protect >> + &pinctrl_mmc0_slot0_switch>; >> + ->> + slot0: slot at 0 { +>> + slot0: slot@0 { >> + reg = <0>; >> + bus-width = <4>; >> + cd-gpios = <&pioB 27 GPIO_ACTIVE_HIGH>; @@ -78,7 +78,7 @@ http://lxr.free-electrons.com/source/Documentation/devicetree/bindings/pinctrl/p >> + }; >> }; >> ->> usb0: ohci at 00300000 { +>> usb0: ohci@00300000 { >> -- >> 1.7.9.5 >> diff --git a/a/content_digest b/N1/content_digest index cefe065..c4ad8fa 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,10 +1,22 @@ "ref\01377687640-10529-1-git-send-email-b.brezillon@overkiz.com\0" "ref\01377687995-10758-1-git-send-email-b.brezillon@overkiz.com\0" "ref\020131120145926.GE14627@ns203013.ovh.net\0" - "From\0b.brezillon@overkiz.com (boris brezillon)\0" - "Subject\0[PATCH 5/9] ARM: at91/dt: add mmc0 slot0 support to at91rm9200ek board\0" + "From\0boris brezillon <b.brezillon@overkiz.com>\0" + "Subject\0Re: [PATCH 5/9] ARM: at91/dt: add mmc0 slot0 support to at91rm9200ek board\0" "Date\0Wed, 20 Nov 2013 17:14:51 +0100\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>" + " Linus Walleij <linus.walleij@linaro.org>\0" + "Cc\0Rob Herring <rob.herring@calxeda.com>" + Pawel Moll <pawel.moll@arm.com> + Mark Rutland <mark.rutland@arm.com> + Stephen Warren <swarren@wwwdotorg.org> + Ian Campbell <ian.campbell@citrix.com> + Russell King <linux@arm.linux.org.uk> + Nicolas Ferre <nicolas.ferre@atmel.com> + Joachim Eastwood <manabian@gmail.com> + devicetree@vger.kernel.org + linux-kernel@vger.kernel.org + " linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On 20/11/2013 15:59, Jean-Christophe PLAGNIOL-VILLARD wrote:\n" @@ -62,13 +74,13 @@ ">> +\t\t\t\t};\n" ">> \t\t\t};\n" ">> \n" - ">> \t\t\tdbgu: serial at fffff200 {\n" + ">> \t\t\tdbgu: serial@fffff200 {\n" ">> @@ -84,6 +101,24 @@\n" ">> \t\t\t\t\treg = <0>;\n" ">> \t\t\t\t};\n" ">> \t\t\t};\n" ">> +\n" - ">> +\t\t\tmmc0: mmc at fffb4000 {\n" + ">> +\t\t\tmmc0: mmc@fffb4000 {\n" ">> +\t\t\t\t#address-cells = <1>;\n" ">> +\t\t\t\t#size-cells = <0>;\n" ">> +\t\t\t\tpinctrl-0 = <&pinctrl_mmc0_clk\n" @@ -78,7 +90,7 @@ ">> +\t\t\t\t\t &pinctrl_mmc0_slot0_write_protect\n" ">> +\t\t\t\t\t &pinctrl_mmc0_slot0_switch>;\n" ">> +\n" - ">> +\t\t\t\tslot0: slot at 0 {\n" + ">> +\t\t\t\tslot0: slot@0 {\n" ">> +\t\t\t\t\treg = <0>;\n" ">> +\t\t\t\t\tbus-width = <4>;\n" ">> +\t\t\t\t\tcd-gpios = <&pioB 27 GPIO_ACTIVE_HIGH>;\n" @@ -87,9 +99,9 @@ ">> +\t\t\t};\n" ">> \t\t};\n" ">> \n" - ">> \t\tusb0: ohci at 00300000 {\n" + ">> \t\tusb0: ohci@00300000 {\n" ">> -- \n" ">> 1.7.9.5\n" >> -93a9220db6e1b42617f310090cd5ea944a78d4f7d91b1610b33db79df0ff7cfd +4fdb1fac92ce3e287685eb5cd57cfb158f945289a901faab8541a86dcc756f95
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.