From patchwork Fri Dec 11 02:52:41 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Horman X-Patchwork-Id: 7823621 X-Patchwork-Delegate: horms@verge.net.au Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 52E309FB32 for ; Fri, 11 Dec 2015 02:53:15 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 66F9720480 for ; Fri, 11 Dec 2015 02:53:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 452B32056E for ; Fri, 11 Dec 2015 02:53:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751130AbbLKCxM (ORCPT ); Thu, 10 Dec 2015 21:53:12 -0500 Received: from kirsty.vergenet.net ([202.4.237.240]:60851 "EHLO kirsty.vergenet.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752537AbbLKCxL (ORCPT ); Thu, 10 Dec 2015 21:53:11 -0500 Received: from reginn.isobedori.kobe.vergenet.net (p5254-ipbfp1403kobeminato.hyogo.ocn.ne.jp [114.152.48.254]) by kirsty.vergenet.net (Postfix) with ESMTPA id EC80625BE6A; Fri, 11 Dec 2015 13:53:04 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=verge.net.au; s=mail; t=1449802385; bh=IkIN3Uv8BJy9mKzgRFrA3QjhO0QPPUxuOzUQZ9rGN9E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Xgyr9G60fwtk1rTDkQGk/CbxreNkGEHWccGJjGt0kODE4nQp0HnmWoH2i+etNAG3x Ow/ilRpaWXABm3bbRDCkRyBEfKCUan3+I683nVaifdN3wEJf9FFrcrA+kq4Hh8oknY Z8iYSuvZXgmMhrdLVJ/VA9b+hUYOUgqCmcPpJtOw= Received: by reginn.isobedori.kobe.vergenet.net (Postfix, from userid 7100) id 314F79407AA; Fri, 11 Dec 2015 11:53:03 +0900 (JST) From: Simon Horman To: linux-sh@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, Magnus Damm , Simon Horman , Wolfram Sang Subject: [PATCH/RFC 04/19] ARM: shmobile: r8a7793: add iic(b) to device tree Date: Fri, 11 Dec 2015 11:52:41 +0900 Message-Id: <1449802376-11301-5-git-send-email-horms+renesas@verge.net.au> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1449802376-11301-1-git-send-email-horms+renesas@verge.net.au> References: <1449802376-11301-1-git-send-email-horms+renesas@verge.net.au> Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_RP_MATCHES_RCVD,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Instantiate iic(b) controllers in r8a7793 device tree. Based on similar work for the r8a7791 and r8a7791 by Wolfram Sang. Cc: Wolfram Sang Signed-off-by: Simon Horman --- The out-of order aliasing of iic to i2c is as per the documentation. This differs from the scheme in use in the dtsi files for other R-Car SoCs. It would be nice to harmonise this somehow but I'm unsure of the backwards compatibility issues. For reference those aliases are: * r8a7790: - i2c0 = &i2c0; - i2c1 = &i2c1; - i2c2 = &i2c2; - i2c3 = &i2c3; - i2c4 = &iic0; - i2c5 = &iic1; - i2c6 = &iic2; - i2c7 = &iic3; Notes: - The documentation does not make note of i2c aliases for iic (v1.02, table 12.2.1) - i2c4 and i2c5 are not present on this SoC * r8a7791: - i2c0 = &i2c0; - i2c1 = &i2c1; - i2c2 = &i2c2; - i2c3 = &i2c3; - i2c4 = &i2c4; - i2c5 = &i2c5; - i2c6 = &i2c6; - i2c7 = &i2c7; - i2c8 = &i2c8; Notes: - i2c is used in place of iic and it is my understanding that i2c6 is iic0, i2c7 is iic1 and i2c8 is iic3. - iic3 is not present on this SoC - Documentation makes note of (v1.02, table 12.2.1). They are the same as those used in this patch for the r8a7793 * r8a7794: - i2c0 = &i2c0; - i2c1 = &i2c1; - i2c2 = &i2c2; - i2c3 = &i2c3; - i2c4 = &i2c4; - i2c5 = &i2c5; Notes: - iic0 and iic1 nodes not present in mainline but are present on this SoC - Documentation makes note of the following aliases (v1.02, table 12.2.1) - iic6 = &iic0 - iic8 = &iic1 - iic2 and iic3 are not present on this SoC --- arch/arm/boot/dts/r8a7793.dtsi | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/arch/arm/boot/dts/r8a7793.dtsi b/arch/arm/boot/dts/r8a7793.dtsi index b8998b9519f6..cdf40abcc36c 100644 --- a/arch/arm/boot/dts/r8a7793.dtsi +++ b/arch/arm/boot/dts/r8a7793.dtsi @@ -25,6 +25,9 @@ i2c3 = &i2c3; i2c4 = &i2c4; i2c5 = &i2c5; + i2c6 = &iic3; + i2c7 = &iic0; + i2c8 = &iic1; spi0 = &qspi; }; @@ -478,6 +481,45 @@ status = "disabled"; }; + iic0: i2c@e6500000 { + #address-cells = <1>; + #size-cells = <0>; + compatible = "renesas,iic-r8a7793", "renesas,rmobile-iic"; + reg = <0 0xe6500000 0 0x425>; + interrupts = <0 174 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&mstp3_clks R8A7793_CLK_IIC0>; + dmas = <&dmac0 0x61>, <&dmac0 0x62>; + dma-names = "tx", "rx"; + power-domains = <&cpg_clocks>; + status = "disabled"; + }; + + iic1: i2c@e6510000 { + #address-cells = <1>; + #size-cells = <0>; + compatible = "renesas,iic-r8a7793", "renesas,rmobile-iic"; + reg = <0 0xe6510000 0 0x425>; + interrupts = <0 175 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&mstp3_clks R8A7793_CLK_IIC1>; + dmas = <&dmac0 0x65>, <&dmac0 0x66>; + dma-names = "tx", "rx"; + power-domains = <&cpg_clocks>; + status = "disabled"; + }; + + iic3: i2c@e60b0000 { + #address-cells = <1>; + #size-cells = <0>; + compatible = "renesas,iic-r8a7793", "renesas,rmobile-iic"; + reg = <0 0xe60b0000 0 0x425>; + interrupts = <0 173 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&mstp9_clks R8A7793_CLK_IICDVFS>; + dmas = <&dmac0 0x77>, <&dmac0 0x78>; + dma-names = "tx", "rx"; + power-domains = <&cpg_clocks>; + status = "disabled"; + }; + scif0: serial@e6e60000 { compatible = "renesas,scif-r8a7793", "renesas,scif"; reg = <0 0xe6e60000 0 64>;