From patchwork Wed Oct 23 10:14:29 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roger Quadros X-Patchwork-Id: 3087621 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 26C7F9F2B8 for ; Wed, 23 Oct 2013 10:15:11 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0AFD1202EA for ; Wed, 23 Oct 2013 10:15:10 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id BF4A3202E8 for ; Wed, 23 Oct 2013 10:15:08 +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 1VYvSv-0006xb-Er; Wed, 23 Oct 2013 10:15:01 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VYvSs-0002Kt-MR; Wed, 23 Oct 2013 10:14:58 +0000 Received: from comal.ext.ti.com ([198.47.26.152]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VYvSq-0002KX-2s for linux-arm-kernel@lists.infradead.org; Wed, 23 Oct 2013 10:14:57 +0000 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id r9NAEWsQ018777; Wed, 23 Oct 2013 05:14:32 -0500 Received: from DFLE72.ent.ti.com (dfle72.ent.ti.com [128.247.5.109]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id r9NAEWrd010809; Wed, 23 Oct 2013 05:14:32 -0500 Received: from dflp32.itg.ti.com (10.64.6.15) by DFLE72.ent.ti.com (128.247.5.109) with Microsoft SMTP Server id 14.2.342.3; Wed, 23 Oct 2013 05:14:32 -0500 Received: from [172.24.56.149] (ileax41-snat.itg.ti.com [10.172.224.153]) by dflp32.itg.ti.com (8.14.3/8.13.8) with ESMTP id r9NAET5a018309; Wed, 23 Oct 2013 05:14:30 -0500 Message-ID: <5267A185.7030607@ti.com> Date: Wed, 23 Oct 2013 13:14:29 +0300 From: Roger Quadros User-Agent: Mozilla/5.0 (X11; Linux i686; rv:24.0) Gecko/20100101 Thunderbird/24.0 MIME-Version: 1.0 To: Tony Lindgren Subject: Re: [PATCH v2 5/6] Revert "ARM: OMAP2+: Provide alias to USB PHY clock" References: <1381226799-29158-1-git-send-email-rogerq@ti.com> <1381226799-29158-6-git-send-email-rogerq@ti.com> <52550180.1000506@ti.com> <20131009151522.GA8313@atomide.com> <5256703F.1070806@ti.com> <20131022151659.GO15154@atomide.com> In-Reply-To: <20131022151659.GO15154@atomide.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131023_061456_208043_D0119A40 X-CRM114-Status: GOOD ( 16.99 ) X-Spam-Score: -7.3 (-------) Cc: devicetree@vger.kernel.org, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, balbi@ti.com, bcousson@baylibre.com, linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On 10/22/2013 06:17 PM, Tony Lindgren wrote: > * Roger Quadros [131010 02:23]: >> On 10/09/2013 06:15 PM, Tony Lindgren wrote: >>> * Roger Quadros [131009 00:19]: >>>> Hi Tony, >>>> >>>> On 10/08/2013 01:06 PM, Roger Quadros wrote: >>>>> This reverts commit 741532c4a995be11815cb72d4d7a48f442a22fea. >>>>> >>>>> The proper clock reference is provided in device tree so we >>>>> no longer need this. >>>> >>>> Could you please Ack this one? I think it is best if it goes through Benoit's tree. >>> >>> I could queue this into my board removal series that will be >>> based on Benoit's branch if that works for you. And this >>> also seems to depend on the omap-for-v3.13/quirk branch >>> that moves all the legacy pdata handling into pdata-quirks.c. >> >> OK Tony. Thanks. > > Actually, can you please update this patch against branch > omap-for-v3.13/board-removal-take2 and check the > omap5_uevm_legacy_init() part as well? Updated patch is below. Note that this must go in only after Benoit has picked up Tero's clock series and the dts patches in this series. If needed, you can wait and I can send you a reminder when that happens. Thanks. From ab81199d5b9c487c8493e6aa1d8b4bf17c0c5110 Mon Sep 17 00:00:00 2001 From: Roger Quadros Date: Wed, 23 Oct 2013 12:58:59 +0300 Subject: [PATCH] ARM: OMAP2+: Get rid of legacy_init_ehci_clk() The proper clock reference is provided in device tree so we no longer need this. Signed-off-by: Roger Quadros --- arch/arm/mach-omap2/pdata-quirks.c | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/arch/arm/mach-omap2/pdata-quirks.c b/arch/arm/mach-omap2/pdata-quirks.c index 10c7145..22537ed 100644 --- a/arch/arm/mach-omap2/pdata-quirks.c +++ b/arch/arm/mach-omap2/pdata-quirks.c @@ -26,20 +26,6 @@ struct pdata_init { void (*fn)(void); }; -/* - * Create alias for USB host PHY clock. - * Remove this when clock phandle can be provided via DT - */ -static void __init __used legacy_init_ehci_clk(char *clkname) -{ - int ret; - - ret = clk_add_alias("main_clk", NULL, clkname, NULL); - if (ret) - pr_err("%s:Failed to add main_clk alias to %s :%d\n", - __func__, clkname, ret); -} - #if IS_ENABLED(CONFIG_WL12XX) static struct wl12xx_platform_data wl12xx __initdata; @@ -105,18 +91,10 @@ static void __init omap4_sdp_legacy_init(void) static void __init omap4_panda_legacy_init(void) { omap4_panda_display_init_of(); - legacy_init_ehci_clk("auxclk3_ck"); legacy_init_wl12xx(WL12XX_REFCLOCK_38, 0, 53); } #endif -#ifdef CONFIG_SOC_OMAP5 -static void __init omap5_uevm_legacy_init(void) -{ - legacy_init_ehci_clk("auxclk1_ck"); -} -#endif - static struct pcs_pdata pcs_pdata; void omap_pcs_legacy_init(int irq, void (*rearm)(void)) @@ -149,9 +127,6 @@ static struct pdata_init pdata_quirks[] __initdata = { { "ti,omap4-sdp", omap4_sdp_legacy_init, }, { "ti,omap4-panda", omap4_panda_legacy_init, }, #endif -#ifdef CONFIG_SOC_OMAP5 - { "ti,omap5-uevm", omap5_uevm_legacy_init, }, -#endif { /* sentinel */ }, };