drop GPIODEV platform code

SVN-Revision: 33825

3 files changed, 4 insertions, 33 deletions

diff --git a/target/linux/ixp4xx/patches-3.3/190-cambria_support.patch b/target/linux/ixp4xx/patches-3.3/190-cambria_support.patch
index 57dfdace8e..4eb1631a9e 100644
--- a/target/linux/ixp4xx/patches-3.3/190-cambria_support.patch
+++ b/target/linux/ixp4xx/patches-3.3/190-cambria_support.patch
@@ -82,7 +82,7 @@
 +subsys_initcall(cambria_pci_init);
 --- /dev/null
 +++ b/arch/arm/mach-ixp4xx/cambria-setup.c
-@@ -0,0 +1,1006 @@
+@@ -0,0 +1,992 @@
 +/*
 + * arch/arm/mach-ixp4xx/cambria-setup.c
 + *
@@ -517,13 +517,6 @@
 +	{131, GPIOF_IN,            "DIO4" },
 +};
 +
-+static struct platform_device cambria_gpio = {
-+	.name     = "GPIODEV",
-+	.id     = -1,
-+	.num_resources    = ARRAY_SIZE(cambria_gpio_resources),
-+	.resource   = cambria_gpio_resources,
-+};
-+
 +static struct latch_led cambria_latch_leds[] = {
 +	{
 +		.name	= "ledA",  /* green led */
@@ -683,7 +676,6 @@
 +																		(1 << 5) | (1 << 8) | (1 << 9) | (1 << 12);
 +	cambria_gpio_resources[0].end = cambria_gpio_resources[0].start;
 +
-+	platform_device_register(&cambria_gpio);
 +	platform_device_register(&cambria_npec_device);
 +	platform_device_register(&cambria_npea_device);
 +}
@@ -706,7 +698,6 @@
 +																		(1 << 5) | (1 << 8) | (1 << 9) | (1 << 12);
 +	cambria_gpio_resources[0].end = cambria_gpio_resources[0].start;
 +
-+	platform_device_register(&cambria_gpio);
 +	platform_device_register(&cambria_optional_uart);
 +	platform_device_register(&cambria_npec_device);
 +	platform_device_register(&cambria_npea_device);
@@ -737,7 +728,6 @@
 +																		(1 << 19) | (1 << 20) | (1 << 24) | (1 << 25);
 +	cambria_gpio_resources[0].end = cambria_gpio_resources[0].start;
 +
-+	platform_device_register(&cambria_gpio);
 +	platform_device_register(&cambria_optional_uart);
 +
 +	platform_device_register(&cambria_npec_device);
@@ -761,8 +751,6 @@
 +
 +static void __init cambria_gw2359_setup(void)
 +{
-+	platform_device_register(&cambria_gpio);
-+
 +#if defined(CONFIG_MVSWITCH_PHY) || defined(CONFIG_MVSWITCH_PHY_MODULE)
 +	/* The mvswitch driver has some hard-coded values which could
 +	 * easily be turned into a platform resource if needed.  For now they
@@ -865,8 +853,6 @@
 +	cambria_optional_uart.num_resources   = 7,
 +	platform_device_register(&cambria_optional_uart);
 +
-+	platform_device_register(&cambria_gpio);
-+
 +#if defined(CONFIG_MVSWITCH_PHY) || defined(CONFIG_MVSWITCH_PHY_MODULE)
 +	/* The mvswitch driver has some hard-coded values which could
 +	 * easily be turned into a platform resource if needed.  For now they
diff --git a/target/linux/ixp4xx/patches-3.3/300-avila_support.patch b/target/linux/ixp4xx/patches-3.3/300-avila_support.patch
index 958a3aecc1..0f10c2e149 100644
--- a/target/linux/ixp4xx/patches-3.3/300-avila_support.patch
+++ b/target/linux/ixp4xx/patches-3.3/300-avila_support.patch
@@ -117,7 +117,7 @@
  		.name	= "intrq",
  		.start	= IRQ_IXP4XX_GPIO12,
  		.end	= IRQ_IXP4XX_GPIO12,
-@@ -133,21 +210,280 @@ static struct platform_device avila_pata
+@@ -133,21 +210,275 @@ static struct platform_device avila_pata
  	.resource		= avila_pata_resources,
  };
  
@@ -240,11 +240,6 @@
  };
  
 -static void __init avila_init(void)
-+static struct platform_device avila_gpio_dev = {
-+	.name     = "GPIODEV",
-+	.id     = -1,
-+};
-+
 +/*
 + * Audio Devices
 + */
@@ -405,7 +400,7 @@
  
  	avila_pata_resources[0].start = IXP4XX_EXP_BUS_BASE(1);
  	avila_pata_resources[0].end = IXP4XX_EXP_BUS_END(1);
-@@ -159,8 +495,274 @@ static void __init avila_init(void)
+@@ -159,8 +495,272 @@ static void __init avila_init(void)
  	avila_pata_data.cs1_cfg = IXP4XX_EXP_CS2;
  
  	platform_device_register(&avila_pata);
@@ -650,8 +645,6 @@
 +
 +	i2c_register_board_info(0, avila_i2c_board_info,
 +			ARRAY_SIZE(avila_i2c_board_info));
-+
-+	platform_device_register(&avila_gpio_dev);
 +}
 +
 +static int __init avila_model_setup(void)
diff --git a/target/linux/ixp4xx/patches-3.3/520-tw2662_support.patch b/target/linux/ixp4xx/patches-3.3/520-tw2662_support.patch
index c7940a7696..d2fb1f5207 100644
--- a/target/linux/ixp4xx/patches-3.3/520-tw2662_support.patch
+++ b/target/linux/ixp4xx/patches-3.3/520-tw2662_support.patch
@@ -118,7 +118,7 @@
 +subsys_initcall(tw2662_pci_init);
 --- /dev/null
 +++ b/arch/arm/mach-ixp4xx/tw2662-setup.c
-@@ -0,0 +1,213 @@
+@@ -0,0 +1,205 @@
 +/*
 + * arch/arm/mach-ixp4xx/tw2662-setup.c
 + *
@@ -185,13 +185,6 @@
 +        },
 +};
 +
-+static struct platform_device tw2662_gpio = {
-+	.name			= "GPIODEV",
-+	.id			= -1,
-+	.num_resources		= ARRAY_SIZE(tw2662_gpio_resources),
-+	.resource		= tw2662_gpio_resources,
-+};
-+
 +static struct resource tw2662_uart_resources[] = {
 +	{
 +		.start		= IXP4XX_UART1_BASE_PHYS,
@@ -264,7 +257,6 @@
 +static struct platform_device *tw2662_devices[] __initdata = {
 +	&tw2662_flash,
 +	&tw2662_uart,
-+	&tw2662_gpio,
 +	&tw2662_eth[0],
 +	&tw2662_eth[1],
 +};