From: Roger Quadros <rogerq@ti.com>
To: <bcousson@baylibre.com>, <tony@atomide.com>
Cc: <balbi@ti.com>, <linux-usb@vger.kernel.org>,
<linux-omap@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>,
<devicetree@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
Roger Quadros <rogerq@ti.com>
Subject: [PATCH v2 5/6] Revert "ARM: OMAP2+: Provide alias to USB PHY clock"
Date: Tue, 8 Oct 2013 13:06:38 +0300 [thread overview]
Message-ID: <1381226799-29158-6-git-send-email-rogerq@ti.com> (raw)
In-Reply-To: <1381226799-29158-1-git-send-email-rogerq@ti.com>
This reverts commit 741532c4a995be11815cb72d4d7a48f442a22fea.
The proper clock reference is provided in device tree so we
no longer need this.
Signed-off-by: Roger Quadros <rogerq@ti.com>
---
arch/arm/mach-omap2/board-generic.c | 23 +----------------------
1 files changed, 1 insertions(+), 22 deletions(-)
diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c
index cd85b36..da4e9b2 100644
--- a/arch/arm/mach-omap2/board-generic.c
+++ b/arch/arm/mach-omap2/board-generic.c
@@ -15,7 +15,6 @@
#include <linux/of_irq.h>
#include <linux/of_platform.h>
#include <linux/irqdomain.h>
-#include <linux/clk.h>
#include <asm/mach/arch.h>
@@ -36,21 +35,6 @@ static struct of_device_id omap_dt_match_table[] __initdata = {
{ }
};
-/*
- * Create alias for USB host PHY clock.
- * Remove this when clock phandle can be provided via DT
- */
-static void __init 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);
- }
-}
-
static void __init omap_generic_init(void)
{
omap_sdrc_init(NULL, NULL);
@@ -61,15 +45,10 @@ static void __init omap_generic_init(void)
* HACK: call display setup code for selected boards to enable omapdss.
* This will be removed when omapdss supports DT.
*/
- if (of_machine_is_compatible("ti,omap4-panda")) {
+ if (of_machine_is_compatible("ti,omap4-panda"))
omap4_panda_display_init_of();
- legacy_init_ehci_clk("auxclk3_ck");
-
- }
else if (of_machine_is_compatible("ti,omap4-sdp"))
omap_4430sdp_display_init_of();
- else if (of_machine_is_compatible("ti,omap5-uevm"))
- legacy_init_ehci_clk("auxclk1_ck");
}
#ifdef CONFIG_SOC_OMAP2420
--
1.7.4.1
next prev parent reply other threads:[~2013-10-08 10:07 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-08 10:06 [PATCH v2 0/6] Add USB Host support for OMAP5 uevm for 3.13 Roger Quadros
2013-10-08 10:06 ` [PATCH v2 1/6] ARM: OMAP5: hwmod data: Add USB Host and TLL modules Roger Quadros
2013-10-09 7:03 ` Paul Walmsley
2013-10-08 10:06 ` [PATCH v2 2/6] ARM: dts: OMAP5: Add 60MHz clock reference to USB Host module Roger Quadros
2013-10-08 10:06 ` [PATCH v2 3/6] ARM: dts: omap4-panda: Provide USB PHY clock Roger Quadros
2013-10-08 10:06 ` [PATCH v2 4/6] ARM: dts: omap5-uevm: " Roger Quadros
2013-10-08 10:06 ` Roger Quadros [this message]
2013-10-09 7:10 ` [PATCH v2 5/6] Revert "ARM: OMAP2+: Provide alias to USB PHY clock" Roger Quadros
2013-10-09 15:15 ` Tony Lindgren
2013-10-10 9:15 ` Roger Quadros
2013-10-22 15:17 ` Tony Lindgren
2013-10-23 10:14 ` Roger Quadros
2013-12-08 23:22 ` Tony Lindgren
2013-10-08 10:06 ` [PATCH v2 6/6] mfd: omap-usb: prepare/unprepare clock while enable/disable Roger Quadros
2013-10-10 9:31 ` Roger Quadros
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1381226799-29158-6-git-send-email-rogerq@ti.com \
--to=rogerq@ti.com \
--cc=balbi@ti.com \
--cc=bcousson@baylibre.com \
--cc=devicetree@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=tony@atomide.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®