From patchwork Tue Jul 31 10:29:36 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Ripard X-Patchwork-Id: 1258671 Return-Path: X-Original-To: patchwork-linux-fbdev@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 37A15DF26F for ; Tue, 31 Jul 2012 10:29:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753565Ab2GaK3z (ORCPT ); Tue, 31 Jul 2012 06:29:55 -0400 Received: from mail.free-electrons.com ([88.190.12.23]:46538 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753172Ab2GaK3z (ORCPT ); Tue, 31 Jul 2012 06:29:55 -0400 Received: by mail.free-electrons.com (Postfix, from userid 106) id 676C6169; Tue, 31 Jul 2012 12:29:46 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.free-electrons.com X-Spam-Level: X-Spam-Status: No, score=-3.1 required=5.0 tests=ALL_TRUSTED,AWL,BAYES_00 shortcircuit=no autolearn=ham version=3.3.1 Received: from localhost (col31-4-88-188-83-94.fbx.proxad.net [88.188.83.94]) by mail.free-electrons.com (Postfix) with ESMTPSA id BC3611A5; Tue, 31 Jul 2012 12:29:35 +0200 (CEST) From: Maxime Ripard To: linux-fbdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org, FlorianSchandinat@gmx.de, shawn.guo@linaro.org Cc: brian@crystalfontz.com Subject: [PATCH 4/4] ARM: dts: mxs: add oled support for the cfa-10036 Date: Tue, 31 Jul 2012 12:29:36 +0200 Message-Id: <1343730576-20494-5-git-send-email-maxime.ripard@free-electrons.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1343730576-20494-1-git-send-email-maxime.ripard@free-electrons.com> References: <1343730576-20494-1-git-send-email-maxime.ripard@free-electrons.com> Sender: linux-fbdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org Signed-off-by: Maxime Ripard Cc: Brian Lilly --- arch/arm/boot/dts/imx28-cfa10036.dts | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/arch/arm/boot/dts/imx28-cfa10036.dts b/arch/arm/boot/dts/imx28-cfa10036.dts index c03a577..92784a9 100644 --- a/arch/arm/boot/dts/imx28-cfa10036.dts +++ b/arch/arm/boot/dts/imx28-cfa10036.dts @@ -33,11 +33,31 @@ }; 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>; + oled-reset-gpio = <&gpio2 7 1>; + oled-reset-active-low; + }; + }; }; };