diff for duplicates of <20150420182634.GH3447@x1> diff --git a/a/1.txt b/N1/1.txt index 5160946..3f89ca5 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -11,7 +11,7 @@ node) in the highest level DTSI file, then add the platform specific ones in the DTS files. > Fixes: c94a4ab7af3f ("ARM: ux500: Disable the MMCI gpio-regulator by default") -> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> +> Signed-off-by: Ulf Hansson <ulf.hansson-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> > --- > arch/arm/boot/dts/ste-dbx5x0.dtsi | 17 ----------------- > arch/arm/boot/dts/ste-href.dtsi | 17 +++++++++++++++++ @@ -43,7 +43,7 @@ ones in the DTS files. > - status = "disabled"; > - }; > - -> mcde at a0350000 { +> mcde@a0350000 { > compatible = "stericsson,mcde"; > reg = <0xa0350000 0x1000>, /* MCDE */ > diff --git a/arch/arm/boot/dts/ste-href.dtsi b/arch/arm/boot/dts/ste-href.dtsi @@ -72,7 +72,7 @@ ones in the DTS files. > + }; > + > // External Micro SD slot -> sdi0_per1 at 80126000 { +> sdi0_per1@80126000 { > arm,primecell-periphid = <0x10480180>; > diff --git a/arch/arm/boot/dts/ste-snowball.dts b/arch/arm/boot/dts/ste-snowball.dts > index 206826a..65a7f63 100644 @@ -102,3 +102,7 @@ ones in the DTS files. > }; > > // External Micro SD slot +-- +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 e5b39e7..f2751b3 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,14 @@ "ref\01429538553-17366-1-git-send-email-ulf.hansson@linaro.org\0" "ref\01429538553-17366-2-git-send-email-ulf.hansson@linaro.org\0" - "From\0lee@kernel.org (Lee Jones)\0" - "Subject\0[PATCH 1/3] ARM: ux500: Move GPIO regulator for SD-card into board DTSs\0" + "ref\01429538553-17366-2-git-send-email-ulf.hansson-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org\0" + "From\0Lee Jones <lee-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>\0" + "Subject\0Re: [PATCH 1/3] ARM: ux500: Move GPIO regulator for SD-card into board DTSs\0" "Date\0Mon, 20 Apr 2015 19:26:34 +0100\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Ulf Hansson <ulf.hansson-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>\0" + "Cc\0Linus Walleij <linus.walleij-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>" + linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org + devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + " Bjorn Andersson <bjorn.andersson-/MT0OVThwyLZJqsBc5GL+g@public.gmane.org>\0" "\00:1\0" "b\0" "On Mon, 20 Apr 2015, Ulf Hansson wrote:\n" @@ -19,7 +24,7 @@ "ones in the DTS files.\n" "\n" "> Fixes: c94a4ab7af3f (\"ARM: ux500: Disable the MMCI gpio-regulator by default\")\n" - "> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>\n" + "> Signed-off-by: Ulf Hansson <ulf.hansson-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>\n" "> ---\n" "> arch/arm/boot/dts/ste-dbx5x0.dtsi | 17 -----------------\n" "> arch/arm/boot/dts/ste-href.dtsi | 17 +++++++++++++++++\n" @@ -51,7 +56,7 @@ "> -\t\t\tstatus = \"disabled\";\n" "> -\t\t};\n" "> -\n" - "> \t\tmcde at a0350000 {\n" + "> \t\tmcde@a0350000 {\n" "> \t\t\tcompatible = \"stericsson,mcde\";\n" "> \t\t\treg = <0xa0350000 0x1000>, /* MCDE */\n" "> diff --git a/arch/arm/boot/dts/ste-href.dtsi b/arch/arm/boot/dts/ste-href.dtsi\n" @@ -80,7 +85,7 @@ "> +\t\t};\n" "> +\n" "> \t\t// External Micro SD slot\n" - "> \t\tsdi0_per1 at 80126000 {\n" + "> \t\tsdi0_per1@80126000 {\n" "> \t\t\tarm,primecell-periphid = <0x10480180>;\n" "> diff --git a/arch/arm/boot/dts/ste-snowball.dts b/arch/arm/boot/dts/ste-snowball.dts\n" "> index 206826a..65a7f63 100644\n" @@ -109,6 +114,10 @@ "> +\t\t\tstatus = \"disabled\";\n" "> \t\t};\n" "> \n" - "> \t\t// External Micro SD slot" + "> \t\t// External Micro SD slot\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 -cb70c5865a82ff9788160e5b06926825499a938062ccef9a80c6e999ce17b10d +44d7498fb43f89fec5fc06f1e29fc6b23687c6560c81eac370112fcaab1919c1
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.