From patchwork Sun Jun 23 15:00:02 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Prabhakar X-Patchwork-Id: 253573 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id DEF772C076F for ; Mon, 24 Jun 2013 01:02:16 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751975Ab3FWPAg (ORCPT ); Sun, 23 Jun 2013 11:00:36 -0400 Received: from mail-pd0-f169.google.com ([209.85.192.169]:37414 "EHLO mail-pd0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751764Ab3FWPAd (ORCPT ); Sun, 23 Jun 2013 11:00:33 -0400 Received: by mail-pd0-f169.google.com with SMTP id y10so252368pdj.28 for ; Sun, 23 Jun 2013 08:00:33 -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=rL5YGEJHaR6FJAKeqmltBfQe1lhe10vlBU8D+V7HPB0=; b=AxOjXSqaBhQ38ayzOmH2O65x4eqEiwMJ9cTPCMFJVtHRoS3O8L7GdmAZLhJcpjgfA2 hULj30aOBGubf9cHEmokP0egX5iJiDieYs+C4oZ5T9ysrC3Qo0i8+c96ygEHVkQAysns ataoxFQkBb/lpC5m1fKmgbreBpf8aMeLbNbuDjuTrlsaQ28YCCWnEvg7xCUGncOrtT4F h51RAXmgt4aHW/D5vllmf4i8h2Z+3DWmafj97s94y8DBNjrfM4W8mr7M8GowCVRIoeQa vBxL/PU8h3QA4DaS5qv/xBo8+oSXL2Rkhj8wZkS9wlRCstiREo4r3uAdAtdkZYQZ/Pb+ dPEg== X-Received: by 10.68.164.69 with SMTP id yo5mr20184937pbb.96.1371999633035; Sun, 23 Jun 2013 08:00:33 -0700 (PDT) Received: from localhost.localdomain ([1.23.212.179]) by mx.google.com with ESMTPSA id dc3sm13775600pbc.9.2013.06.23.08.00.28 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 23 Jun 2013 08:00:32 -0700 (PDT) From: Prabhakar Lad To: DLOS , LAK , devicetree-discuss@lists.ozlabs.org, Sekhar Nori Cc: LKML , netdev@vger.kernel.org, "Lad, Prabhakar" , Heiko Schocher Subject: [PATCH v3 1/6] ARM: davinci: da8xx: fix clock lookup for mdio device Date: Sun, 23 Jun 2013 20:30:02 +0530 Message-Id: <1371999607-6483-2-git-send-email-prabhakar.csengg@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1371999607-6483-1-git-send-email-prabhakar.csengg@gmail.com> References: <1371999607-6483-1-git-send-email-prabhakar.csengg@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.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 --- changes for v2: None Changes for v3: a> added clock lookup entry for davinci_mdio in da830 file. arch/arm/mach-davinci/da830.c | 1 + arch/arm/mach-davinci/da850.c | 1 + arch/arm/mach-davinci/devices-da8xx.c | 8 ++------ 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/arch/arm/mach-davinci/da830.c b/arch/arm/mach-davinci/da830.c index abbaf02..1f949a9 100644 --- a/arch/arm/mach-davinci/da830.c +++ b/arch/arm/mach-davinci/da830.c @@ -417,6 +417,7 @@ static struct clk_lookup da830_clks[] = { CLK(NULL, "aintc", &aintc_clk), CLK(NULL, "secu_mgr", &secu_mgr_clk), CLK("davinci_emac.1", NULL, &emac_clk), + CLK("davinci_mdio.0", "fck", &emac_clk), CLK(NULL, "gpio", &gpio_clk), CLK("i2c_davinci.2", NULL, &i2c1_clk), CLK(NULL, "usb11", &usb11_clk), diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c index 183a7dd..c43abee 100644 --- a/arch/arm/mach-davinci/da850.c +++ b/arch/arm/mach-davinci/da850.c @@ -461,6 +461,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("da830-mmc.0", NULL, &mmcsd0_clk), diff --git a/arch/arm/mach-davinci/devices-da8xx.c b/arch/arm/mach-davinci/devices-da8xx.c index bf57252..a5a78d9 100644 --- a/arch/arm/mach-davinci/devices-da8xx.c +++ b/arch/arm/mach-davinci/devices-da8xx.c @@ -452,12 +452,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[] = {