From patchwork Fri Sep 9 21:25:35 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 9324425 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 597B260231 for ; Fri, 9 Sep 2016 21:25:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4AA4C2A014 for ; Fri, 9 Sep 2016 21:25:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3FAAE2A01E; Fri, 9 Sep 2016 21:25:58 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A732C2A014 for ; Fri, 9 Sep 2016 21:25:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754746AbcIIVZ5 (ORCPT ); Fri, 9 Sep 2016 17:25:57 -0400 Received: from mail-lf0-f47.google.com ([209.85.215.47]:35733 "EHLO mail-lf0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753520AbcIIVZ4 (ORCPT ); Fri, 9 Sep 2016 17:25:56 -0400 Received: by mail-lf0-f47.google.com with SMTP id l131so52679148lfl.2 for ; Fri, 09 Sep 2016 14:25:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=waR8H2rXVmcTkvgcTfZmfPvjw75ZsIGbnjkB0LQYqOw=; b=Y9GQ/+p0MfSwy04rR7cUF4otWVy95rPrisVXOGO+oVdV6BK8XANwwmGcJQ0D90y419 mpkvdFoRjGyY5+FPKhxbQOOGCR7CAZtU2zWlHiWcCHzW7YjrJfup8dHDAT2n326n95l4 6xSoTCXKmb2iurPx6C2Ucq9EeKEHogiGgO/QY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=waR8H2rXVmcTkvgcTfZmfPvjw75ZsIGbnjkB0LQYqOw=; b=I7Bf2+vAtR9C63yoDIT4UjxjMFc5fZIcpBuR24ksVjz0rNKo01YVtoJg+zAaoi6zZ1 hJ0lE5K0yxKSoO1N3DzZsHEA3p5d7cn/tbIpfGue3mLkHEuFZU4qMq22uNHCk0PnqFvr moMu9FE7zW04DYAuDDaqQo/3f5KGZbVrgHQ/Z6L3ABCHiKcrRPvcwMfIi9MPILEDlZPj QoatlVjzQcmVUIw1bZtWXoJbf+k4QI5edQQ46uP7aeWRdx3PdiQAR62VErSKrs90J5RR w2PRK9mzavwZRKH0Bp/2tO2il83h/O8HADwIomTREpRixRVjUYR+VI9sQ9qaySVEiIbU Zp6Q== X-Gm-Message-State: AE9vXwO6Lk6gDfStklBr1Vpy5UP5mAHm4uOg9w0kJ0rcLsyeuVW0C2DGn3TrDyXvBCuBLUst X-Received: by 10.46.33.80 with SMTP id h77mr1938016ljh.53.1473456354907; Fri, 09 Sep 2016 14:25:54 -0700 (PDT) Received: from fecusa.localdomain (c-357171d5.014-348-6c756e10.cust.bredbandsbolaget.se. [213.113.113.53]) by smtp.gmail.com with ESMTPSA id 4sm907248ljb.10.2016.09.09.14.25.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 09 Sep 2016 14:25:54 -0700 (PDT) From: Linus Walleij To: linux-arm-kernel@lists.infradead.org Cc: linux-fbdev@vger.kernel.org, Tomi Valkeinen , Rob Herring , Linus Walleij Subject: [PATCH 6/6] ARM: dts: add the CLCD LCD display to the NHK15 Date: Fri, 9 Sep 2016 23:25:35 +0200 Message-Id: <1473456335-22767-7-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1473456335-22767-1-git-send-email-linus.walleij@linaro.org> References: <1473456335-22767-1-git-send-email-linus.walleij@linaro.org> Sender: linux-fbdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This adds the TPG110 TDO43MTEA2 24-bit RGB LCD panel and sets up the Nomadik device tree to activate the CLCD and connect it to this panel. Signed-off-by: Linus Walleij --- arch/arm/boot/dts/ste-nomadik-nhk15.dts | 44 ++++++++++++++++++++++++++++++ arch/arm/boot/dts/ste-nomadik-stn8815.dtsi | 22 +++++++++++++++ 2 files changed, 66 insertions(+) diff --git a/arch/arm/boot/dts/ste-nomadik-nhk15.dts b/arch/arm/boot/dts/ste-nomadik-nhk15.dts index 3ec5c653ad56..1ec46a794a4d 100644 --- a/arch/arm/boot/dts/ste-nomadik-nhk15.dts +++ b/arch/arm/boot/dts/ste-nomadik-nhk15.dts @@ -176,6 +176,50 @@ }; amba { + clcd@10120000 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&clcd_24bit_mux>; + port { + nomadik_clcd_pads: endpoint { + remote-endpoint = <&nomadik_clcd_panel>; + arm,pl11x,tft-r0g0b0-pads = <16 8 0>; + }; + }; + + /* + * WVGA connector 21 + * WVGA (800x480): 4.3" TPG110 TDO43MTEA2 24-bit RGB + * with TPO touch screen. + */ + panel { + compatible = "tpo,tpg110", "panel-dpi"; + grestb-gpios = <&stmpe_gpio44 5 GPIO_ACTIVE_LOW>; + scen-gpios = <&gpio0 6 GPIO_ACTIVE_LOW>; + scl-gpios = <&gpio0 5 GPIO_ACTIVE_HIGH>; + sda-gpios = <&gpio0 4 GPIO_ACTIVE_HIGH>; + backlight = <&bl>; + + port { + nomadik_clcd_panel: endpoint { + remote-endpoint = <&nomadik_clcd_pads>; + }; + }; + + panel-timing { + clock-frequency = <33200000>; + hactive = <800>; + hback-porch = <216>; + hfront-porch = <40>; + hsync-len = <1>; + vactive = <480>; + vback-porch = <35>; + vfront-porch = <10>; + vsync-len = <1>; + }; + }; + }; + /* Activate RX/TX and CTS/RTS on UART 0 */ uart0: uart@101fd000 { pinctrl-names = "default"; diff --git a/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi b/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi index 80a3c9ccccd9..adb1c0998b81 100644 --- a/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi +++ b/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi @@ -166,6 +166,18 @@ }; }; }; + clcd { + /* + * This should be activated to use the additional + * 8 lines for bits 16 thru 23 from the CLCD block. + */ + clcd_24bit_mux: clcd_mux { + clcd_24bit_mux { + function = "clcd"; + groups = "clcd_16_23_b_1"; + }; + }; + }; }; /* Power Management Unit */ @@ -732,6 +744,16 @@ #size-cells = <1>; ranges; + clcd@10120000 { + compatible = "arm,pl110", "arm,primecell"; + reg = <0x10120000 0x1000>; + interrupt-names = "combined"; + interrupts = <14>; + clocks = <&clcdclk>, <&hclkclcd>; + clock-names = "clcdclk", "apb_pclk"; + status = "disabled"; + }; + vica: intc@10140000 { compatible = "arm,versatile-vic"; interrupt-controller;