From: maxime.ripard@free-electrons.com (Maxime Ripard)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 2/2] ARM: dts: cfa10036: Change the OLED display to SSD1306
Date: Wed, 6 Mar 2013 17:44:10 +0100 [thread overview]
Message-ID: <1362588251-1824-3-git-send-email-maxime.ripard@free-electrons.com> (raw)
In-Reply-To: <1362588251-1824-1-git-send-email-maxime.ripard@free-electrons.com>
The SSD1307 was used in an early prototype that will never get
distributed. The final board now has a SSD1306 instead, that has its own
power generation unit and thus doesn't need any PWM. The panel attached
to it also changed.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
arch/arm/boot/dts/imx28-cfa10036.dts | 14 +++++---------
arch/arm/boot/dts/imx28-cfa10049.dts | 4 ++--
2 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/arch/arm/boot/dts/imx28-cfa10036.dts b/arch/arm/boot/dts/imx28-cfa10036.dts
index 1594694..40488f5a8 100644
--- a/arch/arm/boot/dts/imx28-cfa10036.dts
+++ b/arch/arm/boot/dts/imx28-cfa10036.dts
@@ -58,12 +58,6 @@
};
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>;
@@ -75,11 +69,13 @@
pinctrl-0 = <&i2c0_pins_b>;
status = "okay";
- ssd1307: oled at 3c {
- compatible = "solomon,ssd1307fb-i2c";
+ ssd1306: oled at 3c {
+ compatible = "solomon,ssd1306fb-i2c";
reg = <0x3c>;
- pwms = <&pwm 4 3000>;
reset-gpios = <&gpio2 7 0>;
+ solomon,height = <32>;
+ solomon,width = <128>;
+ solomon,page-offset = <0>;
};
};
};
diff --git a/arch/arm/boot/dts/imx28-cfa10049.dts b/arch/arm/boot/dts/imx28-cfa10049.dts
index a0d3e9f..ded7784 100644
--- a/arch/arm/boot/dts/imx28-cfa10049.dts
+++ b/arch/arm/boot/dts/imx28-cfa10049.dts
@@ -132,8 +132,8 @@
apbx at 80040000 {
pwm: pwm at 80064000 {
- pinctrl-names = "default", "default";
- pinctrl-1 = <&pwm3_pins_b>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&pwm3_pins_b>;
status = "okay";
};
--
1.7.10.4
next prev parent reply other threads:[~2013-03-06 16:44 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-06 16:44 [PATCH 0/2] Add support for the Solomon SSD1306 OLED Controller Maxime Ripard
2013-03-06 16:44 ` [PATCH 1/2] video: ssd1307fb: Add support for SSD1306 OLED controller Maxime Ripard
2013-03-29 18:38 ` Jean-Christophe PLAGNIOL-VILLARD
2013-03-29 19:34 ` Maxime Ripard
2013-03-06 16:44 ` Maxime Ripard [this message]
2013-03-25 10:02 ` [PATCH 0/2] Add support for the Solomon SSD1306 OLED Controller Maxime Ripard
2013-04-12 8:00 [PATCH RESEND " Maxime Ripard
2013-04-12 8:00 ` [PATCH 2/2] ARM: dts: cfa10036: Change the OLED display to SSD1306 Maxime Ripard
2013-04-22 9:55 [PATCHv2 0/2] Add support for the Solomon SSD1306 OLED Controller Maxime Ripard
2013-04-22 9:55 ` [PATCH 2/2] ARM: dts: cfa10036: Change the OLED display to SSD1306 Maxime Ripard
2013-05-08 14:00 ` Shawn Guo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1362588251-1824-3-git-send-email-maxime.ripard@free-electrons.com \
--to=maxime.ripard@free-electrons.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).