From patchwork Thu Apr 24 21:11:21 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ezequiel Garcia X-Patchwork-Id: 4054021 Return-Path: X-Original-To: patchwork-linux-omap@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 BEAA69F271 for ; Thu, 24 Apr 2014 21:12:20 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id ECA4D200D9 for ; Thu, 24 Apr 2014 21:12:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id ED5A720351 for ; Thu, 24 Apr 2014 21:12:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754221AbaDXVME (ORCPT ); Thu, 24 Apr 2014 17:12:04 -0400 Received: from mail-yk0-f169.google.com ([209.85.160.169]:58988 "EHLO mail-yk0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753343AbaDXVMC (ORCPT ); Thu, 24 Apr 2014 17:12:02 -0400 Received: by mail-yk0-f169.google.com with SMTP id 142so2630974ykq.0 for ; Thu, 24 Apr 2014 14:12:01 -0700 (PDT) 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=qeG2xWzB9Z+/dmBFrCXkS0s/SqYw7WgJMQ8y1F2ZZLY=; b=PSzu9KXbgN/eTH7/w0gyJVb0hmliQ2dPl0dOcZPqYfOybGy4rp84EjAnbJtVX4wJUe ANTc6OgqNNlEMNwMyFlnYQS+MEkE3QRXbF7r0DjbfJMP6bxDKHPZK8mYwrsGC9ClWz6r D/I/dKR4PgqSiJv3t0MSn50772Kd4eGwoL1f4artHJrrgTlWpri18t2Bgh5c0g9nxfDW 44TWZts+Dt9aUIzcf7UBjFIPj3uqgrBX483Nt91Yp+RxCMaMQPJCyzHEtcmvc+pHLnRI o+PZNdlio5zaOmyzTp/cY2Hz0sewmle0Y6R50gDS6q9en6HkS5tEAnTnYiEY4GDJ8zIe aA5Q== X-Gm-Message-State: ALoCoQlvOkCkKNNJVC1JaGT5nkqP8okL+nt7SxkAOBd2hEd30K37UhPnQ8admihSoRFBnVDdEmvU X-Received: by 10.236.79.134 with SMTP id i6mr6097070yhe.16.1398373921380; Thu, 24 Apr 2014 14:12:01 -0700 (PDT) Received: from localhost.localdomain ([190.2.108.30]) by mx.google.com with ESMTPSA id f2sm9710506yhg.7.2014.04.24.14.11.59 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 24 Apr 2014 14:12:01 -0700 (PDT) From: Ezequiel Garcia To: , , Benoit Cousson Cc: Sebastian Andrzej Siewior , Felipe Balbi , Tony Lindgren , Ezequiel Garcia Subject: [PATCH v2] ARM: dts: am33xx: Move the cppi41dma node so it's probed early Date: Thu, 24 Apr 2014 18:11:21 -0300 Message-Id: <1398373881-23369-1-git-send-email-ezequiel@vanguardiasur.com.ar> X-Mailer: git-send-email 1.9.1 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, 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 The DMA controller is needed for the USB controller to be correctly registered. Therefore, if the DMA node is located at the end an unecessary probe deferral is produced systematically. This is easily fixed by moving the node at the beggining of the child list, so it's probed first. Signed-off-by: Ezequiel Garcia Tested-by: Yegor Yefremov Acked-by: George Cherian --- v1->v2: * Added a comment to prevent a future clean-up based on the memory offset. arch/arm/boot/dts/am33xx.dtsi | 34 ++++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi index 9770e35..02e1eb6 100644 --- a/arch/arm/boot/dts/am33xx.dtsi +++ b/arch/arm/boot/dts/am33xx.dtsi @@ -453,6 +453,26 @@ ti,hwmods = "usb_otg_hs"; status = "disabled"; + /* + * The probe order matches the child ordering so the + * dma-controller node must be the first one to prevent + * spurious probe deferrals. + */ + cppi41dma: dma-controller@47402000 { + compatible = "ti,am3359-cppi41"; + reg = <0x47400000 0x1000 + 0x47402000 0x1000 + 0x47403000 0x1000 + 0x47404000 0x4000>; + reg-names = "glue", "controller", "scheduler", "queuemgr"; + interrupts = <17>; + interrupt-names = "glue"; + #dma-cells = <2>; + #dma-channels = <30>; + #dma-requests = <256>; + status = "disabled"; + }; + usb_ctrl_mod: control@44e10620 { compatible = "ti,am335x-usb-ctrl-module"; reg = <0x44e10620 0x10 @@ -556,20 +576,6 @@ "tx14", "tx15"; }; - cppi41dma: dma-controller@47402000 { - compatible = "ti,am3359-cppi41"; - reg = <0x47400000 0x1000 - 0x47402000 0x1000 - 0x47403000 0x1000 - 0x47404000 0x4000>; - reg-names = "glue", "controller", "scheduler", "queuemgr"; - interrupts = <17>; - interrupt-names = "glue"; - #dma-cells = <2>; - #dma-channels = <30>; - #dma-requests = <256>; - status = "disabled"; - }; }; epwmss0: epwmss@48300000 {