From patchwork Wed Apr 23 13:53:24 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Popov X-Patchwork-Id: 4041291 X-Patchwork-Delegate: vinod.koul@intel.com Return-Path: X-Original-To: patchwork-dmaengine@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 1110D9F319 for ; Wed, 23 Apr 2014 13:54:35 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3AC15201E7 for ; Wed, 23 Apr 2014 13:54:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6C874201C8 for ; Wed, 23 Apr 2014 13:54:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756855AbaDWNxo (ORCPT ); Wed, 23 Apr 2014 09:53:44 -0400 Received: from mail-lb0-f181.google.com ([209.85.217.181]:59643 "EHLO mail-lb0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756661AbaDWNxk (ORCPT ); Wed, 23 Apr 2014 09:53:40 -0400 Received: by mail-lb0-f181.google.com with SMTP id c11so779337lbj.26 for ; Wed, 23 Apr 2014 06:53:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=UYSznB3ykBQ3goXC5b3oxkKNzzeLsHPY3uw0yBVmRD0=; b=QCd9jCKnVMm6suAjeNKwMA1rQVTCOXDJUuEfGgZfwQymqLQIWIEAc9L9ue794oiwoh R8S5nwR4KlOuvVgcR413GJQWyXp8MwhjFdTQOOIyDoMXPse9m52IITsxrxJS4q/NQoUP +zVb1pwsvzpjCTPxL6ROmQ1+virnxl6WB2jgiZ0+d6qBu2nGLpDIuy08Qwgg+qb9e9ct mpHat499/66G1dOIXsa/OFVgk9oJVCaHfH84Eu1JmG4JueTQ4d+6fslcllZZiRhZ3UUM O5v9P9FAHI45rHMvjKJVci7XBpkLfpsg1njNGpbXJ1TWtyi3TMJ93ANkkwaqfd/k2v47 uorA== X-Received: by 10.152.21.200 with SMTP id x8mr532209lae.58.1398261218403; Wed, 23 Apr 2014 06:53:38 -0700 (PDT) Received: from a13xCCC.localdomain ([89.175.56.18]) by mx.google.com with ESMTPSA id zx3sm1160816lbc.2.2014.04.23.06.53.37 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 23 Apr 2014 06:53:37 -0700 (PDT) From: Alexander Popov To: Gerhard Sittig , Dan Williams , Vinod Koul , Lars-Peter Clausen , Arnd Bergmann , Anatolij Gustschin , Andy Shevchenko , Alexander Popov , linuxppc-dev@lists.ozlabs.org, dmaengine@vger.kernel.org Cc: devicetree@vger.kernel.org Subject: [PATCH RFC v12 2/7] dma: mpc512x: separate 'compatible' values for MPC512x and MPC8308 Date: Wed, 23 Apr 2014 17:53:24 +0400 Message-Id: <1398261209-5578-3-git-send-email-a13xp0p0v88@gmail.com> X-Mailer: git-send-email 1.7.11.3 In-Reply-To: <1398261209-5578-1-git-send-email-a13xp0p0v88@gmail.com> References: <1398261209-5578-1-git-send-email-a13xp0p0v88@gmail.com> Sender: dmaengine-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: dmaengine@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham 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 MPC512x and MPC8308 have similar DMA controllers, but are independent SoCs. DMA controller driver should have separate 'compatible' values for these SoCs. Signed-off-by: Alexander Popov --- arch/powerpc/boot/dts/mpc8308_p1m.dts | 2 +- arch/powerpc/boot/dts/mpc8308rdb.dts | 2 +- drivers/dma/mpc512x_dma.c | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/powerpc/boot/dts/mpc8308_p1m.dts b/arch/powerpc/boot/dts/mpc8308_p1m.dts index 651e4f5..57f86cd 100644 --- a/arch/powerpc/boot/dts/mpc8308_p1m.dts +++ b/arch/powerpc/boot/dts/mpc8308_p1m.dts @@ -296,7 +296,7 @@ }; dma@2c000 { - compatible = "fsl,mpc8308-dma", "fsl,mpc5121-dma"; + compatible = "fsl,mpc8308-dma"; reg = <0x2c000 0x1800>; interrupts = <3 0x8 94 0x8>; diff --git a/arch/powerpc/boot/dts/mpc8308rdb.dts b/arch/powerpc/boot/dts/mpc8308rdb.dts index 9ce45f2..d0211f0 100644 --- a/arch/powerpc/boot/dts/mpc8308rdb.dts +++ b/arch/powerpc/boot/dts/mpc8308rdb.dts @@ -265,7 +265,7 @@ }; dma@2c000 { - compatible = "fsl,mpc8308-dma", "fsl,mpc5121-dma"; + compatible = "fsl,mpc8308-dma"; reg = <0x2c000 0x1800>; interrupts = <3 0x8 94 0x8>; diff --git a/drivers/dma/mpc512x_dma.c b/drivers/dma/mpc512x_dma.c index 2ce248b..0b17f4d 100644 --- a/drivers/dma/mpc512x_dma.c +++ b/drivers/dma/mpc512x_dma.c @@ -815,6 +815,7 @@ static int mpc_dma_remove(struct platform_device *op) static struct of_device_id mpc_dma_match[] = { { .compatible = "fsl,mpc5121-dma", }, + { .compatible = "fsl,mpc8308-dma", }, {}, };