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: 162346 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp4290182jan; Tue, 16 Apr 2019 07:31:13 -0700 (PDT) X-Google-Smtp-Source: APXvYqxqkuG9z+RUQSg26zmJ3md1fa92EfXV7Sg9XwqVnzvIypqtkgv4N8EgoOVtB413ZgUkbe48 X-Received: by 2002:a63:494f:: with SMTP id y15mr77631441pgk.56.1555425073812; Tue, 16 Apr 2019 07:31:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1555425073; cv=none; d=google.com; s=arc-20160816; b=B7aMigVVh7SVE9OrbUOepl2woKu6pP5h8B1UPNRV062Epzb2vjZXGRtkJStkOLH9Uy ub7z/3PtiMFKv8snzy3E3s5hh9siH2PV914rmVdSjouWDKP7bKCqzJ2CTJtJJbdueZS6 fzy1jDi3kDPHkDOUdnwBozARLr/AAHYcrIJGmWQUZlv2wQHS9ziqFaDJfZdPazRojdXM 3KO/zlCWPJlMKNdEZmOYwsMWjSpSYa2twGpM9dyfH+WaG53gWkurGKlMBgDGXRO4P8i6 Sjjl01dGDJ2g40rzjMFiv7n8DnkEA1vm3Rzi/DWx+O3T1zo4CHvm0o6DQLeo1ta2+cXZ To+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:mime-version:message-id:date:subject:to:from :delivered-to; bh=WYG6CPyS1dhNF7oNfEJQaRXRIgCELx60+MZl9pMVQGg=; b=c746BoSngrPLRP0ES+1/Pwx0nLDTu53B66E5IB+eKtxRnSxCQwWkU6GEo0dJ/cLT5d /wPE16futxOQ4V0m1qUKH1BxMEbZv286X/1HueDDEMtXIUd94XYcGIEvvqtM0S33ZUuD Ro8I4KpVciW3M6lUdUc8om21LOCk4GudYgyxA6K8tS/aDBEEzP/06eta/tGY/6oQ9JCC YsQ1ud+cj/Oc3QTrj8Lpx5Mfy81QH0Nrjf4JOJUJYXVG7ONwpNs0OpkPiyq7YD7mBaWI eHhY+7c8aQD5P/wp8eeND9uiylKW2O6SZHTuH06GHtvBgbqtUqvEJigWJmj9GlehGH2s Jwsg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 2610:10:20:722:a800:ff:fe36:1795 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from gabe.freedesktop.org (gabe.freedesktop.org. [2610:10:20:722:a800:ff:fe36:1795]) by mx.google.com with ESMTPS id s26si49085383pgm.223.2019.04.16.07.31.13 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 16 Apr 2019 07:31:13 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 2610:10:20:722:a800:ff:fe36:1795 as permitted sender) client-ip=2610:10:20:722:a800:ff:fe36:1795; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 2610:10:20:722:a800:ff:fe36:1795 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org 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-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" 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>; + }; + }; + }; }; };