From patchwork Fri Nov 13 02:23:51 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Horman X-Patchwork-Id: 7607691 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 3D630BF90C for ; Fri, 13 Nov 2015 02:24:31 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 773C32060A for ; Fri, 13 Nov 2015 02:24:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 677652053A for ; Fri, 13 Nov 2015 02:24:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932370AbbKMCY0 (ORCPT ); Thu, 12 Nov 2015 21:24:26 -0500 Received: from kirsty.vergenet.net ([202.4.237.240]:46741 "EHLO kirsty.vergenet.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932453AbbKMCYY (ORCPT ); Thu, 12 Nov 2015 21:24:24 -0500 Received: from penelope.kanocho.kobe.vergenet.net (g1-27-253-251-11.bmobile.ne.jp [27.253.251.11]) by kirsty.vergenet.net (Postfix) with ESMTPSA id CF4BE25B832; Fri, 13 Nov 2015 13:24:21 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=verge.net.au; s=mail; t=1447381462; bh=yyMnGVYtpYx1q1MZ8fAC8gN4BCqF57UIDR/ddKIk1bc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WL3AXNgpFDcVsUzsahOouCWS2wOb7u15ZT8ZISLZ1pY5sHMtDwOibYCtffM99GIvD Np36eDPOYZDlmho8EWUGRNU23ua+K0nXKHAk4bGg8BU1yoOliCtfKD+UFellwOJOOA LUln92nDAPBk3D4CAt4cMc9UYuM4zWMAzoQ9lWck= Received: by penelope.kanocho.kobe.vergenet.net (Postfix, from userid 7100) id DFE23668C3; Fri, 13 Nov 2015 11:24:05 +0900 (JST) From: Simon Horman To: linux-sh@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, Magnus Damm , Simon Horman Subject: [PATCH 4/4] ARM: shmobile: r8a7794: Use SoC specific binding for rcar-dmac nodes Date: Fri, 13 Nov 2015 11:23:51 +0900 Message-Id: <1447381431-2255-5-git-send-email-horms+renesas@verge.net.au> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1447381431-2255-1-git-send-email-horms+renesas@verge.net.au> References: <1447381431-2255-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=-7.2 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,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 Use the new SoC specific binding for rcar-dmac and the generic binding as a fall-back in the r8a7794 device tree. In general Renesas hardware is not documented to the extent where the relationship between IP blocks on different SoCs can be assumed although they may appear to operate the same way. Furthermore the documentation typically does not specify a version for individual IP blocks. For these reasons a convention of using the SoC name in place of a version and providing SoC-specific compat strings has been adopted. Although not universally liked this convention is used in the bindings for most drivers for Renesas hardware. The purpose of this patch is to update the Renesas R-Car DMA Controller nodes to follow this convention. Signed-off-by: Simon Horman --- arch/arm/boot/dts/r8a7794.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/r8a7794.dtsi b/arch/arm/boot/dts/r8a7794.dtsi index 018ff56470b6..33af10f2230f 100644 --- a/arch/arm/boot/dts/r8a7794.dtsi +++ b/arch/arm/boot/dts/r8a7794.dtsi @@ -221,7 +221,7 @@ }; dmac0: dma-controller@e6700000 { - compatible = "renesas,rcar-dmac"; + compatible = "renesas,dmac-r8a7794", "renesas,rcar-dmac"; reg = <0 0xe6700000 0 0x20000>; interrupts = <0 197 IRQ_TYPE_LEVEL_HIGH 0 200 IRQ_TYPE_LEVEL_HIGH @@ -252,7 +252,7 @@ }; dmac1: dma-controller@e6720000 { - compatible = "renesas,rcar-dmac"; + compatible = "renesas,dmac-r8a7794", "renesas,rcar-dmac"; reg = <0 0xe6720000 0 0x20000>; interrupts = <0 220 IRQ_TYPE_LEVEL_HIGH 0 216 IRQ_TYPE_LEVEL_HIGH