| Message ID | 1351674774-2891-3-git-send-email-maxime.ripard@free-electrons.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi Shawn, 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 > file changed, 19 insertions(+) > > diff --git a/arch/arm/boot/dts/imx28-cfa10036.dts > b/arch/arm/boot/dts/imx28-cfa10036.dts index c03a577..816cae9 > 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 { + > pinctrl-names = "default"; + pinctrl-0 = <&i2c0_pins_b>; + > status = "okay"; + + ssd1307: oled@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=135336761530731&w=2) Thanks, Maxime - -- Maxime Ripard, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://www.enigmail.net/ iEYEARECAAYFAlCsl7MACgkQGxsu9jQV9nZtJwCfR9c2SnwK1hzAU2F+xptFqg9x 2+0An3YrhNMXSZaPwPcJwc3Bnwy+FSqe =mjpV -----END PGP SIGNATURE----- -- To unsubscribe from this list: send the line "unsubscribe linux-fbdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, Nov 21, 2012 at 09:58:27AM +0100, Maxime Ripard wrote: > Would you consider merging this patch? > Andrew Morton merged the driver into its tree > (http://marc.info/?l=linux-fbdev&m=135336761530731&w=2) > Just applied, thanks. -- To unsubscribe from this list: send the line "unsubscribe linux-fbdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/arm/boot/dts/imx28-cfa10036.dts b/arch/arm/boot/dts/imx28-cfa10036.dts index c03a577..816cae9 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 { + pinctrl-names = "default"; + pinctrl-0 = <&i2c0_pins_b>; + status = "okay"; + + ssd1307: oled@3c { + compatible = "solomon,ssd1307fb-i2c"; + reg = <0x3c>; + pwms = <&pwm 4 3000>; + reset-gpios = <&gpio2 7 0>; + }; + }; }; };
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 file changed, 19 insertions(+)