diff for duplicates of <51D7F0E6.2000008@kernel.org> diff --git a/a/1.txt b/N1/1.txt index 176a1b9..46c4b7b 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -25,7 +25,7 @@ Jonathan > fsl,pull-up = <0>; /* 0 will enable the keeper */ > }; > -> + i2c1_pins_cfa10049: i2c1@0 { +> + i2c1_pins_cfa10049: i2c1 at 0 { > + reg = <0>; > + fsl,pinmux-ids = < > + 0x3103 /* MX28_PAD_PWM0__GPIO */ @@ -36,14 +36,14 @@ Jonathan > + fsl,pull-up = <1>; > + }; > + -> fiq_pins_cfa10049: fiq@0 { +> fiq_pins_cfa10049: fiq at 0 { > reg = <0>; > fsl,pinmux-ids = < > @@ -199,49 +210,6 @@ > status = "okay"; > }; > -> - i2c1: i2c@8005a000 { +> - i2c1: i2c at 8005a000 { > - pinctrl-names = "default"; > - pinctrl-0 = <&i2c1_pins_a>; > - status = "okay"; @@ -56,24 +56,24 @@ Jonathan > - mux-gpios = <&gpio1 22 0 &gpio1 23 0>; > - i2c-parent = <&i2c1>; > - -> - i2c@0 { +> - i2c at 0 { > - reg = <0>; > - }; > - -> - i2c@1 { +> - i2c at 1 { > - reg = <1>; > - }; > - -> - i2c@2 { +> - i2c at 2 { > - reg = <2>; > - }; > - -> - i2c@3 { +> - i2c at 3 { > - reg = <3>; > - #address-cells = <1>; > - #size-cells = <0>; > - -> - pca9555: pca9555@20 { +> - pca9555: pca9555 at 20 { > - compatible = "nxp,pca9555"; > - interrupt-parent = <&gpio2>; > - interrupts = <19 0x2>; @@ -86,14 +86,14 @@ Jonathan > - }; > - }; > - -> usbphy1: usbphy@8007e000 { +> usbphy1: usbphy at 8007e000 { > status = "okay"; > }; > @@ -366,6 +334,60 @@ > rotary-encoder,relative-axis; > }; > -> + i2c1gpio: i2c@0 { +> + i2c1gpio: i2c at 0 { > + compatible = "i2c-gpio"; > + pinctrl-0 = <&i2c1_pins_cfa10049>; > + pinctrl-names = "default"; @@ -111,30 +111,30 @@ Jonathan > + mux-gpios = <&gpio1 22 0 &gpio1 23 0>; > + i2c-parent = <&i2c1gpio>; > + -> + i2c@0 { +> + i2c at 0 { > + reg = <0>; > + #address-cells = <1>; > + #size-cells = <0>; > + }; > + -> + i2c@1 { +> + i2c at 1 { > + reg = <1>; > + #address-cells = <1>; > + #size-cells = <0>; > + }; > + -> + i2c@2 { +> + i2c at 2 { > + reg = <2>; > + #address-cells = <1>; > + #size-cells = <0>; > + }; > + -> + i2c@3 { +> + i2c at 3 { > + reg = <3>; > + #address-cells = <1>; > + #size-cells = <0>; > + -> + pca9555: pca9555@20 { +> + pca9555: pca9555 at 20 { > + compatible = "nxp,pca9555"; > + interrupt-parent = <&gpio2>; > + interrupts = <19 0x2>; diff --git a/a/content_digest b/N1/content_digest index c21eb52..7fcae27 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,22 +1,9 @@ "ref\01372094699-3832-1-git-send-email-alexandre.belloni@free-electrons.com\0" "ref\01372094699-3832-3-git-send-email-alexandre.belloni@free-electrons.com\0" - "From\0Jonathan Cameron <jic23@kernel.org>\0" - "Subject\0Re: [PATCHv3 2/3] ARM: mxs: cfa10049: Switch bus i2c1 to bitbanging\0" + "From\0jic23@kernel.org (Jonathan Cameron)\0" + "Subject\0[PATCHv3 2/3] ARM: mxs: cfa10049: Switch bus i2c1 to bitbanging\0" "Date\0Sat, 06 Jul 2013 11:26:46 +0100\0" - "To\0Alexandre Belloni <alexandre.belloni@free-electrons.com>\0" - "Cc\0Shawn Guo <shawn.guo@linaro.org>" - Jonathan Cameron <jic23@cam.ac.uk> - jimwall@q.com - brian@crystalfontz.com - Maxime Ripard <maxime.ripard@free-electrons.com> - linux-iio@vger.kernel.org - linux-kernel@vger.kernel.org - linux-doc@vger.kernel.org - linux-arm-kernel@lists.infradead.org - devicetree-discuss@lists.ozlabs.org - Rob Landley <rob@landley.net> - Rob Herring <rob.herring@calxeda.com> - " Grant Likely <grant.likely@secretlab.ca>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On 06/24/2013 06:24 PM, Alexandre Belloni wrote:\n" @@ -46,7 +33,7 @@ "> \t\t\t\t\tfsl,pull-up = <0>; /* 0 will enable the keeper */\n" "> \t\t\t\t};\n" "> \n" - "> +\t\t\t\ti2c1_pins_cfa10049: i2c1@0 {\n" + "> +\t\t\t\ti2c1_pins_cfa10049: i2c1 at 0 {\n" "> +\t\t\t\t\treg = <0>;\n" "> +\t\t\t\t\tfsl,pinmux-ids = <\n" "> +\t\t\t\t\t\t0x3103 /* MX28_PAD_PWM0__GPIO */\n" @@ -57,14 +44,14 @@ "> +\t\t\t\t\tfsl,pull-up = <1>;\n" "> +\t\t\t\t};\n" "> +\n" - "> \t\t\t\tfiq_pins_cfa10049: fiq@0 {\n" + "> \t\t\t\tfiq_pins_cfa10049: fiq at 0 {\n" "> \t\t\t\t\treg = <0>;\n" "> \t\t\t\t\tfsl,pinmux-ids = <\n" "> @@ -199,49 +210,6 @@\n" "> \t\t\t\tstatus = \"okay\";\n" "> \t\t\t};\n" "> \n" - "> -\t\t\ti2c1: i2c@8005a000 {\n" + "> -\t\t\ti2c1: i2c at 8005a000 {\n" "> -\t\t\t\tpinctrl-names = \"default\";\n" "> -\t\t\t\tpinctrl-0 = <&i2c1_pins_a>;\n" "> -\t\t\t\tstatus = \"okay\";\n" @@ -77,24 +64,24 @@ "> -\t\t\t\tmux-gpios = <&gpio1 22 0 &gpio1 23 0>;\n" "> -\t\t\t\ti2c-parent = <&i2c1>;\n" "> -\n" - "> -\t\t\t\ti2c@0 {\n" + "> -\t\t\t\ti2c at 0 {\n" "> -\t\t\t\t\treg = <0>;\n" "> -\t\t\t\t};\n" "> -\n" - "> -\t\t\t\ti2c@1 {\n" + "> -\t\t\t\ti2c at 1 {\n" "> -\t\t\t\t\treg = <1>;\n" "> -\t\t\t\t};\n" "> -\n" - "> -\t\t\t\ti2c@2 {\n" + "> -\t\t\t\ti2c at 2 {\n" "> -\t\t\t\t\treg = <2>;\n" "> -\t\t\t\t};\n" "> -\n" - "> -\t\t\t\ti2c@3 {\n" + "> -\t\t\t\ti2c at 3 {\n" "> -\t\t\t\t\treg = <3>;\n" "> -\t\t\t\t\t#address-cells = <1>;\n" "> -\t\t\t\t\t#size-cells = <0>;\n" "> -\n" - "> -\t\t\t\t\tpca9555: pca9555@20 {\n" + "> -\t\t\t\t\tpca9555: pca9555 at 20 {\n" "> -\t\t\t\t\t\tcompatible = \"nxp,pca9555\";\n" "> -\t\t\t\t\t\tinterrupt-parent = <&gpio2>;\n" "> -\t\t\t\t\t\tinterrupts = <19 0x2>;\n" @@ -107,14 +94,14 @@ "> -\t\t\t\t};\n" "> -\t\t\t};\n" "> -\n" - "> \t\t\tusbphy1: usbphy@8007e000 {\n" + "> \t\t\tusbphy1: usbphy at 8007e000 {\n" "> \t\t\t\tstatus = \"okay\";\n" "> \t\t\t};\n" "> @@ -366,6 +334,60 @@\n" "> \t\trotary-encoder,relative-axis;\n" "> \t};\n" "> \n" - "> +\ti2c1gpio: i2c@0 {\n" + "> +\ti2c1gpio: i2c at 0 {\n" "> +\t\tcompatible = \"i2c-gpio\";\n" "> +\t\tpinctrl-0 = <&i2c1_pins_cfa10049>;\n" "> +\t\tpinctrl-names = \"default\";\n" @@ -132,30 +119,30 @@ "> +\t\tmux-gpios = <&gpio1 22 0 &gpio1 23 0>;\n" "> +\t\ti2c-parent = <&i2c1gpio>;\n" "> +\n" - "> +\t\ti2c@0 {\n" + "> +\t\ti2c at 0 {\n" "> +\t\t\treg = <0>;\n" "> +\t\t\t#address-cells = <1>;\n" "> +\t\t\t#size-cells = <0>;\n" "> +\t\t};\n" "> +\n" - "> +\t\ti2c@1 {\n" + "> +\t\ti2c at 1 {\n" "> +\t\t\treg = <1>;\n" "> +\t\t\t#address-cells = <1>;\n" "> +\t\t\t#size-cells = <0>;\n" "> +\t\t};\n" "> +\n" - "> +\t\ti2c@2 {\n" + "> +\t\ti2c at 2 {\n" "> +\t\t\treg = <2>;\n" "> +\t\t\t#address-cells = <1>;\n" "> +\t\t\t#size-cells = <0>;\n" "> +\t\t};\n" "> +\n" - "> +\t\ti2c@3 {\n" + "> +\t\ti2c at 3 {\n" "> +\t\t\treg = <3>;\n" "> +\t\t\t#address-cells = <1>;\n" "> +\t\t\t#size-cells = <0>;\n" "> +\n" - "> +\t\t\tpca9555: pca9555@20 {\n" + "> +\t\t\tpca9555: pca9555 at 20 {\n" "> +\t\t\t\tcompatible = \"nxp,pca9555\";\n" "> +\t\t\t\tinterrupt-parent = <&gpio2>;\n" "> +\t\t\t\tinterrupts = <19 0x2>;\n" @@ -173,4 +160,4 @@ "> \t\tpwms = <&pwm 3 5000000>;\n" > -6d5d4699564a927c669aa7d0d77e495f1ae35cd88db55ae07f3ec46dc49dcabf +2ba5ee9dbb4a9b35dad1dfec11948e9daacaa88734e1fe89e24067a89c56a3a8
diff --git a/a/1.txt b/N2/1.txt index 176a1b9..c18558e 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -1,12 +1,12 @@ On 06/24/2013 06:24 PM, Alexandre Belloni wrote: -> From: Maxime Ripard <maxime.ripard@free-electrons.com> +> From: Maxime Ripard <maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> > > The ADCs connected to this bus have been experiencing some timeout > issues when using the iMX28 i2c controller. Switching back to bitbanging > solves this. > -> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> -> Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> +> Signed-off-by: Maxime Ripard <maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> +> Signed-off-by: Alexandre Belloni <alexandre.belloni-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> As there are no disadvantages in taking the driver through IIO and these changes through the appropriate arch trees, I'd not propose to take these through IIO diff --git a/a/content_digest b/N2/content_digest index c21eb52..96d7c65 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,33 +1,34 @@ "ref\01372094699-3832-1-git-send-email-alexandre.belloni@free-electrons.com\0" "ref\01372094699-3832-3-git-send-email-alexandre.belloni@free-electrons.com\0" - "From\0Jonathan Cameron <jic23@kernel.org>\0" + "ref\01372094699-3832-3-git-send-email-alexandre.belloni-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org\0" + "From\0Jonathan Cameron <jic23-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>\0" "Subject\0Re: [PATCHv3 2/3] ARM: mxs: cfa10049: Switch bus i2c1 to bitbanging\0" "Date\0Sat, 06 Jul 2013 11:26:46 +0100\0" - "To\0Alexandre Belloni <alexandre.belloni@free-electrons.com>\0" - "Cc\0Shawn Guo <shawn.guo@linaro.org>" - Jonathan Cameron <jic23@cam.ac.uk> + "To\0Alexandre Belloni <alexandre.belloni-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>\0" + "Cc\0Shawn Guo <shawn.guo-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>" + Jonathan Cameron <jic23-KWPb1pKIrIJaa/9Udqfwiw@public.gmane.org> jimwall@q.com - brian@crystalfontz.com - Maxime Ripard <maxime.ripard@free-electrons.com> - linux-iio@vger.kernel.org - linux-kernel@vger.kernel.org - linux-doc@vger.kernel.org - linux-arm-kernel@lists.infradead.org - devicetree-discuss@lists.ozlabs.org - Rob Landley <rob@landley.net> - Rob Herring <rob.herring@calxeda.com> - " Grant Likely <grant.likely@secretlab.ca>\0" + brian-ZKiFAVwZFM2FeswfMrDH8w@public.gmane.org + Maxime Ripard <maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> + linux-iio-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + linux-doc-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org + devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org + Rob Landley <rob-VoJi6FS/r0vR7s880joybQ@public.gmane.org> + Rob Herring <rob.herring-bsGFqQB8/DxBDgjK7y7TUQ@public.gmane.org> + " Grant Likely <grant.likely-s3s/WqlpOiPyB63q8FvJNQ@public.gmane.org>\0" "\00:1\0" "b\0" "On 06/24/2013 06:24 PM, Alexandre Belloni wrote:\n" - "> From: Maxime Ripard <maxime.ripard@free-electrons.com>\n" + "> From: Maxime Ripard <maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>\n" "> \n" "> The ADCs connected to this bus have been experiencing some timeout\n" "> issues when using the iMX28 i2c controller. Switching back to bitbanging\n" "> solves this.\n" "> \n" - "> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>\n" - "> Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>\n" + "> Signed-off-by: Maxime Ripard <maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>\n" + "> Signed-off-by: Alexandre Belloni <alexandre.belloni-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>\n" "\n" "As there are no disadvantages in taking the driver through IIO and these changes\n" "through the appropriate arch trees, I'd not propose to take these through IIO\n" @@ -173,4 +174,4 @@ "> \t\tpwms = <&pwm 3 5000000>;\n" > -6d5d4699564a927c669aa7d0d77e495f1ae35cd88db55ae07f3ec46dc49dcabf +a95e6298f445bbe52399facb52fc3aeadb88f22c5242ed14d34e33c5157c4bbb
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.