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

Commit 21b03cfe authored by Mike Frysinger's avatar Mike Frysinger
Browse files

Blackfin: clean up isp1362 board resources 



Drop the CONFIG_USB_ISP1362_BFIN_GPIO_IRQ Kconfig as it never made it into
mainline and it was a bad interface into the board resources.  For boards
that actually used this, replace it with an actual IRQ define.  For boards
that didn't, simply drop the resources.

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

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

+0 −46
Original line number Diff line number Diff line
@@ -15,9 +15,6 @@ 
#include <linux/spi/spi.h>

#include <linux/spi/flash.h>

#include <linux/etherdevice.h>

#if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE)

#include <linux/usb/isp1362.h>

#endif

#include <linux/i2c.h>

#include <linux/irq.h>

#include <linux/interrupt.h>
@@ -317,45 +314,6 @@ static struct platform_device sl811_hcd_device = { 
};

#endif



#if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE)

static struct resource isp1362_hcd_resources[] = {

	{

		.start = 0x20360000,

		.end = 0x20360000,

		.flags = IORESOURCE_MEM,

	}, {

		.start = 0x20360004,

		.end = 0x20360004,

		.flags = IORESOURCE_MEM,

	}, {

		.start = CONFIG_USB_ISP1362_BFIN_GPIO_IRQ,

		.end = CONFIG_USB_ISP1362_BFIN_GPIO_IRQ,

		.flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,

	},

};



static struct isp1362_platform_data isp1362_priv = {

	.sel15Kres = 1,

	.clknotstop = 0,

	.oc_enable = 0,

	.int_act_high = 0,

	.int_edge_triggered = 0,

	.remote_wakeup_connected = 0,

	.no_power_switching = 1,

	.power_switching_mode = 0,

};



static struct platform_device isp1362_hcd_device = {

	.name = "isp1362-hcd",

	.id = 0,

	.dev = {

		.platform_data = &isp1362_priv,

	},

	.num_resources = ARRAY_SIZE(isp1362_hcd_resources),

	.resource = isp1362_hcd_resources,

};

#endif



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

static struct platform_device bfin_mii_bus = {

	.name = "bfin_mii_bus",
@@ -841,10 +799,6 @@ static struct platform_device *cmbf527_devices[] __initdata = { 
	&sl811_hcd_device,

#endif



#if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE)

	&isp1362_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 −46
Original line number Diff line number Diff line
@@ -13,9 +13,6 @@ 
#include <linux/mtd/physmap.h>

#include <linux/spi/spi.h>

#include <linux/spi/flash.h>

#if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE)

#include <linux/usb/isp1362.h>

#endif

#include <linux/i2c.h>

#include <linux/irq.h>

#include <linux/interrupt.h>
@@ -373,45 +370,6 @@ static struct platform_device sl811_hcd_device = { 
};

#endif



#if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE)

static struct resource isp1362_hcd_resources[] = {

	{

		.start = 0x20360000,

		.end = 0x20360000,

		.flags = IORESOURCE_MEM,

	}, {

		.start = 0x20360004,

		.end = 0x20360004,

		.flags = IORESOURCE_MEM,

	}, {

		.start = CONFIG_USB_ISP1362_BFIN_GPIO_IRQ,

		.end = CONFIG_USB_ISP1362_BFIN_GPIO_IRQ,

		.flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,

	},

};



static struct isp1362_platform_data isp1362_priv = {

	.sel15Kres = 1,

	.clknotstop = 0,

	.oc_enable = 0,

	.int_act_high = 0,

	.int_edge_triggered = 0,

	.remote_wakeup_connected = 0,

	.no_power_switching = 1,

	.power_switching_mode = 0,

};



static struct platform_device isp1362_hcd_device = {

	.name = "isp1362-hcd",

	.id = 0,

	.dev = {

		.platform_data = &isp1362_priv,

	},

	.num_resources = ARRAY_SIZE(isp1362_hcd_resources),

	.resource = isp1362_hcd_resources,

};

#endif



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

static struct platform_device bfin_mii_bus = {

	.name = "bfin_mii_bus",
@@ -918,10 +876,6 @@ static struct platform_device *stamp_devices[] __initdata = { 
	&sl811_hcd_device,

#endif



#if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE)

	&isp1362_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 −46
Original line number Diff line number Diff line
@@ -13,9 +13,6 @@ 
#include <linux/mtd/partitions.h>

#include <linux/spi/spi.h>

#include <linux/spi/flash.h>

#if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE)

#include <linux/usb/isp1362.h>

#endif

#include <linux/irq.h>

#include <asm/dma.h>

#include <asm/bfin5xx_spi.h>
@@ -147,45 +144,6 @@ static struct platform_device sl811_hcd_device = { 
};

#endif



#if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE)

static struct resource isp1362_hcd_resources[] = {

	{

		.start = 0x20360000,

		.end = 0x20360000,

		.flags = IORESOURCE_MEM,

	}, {

		.start = 0x20360004,

		.end = 0x20360004,

		.flags = IORESOURCE_MEM,

	}, {

		.start = CONFIG_USB_ISP1362_BFIN_GPIO_IRQ,

		.end = CONFIG_USB_ISP1362_BFIN_GPIO_IRQ,

		.flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,

	},

};



static struct isp1362_platform_data isp1362_priv = {

	.sel15Kres = 1,

	.clknotstop = 0,

	.oc_enable = 0,

	.int_act_high = 0,

	.int_edge_triggered = 0,

	.remote_wakeup_connected = 0,

	.no_power_switching = 1,

	.power_switching_mode = 0,

};



static struct platform_device isp1362_hcd_device = {

	.name = "isp1362-hcd",

	.id = 0,

	.dev = {

		.platform_data = &isp1362_priv,

	},

	.num_resources = ARRAY_SIZE(isp1362_hcd_resources),

	.resource = isp1362_hcd_resources,

};

#endif



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

static struct platform_device bfin_mii_bus = {

	.name = "bfin_mii_bus",
@@ -492,10 +450,6 @@ static struct platform_device *stamp_devices[] __initdata = { 
	&sl811_hcd_device,

#endif



#if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE)

	&isp1362_hcd_device,

#endif



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

	&smc91x_device,

#endif

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

+2 −2
Original line number Diff line number Diff line
@@ -272,8 +272,8 @@ static struct resource isp1362_hcd_resources[] = { 
		.end = 0x20360004,

		.flags = IORESOURCE_MEM,

	}, {

		.start = CONFIG_USB_ISP1362_BFIN_GPIO_IRQ,

		.end = CONFIG_USB_ISP1362_BFIN_GPIO_IRQ,

		.start = IRQ_PF3,

		.end = IRQ_PF3,

		.flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,

	},

};