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

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>

diff --git a/arch/arm/boot/dts/imx28-cfa10036.dts b/arch/arm/boot/dts/imx28-cfa10036.dts
index 1594694532b96d845507d2700b3613dca5020b6d..40488f5a85048029c5fce39b10272f6d7b0abc20 100644 (file)
--- a/arch/arm/boot/dts/imx28-cfa10036.dts
+++ b/arch/arm/boot/dts/imx28-cfa10036.dts
@@ -58,12 +58,6 @@
                };
 
                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 @@
                                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>;
                                };
                        };
                };

diff --git a/arch/arm/boot/dts/imx28-cfa10049.dts b/arch/arm/boot/dts/imx28-cfa10049.dts
index 063e62059890e4f07885e66f02327dd58123ed6c..dfdcd85c265c81dd65536b8d9302b20a3cdc5a3a 100644 (file)
--- a/arch/arm/boot/dts/imx28-cfa10049.dts
+++ b/arch/arm/boot/dts/imx28-cfa10049.dts
@@ -166,8 +166,8 @@
 
                apbx@80040000 {
                        pwm: pwm@80064000 {
-                               pinctrl-names = "default", "default";
-                               pinctrl-1 = <&pwm3_pins_b>;
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&pwm3_pins_b>;
                                status = "okay";
                        };