From patchwork Tue Apr 16 14:31:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 10903233 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 93067161F for ; Tue, 16 Apr 2019 14:31:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7BEA0288B9 for ; Tue, 16 Apr 2019 14:31:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7038328925; Tue, 16 Apr 2019 14:31:14 +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=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 065EB2892A for ; Tue, 16 Apr 2019 14:31:13 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0198789453; Tue, 16 Apr 2019 14:31:12 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-lj1-x243.google.com (mail-lj1-x243.google.com [IPv6:2a00:1450:4864:20::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8489789453 for ; Tue, 16 Apr 2019 14:31:09 +0000 (UTC) Received: by mail-lj1-x243.google.com with SMTP id f18so19305264lja.10 for ; Tue, 16 Apr 2019 07:31:09 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Yt5V88l+DfqZ0DDFkRkxp4IHLiftWlPOuQ0M61KhFe0=; b=uFeGTt+8G8ogZSUNw1bdDTi02JOGjEdBJm+4Zwqz4Mxh2FlLvlNDluH0NOnayc/Wjr RPU09X15E9R0jOdeAhcY90d7ad4kKb14oa3LO1gch1j04C8AJ+uTeu4js/pceCSxwP4y 3X42MbefJ2xvOWeuykEkfl/m5v7MVrNLgp5at7QQ2Ao9phX7cvx99hmzSSFU72N8YXhd CzYYaWVcteDfBNf7+85qmYv72fX0iFs/+2dfunJ4rvxnF/BD8A84MR6wj/uK+o+byBDa jqZi/Moa0K6I1JOOy/ivW/xnwSThQZCcLHGnRIP9crOFrVpkr12DA0qeBypk/caw0k0p UL+Q== X-Gm-Message-State: APjAAAVd/KbHw1Hd2OeVLRqz2a6752nXyDE6hSaBwpbLlEC3J5T0KC8z lcM6pEjM9C7lYpwpmpBOZ8clIx3DLJk= X-Google-Smtp-Source: APXvYqzMBe8xDIdTh94738zimdXQ8ZlXpG1iJVbrjtaAvSsTMUVYMLyPI4BljkgHHaqs+kyvrwZcnA== X-Received: by 2002:a2e:390c:: with SMTP id g12mr43552519lja.174.1555425067422; Tue, 16 Apr 2019 07:31:07 -0700 (PDT) Received: from genomnajs.ideon.se ([85.235.10.227]) by smtp.gmail.com with ESMTPSA id m19sm6677693lfl.43.2019.04.16.07.31.05 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 16 Apr 2019 07:31:06 -0700 (PDT) From: Linus Walleij To: dri-devel@lists.freedesktop.org, Maarten Lankhorst , Maxime Ripard , Sean Paul Subject: [PATCH 4/4 v2] ARM: dts: Ux500: Add MCDE and Samsung display Date: Tue, 16 Apr 2019 16:31:02 +0200 Message-Id: <20190416143102.12462-1-linus.walleij@linaro.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Yt5V88l+DfqZ0DDFkRkxp4IHLiftWlPOuQ0M61KhFe0=; b=g4wrDfZ3XMcZvyKpL08QOUUPNVmp4wzPLJhZRc8f9LsGi01745Z966TF5aYuRArrBH oBhkBOSMqpRjdjdueXLf5gXTypIGfKMkbgJ1l5l98P9/SnILR00mmyScVhaMLxvTQaDG qQgI6HnalAyiejEcNUAwTryzZ5d0pubfgfJoVLyWz6SYhYBPN5pVuwSC9uSSheYPB/cR b0+F4nvk7Si72arKLf6bYdCQItvXbOIkqTNPx7QC1LvQbEB+lLIh46aby6aJnhYFqv2n UPulZSCE4Ds1pRQVg0PKiuo22YPNSesZ2Sz1XvjooFAaHeISdP9Gi+Nsjn2jk/kH8HAD hUMg== X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-arm-kernel@lists.infradead.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP This adds and updates the device tree nodes for the MCDE display controller and connects the Samsung display to the TVK1281618 user interface board (UIB) so we get nicely working graphics on this reference design. Signed-off-by: Linus Walleij --- ChangeLog v1->v2: - Drop the port graph links between DSI host and children and just let the panel be the child of its DSI port. - Move the DSI HS and LP/ES clocks to be properties on the DSI host nodes. --- arch/arm/boot/dts/ste-dbx5x0.dtsi | 50 +++++++++++++++++----- arch/arm/boot/dts/ste-href-stuib.dtsi | 13 ++++++ arch/arm/boot/dts/ste-href-tvk1281618.dtsi | 13 ++++++ 3 files changed, 65 insertions(+), 11 deletions(-) diff --git a/arch/arm/boot/dts/ste-dbx5x0.dtsi b/arch/arm/boot/dts/ste-dbx5x0.dtsi index 43d11346308e..81fabf031eff 100644 --- a/arch/arm/boot/dts/ste-dbx5x0.dtsi +++ b/arch/arm/boot/dts/ste-dbx5x0.dtsi @@ -1221,20 +1221,48 @@ }; mcde@a0350000 { - compatible = "stericsson,mcde"; - reg = <0xa0350000 0x1000>, /* MCDE */ - <0xa0351000 0x1000>, /* DSI link 1 */ - <0xa0352000 0x1000>, /* DSI link 2 */ - <0xa0353000 0x1000>; /* DSI link 3 */ + compatible = "ste,mcde"; + reg = <0xa0350000 0x1000>; interrupts = ; + epod-supply = <&db8500_b2r2_mcde_reg>; + vana-supply = <&ab8500_ldo_ana_reg>; clocks = <&prcmu_clk PRCMU_MCDECLK>, /* Main MCDE clock */ <&prcmu_clk PRCMU_LCDCLK>, /* LCD clock */ - <&prcmu_clk PRCMU_PLLDSI>, /* HDMI clock */ - <&prcmu_clk PRCMU_DSI0CLK>, /* DSI 0 */ - <&prcmu_clk PRCMU_DSI1CLK>, /* DSI 1 */ - <&prcmu_clk PRCMU_DSI0ESCCLK>, /* TVout clock 0 */ - <&prcmu_clk PRCMU_DSI1ESCCLK>, /* TVout clock 1 */ - <&prcmu_clk PRCMU_DSI2ESCCLK>; /* TVout clock 2 */ + <&prcmu_clk PRCMU_PLLDSI>; /* HDMI clock */ + clock-names = "mcde", "lcd", "hdmi"; + #address-cells = <1>; + #size-cells = <1>; + ranges; + status = "disabled"; + + dsi0: dsi@a0351000 { + compatible = "ste,mcde-dsi"; + reg = <0xa0351000 0x1000>; + vana-supply = <&ab8500_ldo_ana_reg>; + clocks = <&prcmu_clk PRCMU_DSI0CLK>, <&prcmu_clk PRCMU_DSI0ESCCLK>; + clock-names = "hs", "lp"; + #address-cells = <1>; + #size-cells = <0>; + }; + dsi1: dsi@a0352000 { + compatible = "ste,mcde-dsi"; + reg = <0xa0352000 0x1000>; + vana-supply = <&ab8500_ldo_ana_reg>; + clocks = <&prcmu_clk PRCMU_DSI1CLK>, <&prcmu_clk PRCMU_DSI1ESCCLK>; + clock-names = "hs", "lp"; + #address-cells = <1>; + #size-cells = <0>; + }; + dsi2: dsi@a0353000 { + compatible = "ste,mcde-dsi"; + reg = <0xa0353000 0x1000>; + vana-supply = <&ab8500_ldo_ana_reg>; + /* This DSI port only has the Low Power / Energy Save clock */ + clocks = <&prcmu_clk PRCMU_DSI2ESCCLK>; + clock-names = "lp"; + #address-cells = <1>; + #size-cells = <0>; + }; }; cryp@a03cb000 { diff --git a/arch/arm/boot/dts/ste-href-stuib.dtsi b/arch/arm/boot/dts/ste-href-stuib.dtsi index 35e944d8b5c4..eeaea21f5eca 100644 --- a/arch/arm/boot/dts/ste-href-stuib.dtsi +++ b/arch/arm/boot/dts/ste-href-stuib.dtsi @@ -190,5 +190,18 @@ }; }; }; + + mcde@a0350000 { + status = "okay"; + + dsi@a0351000 { + panel { + compatible = "samsung,s6d16d0"; + reg = <0>; + vdd1-supply = <&ab8500_ldo_aux1_reg>; + reset-gpios = <&gpio2 1 GPIO_ACTIVE_LOW>; + }; + }; + }; }; }; diff --git a/arch/arm/boot/dts/ste-href-tvk1281618.dtsi b/arch/arm/boot/dts/ste-href-tvk1281618.dtsi index 0e7d77d719d7..76868444caa4 100644 --- a/arch/arm/boot/dts/ste-href-tvk1281618.dtsi +++ b/arch/arm/boot/dts/ste-href-tvk1281618.dtsi @@ -274,5 +274,18 @@ }; }; }; + + mcde@a0350000 { + status = "okay"; + + dsi@a0351000 { + panel { + compatible = "samsung,s6d16d0"; + reg = <0>; + vdd1-supply = <&ab8500_ldo_aux1_reg>; + reset-gpios = <&gpio2 1 GPIO_ACTIVE_LOW>; + }; + }; + }; }; };