USB: musb: make HAVE_CLK support optional
The Blackfin port doesn't support HAVE_CLK and the musb driver works fine with support stubbed out, so take the existing Blackfin clk stubs and move them to common musb code so we can drop the Kconfig dependency. Signed-off-by: Bryan Wu <cooloney@kernel.org> Signed-off-by: Mike Frysinger <vapier@gentoo.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
0a023c6cf1
commit
b20cf90650
|
@ -8,7 +8,7 @@ comment "Enable Host or Gadget support to see Inventra options"
|
||||||
|
|
||||||
# (M)HDRC = (Multipoint) Highspeed Dual-Role Controller
|
# (M)HDRC = (Multipoint) Highspeed Dual-Role Controller
|
||||||
config USB_MUSB_HDRC
|
config USB_MUSB_HDRC
|
||||||
depends on (USB || USB_GADGET) && HAVE_CLK
|
depends on (USB || USB_GADGET)
|
||||||
depends on !SUPERH
|
depends on !SUPERH
|
||||||
select NOP_USB_XCEIV if ARCH_DAVINCI
|
select NOP_USB_XCEIV if ARCH_DAVINCI
|
||||||
select TWL4030_USB if MACH_OMAP_3430SDP
|
select TWL4030_USB if MACH_OMAP_3430SDP
|
||||||
|
|
|
@ -14,7 +14,6 @@
|
||||||
#include <linux/slab.h>
|
#include <linux/slab.h>
|
||||||
#include <linux/init.h>
|
#include <linux/init.h>
|
||||||
#include <linux/list.h>
|
#include <linux/list.h>
|
||||||
#include <linux/clk.h>
|
|
||||||
#include <linux/gpio.h>
|
#include <linux/gpio.h>
|
||||||
#include <linux/io.h>
|
#include <linux/io.h>
|
||||||
|
|
||||||
|
|
|
@ -95,6 +95,13 @@ struct musb_ep;
|
||||||
#endif
|
#endif
|
||||||
#endif /* need MUSB gadget selection */
|
#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
|
#ifdef CONFIG_PROC_FS
|
||||||
#include <linux/fs.h>
|
#include <linux/fs.h>
|
||||||
|
|
|
@ -439,15 +439,6 @@ static inline void musb_write_txhubport(void __iomem *mbase, u8 epnum,
|
||||||
/* Not implemented - HW has seperate Tx/Rx FIFO */
|
/* Not implemented - HW has seperate Tx/Rx FIFO */
|
||||||
#define MUSB_TXCSR_MODE 0x0000
|
#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)
|
static inline void musb_write_txfifosz(void __iomem *mbase, u8 c_size)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue