mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-01 14:44:12 +00:00
Code Issues Releases Wiki Activity

ARM: dts: cfa10036: Change the OLED display to SSD1306

Browse source 
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>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
This commit is contained in:
Maxime Ripard 2013-04-22 11:55:55 +02:00 committed by Shawn Guo
parent 33678d1230
commit b400932c29
2 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
arch/arm/boot/dts/imx28-cfa10036.dts
View file

@ -58,12 +58,6 @@ ssp0: ssp@80010000 {
};
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>;
@ -75,11 +69,13 @@ i2c0: i2c@80058000 {
pinctrl-0 = <&i2c0_pins_b>;
status = "okay";
ssd1307: oled@3c {
compatible = "solomon,ssd1307fb-i2c";
ssd1306: oled@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>;
};
};
};

4
arch/arm/boot/dts/imx28-cfa10049.dts
View file

@ -166,8 +166,8 @@ timing0: timing0 {
apbx@80040000 {
pwm: pwm@80064000 {
pinctrl-names = "default", "default";
pinctrl-1 = <&pwm3_pins_b>;
pinctrl-names = "default";
pinctrl-0 = <&pwm3_pins_b>;
status = "okay";
};