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: Prabhakar X-Patchwork-Id: 2056071 Return-Path: X-Original-To: patchwork-davinci@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from arroyo.ext.ti.com (arroyo.ext.ti.com [192.94.94.40]) by patchwork1.kernel.org (Postfix) with ESMTP id 3ABA53FD49 for ; Mon, 28 Jan 2013 13:53:35 +0000 (UTC) Received: from dlelxv30.itg.ti.com ([172.17.2.17]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id r0SDnZhK003431; Mon, 28 Jan 2013 07:49:35 -0600 Received: from DFLE73.ent.ti.com (dfle73.ent.ti.com [128.247.5.110]) by dlelxv30.itg.ti.com (8.13.8/8.13.8) with ESMTP id r0SDnZHk014486; Mon, 28 Jan 2013 07:49:35 -0600 Received: from dlelxv23.itg.ti.com (172.17.1.198) by dfle73.ent.ti.com (128.247.5.110) with Microsoft SMTP Server id 14.1.323.3; Mon, 28 Jan 2013 07:49:35 -0600 Received: from linux.omap.com (dlelxs01.itg.ti.com [157.170.227.31]) by dlelxv23.itg.ti.com (8.13.8/8.13.8) with ESMTP id r0SDnZaf022338; Mon, 28 Jan 2013 07:49:35 -0600 Received: from linux.omap.com (localhost [127.0.0.1]) by linux.omap.com (Postfix) with ESMTP id 552148062A; Mon, 28 Jan 2013 07:49:35 -0600 (CST) X-Original-To: davinci-linux-open-source@linux.davincidsp.com Delivered-To: davinci-linux-open-source@linux.davincidsp.com Received: from dflp52.itg.ti.com (dflp52.itg.ti.com [128.247.22.96]) by linux.omap.com (Postfix) with ESMTP id 4BCF88062F for ; Mon, 28 Jan 2013 07:48:31 -0600 (CST) Received: from neches.ext.ti.com (neches.ext.ti.com [192.91.81.29]) by dflp52.itg.ti.com (8.13.7/8.13.8) with ESMTP id r0SDmVFp025026 for ; Mon, 28 Jan 2013 07:48:31 -0600 (CST) Received: from mail6.bemta12.messagelabs.com (mail6.bemta12.messagelabs.com [216.82.250.247]) by neches.ext.ti.com (8.13.7/8.13.7) with ESMTP id r0SDmUhn031659 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 28 Jan 2013 07:48:30 -0600 Received: from [216.82.250.99:12268] by server-8.bemta-12.messagelabs.com id 5C/EF-13087-EA186015; Mon, 28 Jan 2013 13:48:30 +0000 X-Env-Sender: prabhakar.csengg@gmail.com X-Msg-Ref: server-12.tower-126.messagelabs.com!1359380908!10748697!1 X-Originating-IP: [209.85.160.43] X-SpamReason: No, hits=0.0 required=7.0 tests=ML_RADAR_SPEW_LINKS_14, spamassassin: X-StarScan-Received: X-StarScan-Version: 6.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9009 invoked from network); 28 Jan 2013 13:48:29 -0000 Received: from mail-pb0-f43.google.com (HELO mail-pb0-f43.google.com) (209.85.160.43) by server-12.tower-126.messagelabs.com with RC4-SHA encrypted SMTP; 28 Jan 2013 13:48:29 -0000 Received: by mail-pb0-f43.google.com with SMTP id jt11so1490655pbb.30 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 , , 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> CC: , , Heiko Schocher , X-BeenThere: davinci-linux-open-source@linux.davincidsp.com X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: Errors-To: davinci-linux-open-source-bounces@linux.davincidsp.com 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[] = {