diff for duplicates of <1518387302.1342.3.camel@gmail.com> diff --git a/a/1.txt b/N1/1.txt index 1d2dc42..8bcba54 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -4,10 +4,10 @@ Am Freitag, den 09.02.2018, 18:52 +0100 schrieb Philipp Rossak: > We can now remove the sunxi-common-regulators.dtsi include since we > don't need it anymore. > -> Signed-off-by: Philipp Rossak <embed3d@gmail.com> +> Signed-off-by: Philipp Rossak <embed3d-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> > --- -> ?arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts | 5 ++--- -> ?1 file changed, 2 insertions(+), 3 deletions(-) +> arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts | 5 ++--- +> 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts > b/arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts @@ -15,32 +15,37 @@ Am Freitag, den 09.02.2018, 18:52 +0100 schrieb Philipp Rossak: > --- a/arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts > +++ b/arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts > @@ -42,7 +42,6 @@ -> ? -> ?/dts-v1/; -> ?#include "sun6i-a31s.dtsi" +> +> /dts-v1/; +> #include "sun6i-a31s.dtsi" > -#include "sunxi-common-regulators.dtsi" -> ?#include <dt-bindings/gpio/gpio.h> -> ? -> ?/ { +> #include <dt-bindings/gpio/gpio.h> +> +> / { > @@ -118,7 +117,7 @@ -> ?&mmc0 { -> ? pinctrl-names = "default"; -> ? pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_bpi_m2>; +> &mmc0 { +> pinctrl-names = "default"; +> pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_bpi_m2>; > - vmmc-supply = <®_vcc3v0>; > + vmmc-supply = <®_dcdc1>; -> ? bus-width = <4>; -> ? cd-gpios = <&pio 0 4 GPIO_ACTIVE_HIGH>; /* PA4 */ -> ? cd-inverted; +> bus-width = <4>; +> cd-gpios = <&pio 0 4 GPIO_ACTIVE_HIGH>; /* PA4 */ +> cd-inverted; > @@ -132,7 +131,7 @@ -> ?&mmc2 { -> ? pinctrl-names = "default"; -> ? pinctrl-0 = <&mmc2_pins_a>; +> &mmc2 { +> pinctrl-names = "default"; +> pinctrl-0 = <&mmc2_pins_a>; > - vmmc-supply = <®_vcc3v0>; > + vmmc-supply = <®_dcdc1>; ^^ this here is wrong! this should be ®_aldo1 -> ? mmc-pwrseq = <&mmc2_pwrseq>; -> ? bus-width = <4>; -> ? non-removable; +> mmc-pwrseq = <&mmc2_pwrseq>; +> bus-width = <4>; +> non-removable; Philipp + +-- +You received this message because you are subscribed to the Google Groups "linux-sunxi" group. +To unsubscribe from this group and stop receiving emails from it, send an email to linux-sunxi+unsubscribe-/JYPxA39Uh5TLH3MbocFF+G/Ez6ZCGd0@public.gmane.org +For more options, visit https://groups.google.com/d/optout. diff --git a/a/content_digest b/N1/content_digest index 8779a52..10ac04b 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,18 @@ "ref\020180209175236.21215-1-embed3d@gmail.com\0" "ref\020180209175236.21215-2-embed3d@gmail.com\0" - "From\0embed3d@gmail.com (Philipp Rossak)\0" - "Subject\0[PATCH 1/3] arm: dts: sun6i: a31s: bpi-m2: update mmc supply nodes\0" + "ref\020180209175236.21215-2-embed3d-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org\0" + "From\0Philipp Rossak <embed3d-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\0" + "Subject\0Re: [PATCH 1/3] arm: dts: sun6i: a31s: bpi-m2: update mmc supply nodes\0" "Date\0Sun, 11 Feb 2018 23:15:02 +0100\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org" + mark.rutland-5wv7dgnIgG8@public.gmane.org + linux-I+IVW8TIWO2tmTQ+vhA3Yw@public.gmane.org + maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org + " wens-jdAy2FN1RRM@public.gmane.org\0" + "Cc\0devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org" + linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org + linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + " linux-sunxi-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org\0" "\00:1\0" "b\0" "Am Freitag, den 09.02.2018, 18:52 +0100 schrieb Philipp Rossak:\n" @@ -12,10 +21,10 @@ "> We can now remove the sunxi-common-regulators.dtsi include since we\n" "> don't need it anymore.\n" "> \n" - "> Signed-off-by: Philipp Rossak <embed3d@gmail.com>\n" + "> Signed-off-by: Philipp Rossak <embed3d-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\n" "> ---\n" - "> ?arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts | 5 ++---\n" - "> ?1 file changed, 2 insertions(+), 3 deletions(-)\n" + "> \302\240arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts | 5 ++---\n" + "> \302\2401 file changed, 2 insertions(+), 3 deletions(-)\n" "> \n" "> diff --git a/arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts\n" "> b/arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts\n" @@ -23,34 +32,39 @@ "> --- a/arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts\n" "> +++ b/arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts\n" "> @@ -42,7 +42,6 @@\n" - "> ?\n" - "> ?/dts-v1/;\n" - "> ?#include \"sun6i-a31s.dtsi\"\n" + "> \302\240\n" + "> \302\240/dts-v1/;\n" + "> \302\240#include \"sun6i-a31s.dtsi\"\n" "> -#include \"sunxi-common-regulators.dtsi\"\n" - "> ?#include <dt-bindings/gpio/gpio.h>\n" - "> ?\n" - "> ?/ {\n" + "> \302\240#include <dt-bindings/gpio/gpio.h>\n" + "> \302\240\n" + "> \302\240/ {\n" "> @@ -118,7 +117,7 @@\n" - "> ?&mmc0 {\n" - "> ?\tpinctrl-names = \"default\";\n" - "> ?\tpinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_bpi_m2>;\n" + "> \302\240&mmc0 {\n" + "> \302\240\tpinctrl-names = \"default\";\n" + "> \302\240\tpinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_bpi_m2>;\n" "> -\tvmmc-supply = <®_vcc3v0>;\n" "> +\tvmmc-supply = <®_dcdc1>;\n" - "> ?\tbus-width = <4>;\n" - "> ?\tcd-gpios = <&pio 0 4 GPIO_ACTIVE_HIGH>; /* PA4 */\n" - "> ?\tcd-inverted;\n" + "> \302\240\tbus-width = <4>;\n" + "> \302\240\tcd-gpios = <&pio 0 4 GPIO_ACTIVE_HIGH>; /* PA4 */\n" + "> \302\240\tcd-inverted;\n" "> @@ -132,7 +131,7 @@\n" - "> ?&mmc2 {\n" - "> ?\tpinctrl-names = \"default\";\n" - "> ?\tpinctrl-0 = <&mmc2_pins_a>;\n" + "> \302\240&mmc2 {\n" + "> \302\240\tpinctrl-names = \"default\";\n" + "> \302\240\tpinctrl-0 = <&mmc2_pins_a>;\n" "> -\tvmmc-supply = <®_vcc3v0>;\n" "> +\tvmmc-supply = <®_dcdc1>;\n" "\t\t\t^^\n" "\t\tthis here is wrong! this should be ®_aldo1\n" - "> ?\tmmc-pwrseq = <&mmc2_pwrseq>;\n" - "> ?\tbus-width = <4>;\n" - "> ?\tnon-removable;\n" + "> \302\240\tmmc-pwrseq = <&mmc2_pwrseq>;\n" + "> \302\240\tbus-width = <4>;\n" + "> \302\240\tnon-removable;\n" "\n" - Philipp + "Philipp\n" + "\n" + "-- \n" + "You received this message because you are subscribed to the Google Groups \"linux-sunxi\" group.\n" + "To unsubscribe from this group and stop receiving emails from it, send an email to linux-sunxi+unsubscribe-/JYPxA39Uh5TLH3MbocFF+G/Ez6ZCGd0@public.gmane.org\n" + For more options, visit https://groups.google.com/d/optout. -268eb9e36aab7bdfe1b04dc8dd94f40cfa976136c983b999504e0c4eb8a2f6f9 +98df27c0819a91301c3a0a5f10df3d3a039c6643cf48bbf78c94d5498da7c429
diff --git a/a/1.txt b/N2/1.txt index 1d2dc42..c7ef3ee 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -6,8 +6,8 @@ Am Freitag, den 09.02.2018, 18:52 +0100 schrieb Philipp Rossak: > > Signed-off-by: Philipp Rossak <embed3d@gmail.com> > --- -> ?arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts | 5 ++--- -> ?1 file changed, 2 insertions(+), 3 deletions(-) +> arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts | 5 ++--- +> 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts > b/arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts @@ -15,32 +15,32 @@ Am Freitag, den 09.02.2018, 18:52 +0100 schrieb Philipp Rossak: > --- a/arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts > +++ b/arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts > @@ -42,7 +42,6 @@ -> ? -> ?/dts-v1/; -> ?#include "sun6i-a31s.dtsi" +> +> /dts-v1/; +> #include "sun6i-a31s.dtsi" > -#include "sunxi-common-regulators.dtsi" -> ?#include <dt-bindings/gpio/gpio.h> -> ? -> ?/ { +> #include <dt-bindings/gpio/gpio.h> +> +> / { > @@ -118,7 +117,7 @@ -> ?&mmc0 { -> ? pinctrl-names = "default"; -> ? pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_bpi_m2>; +> &mmc0 { +> pinctrl-names = "default"; +> pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_bpi_m2>; > - vmmc-supply = <®_vcc3v0>; > + vmmc-supply = <®_dcdc1>; -> ? bus-width = <4>; -> ? cd-gpios = <&pio 0 4 GPIO_ACTIVE_HIGH>; /* PA4 */ -> ? cd-inverted; +> bus-width = <4>; +> cd-gpios = <&pio 0 4 GPIO_ACTIVE_HIGH>; /* PA4 */ +> cd-inverted; > @@ -132,7 +131,7 @@ -> ?&mmc2 { -> ? pinctrl-names = "default"; -> ? pinctrl-0 = <&mmc2_pins_a>; +> &mmc2 { +> pinctrl-names = "default"; +> pinctrl-0 = <&mmc2_pins_a>; > - vmmc-supply = <®_vcc3v0>; > + vmmc-supply = <®_dcdc1>; ^^ this here is wrong! this should be ®_aldo1 -> ? mmc-pwrseq = <&mmc2_pwrseq>; -> ? bus-width = <4>; -> ? non-removable; +> mmc-pwrseq = <&mmc2_pwrseq>; +> bus-width = <4>; +> non-removable; Philipp diff --git a/a/content_digest b/N2/content_digest index 8779a52..05e0368 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,9 +1,17 @@ "ref\020180209175236.21215-1-embed3d@gmail.com\0" "ref\020180209175236.21215-2-embed3d@gmail.com\0" - "From\0embed3d@gmail.com (Philipp Rossak)\0" - "Subject\0[PATCH 1/3] arm: dts: sun6i: a31s: bpi-m2: update mmc supply nodes\0" + "From\0Philipp Rossak <embed3d@gmail.com>\0" + "Subject\0Re: [PATCH 1/3] arm: dts: sun6i: a31s: bpi-m2: update mmc supply nodes\0" "Date\0Sun, 11 Feb 2018 23:15:02 +0100\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0robh+dt@kernel.org" + mark.rutland@arm.com + linux@armlinux.org.uk + maxime.ripard@free-electrons.com + " wens@csie.org\0" + "Cc\0devicetree@vger.kernel.org" + linux-arm-kernel@lists.infradead.org + linux-kernel@vger.kernel.org + " linux-sunxi@googlegroups.com\0" "\00:1\0" "b\0" "Am Freitag, den 09.02.2018, 18:52 +0100 schrieb Philipp Rossak:\n" @@ -14,8 +22,8 @@ "> \n" "> Signed-off-by: Philipp Rossak <embed3d@gmail.com>\n" "> ---\n" - "> ?arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts | 5 ++---\n" - "> ?1 file changed, 2 insertions(+), 3 deletions(-)\n" + "> \302\240arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts | 5 ++---\n" + "> \302\2401 file changed, 2 insertions(+), 3 deletions(-)\n" "> \n" "> diff --git a/arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts\n" "> b/arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts\n" @@ -23,34 +31,34 @@ "> --- a/arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts\n" "> +++ b/arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts\n" "> @@ -42,7 +42,6 @@\n" - "> ?\n" - "> ?/dts-v1/;\n" - "> ?#include \"sun6i-a31s.dtsi\"\n" + "> \302\240\n" + "> \302\240/dts-v1/;\n" + "> \302\240#include \"sun6i-a31s.dtsi\"\n" "> -#include \"sunxi-common-regulators.dtsi\"\n" - "> ?#include <dt-bindings/gpio/gpio.h>\n" - "> ?\n" - "> ?/ {\n" + "> \302\240#include <dt-bindings/gpio/gpio.h>\n" + "> \302\240\n" + "> \302\240/ {\n" "> @@ -118,7 +117,7 @@\n" - "> ?&mmc0 {\n" - "> ?\tpinctrl-names = \"default\";\n" - "> ?\tpinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_bpi_m2>;\n" + "> \302\240&mmc0 {\n" + "> \302\240\tpinctrl-names = \"default\";\n" + "> \302\240\tpinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_bpi_m2>;\n" "> -\tvmmc-supply = <®_vcc3v0>;\n" "> +\tvmmc-supply = <®_dcdc1>;\n" - "> ?\tbus-width = <4>;\n" - "> ?\tcd-gpios = <&pio 0 4 GPIO_ACTIVE_HIGH>; /* PA4 */\n" - "> ?\tcd-inverted;\n" + "> \302\240\tbus-width = <4>;\n" + "> \302\240\tcd-gpios = <&pio 0 4 GPIO_ACTIVE_HIGH>; /* PA4 */\n" + "> \302\240\tcd-inverted;\n" "> @@ -132,7 +131,7 @@\n" - "> ?&mmc2 {\n" - "> ?\tpinctrl-names = \"default\";\n" - "> ?\tpinctrl-0 = <&mmc2_pins_a>;\n" + "> \302\240&mmc2 {\n" + "> \302\240\tpinctrl-names = \"default\";\n" + "> \302\240\tpinctrl-0 = <&mmc2_pins_a>;\n" "> -\tvmmc-supply = <®_vcc3v0>;\n" "> +\tvmmc-supply = <®_dcdc1>;\n" "\t\t\t^^\n" "\t\tthis here is wrong! this should be ®_aldo1\n" - "> ?\tmmc-pwrseq = <&mmc2_pwrseq>;\n" - "> ?\tbus-width = <4>;\n" - "> ?\tnon-removable;\n" + "> \302\240\tmmc-pwrseq = <&mmc2_pwrseq>;\n" + "> \302\240\tbus-width = <4>;\n" + "> \302\240\tnon-removable;\n" "\n" Philipp -268eb9e36aab7bdfe1b04dc8dd94f40cfa976136c983b999504e0c4eb8a2f6f9 +9e5f0c599d121537297caa90cf9abcb363cf466de87b24d78a127e9a63a269fd
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.