From patchwork Mon Jan 28 13:47:54 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Lad, Prabhakar" X-Patchwork-Id: 2055961 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id 63CEDE00C6 for ; Mon, 28 Jan 2013 13:51:18 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1Tzp4g-0004ec-Ky; Mon, 28 Jan 2013 13:48:38 +0000 Received: from mail-pb0-f42.google.com ([209.85.160.42]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1Tzp4X-0004cq-BS for linux-arm-kernel@lists.infradead.org; Mon, 28 Jan 2013 13:48:30 +0000 Received: by mail-pb0-f42.google.com with SMTP id wz17so240535pbc.15 for ; Mon, 28 Jan 2013 05:48:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=22kkrYzR5ZlhaK83PkckM0IdIXG5j5jpG0lhVPF+w6A=; b=KLwdzz+wyY06xyjqn69rX/gC5uRa4nXk46hriT0VVq4GRBXRov0X5Y50MI885lUlgL apJgExvRnA1rVaLIjBx7777InEXxSVEm3guEL5izhnB9dFjyEs6zVnUa19rBLnLcC/w4 9fQrY8SzdWiYsK4Sn3/rmSQFqt+3R1ownXDQQISGDcvPfAfTYMsDTe7fJl+XaHb5FyJ/ Aso+BRF5lcmYqHqUwoFQE+ToVeYdZR7rP0Yizbq00BxCs+4+I6Wrbem5rrxBe5sDcBc/ PLlRgpGDd0e0tou4DuvVSXLsBZiSK8d3OhLtiTYCz16FjLFjzHZsCWousmM2ZxxjDOkI 3LOg== X-Received: by 10.66.9.2 with SMTP id v2mr36013112paa.18.1359380907792; Mon, 28 Jan 2013 05:48:27 -0800 (PST) Received: from localhost.localdomain ([122.166.13.141]) by mx.google.com with ESMTPS id nm2sm6355934pbc.43.2013.01.28.05.48.23 (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 28 Jan 2013 05:48:26 -0800 (PST) From: Prabhakar Lad To: Sekhar Nori , linux-arm-kernel@lists.infradead.org, davinci-linux-open-source@linux.davincidsp.com Subject: [PATCH v2 1/6] ARM: davinci: da850: fix clock lookup for mdio device Date: Mon, 28 Jan 2013 19:17:54 +0530 Message-Id: <1359380879-26306-2-git-send-email-prabhakar.lad@ti.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1359380879-26306-1-git-send-email-prabhakar.lad@ti.com> References: <1359380879-26306-1-git-send-email-prabhakar.lad@ti.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130128_084829_511569_A0383D56 X-CRM114-Status: GOOD ( 15.46 ) X-Spam-Score: -2.7 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.160.42 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (prabhakar.csengg[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: netdev@vger.kernel.org, devicetree-discuss@lists.ozlabs.org, Heiko Schocher , linux-kernel@vger.kernel.org, "Lad, Prabhakar" X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org From: Lad, Prabhakar This patch removes the clock alias for mdio device and adds a entry in clock lookup table, this entry can now be used by both DT and NON DT case. Signed-off-by: Lad, Prabhakar Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org Cc: davinci-linux-open-source@linux.davincidsp.com Cc: netdev@vger.kernel.org Cc: devicetree-discuss@lists.ozlabs.org Cc: Sekhar Nori Cc: Heiko Schocher --- arch/arm/mach-davinci/da850.c | 1 + arch/arm/mach-davinci/devices-da8xx.c | 8 ++------ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c index 86056ca..f74bfb6 100644 --- a/arch/arm/mach-davinci/da850.c +++ b/arch/arm/mach-davinci/da850.c @@ -402,6 +402,7 @@ static struct clk_lookup da850_clks[] = { CLK(NULL, "arm", &arm_clk), CLK(NULL, "rmii", &rmii_clk), CLK("davinci_emac.1", NULL, &emac_clk), + CLK("davinci_mdio.0", "fck", &emac_clk), CLK("davinci-mcasp.0", NULL, &mcasp_clk), CLK("da8xx_lcdc.0", "fck", &lcdc_clk), CLK("davinci_mmc.0", NULL, &mmcsd0_clk), diff --git a/arch/arm/mach-davinci/devices-da8xx.c b/arch/arm/mach-davinci/devices-da8xx.c index 2d5502d..52faa05 100644 --- a/arch/arm/mach-davinci/devices-da8xx.c +++ b/arch/arm/mach-davinci/devices-da8xx.c @@ -444,12 +444,8 @@ int __init da8xx_register_emac(void) ret = platform_device_register(&da8xx_mdio_device); if (ret < 0) return ret; - ret = platform_device_register(&da8xx_emac_device); - if (ret < 0) - return ret; - ret = clk_add_alias(NULL, dev_name(&da8xx_mdio_device.dev), - NULL, &da8xx_emac_device.dev); - return ret; + + return platform_device_register(&da8xx_emac_device); } static struct resource da830_mcasp1_resources[] = {