From patchwork Tue Jun 4 04:12:50 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haojian Zhuang X-Patchwork-Id: 2656711 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) by patchwork1.kernel.org (Postfix) with ESMTP id E11FF40077 for ; Tue, 4 Jun 2013 05:02:32 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Ujigo-0004sx-6U; Tue, 04 Jun 2013 04:17:47 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Ujifj-0000wa-6C; Tue, 04 Jun 2013 04:16:35 +0000 Received: from mail-ie0-x22a.google.com ([2607:f8b0:4001:c03::22a]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UjifF-0000qW-6e for linux-arm-kernel@lists.infradead.org; Tue, 04 Jun 2013 04:16:07 +0000 Received: by mail-ie0-f170.google.com with SMTP id e14so13038965iej.1 for ; Mon, 03 Jun 2013 21:15:44 -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:x-mailer:in-reply-to:references; bh=GQJEI06ISWTnRAZdd+uc2Pn6nXznLiBCy8NFd+CTnr0=; b=ld5O42h4xoY6hMkvsR6V/1CjCn0bVGI6eU1ke9sXY7F8VCqgOkMADUR3WuZM0aEqiJ QSYa7UG1ZbuVM5iBYK7AjuBT8MhODJhX+4KhcvfN86Mx5KFzbdcgLIQcgmCdobPow51O 39uJDvphXAmmImQKmToBgLvOrAF2RDpoL8bPjtuab8IhDdpdZJGZnfQnjNhopO2zKR86 poPdkDRfAzh6t06IJaBT7l2DuttxHhhgi59KBTDZoC9Yeqdl+ec/MgxmYzGskLBXEb7I 38V770n5GfzaUIE5KicAlENMNW0IIxnoV5BfVgfV1TkkQPIrGSCnEpsaW67OCOaYkBha 3Otg== X-Received: by 10.50.153.42 with SMTP id vd10mr644490igb.43.1370319344122; Mon, 03 Jun 2013 21:15:44 -0700 (PDT) Received: from localhost.localdomain ([67.229.68.100]) by mx.google.com with ESMTPSA id k10sm22887440ige.0.2013.06.03.21.15.39 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 03 Jun 2013 21:15:43 -0700 (PDT) From: Haojian Zhuang To: tglx@linutronix.de, arnd@arndb.de, linux-arm-kernel@lists.infradead.org, chao.xie@marvell.com, john.stultz@linaro.org, mturquette@linaro.org, eric.y.miao@gmail.com, linux@arm.linux.org.uk Subject: [PATCH v4 08/10] ARM: pxa: init dma debugfs in late level Date: Tue, 4 Jun 2013 12:12:50 +0800 Message-Id: <1370319172-31788-9-git-send-email-haojian.zhuang@gmail.com> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1370319172-31788-1-git-send-email-haojian.zhuang@gmail.com> References: <1370319172-31788-1-git-send-email-haojian.zhuang@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130604_001605_322443_45052664 X-CRM114-Status: GOOD ( 17.02 ) X-Spam-Score: -2.0 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (haojian.zhuang[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Cc: Haojian Zhuang X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Remove pxa_init_dma() from core_initcall level since it's unncecssary for DT mode. But dma debugfs is also included in pxa_init_dma(). So only initiliaze dma debugfs in late_initcall level. Signed-off-by: Haojian Zhuang --- arch/arm/mach-mmp/mmp2.c | 2 +- arch/arm/mach-mmp/pxa168.c | 2 +- arch/arm/mach-mmp/pxa910.c | 2 +- arch/arm/plat-pxa/dma.c | 30 ++++++++++++++++++++---------- 4 files changed, 23 insertions(+), 13 deletions(-) diff --git a/arch/arm/mach-mmp/mmp2.c b/arch/arm/mach-mmp/mmp2.c index f26ea9d..a0abfd7 100644 --- a/arch/arm/mach-mmp/mmp2.c +++ b/arch/arm/mach-mmp/mmp2.c @@ -114,7 +114,6 @@ static int __init mmp2_init(void) return 0; } -postcore_initcall(mmp2_init); #define APBC_TIMERS APBC_REG(0x024) @@ -122,6 +121,7 @@ void __init mmp2_timer_init(void) { unsigned long clk_rst; + mmp2_init(); __raw_writel(APBC_APBCLK | APBC_RST, APBC_TIMERS); /* diff --git a/arch/arm/mach-mmp/pxa168.c b/arch/arm/mach-mmp/pxa168.c index 2bdec91..345a493 100644 --- a/arch/arm/mach-mmp/pxa168.c +++ b/arch/arm/mach-mmp/pxa168.c @@ -61,7 +61,6 @@ static int __init pxa168_init(void) return 0; } -postcore_initcall(pxa168_init); /* system timer - clock enabled, 3.25MHz */ #define TIMER_CLK_RST (APBC_APBCLK | APBC_FNCLK | APBC_FNCLKSEL(3)) @@ -69,6 +68,7 @@ postcore_initcall(pxa168_init); void __init pxa168_timer_init(void) { + pxa168_init(); /* this is early, we have to initialize the CCU registers by * ourselves instead of using clk_* API. Clock rate is defined * by APBC_TIMERS_CLK_RST (3.25MHz) and enabled free-running diff --git a/arch/arm/mach-mmp/pxa910.c b/arch/arm/mach-mmp/pxa910.c index df379c2..1a84800 100644 --- a/arch/arm/mach-mmp/pxa910.c +++ b/arch/arm/mach-mmp/pxa910.c @@ -100,7 +100,6 @@ static int __init pxa910_init(void) return 0; } -postcore_initcall(pxa910_init); /* system timer - clock enabled, 3.25MHz */ #define TIMER_CLK_RST (APBC_APBCLK | APBC_FNCLK | APBC_FNCLKSEL(3)) @@ -108,6 +107,7 @@ postcore_initcall(pxa910_init); void __init pxa910_timer_init(void) { + pxa910_init(); /* reset and configure */ __raw_writel(APBC_APBCLK | APBC_RST, APBC_TIMERS); __raw_writel(TIMER_CLK_RST, APBC_TIMERS); diff --git a/arch/arm/plat-pxa/dma.c b/arch/arm/plat-pxa/dma.c index 79ef102..6c5472b 100644 --- a/arch/arm/plat-pxa/dma.c +++ b/arch/arm/plat-pxa/dma.c @@ -228,36 +228,46 @@ err_state: return NULL; } -static void pxa_dma_init_debugfs(void) +static int __init pxa_dma_init_debugfs(void) { - int i; + int i, ret; struct dentry *chandir; dbgfs_root = debugfs_create_dir(DMA_DEBUG_NAME, NULL); - if (IS_ERR(dbgfs_root) || !dbgfs_root) + if (IS_ERR(dbgfs_root) || !dbgfs_root) { + ret = -EINVAL; goto err_root; + } dbgfs_state = debugfs_create_file("state", 0400, dbgfs_root, NULL, &dbg_fops_state); - if (!dbgfs_state) + if (!dbgfs_state) { + ret = -EINVAL; goto err_state; + } dbgfs_chan = kmalloc(sizeof(*dbgfs_state) * num_dma_channels, GFP_KERNEL); - if (!dbgfs_chan) + if (!dbgfs_chan) { + ret = -ENOMEM; goto err_alloc; + } chandir = debugfs_create_dir("channels", dbgfs_root); - if (!chandir) + if (!chandir) { + ret = -EINVAL; goto err_chandir; + } for (i = 0; i < num_dma_channels; i++) { dbgfs_chan[i] = pxa_dma_dbg_alloc_chan(i, chandir); - if (!dbgfs_chan[i]) + if (!dbgfs_chan[i]) { + ret = -EINVAL; goto err_chans; + } } - return; + return 0; err_chans: err_chandir: kfree(dbgfs_chan); @@ -266,7 +276,9 @@ err_state: debugfs_remove_recursive(dbgfs_root); err_root: pr_err("pxa_dma: debugfs is not available\n"); + return ret; } +late_initcall(pxa_dma_init_debugfs); static void __exit pxa_dma_cleanup_debugfs(void) { @@ -385,7 +397,5 @@ int __init pxa_init_dma(int irq, int num_ch) } num_dma_channels = num_ch; - pxa_dma_init_debugfs(); - return 0; }