diff for duplicates of <532B37D6.6070400@st.com> diff --git a/a/1.txt b/N1/1.txt index 9d10487..607f573 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -61,7 +61,7 @@ Maxime > }; > + > + /* FSM */ -> + spifsm: spifsm at fe902000 { +> + spifsm: spifsm@fe902000 { > + compatible = "st,spi-fsm"; > + reg = <0xfe902000 0x1000>; > + pinctrl-0 = <&pinctrl_fsm>; @@ -102,18 +102,18 @@ Maxime > + */ > +/ { > + soc { -> + spifsm: spifsm at fe902000 { +> + spifsm: spifsm@fe902000 { > + #address-cells = <1>; > + #size-cells = <1>; > + > + status = "okay"; > + -> + partition at 0 { +> + partition@0 { > + label = "SerialFlash1"; > + reg = <0x00000000 0x00500000>; > + }; > + -> + partition at 500000 { +> + partition@500000 { > + label = "SerialFlash2"; > + reg = <0x00500000 0x00b00000>; > + }; diff --git a/a/content_digest b/N1/content_digest index 0ec308b..8e714d2 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,13 @@ "ref\01395330920-10559-1-git-send-email-lee.jones@linaro.org\0" - "From\0maxime.coquelin@st.com (Maxime Coquelin)\0" - "Subject\0[PATCH] ARM: STi: Add support for the FSM Serial Flash Controller\0" + "From\0Maxime Coquelin <maxime.coquelin@st.com>\0" + "Subject\0Re: [PATCH] ARM: STi: Add support for the FSM Serial Flash Controller\0" "Date\0Thu, 20 Mar 2014 19:47:50 +0100\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Lee Jones <lee.jones@linaro.org>" + <linux-arm-kernel@lists.infradead.org> + " <linux-kernel@vger.kernel.org>\0" + "Cc\0<kernel@stlinux.com>" + <srinivas.kandagatla@st.com> + " <patrice.chotard@st.com>\0" "\00:1\0" "b\0" "\n" @@ -68,7 +73,7 @@ "> \t\t};\n" "> +\n" "> +\t\t/* FSM */\n" - "> +\t\tspifsm: spifsm at fe902000 {\n" + "> +\t\tspifsm: spifsm@fe902000 {\n" "> +\t\t\tcompatible\t = \"st,spi-fsm\";\n" "> +\t\t\treg\t\t = <0xfe902000 0x1000>;\n" "> +\t\t\tpinctrl-0\t = <&pinctrl_fsm>;\n" @@ -109,18 +114,18 @@ "> + */\n" "> +/ {\n" "> +\tsoc {\n" - "> +\t\tspifsm: spifsm at fe902000 {\n" + "> +\t\tspifsm: spifsm@fe902000 {\n" "> +\t\t\t#address-cells = <1>;\n" "> +\t\t\t#size-cells = <1>;\n" "> +\n" "> +\t\t\tstatus = \"okay\";\n" "> +\n" - "> +\t\t\tpartition at 0 {\n" + "> +\t\t\tpartition@0 {\n" "> +\t\t\t\tlabel = \"SerialFlash1\";\n" "> +\t\t\t\treg = <0x00000000 0x00500000>;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tpartition at 500000 {\n" + "> +\t\t\tpartition@500000 {\n" "> +\t\t\t\tlabel = \"SerialFlash2\";\n" "> +\t\t\t\treg = <0x00500000 0x00b00000>;\n" "> +\t\t\t};\n" @@ -129,4 +134,4 @@ "> +};\n" > -c7e42c97cfbcf628d30afa08736dce316c78af92983818878a30830a8d6f005e +53f20fccb75a9200de74509bde55e532bd383bf7c5d58f38c52affcd2fb49643
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.