diff for duplicates of <20120427084056.GD826@shlinux2.ap.freescale.net> diff --git a/a/1.txt b/N1/1.txt index ffa78bd..b232766 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,5 +1,5 @@ On Fri, Apr 27, 2012 at 03:02:58PM +0800, Richard Zhao wrote: -> Signed-off-by: Richard Zhao <richard.zhao-KZfg59tc24xl57MIdRCFDg@public.gmane.org> +> Signed-off-by: Richard Zhao <richard.zhao@freescale.com> > --- > arch/arm/boot/dts/imx6q-sabrelite.dts | 2 ++ > arch/arm/boot/dts/imx6q.dtsi | 16 ++++++++++++++++ @@ -11,13 +11,13 @@ On Fri, Apr 27, 2012 at 03:02:58PM +0800, Richard Zhao wrote: > --- a/arch/arm/boot/dts/imx6q-sabrelite.dts > +++ b/arch/arm/boot/dts/imx6q-sabrelite.dts > @@ -50,6 +50,8 @@ -> i2c@021a0000 { /* I2C1 */ +> i2c at 021a0000 { /* I2C1 */ > status = "okay"; > clock-frequency = <100000>; > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_i2c1_1>; > -> codec: sgtl5000@0a { +> codec: sgtl5000 at 0a { > compatible = "fsl,sgtl5000"; > diff --git a/arch/arm/boot/dts/imx6q.dtsi b/arch/arm/boot/dts/imx6q.dtsi > index 2ba32e7..fe8c80d 100644 diff --git a/a/content_digest b/N1/content_digest index b06133e..edd89d9 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,24 +1,13 @@ "ref\01335510185-7906-1-git-send-email-richard.zhao@freescale.com\0" "ref\01335510185-7906-5-git-send-email-richard.zhao@freescale.com\0" - "ref\01335510185-7906-5-git-send-email-richard.zhao-KZfg59tc24xl57MIdRCFDg@public.gmane.org\0" - "From\0Dong Aisheng <aisheng.dong-KZfg59tc24xl57MIdRCFDg@public.gmane.org>\0" - "Subject\0Re: [PATCH 04/11] i2c: imx: add pinctrl support\0" + "From\0aisheng.dong@freescale.com (Dong Aisheng)\0" + "Subject\0[PATCH 04/11] i2c: imx: add pinctrl support\0" "Date\0Fri, 27 Apr 2012 16:40:57 +0800\0" - "To\0Richard Zhao <richard.zhao-KZfg59tc24xl57MIdRCFDg@public.gmane.org>\0" - "Cc\0linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org" - linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - alsa-devel-K7yf7f+aM1XWsZ/bQMPhNw@public.gmane.org - kernel-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org - broonie-yzvPICuk2AATkU/dhu1WVueM+bqZidxxQQ4Iyu8u01E@public.gmane.org - w.sang-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org - ben-linux-elnMNo+KYs3YtjvyW6yDsg@public.gmane.org - dan.j.williams-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org - shawn.guo-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org - " lrg-l0cyMroinI0@public.gmane.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Fri, Apr 27, 2012 at 03:02:58PM +0800, Richard Zhao wrote:\n" - "> Signed-off-by: Richard Zhao <richard.zhao-KZfg59tc24xl57MIdRCFDg@public.gmane.org>\n" + "> Signed-off-by: Richard Zhao <richard.zhao@freescale.com>\n" "> ---\n" "> arch/arm/boot/dts/imx6q-sabrelite.dts | 2 ++\n" "> arch/arm/boot/dts/imx6q.dtsi | 16 ++++++++++++++++\n" @@ -30,13 +19,13 @@ "> --- a/arch/arm/boot/dts/imx6q-sabrelite.dts\n" "> +++ b/arch/arm/boot/dts/imx6q-sabrelite.dts\n" "> @@ -50,6 +50,8 @@\n" - "> \t\t\ti2c@021a0000 { /* I2C1 */\n" + "> \t\t\ti2c at 021a0000 { /* I2C1 */\n" "> \t\t\t\tstatus = \"okay\";\n" "> \t\t\t\tclock-frequency = <100000>;\n" "> +\t\t\t\tpinctrl-names = \"default\";\n" "> +\t\t\t\tpinctrl-0 = <&pinctrl_i2c1_1>;\n" "> \n" - "> \t\t\t\tcodec: sgtl5000@0a {\n" + "> \t\t\t\tcodec: sgtl5000 at 0a {\n" "> \t\t\t\t\tcompatible = \"fsl,sgtl5000\";\n" "> diff --git a/arch/arm/boot/dts/imx6q.dtsi b/arch/arm/boot/dts/imx6q.dtsi\n" "> index 2ba32e7..fe8c80d 100644\n" @@ -100,4 +89,4 @@ "Regards\n" Dong Aisheng -dd0f51491e8e0ebf4f88953086cfd858681631af93b4873538f8015b401f4ca5 +c40a684b047d008d661d165a008f911b61a10534283711a90481203942e41f09
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.