From patchwork Mon Aug 22 22:48:02 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 9294501 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 95F81607F0 for ; Mon, 22 Aug 2016 22:50:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8345C28AD1 for ; Mon, 22 Aug 2016 22:50:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 775D428AD7; Mon, 22 Aug 2016 22:50:27 +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=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id CF04228AD1 for ; Mon, 22 Aug 2016 22:50:25 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1bby1I-0006Nc-Lf; Mon, 22 Aug 2016 22:48:40 +0000 Received: from mail-pf0-x231.google.com ([2607:f8b0:400e:c00::231]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bby1C-0006J8-5O for linux-arm-kernel@lists.infradead.org; Mon, 22 Aug 2016 22:48:35 +0000 Received: by mail-pf0-x231.google.com with SMTP id p64so36601634pfb.1 for ; Mon, 22 Aug 2016 15:48:13 -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; bh=68GO8Ilsa1uDiN+p/3XDNTN7467INe7ttqZIHbXOXvw=; b=k25Ys00tIlPdaIlioU4f+xCFDIwOoALH696o90CEUsMN4/Hm369HFzw+B1uTOqKBt7 AAw6GZBI50Hym2D52p/e0kuptYf5ENk01Sb8cBwUkPlybqX2MhViaqaOG6kzRzrQapd2 clReeuV6Qwmn25J/lNjEPQ4nmM9AuNYD0MFyE= 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; bh=68GO8Ilsa1uDiN+p/3XDNTN7467INe7ttqZIHbXOXvw=; b=hpg7PmJZOls8cMM/Kn0LigjQSSLqkiU0f5JPGMSDZJ+7TZr2ymnO8NKmv9hbwJm2JG J2GsH101kXZ4rFcfAOEVoJlWGw9AoPEtNH7bpv9wfdOF2WoclXh1yZCBSFxKfua2j/2o FfuCZTemtPpaChYuGwzLX0kaE1kwnvPPgyGOf6UztLvQtTdSrBAisrUewDmH7E7XMSNc aaYrL6NrXjKp/wl5Vpymg3rxGDs9obem0q1WoF2nbEXIzR/899liWAZX6b30y2PrdT0H IsB44pXBY/SgQt2lNz/3nUxBPeAKhGfyWqlX/XkSvb1H99sK60B4A7B1FeL/PDDR/2oc Ytmg== X-Gm-Message-State: AEkoousyCauRPrmw1ZntZF70/fiXt4tJjJgL4Dx2bUq7w3k7chZ6wt1Lgs4xsq8T7yUR5syQ X-Received: by 10.98.88.131 with SMTP id m125mr46960605pfb.63.1471906092913; Mon, 22 Aug 2016 15:48:12 -0700 (PDT) Received: from localhost.localdomain (c-73-67-244-238.hsd1.or.comcast.net. [73.67.244.238]) by smtp.gmail.com with ESMTPSA id uc1sm189946pac.24.2016.08.22.15.48.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 22 Aug 2016 15:48:12 -0700 (PDT) From: John Stultz To: lkml Subject: [PATCH 1/4] arm64: dts: Add display subsystem DT nodes for hi6220-hikey Date: Mon, 22 Aug 2016 15:48:02 -0700 Message-Id: <1471906085-16682-1-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 1.9.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160822_154834_234836_F6A5A6E9 X-CRM114-Status: GOOD ( 11.51 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , devicetree@vger.kernel.org, Guodong Xu , Xinliang Liu , Catalin Marinas , Will Deacon , Wei Xu , Rob Herring , John Stultz , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Xinliang Liu Add ade and dsi DT nodes for hikey board. Cc: Guodong Xu Cc: Wei Xu Cc: Rob Herring Cc: Mark Rutland Cc: Catalin Marinas Cc: Will Deacon Cc: linux-arm-kernel@lists.infradead.org Cc: devicetree@vger.kernel.org Signed-off-by: Xinliang Liu Signed-off-by: John Stultz --- arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts | 8 ++++ arch/arm64/boot/dts/hisilicon/hi6220.dtsi | 55 ++++++++++++++++++++++++++ 2 files changed, 63 insertions(+) diff --git a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts index 593c7e4..c2f014e 100644 --- a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts +++ b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts @@ -372,3 +372,11 @@ &uart3 { label = "LS-UART1"; }; + +&ade { + status = "ok"; +}; + +&dsi { + status = "ok"; +}; diff --git a/arch/arm64/boot/dts/hisilicon/hi6220.dtsi b/arch/arm64/boot/dts/hisilicon/hi6220.dtsi index 4f27041..d0b887a 100644 --- a/arch/arm64/boot/dts/hisilicon/hi6220.dtsi +++ b/arch/arm64/boot/dts/hisilicon/hi6220.dtsi @@ -262,6 +262,11 @@ #clock-cells = <1>; }; + medianoc_ade: medianoc_ade@f4520000 { + compatible = "syscon"; + reg = <0x0 0xf4520000 0x0 0x4000>; + }; + stub_clock: stub_clock { compatible = "hisilicon,hi6220-stub-clk"; hisilicon,hi6220-clk-sram = <&sram>; @@ -850,5 +855,55 @@ }; }; }; + + ade: ade@f4100000 { + compatible = "hisilicon,hi6220-ade"; + reg = <0x0 0xf4100000 0x0 0x7800>; + reg-names = "ade_base"; + hisilicon,noc-syscon = <&medianoc_ade>; + resets = <&media_ctrl MEDIA_ADE>; + interrupts = <0 115 4>; /* ldi interrupt */ + + clocks = <&media_ctrl HI6220_ADE_CORE>, + <&media_ctrl HI6220_CODEC_JPEG>, + <&media_ctrl HI6220_ADE_PIX_SRC>; + /*clock name*/ + clock-names = "clk_ade_core", + "clk_codec_jpeg", + "clk_ade_pix"; + + assigned-clocks = <&media_ctrl HI6220_ADE_CORE>, + <&media_ctrl HI6220_CODEC_JPEG>; + assigned-clock-rates = <360000000>, <288000000>; + dma-coherent; + status = "disabled"; + + port { + ade_out: endpoint { + remote-endpoint = <&dsi_in>; + }; + }; + }; + + dsi: dsi@f4107800 { + compatible = "hisilicon,hi6220-dsi"; + reg = <0x0 0xf4107800 0x0 0x100>; + clocks = <&media_ctrl HI6220_DSI_PCLK>; + clock-names = "pclk"; + status = "disabled"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + /* 0 for input port */ + port@0 { + reg = <0>; + dsi_in: endpoint { + remote-endpoint = <&ade_out>; + }; + }; + }; + }; }; };