From patchwork Mon Jan 9 16:06:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Bailon X-Patchwork-Id: 90511 Delivered-To: patch@linaro.org Received: by 10.140.20.99 with SMTP id 90csp152099qgi; Mon, 9 Jan 2017 08:08:20 -0800 (PST) X-Received: by 10.99.116.22 with SMTP id p22mr160884338pgc.161.1483978100394; Mon, 09 Jan 2017 08:08:20 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g76si7768349pfb.262.2017.01.09.08.08.20; Mon, 09 Jan 2017 08:08:20 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-omap-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@baylibre-com.20150623.gappssmtp.com; spf=pass (google.com: best guess record for domain of linux-omap-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-omap-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1762289AbdAIQIO (ORCPT + 4 others); Mon, 9 Jan 2017 11:08:14 -0500 Received: from mail-wm0-f44.google.com ([74.125.82.44]:38665 "EHLO mail-wm0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S970233AbdAIQHY (ORCPT ); Mon, 9 Jan 2017 11:07:24 -0500 Received: by mail-wm0-f44.google.com with SMTP id k184so126048257wme.1 for ; Mon, 09 Jan 2017 08:07:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=0eK6+uGoEk5xyBSjIQTlVHSEx/yAB6SzqEOWfxocu/o=; b=rLLPU9yz1wcUrYPsxQ+2eQ91Ft3HA+s7E4kuprx70ZHk4SuhCXAxvuk1ZsAcUVI69U 5/x71SCCiXyy94MKnXXoRSKW3WdhevuqzCFMpGw2CgDxGYjLBWdGJ0+e+v+od22m9e0u 9gmeAqOT774UX+wrJc7+UAGrY75kBLKUXF+QjP/Vpx+AkYBIt8Uab8G+8by0jA10XFEf 8CM8oTJmOau1qvORXqROvBGydjwG+cdojKyGM/DveLjxpapp4s/lwwhxsVv8xaazXsLq RrN7UdJbhrSMMYBVqJMuz+7rHCtEsyklXsJf69Jij+Uzu77r6kJq7DhUclEIv4uEggrB +XRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=0eK6+uGoEk5xyBSjIQTlVHSEx/yAB6SzqEOWfxocu/o=; b=fHR7sfFvTqrBFPbAoIkGBjJLKy+R5vIbRyTPrFpxTWdn04rWReG4rnTTImrq+mjUJP shIy5t2OAKTYVc8LaSSdDxjlHccMaRiH05JHnzGnHusLXK9bDGS2TNF6bcPKBKnMa7Kj MCZHLtgxQj9yCSb1MriHnFa8ReIejiEvJniruP/6A1/fcxNuvJHyR+C3CJt/2VcemfXr /WMR9XYmm2RBEk7hbREv/B7uKmstMs8K8qubhAMYSFqiuMZtRWtIF0MhyFjaj20gGLx/ 8gKc39Tv4KJrf3Q441APN8TR3ut9QD0dAOIPgmzdhMbF+bcmv5/WhJjQZ5C8kMFm1ZGK RBaQ== X-Gm-Message-State: AIkVDXJIfjSoREUn1gw87hJ9cqu48/Tygijy7lLhWjgSsudQIRfqX70Lruquiqc7ksBkjtDc X-Received: by 10.28.137.193 with SMTP id l184mr4572489wmd.88.1483978043259; Mon, 09 Jan 2017 08:07:23 -0800 (PST) Received: from localhost.localdomain ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id w18sm19656244wme.9.2017.01.09.08.07.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 09 Jan 2017 08:07:22 -0800 (PST) From: Alexandre Bailon To: vinod.koul@intel.com Cc: dmaengine@vger.kernel.org, linux-usb@vger.kernel.org, nsekhar@ti.com, khilman@baylibre.com, ptitiano@baylibre.com, tony@atomide.com, linux-omap@vger.kernel.org, devicetree@vger.kernel.org, robh+dt@kernel.org, b-liu@ti.com, Alexandre Bailon Subject: [PATCH 06/11] dmaengine: cppi41: Only configure am335x's registers on amm335x platform Date: Mon, 9 Jan 2017 17:06:51 +0100 Message-Id: <20170109160656.3470-7-abailon@baylibre.com> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20170109160656.3470-1-abailon@baylibre.com> References: <20170109160656.3470-1-abailon@baylibre.com> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org Currently, the driver configure some am335x's usb registers. Test if the driver is running on am335x before to configure these registers. Signed-off-by: Alexandre Bailon --- drivers/dma/cppi41.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) -- 2.10.2 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/dma/cppi41.c b/drivers/dma/cppi41.c index 58b27ef..939398e 100644 --- a/drivers/dma/cppi41.c +++ b/drivers/dma/cppi41.c @@ -1077,7 +1077,9 @@ static int cppi41_dma_probe(struct platform_device *pdev) goto err_irq; } - cppi_writel(USBSS_IRQ_PD_COMP, cdd->usbss_mem + USBSS_IRQ_ENABLER); + if (is_am335x_cppi41(dev)) + cppi_writel(USBSS_IRQ_PD_COMP, + cdd->usbss_mem + USBSS_IRQ_ENABLER); ret = devm_request_irq(&pdev->dev, irq, glue_info->isr, IRQF_SHARED, dev_name(dev), cdd); @@ -1102,7 +1104,8 @@ static int cppi41_dma_probe(struct platform_device *pdev) dma_async_device_unregister(&cdd->ddev); err_dma_reg: err_irq: - cppi_writel(0, cdd->usbss_mem + USBSS_IRQ_CLEARR); + if (is_am335x_cppi41(dev)) + cppi_writel(0, cdd->usbss_mem + USBSS_IRQ_CLEARR); cleanup_chans(cdd); err_chans: deinit_cppi41(dev, cdd); @@ -1131,7 +1134,8 @@ static int cppi41_dma_remove(struct platform_device *pdev) of_dma_controller_free(pdev->dev.of_node); dma_async_device_unregister(&cdd->ddev); - cppi_writel(0, cdd->usbss_mem + USBSS_IRQ_CLEARR); + if (is_am335x_cppi41(&pdev->dev)) + cppi_writel(0, cdd->usbss_mem + USBSS_IRQ_CLEARR); devm_free_irq(&pdev->dev, cdd->irq, cdd); cleanup_chans(cdd); deinit_cppi41(&pdev->dev, cdd); @@ -1150,7 +1154,8 @@ static int __maybe_unused cppi41_suspend(struct device *dev) struct cppi41_dd *cdd = dev_get_drvdata(dev); cdd->dma_tdfdq = cppi_readl(cdd->ctrl_mem + DMA_TDFDQ); - cppi_writel(0, cdd->usbss_mem + USBSS_IRQ_CLEARR); + if (is_am335x_cppi41(dev)) + cppi_writel(0, cdd->usbss_mem + USBSS_IRQ_CLEARR); disable_sched(cdd); return 0; @@ -1176,7 +1181,9 @@ static int __maybe_unused cppi41_resume(struct device *dev) cppi_writel(QMGR_SCRATCH_SIZE, cdd->qmgr_mem + QMGR_LRAM_SIZE); cppi_writel(0, cdd->qmgr_mem + QMGR_LRAM1_BASE); - cppi_writel(USBSS_IRQ_PD_COMP, cdd->usbss_mem + USBSS_IRQ_ENABLER); + if (is_am335x_cppi41(dev)) + cppi_writel(USBSS_IRQ_PD_COMP, + cdd->usbss_mem + USBSS_IRQ_ENABLER); return 0; }