diff for duplicates of <50AC97B3.5070709@free-electrons.com> diff --git a/a/1.txt b/N1/1.txt index da0386a..0c82257 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -3,7 +3,7 @@ Hash: SHA1 Hi Shawn, -Le 31/10/2012 10:12, Maxime Ripard a écrit : +Le 31/10/2012 10:12, Maxime Ripard a ?crit : > Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Cc: > Brian Lilly <brian@crystalfontz.com> --- > arch/arm/boot/dts/imx28-cfa10036.dts | 19 +++++++++++++++++++ 1 @@ -14,17 +14,19 @@ Le 31/10/2012 10:12, Maxime Ripard a écrit : > 100644 --- a/arch/arm/boot/dts/imx28-cfa10036.dts +++ > b/arch/arm/boot/dts/imx28-cfa10036.dts @@ -33,11 +33,30 @@ }; > -> apbx@80040000 { + pwm: pwm@80064000 { + pinctrl-names > "default"; + pinctrl-0 = <&pwm4_pins_a>; + status = "okay"; + -> }; + duart: serial@80074000 { pinctrl-names = "default"; pinctrl-0 -> = <&duart_pins_b>; status = "okay"; }; + + i2c0: i2c@80058000 { + +> apbx at 80040000 { + pwm: pwm at 80064000 { + pinctrl-names = +> "default"; + pinctrl-0 = <&pwm4_pins_a>; + status = "okay"; + +> }; + duart: serial at 80074000 { pinctrl-names = "default"; pinctrl-0 +> = <&duart_pins_b>; status = "okay"; }; + + i2c0: i2c at 80058000 { + > pinctrl-names = "default"; + pinctrl-0 = <&i2c0_pins_b>; + -> status = "okay"; + + ssd1307: oled@3c { + compatible > "solomon,ssd1307fb-i2c"; + reg = <0x3c>; + pwms = <&pwm 4 +> status = "okay"; + + ssd1307: oled at 3c { + compatible = +> "solomon,ssd1307fb-i2c"; + reg = <0x3c>; + pwms = <&pwm 4 > 3000>; + reset-gpios = <&gpio2 7 0>; + }; + }; }; }; Would you consider merging this patch? Andrew Morton merged the driver into its tree -(http://marc.info/?l=linux-fbdev&m\x135336761530731&w=2) +(http://marc.info/?l=linux-fbdev&m=135336761530731&w=2) Thanks, Maxime diff --git a/a/content_digest b/N1/content_digest index bea6caf..f899bc3 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,8 @@ "ref\01351674774-2891-1-git-send-email-maxime.ripard@free-electrons.com\0" "ref\01351674774-2891-3-git-send-email-maxime.ripard@free-electrons.com\0" - "From\0Maxime Ripard <maxime.ripard@free-electrons.com>\0" - "Subject\0Re: [PATCH 2/2] ARM: dts: mxs: add oled support for the cfa-10036\0" - "Date\0Wed, 21 Nov 2012 08:58:27 +0000\0" + "From\0maxime.ripard@free-electrons.com (Maxime Ripard)\0" + "Subject\0[PATCH 2/2] ARM: dts: mxs: add oled support for the cfa-10036\0" + "Date\0Wed, 21 Nov 2012 09:58:27 +0100\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -11,7 +11,7 @@ "\n" "Hi Shawn,\n" "\n" - "Le 31/10/2012 10:12, Maxime Ripard a \303\251crit :\n" + "Le 31/10/2012 10:12, Maxime Ripard a ?crit :\n" "> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Cc:\n" "> Brian Lilly <brian@crystalfontz.com> --- \n" "> arch/arm/boot/dts/imx28-cfa10036.dts | 19 +++++++++++++++++++ 1\n" @@ -22,17 +22,19 @@ "> 100644 --- a/arch/arm/boot/dts/imx28-cfa10036.dts +++\n" "> b/arch/arm/boot/dts/imx28-cfa10036.dts @@ -33,11 +33,30 @@ };\n" "> \n" - "> apbx@80040000 { +\t\t\tpwm: pwm@80064000 { +\t\t\t\tpinctrl-names > \"default\"; +\t\t\t\tpinctrl-0 = <&pwm4_pins_a>; +\t\t\t\tstatus = \"okay\"; +\n" - "> }; + duart: serial@80074000 { pinctrl-names = \"default\"; pinctrl-0\n" - "> = <&duart_pins_b>; status = \"okay\"; }; + +\t\t\ti2c0: i2c@80058000 { +\n" + "> apbx at 80040000 { +\t\t\tpwm: pwm at 80064000 { +\t\t\t\tpinctrl-names =\n" + "> \"default\"; +\t\t\t\tpinctrl-0 = <&pwm4_pins_a>; +\t\t\t\tstatus = \"okay\"; +\n" + "> }; + duart: serial at 80074000 { pinctrl-names = \"default\"; pinctrl-0\n" + "> = <&duart_pins_b>; status = \"okay\"; }; + +\t\t\ti2c0: i2c at 80058000 { +\n" "> pinctrl-names = \"default\"; +\t\t\t\tpinctrl-0 = <&i2c0_pins_b>; +\n" - "> status = \"okay\"; + +\t\t\t\tssd1307: oled@3c { +\t\t\t\t\tcompatible > \"solomon,ssd1307fb-i2c\"; +\t\t\t\t\treg = <0x3c>; +\t\t\t\t\tpwms = <&pwm 4\n" + "> status = \"okay\"; + +\t\t\t\tssd1307: oled at 3c { +\t\t\t\t\tcompatible =\n" + "> \"solomon,ssd1307fb-i2c\"; +\t\t\t\t\treg = <0x3c>; +\t\t\t\t\tpwms = <&pwm 4\n" "> 3000>; +\t\t\t\t\treset-gpios = <&gpio2 7 0>; +\t\t\t\t}; +\t\t\t}; }; };\n" "\n" "\n" "Would you consider merging this patch?\n" "Andrew Morton merged the driver into its tree\n" - "(http://marc.info/?l=linux-fbdev&m\0235336761530731&w=2)\n" + "(http://marc.info/?l=linux-fbdev&m=135336761530731&w=2)\n" "\n" "Thanks,\n" "Maxime\n" @@ -52,4 +54,4 @@ "=mjpV\n" -----END PGP SIGNATURE----- -20c6f2107a64a2566e16f7cfa02743e89c2050150404d094155db8763e2cb11c +76a36c2cad0f0764f19d6c7819ab960c263a09fb6fe20a3edff8883999d3a8f0
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.