From patchwork Tue Nov 20 14:52:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Maxime Ripard X-Patchwork-Id: 10690733 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 3A7A95A4 for ; Tue, 20 Nov 2018 16:23:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 243942A7EF for ; Tue, 20 Nov 2018 16:23:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 127882A7FF; Tue, 20 Nov 2018 16:23:34 +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=-3.6 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id A50F72A34B for ; Tue, 20 Nov 2018 16:23:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=kbz71Dl8jSnZVUhCevogsMj2BQapael1XDDBbyyoGWQ=; b=Wp5CP3frWQnlgQ ayF0ygkJh6bSabudPVS1yXtBaIMgUJGUIs2D9ksI9Gy5r5cVyhl2CFWazZ6UM9guCHeg67YcmCGsM VC+jVGoSD5Pf3IDd1NWYFyAou90mnIXaRhDCLV00mBf0we3xxjK8Bzf9d1wfwDgFYDdpFNYJoO8WU 2RqZLyJRAnp3eZpABGALozNdOgVXWRP3G/BYTU43Mt4Dkfmp+5PdVBnXBig9py1ZThTKTlkgQ26qg mQ3JIZCk9x5tsMbDrPReJdDxtrR2h8lswt57r8wZkTnACo/HdMQiRGQEC/0oGfDx+VaAhoRryqIhl O1cnrwAo+Xz3xZ4KObKA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gP8oF-0001nh-Mh; Tue, 20 Nov 2018 16:23:31 +0000 Received: from casper.infradead.org ([85.118.1.10]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gP8k5-0001i9-DR for linux-arm-kernel@bombadil.infradead.org; Tue, 20 Nov 2018 16:19:13 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:Content-Type: MIME-Version:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=OhLxdlIMr5TkXe2Lgyw8qDTGB61mx4g/Q4iGzGS6qP4=; b=MO2sDdV0pJqJMAt6Sn+wtsga0i tZeVRUM7hhrJS6xEJWpk6vKy0LXOu1oDRrrVzes75kd06x01blrWnNgKV74Yz7hkNv6ZHNW616vKe 7rQ3ht+4e4Mdqn4CnLYywvFefqY1uLtDjIVcPl8PkJEcfduDXoqd3DE6cEB28DxKsOiE7XFzByLps u6l/bKRjq2/diN2WUSc9m+9Oqy7b5dXz3mB6+Mw8dfZCP3KlWlcRndgh4wbVEQWuIiTUyRafaYQzW F4VSl+rjsGSPeL6butvLRSOY4hr5RqNCZ9B1xvem42igpDbovcyy/XJttDlB1Mz3gFL2coNItSubJ pcztlf5g==; Received: from mail.bootlin.com ([62.4.15.54]) by casper.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gP7Ob-0005km-GA for linux-arm-kernel@lists.infradead.org; Tue, 20 Nov 2018 14:52:58 +0000 Received: by mail.bootlin.com (Postfix, from userid 110) id E5BBD2074F; Tue, 20 Nov 2018 15:52:45 +0100 (CET) Received: from localhost (aaubervilliers-681-1-13-146.w90-88.abo.wanadoo.fr [90.88.134.146]) by mail.bootlin.com (Postfix) with ESMTPSA id B7368206A1; Tue, 20 Nov 2018 15:52:45 +0100 (CET) From: Maxime Ripard To: Chen-Yu Tsai , Maxime Ripard Subject: [PATCH v3] ARM: dts: sun8i: Add the H3/H5 CSI controller Date: Tue, 20 Nov 2018 15:52:41 +0100 Message-Id: <20181120145241.18618-1-maxime.ripard@bootlin.com> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181120_145257_570868_1C3AD560 X-CRM114-Status: GOOD ( 12.92 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Myl=C3=A8ne_Josserand?= , linux-arm-kernel@lists.infradead.org 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: Mylène Josserand The H3 and H5 features the same CSI controller that was initially found on the A31. Add a DT node for it. Signed-off-by: Mylène Josserand Signed-off-by: Maxime Ripard --- Changes from v3: - Removed the CSI MCLK pin from the default pin group --- arch/arm/boot/dts/sunxi-h3-h5.dtsi | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/arch/arm/boot/dts/sunxi-h3-h5.dtsi b/arch/arm/boot/dts/sunxi-h3-h5.dtsi index 4b1530ebe427..39cd445f796a 100644 --- a/arch/arm/boot/dts/sunxi-h3-h5.dtsi +++ b/arch/arm/boot/dts/sunxi-h3-h5.dtsi @@ -393,6 +393,13 @@ interrupt-controller; #interrupt-cells = <3>; + csi_pins: csi { + pins = "PE1", "PE2", "PE3", "PE4", "PE5", + "PE6", "PE7", "PE8", "PE9", "PE10", + "PE11"; + function = "csi"; + }; + emac_rgmii_pins: emac0 { pins = "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD7", "PD8", "PD9", "PD10", @@ -744,6 +751,21 @@ interrupts = ; }; + csi: camera@1cb0000 { + compatible = "allwinner,sun8i-h3-csi", + "allwinner,sun6i-a31-csi"; + reg = <0x01cb0000 0x1000>; + interrupts = ; + clocks = <&ccu CLK_BUS_CSI>, + <&ccu CLK_CSI_SCLK>, + <&ccu CLK_DRAM_CSI>; + clock-names = "bus", "mod", "ram"; + resets = <&ccu RST_BUS_CSI>; + pinctrl-names = "default"; + pinctrl-0 = <&csi_pins>; + status = "disabled"; + }; + hdmi: hdmi@1ee0000 { compatible = "allwinner,sun8i-h3-dw-hdmi", "allwinner,sun8i-a83t-dw-hdmi";