diff for duplicates of <56598DE1.9010209@gmail.com> diff --git a/a/1.txt b/N1/1.txt index 57ff70d..d9603cd 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -5,7 +5,7 @@ On 26.11.2015 14:13, Jisheng Zhang wrote: > This patch adds pinmux for this sdcard interface, then adds regulators > for vmmc and vqmmc, lastly adds cd-gpios, wp-gpios properties. > -> Signed-off-by: Jisheng Zhang <jszhang@marvell.com> +> Signed-off-by: Jisheng Zhang <jszhang-eYqpPyKDWXRBDgjK7y7TUQ@public.gmane.org> > --- > arch/arm/boot/dts/berlin2q-marvell-dmp.dts | 43 ++++++++++++++++++++++++++++-- > 1 file changed, 41 insertions(+), 2 deletions(-) @@ -19,7 +19,7 @@ On 26.11.2015 14:13, Jisheng Zhang wrote: > enable-active-high; > }; > + -> + reg_sdio1_vmmc: regulator at 3 { +> + reg_sdio1_vmmc: regulator@3 { > + compatible = "regulator-fixed"; > + regulator-min-microvolt = <3300000>; > + regulator-max-microvolt = <3300000>; @@ -29,7 +29,7 @@ On 26.11.2015 14:13, Jisheng Zhang wrote: > + gpio = <&portb 21 GPIO_ACTIVE_HIGH>; > + }; > + -> + reg_sdio1_vqmmc: regulator at 4 { +> + reg_sdio1_vqmmc: regulator@4 { > + compatible = "regulator-gpio"; > + regulator-min-microvolt = <1800000>; > + regulator-max-microvolt = <3300000>; @@ -80,4 +80,9 @@ Sebastian > status = "okay"; > }; > -> +> + +-- +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 02722c9..ff402da 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,18 @@ "ref\01448543588-1021-1-git-send-email-jszhang@marvell.com\0" - "From\0sebastian.hesselbarth@gmail.com (Sebastian Hesselbarth)\0" - "Subject\0[PATCH] arm: dts: berlin2q-marvell-dmp: add sdhci1 fully functionality\0" + "ref\01448543588-1021-1-git-send-email-jszhang-eYqpPyKDWXRBDgjK7y7TUQ@public.gmane.org\0" + "From\0Sebastian Hesselbarth <sebastian.hesselbarth-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\0" + "Subject\0Re: [PATCH] arm: dts: berlin2q-marvell-dmp: add sdhci1 fully functionality\0" "Date\0Sat, 28 Nov 2015 12:20:01 +0100\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Jisheng Zhang <jszhang-eYqpPyKDWXRBDgjK7y7TUQ@public.gmane.org>" + robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org + pawel.moll-5wv7dgnIgG8@public.gmane.org + mark.rutland-5wv7dgnIgG8@public.gmane.org + ijc+devicetree-KcIKpvwj1kUDXYZnReoRVg@public.gmane.org + galak-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org + " linux-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org\0" + "Cc\0linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org" + devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + " linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\0" "\00:1\0" "b\0" "On 26.11.2015 14:13, Jisheng Zhang wrote:\n" @@ -12,7 +22,7 @@ "> This patch adds pinmux for this sdcard interface, then adds regulators\n" "> for vmmc and vqmmc, lastly adds cd-gpios, wp-gpios properties.\n" "> \n" - "> Signed-off-by: Jisheng Zhang <jszhang@marvell.com>\n" + "> Signed-off-by: Jisheng Zhang <jszhang-eYqpPyKDWXRBDgjK7y7TUQ@public.gmane.org>\n" "> ---\n" "> arch/arm/boot/dts/berlin2q-marvell-dmp.dts | 43 ++++++++++++++++++++++++++++--\n" "> 1 file changed, 41 insertions(+), 2 deletions(-)\n" @@ -26,7 +36,7 @@ "> \t\t\tenable-active-high;\n" "> \t\t};\n" "> +\n" - "> +\t\treg_sdio1_vmmc: regulator at 3 {\n" + "> +\t\treg_sdio1_vmmc: regulator@3 {\n" "> +\t\t\tcompatible = \"regulator-fixed\";\n" "> +\t\t\tregulator-min-microvolt = <3300000>;\n" "> +\t\t\tregulator-max-microvolt = <3300000>;\n" @@ -36,7 +46,7 @@ "> +\t\t\tgpio = <&portb 21 GPIO_ACTIVE_HIGH>;\n" "> +\t\t};\n" "> +\n" - "> +\t\treg_sdio1_vqmmc: regulator at 4 {\n" + "> +\t\treg_sdio1_vqmmc: regulator@4 {\n" "> +\t\t\tcompatible = \"regulator-gpio\";\n" "> +\t\t\tregulator-min-microvolt = <1800000>;\n" "> +\t\t\tregulator-max-microvolt = <3300000>;\n" @@ -87,6 +97,11 @@ "> \tstatus = \"okay\";\n" "> };\n" "> \n" - > + "> \n" + "\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 -ea6c75203ca58dbef80b6e085a99059359719c080b60e752e5f91e1745849ff4 +5b4d6b10116dfcbeaa13e8351740637f36d5c3b0d2809fbf44c2a5ea2b9acbe6
diff --git a/a/1.txt b/N2/1.txt index 57ff70d..b6462b0 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -19,7 +19,7 @@ On 26.11.2015 14:13, Jisheng Zhang wrote: > enable-active-high; > }; > + -> + reg_sdio1_vmmc: regulator at 3 { +> + reg_sdio1_vmmc: regulator@3 { > + compatible = "regulator-fixed"; > + regulator-min-microvolt = <3300000>; > + regulator-max-microvolt = <3300000>; @@ -29,7 +29,7 @@ On 26.11.2015 14:13, Jisheng Zhang wrote: > + gpio = <&portb 21 GPIO_ACTIVE_HIGH>; > + }; > + -> + reg_sdio1_vqmmc: regulator at 4 { +> + reg_sdio1_vqmmc: regulator@4 { > + compatible = "regulator-gpio"; > + regulator-min-microvolt = <1800000>; > + regulator-max-microvolt = <3300000>; diff --git a/a/content_digest b/N2/content_digest index 02722c9..bd344c1 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,8 +1,17 @@ "ref\01448543588-1021-1-git-send-email-jszhang@marvell.com\0" - "From\0sebastian.hesselbarth@gmail.com (Sebastian Hesselbarth)\0" - "Subject\0[PATCH] arm: dts: berlin2q-marvell-dmp: add sdhci1 fully functionality\0" + "From\0Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>\0" + "Subject\0Re: [PATCH] arm: dts: berlin2q-marvell-dmp: add sdhci1 fully functionality\0" "Date\0Sat, 28 Nov 2015 12:20:01 +0100\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Jisheng Zhang <jszhang@marvell.com>" + robh+dt@kernel.org + pawel.moll@arm.com + mark.rutland@arm.com + ijc+devicetree@hellion.org.uk + galak@codeaurora.org + " linux@arm.linux.org.uk\0" + "Cc\0linux-arm-kernel@lists.infradead.org" + devicetree@vger.kernel.org + " linux-kernel@vger.kernel.org\0" "\00:1\0" "b\0" "On 26.11.2015 14:13, Jisheng Zhang wrote:\n" @@ -26,7 +35,7 @@ "> \t\t\tenable-active-high;\n" "> \t\t};\n" "> +\n" - "> +\t\treg_sdio1_vmmc: regulator at 3 {\n" + "> +\t\treg_sdio1_vmmc: regulator@3 {\n" "> +\t\t\tcompatible = \"regulator-fixed\";\n" "> +\t\t\tregulator-min-microvolt = <3300000>;\n" "> +\t\t\tregulator-max-microvolt = <3300000>;\n" @@ -36,7 +45,7 @@ "> +\t\t\tgpio = <&portb 21 GPIO_ACTIVE_HIGH>;\n" "> +\t\t};\n" "> +\n" - "> +\t\treg_sdio1_vqmmc: regulator at 4 {\n" + "> +\t\treg_sdio1_vqmmc: regulator@4 {\n" "> +\t\t\tcompatible = \"regulator-gpio\";\n" "> +\t\t\tregulator-min-microvolt = <1800000>;\n" "> +\t\t\tregulator-max-microvolt = <3300000>;\n" @@ -89,4 +98,4 @@ "> \n" > -ea6c75203ca58dbef80b6e085a99059359719c080b60e752e5f91e1745849ff4 +7c7540daf2a0673e7c1a21129d2c6ae22113923050542ed45ab39d35e7d13491
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.