Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 50041acb authored by Bryan Wu's avatar Bryan Wu
Browse files

Blackfin arch: use new platform data interface of musb to replace old one 



Signed-off-by: default avatarBryan Wu <cooloney@kernel.org>
parent 3fa8749e

arch/blackfin/mach-bf527/boards/cm_bf527.c

+11 −3
Original line number Diff line number Diff line
@@ -43,9 +43,7 @@ 
#include <linux/irq.h>

#include <linux/interrupt.h>

#include <linux/usb/sl811.h>

#if defined(CONFIG_USB_MUSB_HDRC) || defined(CONFIG_USB_MUSB_HDRC_MODULE)

#include <linux/usb/musb.h>

#endif

#include <asm/cplb.h>

#include <asm/dma.h>

#include <asm/bfin5xx_spi.h>
@@ -130,6 +128,16 @@ static struct resource musb_resources[] = { 
	},

};



static struct musb_hdrc_config musb_config = {

	.multipoint	= 0,

	.dyn_fifo	= 0,

	.soft_con	= 1,

	.dma		= 1,

	.num_eps	= 7,

	.dma_channels	= 7,

	.gpio_vrsel	= GPIO_PF11,

};



static struct musb_hdrc_platform_data musb_plat = {

#if defined(CONFIG_USB_MUSB_OTG)

	.mode		= MUSB_OTG,
@@ -138,7 +146,7 @@ static struct musb_hdrc_platform_data musb_plat = { 
#elif defined(CONFIG_USB_GADGET_MUSB_HDRC)

	.mode		= MUSB_PERIPHERAL,

#endif

	.multipoint	= 0,

	.config		= &musb_config,

};



static u64 musb_dmamask = ~(u32)0;

arch/blackfin/mach-bf527/boards/ezkit.c

+11 −3
Original line number Diff line number Diff line
@@ -42,9 +42,7 @@ 
#include <linux/irq.h>

#include <linux/interrupt.h>

#include <linux/usb/sl811.h>

#if defined(CONFIG_USB_MUSB_HDRC) || defined(CONFIG_USB_MUSB_HDRC_MODULE)

#include <linux/usb/musb.h>

#endif

#include <asm/cplb.h>

#include <asm/dma.h>

#include <asm/bfin5xx_spi.h>
@@ -129,6 +127,16 @@ static struct resource musb_resources[] = { 
	},

};



static struct musb_hdrc_config musb_config = {

	.multipoint	= 0,

	.dyn_fifo	= 0,

	.soft_con	= 1,

	.dma		= 1,

	.num_eps	= 7,

	.dma_channels	= 7,

	.gpio_vrsel	= GPIO_PG13,

};



static struct musb_hdrc_platform_data musb_plat = {

#if defined(CONFIG_USB_MUSB_OTG)

	.mode		= MUSB_OTG,
@@ -137,7 +145,7 @@ static struct musb_hdrc_platform_data musb_plat = { 
#elif defined(CONFIG_USB_GADGET_MUSB_HDRC)

	.mode		= MUSB_PERIPHERAL,

#endif

	.multipoint	= 0,

	.config		= &musb_config,

};



static u64 musb_dmamask = ~(u32)0;

arch/blackfin/mach-bf548/boards/cm_bf548.c

+11 −3
Original line number Diff line number Diff line
@@ -36,9 +36,7 @@ 
#include <linux/spi/flash.h>

#include <linux/irq.h>

#include <linux/interrupt.h>

#if defined(CONFIG_USB_MUSB_HDRC) || defined(CONFIG_USB_MUSB_HDRC_MODULE)

#include <linux/usb/musb.h>

#endif

#include <asm/bfin5xx_spi.h>

#include <asm/cplb.h>

#include <asm/dma.h>
@@ -268,6 +266,16 @@ static struct resource musb_resources[] = { 
	},

};



static struct musb_hdrc_config musb_config = {

	.multipoint	= 0,

	.dyn_fifo	= 0,

	.soft_con	= 1,

	.dma		= 1,

	.num_eps	= 7,

	.dma_channels	= 7,

	.gpio_vrsel	= GPIO_PH6,

};



static struct musb_hdrc_platform_data musb_plat = {

#if defined(CONFIG_USB_MUSB_OTG)

	.mode		= MUSB_OTG,
@@ -276,7 +284,7 @@ static struct musb_hdrc_platform_data musb_plat = { 
#elif defined(CONFIG_USB_GADGET_MUSB_HDRC)

	.mode		= MUSB_PERIPHERAL,

#endif

	.multipoint	= 0,

	.config		= &musb_config,

};



static u64 musb_dmamask = ~(u32)0;

arch/blackfin/mach-bf548/boards/ezkit.c

+11 −3
Original line number Diff line number Diff line
@@ -38,9 +38,7 @@ 
#include <linux/irq.h>

#include <linux/i2c.h>

#include <linux/interrupt.h>

#if defined(CONFIG_USB_MUSB_HDRC) || defined(CONFIG_USB_MUSB_HDRC_MODULE)

#include <linux/usb/musb.h>

#endif

#include <asm/bfin5xx_spi.h>

#include <asm/cplb.h>

#include <asm/dma.h>
@@ -314,6 +312,16 @@ static struct resource musb_resources[] = { 
	},

};



static struct musb_hdrc_config musb_config = {

	.multipoint	= 0,

	.dyn_fifo	= 0,

	.soft_con	= 1,

	.dma		= 1,

	.num_eps	= 7,

	.dma_channels	= 7,

	.gpio_vrsel	= GPIO_PE7,

};



static struct musb_hdrc_platform_data musb_plat = {

#if defined(CONFIG_USB_MUSB_OTG)

	.mode		= MUSB_OTG,
@@ -322,7 +330,7 @@ static struct musb_hdrc_platform_data musb_plat = { 
#elif defined(CONFIG_USB_GADGET_MUSB_HDRC)

	.mode		= MUSB_PERIPHERAL,

#endif

	.multipoint	= 0,

	.config		= &musb_config,

};



static u64 musb_dmamask = ~(u32)0;