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

Commit 3b781de6 authored by Mike Frysinger's avatar Mike Frysinger
Browse files

Blackfin: drop unused SL811 platform resources from bf527/pnav boards 



These platforms don't hook up to this USB controller, so no point in
declaring resources for it.

Signed-off-by: default avatarMike Frysinger <vapier@gentoo.org>
parent 1dafdc51

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

+0 −49
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 
#include <linux/i2c.h>

#include <linux/irq.h>

#include <linux/interrupt.h>

#include <linux/usb/sl811.h>

#include <linux/usb/musb.h>

#include <asm/dma.h>

#include <asm/bfin5xx_spi.h>
@@ -270,50 +269,6 @@ static struct platform_device dm9000_device = { 
};

#endif



#if defined(CONFIG_USB_SL811_HCD) || defined(CONFIG_USB_SL811_HCD_MODULE)

static struct resource sl811_hcd_resources[] = {

	{

		.start = 0x20340000,

		.end = 0x20340000,

		.flags = IORESOURCE_MEM,

	}, {

		.start = 0x20340004,

		.end = 0x20340004,

		.flags = IORESOURCE_MEM,

	}, {

		.start = CONFIG_USB_SL811_BFIN_IRQ,

		.end = CONFIG_USB_SL811_BFIN_IRQ,

		.flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,

	},

};



#if defined(CONFIG_USB_SL811_BFIN_USE_VBUS)

void sl811_port_power(struct device *dev, int is_on)

{

	gpio_request(CONFIG_USB_SL811_BFIN_GPIO_VBUS, "usb:SL811_VBUS");

	gpio_direction_output(CONFIG_USB_SL811_BFIN_GPIO_VBUS, is_on);

}

#endif



static struct sl811_platform_data sl811_priv = {

	.potpg = 10,

	.power = 250,       /* == 500mA */

#if defined(CONFIG_USB_SL811_BFIN_USE_VBUS)

	.port_power = &sl811_port_power,

#endif

};



static struct platform_device sl811_hcd_device = {

	.name = "sl811-hcd",

	.id = 0,

	.dev = {

		.platform_data = &sl811_priv,

	},

	.num_resources = ARRAY_SIZE(sl811_hcd_resources),

	.resource = sl811_hcd_resources,

};

#endif



#if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)

static struct platform_device bfin_mii_bus = {

	.name = "bfin_mii_bus",
@@ -929,10 +884,6 @@ static struct platform_device *cmbf527_devices[] __initdata = { 
	&rtc_device,

#endif



#if defined(CONFIG_USB_SL811_HCD) || defined(CONFIG_USB_SL811_HCD_MODULE)

	&sl811_hcd_device,

#endif



#if defined(CONFIG_USB_ISP1760_HCD) || defined(CONFIG_USB_ISP1760_HCD_MODULE)

	&bfin_isp1760_device,

#endif

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

+0 −49
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 
#include <linux/i2c.h>

#include <linux/irq.h>

#include <linux/interrupt.h>

#include <linux/usb/sl811.h>

#include <linux/usb/musb.h>

#include <linux/leds.h>

#include <linux/input.h>
@@ -359,50 +358,6 @@ static struct platform_device dm9000_device = { 
};

#endif



#if defined(CONFIG_USB_SL811_HCD) || defined(CONFIG_USB_SL811_HCD_MODULE)

static struct resource sl811_hcd_resources[] = {

	{

		.start = 0x20340000,

		.end = 0x20340000,

		.flags = IORESOURCE_MEM,

	}, {

		.start = 0x20340004,

		.end = 0x20340004,

		.flags = IORESOURCE_MEM,

	}, {

		.start = CONFIG_USB_SL811_BFIN_IRQ,

		.end = CONFIG_USB_SL811_BFIN_IRQ,

		.flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,

	},

};



#if defined(CONFIG_USB_SL811_BFIN_USE_VBUS)

void sl811_port_power(struct device *dev, int is_on)

{

	gpio_request(CONFIG_USB_SL811_BFIN_GPIO_VBUS, "usb:SL811_VBUS");

	gpio_direction_output(CONFIG_USB_SL811_BFIN_GPIO_VBUS, is_on);

}

#endif



static struct sl811_platform_data sl811_priv = {

	.potpg = 10,

	.power = 250,       /* == 500mA */

#if defined(CONFIG_USB_SL811_BFIN_USE_VBUS)

	.port_power = &sl811_port_power,

#endif

};



static struct platform_device sl811_hcd_device = {

	.name = "sl811-hcd",

	.id = 0,

	.dev = {

		.platform_data = &sl811_priv,

	},

	.num_resources = ARRAY_SIZE(sl811_hcd_resources),

	.resource = sl811_hcd_resources,

};

#endif



#if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)

static struct platform_device bfin_mii_bus = {

	.name = "bfin_mii_bus",
@@ -1113,10 +1068,6 @@ static struct platform_device *stamp_devices[] __initdata = { 
	&rtc_device,

#endif



#if defined(CONFIG_USB_SL811_HCD) || defined(CONFIG_USB_SL811_HCD_MODULE)

	&sl811_hcd_device,

#endif



#if defined(CONFIG_USB_ISP1760_HCD) || defined(CONFIG_USB_ISP1760_HCD_MODULE)

	&bfin_isp1760_device,

#endif

arch/blackfin/mach-bf537/boards/pnav10.c

+0 −50
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
#include <asm/dma.h>

#include <asm/bfin5xx_spi.h>

#include <asm/portmux.h>

#include <linux/usb/sl811.h>



#include <linux/spi/ad7877.h>
@@ -99,51 +98,6 @@ static struct platform_device smc91x_device = { 
};

#endif



#if defined(CONFIG_USB_SL811_HCD) || defined(CONFIG_USB_SL811_HCD_MODULE)

static struct resource sl811_hcd_resources[] = {

	{

		.start = 0x20340000,

		.end = 0x20340000,

		.flags = IORESOURCE_MEM,

	}, {

		.start = 0x20340004,

		.end = 0x20340004,

		.flags = IORESOURCE_MEM,

	}, {

		.start = CONFIG_USB_SL811_BFIN_IRQ,

		.end = CONFIG_USB_SL811_BFIN_IRQ,

		.flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,

	},

};



#if defined(CONFIG_USB_SL811_BFIN_USE_VBUS)

void sl811_port_power(struct device *dev, int is_on)

{

	gpio_request(CONFIG_USB_SL811_BFIN_GPIO_VBUS, "usb:SL811_VBUS");

	gpio_direction_output(CONFIG_USB_SL811_BFIN_GPIO_VBUS, is_on);



}

#endif



static struct sl811_platform_data sl811_priv = {

	.potpg = 10,

	.power = 250,       /* == 500mA */

#if defined(CONFIG_USB_SL811_BFIN_USE_VBUS)

	.port_power = &sl811_port_power,

#endif

};



static struct platform_device sl811_hcd_device = {

	.name = "sl811-hcd",

	.id = 0,

	.dev = {

		.platform_data = &sl811_priv,

	},

	.num_resources = ARRAY_SIZE(sl811_hcd_resources),

	.resource = sl811_hcd_resources,

};

#endif



#if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)

static struct platform_device bfin_mii_bus = {

	.name = "bfin_mii_bus",
@@ -514,10 +468,6 @@ static struct platform_device *stamp_devices[] __initdata = { 
	&rtc_device,

#endif



#if defined(CONFIG_USB_SL811_HCD) || defined(CONFIG_USB_SL811_HCD_MODULE)

	&sl811_hcd_device,

#endif



#if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE)

	&smc91x_device,

#endif