Title: [7367] trunk/drivers/usb/musb: musb: move HAVE_CLK handling to common code
- Revision
- 7367
- Author
- vapier
- Date
- 2009-09-16 21:06:02 -0400 (Wed, 16 Sep 2009)
Log Message
musb: move HAVE_CLK handling to common code
Modified Paths
Diff
Modified: trunk/drivers/usb/musb/Kconfig (7366 => 7367)
--- trunk/drivers/usb/musb/Kconfig 2009-09-16 23:34:47 UTC (rev 7366)
+++ trunk/drivers/usb/musb/Kconfig 2009-09-17 01:06:02 UTC (rev 7367)
@@ -8,7 +8,7 @@
# (M)HDRC = (Multipoint) Highspeed Dual-Role Controller
config USB_MUSB_HDRC
- depends on (USB || USB_GADGET) # && HAVE_CLK
+ depends on (USB || USB_GADGET)
depends on !SUPERH
depends on !BLACKFIN || (BF54x && !BF544) || (BF52x && !BF522 && !BF523)
select NOP_USB_XCEIV if (ARCH_DAVINCI || MACH_OMAP3EVM || BLACKFIN)
Modified: trunk/drivers/usb/musb/blackfin.c (7366 => 7367)
--- trunk/drivers/usb/musb/blackfin.c 2009-09-16 23:34:47 UTC (rev 7366)
+++ trunk/drivers/usb/musb/blackfin.c 2009-09-17 01:06:02 UTC (rev 7367)
@@ -14,7 +14,6 @@
#include <linux/slab.h>
#include <linux/init.h>
#include <linux/list.h>
-#include <linux/clk.h>
#include <linux/gpio.h>
#include <linux/io.h>
Modified: trunk/drivers/usb/musb/musb_core.h (7366 => 7367)
--- trunk/drivers/usb/musb/musb_core.h 2009-09-16 23:34:47 UTC (rev 7366)
+++ trunk/drivers/usb/musb/musb_core.h 2009-09-17 01:06:02 UTC (rev 7367)
@@ -95,6 +95,13 @@
#endif
#endif /* need MUSB gadget selection */
+#ifndef CONFIG_HAVE_CLK
+/* Dummy stub for clk framework */
+#define clk_get(dev, id) NULL
+#define clk_put(clock) do {} while (0)
+#define clk_enable(clock) do {} while (0)
+#define clk_disable(clock) do {} while (0)
+#endif
#ifdef CONFIG_PROC_FS
#include <linux/fs.h>
Modified: trunk/drivers/usb/musb/musb_regs.h (7366 => 7367)
--- trunk/drivers/usb/musb/musb_regs.h 2009-09-16 23:34:47 UTC (rev 7366)
+++ trunk/drivers/usb/musb/musb_regs.h 2009-09-17 01:06:02 UTC (rev 7367)
@@ -439,15 +439,6 @@
/* Not implemented - HW has seperate Tx/Rx FIFO */
#define MUSB_TXCSR_MODE 0x0000
-/*
- * Dummy stub for clk framework, it will be removed
- * until Blackfin supports clk framework
- */
-#define clk_get(dev, id) NULL
-#define clk_put(clock) do {} while (0)
-#define clk_enable(clock) do {} while (0)
-#define clk_disable(clock) do {} while (0)
-
static inline void musb_write_txfifosz(void __iomem *mbase, u8 c_size)
{
}
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
