From: John Crispin Date: Wed, 17 Oct 2012 21:53:37 +0000 (+0000) Subject: drop GPIODEV platform code X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=6993e195328353fe02c525ded684f134edc6e81a;p=openwrt%2Fstaging%2Fnbd.git drop GPIODEV platform code SVN-Revision: 33825 --- diff --git a/target/linux/adm5120/files/arch/mips/adm5120/common/platform.c b/target/linux/adm5120/files/arch/mips/adm5120/common/platform.c index 809d77b8a3..4535a7f397 100644 --- a/target/linux/adm5120/files/arch/mips/adm5120/common/platform.c +++ b/target/linux/adm5120/files/arch/mips/adm5120/common/platform.c @@ -311,26 +311,6 @@ void __init adm5120_add_device_gpio_leds(unsigned num_leds, platform_device_register(&adm5120_gpio_leds_device); } -/* - * GPIO device - */ -static struct resource adm5120_gpio_resource[] __initdata = { - { - .start = 0x3fffff, - }, -}; - -void __init adm5120_add_device_gpio(u32 disable_mask) -{ - if (adm5120_package_pqfp()) - disable_mask |= 0xf0; - - adm5120_gpio_resource[0].start &= ~disable_mask; - platform_device_register_simple("GPIODEV", -1, - adm5120_gpio_resource, - ARRAY_SIZE(adm5120_gpio_resource)); -} - /* * NAND flash */ diff --git a/target/linux/adm5120/files/arch/mips/adm5120/compex/compex.c b/target/linux/adm5120/files/arch/mips/adm5120/compex/compex.c index c14655ada7..814acfb0cf 100644 --- a/target/linux/adm5120/files/arch/mips/adm5120/compex/compex.c +++ b/target/linux/adm5120/files/arch/mips/adm5120/compex/compex.c @@ -13,8 +13,6 @@ #include -#define COMPEX_GPIO_DEV_MASK (1 << ADM5120_GPIO_PIN5) - static void switch_bank_gpio5(unsigned bank) { switch (bank) { @@ -58,7 +56,5 @@ void __init compex_generic_setup(void) adm5120_add_device_uart(0); adm5120_add_device_uart(1); - adm5120_add_device_gpio(COMPEX_GPIO_DEV_MASK); - compex_mac_setup(); } diff --git a/target/linux/adm5120/files/arch/mips/adm5120/edimax/br-61xx.c b/target/linux/adm5120/files/arch/mips/adm5120/edimax/br-61xx.c index cc64ccba24..62a1cee384 100644 --- a/target/linux/adm5120/files/arch/mips/adm5120/edimax/br-61xx.c +++ b/target/linux/adm5120/files/arch/mips/adm5120/edimax/br-61xx.c @@ -13,8 +13,6 @@ #include -#define BR61XX_GPIO_DEV_MASK 0 - #define BR61XX_CONFIG_OFFSET 0x8000 #define BR61XX_CONFIG_SIZE 0x1000 @@ -73,8 +71,6 @@ void __init br61xx_generic_setup(void) adm5120_flash0_data.parts = br61xx_partitions; adm5120_add_device_flash(0); - adm5120_add_device_gpio(BR61XX_GPIO_DEV_MASK); - adm5120_add_device_uart(0); adm5120_add_device_uart(1); diff --git a/target/linux/adm5120/files/arch/mips/adm5120/generic/eb-214a.c b/target/linux/adm5120/files/arch/mips/adm5120/generic/eb-214a.c index c62c147c5a..cf491a1efc 100644 --- a/target/linux/adm5120/files/arch/mips/adm5120/generic/eb-214a.c +++ b/target/linux/adm5120/files/arch/mips/adm5120/generic/eb-214a.c @@ -25,7 +25,6 @@ #include -#define EB214A_GPIO_DEV_MASK 0 #define EB214A_CONFIG_OFFSET 0x4000 #define EB214A_KEYS_POLL_INTERVAL 20 @@ -99,8 +98,6 @@ static void __init eb214a_setup(void) adm5120_flash0_data.parts = eb214a_partitions; adm5120_add_device_flash(0); - adm5120_add_device_gpio(EB214A_GPIO_DEV_MASK); - adm5120_add_device_uart(0); /* adm5120_add_device_uart(1); */ diff --git a/target/linux/adm5120/files/arch/mips/adm5120/mikrotik/rb-11x.c b/target/linux/adm5120/files/arch/mips/adm5120/mikrotik/rb-11x.c index 30625c9202..fd768d8ef0 100644 --- a/target/linux/adm5120/files/arch/mips/adm5120/mikrotik/rb-11x.c +++ b/target/linux/adm5120/files/arch/mips/adm5120/mikrotik/rb-11x.c @@ -27,7 +27,6 @@ static void __init rb11x_setup(void) rb1xx_add_device_nand(); adm5120_add_device_switch(1, rb11x_vlans); - adm5120_add_device_gpio(0); adm5120_add_device_gpio_leds(ARRAY_SIZE(rb11x_gpio_leds), rb11x_gpio_leds); } diff --git a/target/linux/adm5120/files/arch/mips/adm5120/mikrotik/rb-133.c b/target/linux/adm5120/files/arch/mips/adm5120/mikrotik/rb-133.c index 4d8fae011a..23c57820c3 100644 --- a/target/linux/adm5120/files/arch/mips/adm5120/mikrotik/rb-133.c +++ b/target/linux/adm5120/files/arch/mips/adm5120/mikrotik/rb-133.c @@ -32,7 +32,6 @@ static void __init rb133_setup(void) rb1xx_add_device_nand(); adm5120_add_device_switch(3, rb133_vlans); - adm5120_add_device_gpio(0); adm5120_add_device_gpio_leds(ARRAY_SIZE(rb133_gpio_leds), rb133_gpio_leds); } diff --git a/target/linux/adm5120/files/arch/mips/adm5120/mikrotik/rb-133c.c b/target/linux/adm5120/files/arch/mips/adm5120/mikrotik/rb-133c.c index 11924c1326..25bab70c00 100644 --- a/target/linux/adm5120/files/arch/mips/adm5120/mikrotik/rb-133c.c +++ b/target/linux/adm5120/files/arch/mips/adm5120/mikrotik/rb-133c.c @@ -28,7 +28,6 @@ static void __init rb133c_setup(void) rb1xx_add_device_nand(); adm5120_add_device_switch(1, rb133c_vlans); - adm5120_add_device_gpio(0); adm5120_add_device_gpio_leds(ARRAY_SIZE(rb133c_gpio_leds), rb133c_gpio_leds); } diff --git a/target/linux/adm5120/files/arch/mips/adm5120/mikrotik/rb-150.c b/target/linux/adm5120/files/arch/mips/adm5120/mikrotik/rb-150.c index af9525635e..96a8c1b87b 100644 --- a/target/linux/adm5120/files/arch/mips/adm5120/mikrotik/rb-150.c +++ b/target/linux/adm5120/files/arch/mips/adm5120/mikrotik/rb-150.c @@ -20,11 +20,6 @@ #define RB150_GPIO_NAND_ALE ADM5120_GPIO_P3L2 #define RB150_GPIO_RESET_BUTTON ADM5120_GPIO_PIN1 /* FIXME */ -#define RB150_GPIO_DEV_MASK (1 << RB150_GPIO_NAND_READY \ - | 1 << RB150_GPIO_NAND_NCE \ - | 1 << RB150_GPIO_NAND_CLE \ - | 1 << RB150_GPIO_NAND_ALE) - #define RB150_NAND_DELAY 100 #define RB150_NAND_WRITE(v) \ @@ -127,7 +122,6 @@ static void __init rb150_setup(void) rb1xx_generic_setup(); rb150_add_device_nand(); - adm5120_add_device_gpio(RB150_GPIO_DEV_MASK); adm5120_add_device_gpio_leds(ARRAY_SIZE(rb150_gpio_leds), rb150_gpio_leds); adm5120_add_device_switch(5, rb150_vlans); diff --git a/target/linux/adm5120/files/arch/mips/adm5120/mikrotik/rb-153.c b/target/linux/adm5120/files/arch/mips/adm5120/mikrotik/rb-153.c index b2ebdc7c10..8456684951 100644 --- a/target/linux/adm5120/files/arch/mips/adm5120/mikrotik/rb-153.c +++ b/target/linux/adm5120/files/arch/mips/adm5120/mikrotik/rb-153.c @@ -11,10 +11,6 @@ #include "rb-1xx.h" -#define RB153_GPIO_DEV_MASK (1 << ADM5120_GPIO_PIN0 \ - | 1 << ADM5120_GPIO_PIN3 \ - | 1 << ADM5120_GPIO_PIN4) - static struct resource rb153_cf_resources[] __initdata = { { .name = "cf_membase", @@ -65,7 +61,6 @@ static void __init rb153_setup(void) rb1xx_add_device_nand(); rb153_add_device_cf(); - adm5120_add_device_gpio(RB153_GPIO_DEV_MASK); adm5120_add_device_gpio_leds(ARRAY_SIZE(rb153_gpio_leds), rb153_gpio_leds); adm5120_add_device_switch(5, rb153_vlans); diff --git a/target/linux/adm5120/files/arch/mips/adm5120/mikrotik/rb-192.c b/target/linux/adm5120/files/arch/mips/adm5120/mikrotik/rb-192.c index 8cf8941b75..9049421397 100644 --- a/target/linux/adm5120/files/arch/mips/adm5120/mikrotik/rb-192.c +++ b/target/linux/adm5120/files/arch/mips/adm5120/mikrotik/rb-192.c @@ -20,7 +20,6 @@ static void __init rb192_setup(void) rb1xx_generic_setup(); rb1xx_add_device_nand(); - adm5120_add_device_gpio(0); adm5120_add_device_switch(6, rb192_vlans); } diff --git a/target/linux/adm5120/files/arch/mips/adm5120/zyxel/p-33x.c b/target/linux/adm5120/files/arch/mips/adm5120/zyxel/p-33x.c index 7f86cab850..2626cf9eec 100644 --- a/target/linux/adm5120/files/arch/mips/adm5120/zyxel/p-33x.c +++ b/target/linux/adm5120/files/arch/mips/adm5120/zyxel/p-33x.c @@ -14,8 +14,6 @@ #include #define P33X_GPIO_FLASH_A20 ADM5120_GPIO_PIN5 -#define P33X_GPIO_DEV_MASK (1 << P33X_GPIO_FLASH_A20) - static struct mtd_partition p33x_partitions[] = { { .name = "bootbase", @@ -80,8 +78,6 @@ void __init p33x_generic_setup(void) adm5120_add_device_uart(0); adm5120_add_device_uart(1); - adm5120_add_device_gpio(P33X_GPIO_DEV_MASK); - adm5120_setup_eth_macs(bootbase_info.mac); adm5120_add_device_switch(6, p33x_vlans); diff --git a/target/linux/adm5120/files/arch/mips/include/asm/mach-adm5120/adm5120_platform.h b/target/linux/adm5120/files/arch/mips/include/asm/mach-adm5120/adm5120_platform.h index 952c7adc8d..ed73b53297 100644 --- a/target/linux/adm5120/files/arch/mips/include/asm/mach-adm5120/adm5120_platform.h +++ b/target/linux/adm5120/files/arch/mips/include/asm/mach-adm5120/adm5120_platform.h @@ -66,7 +66,6 @@ extern void adm5120_add_device_usb(void) __init; extern void adm5120_add_device_uart(unsigned id) __init; extern void adm5120_add_device_nand(struct platform_nand_data *pdata) __init; extern void adm5120_add_device_switch(unsigned num_ports, u8 *vlan_map) __init; -extern void adm5120_add_device_gpio(u32 disable_mask) __init; extern void adm5120_register_gpio_buttons(int id, unsigned poll_interval, unsigned nbuttons, diff --git a/target/linux/atheros/patches-3.3/100-board.patch b/target/linux/atheros/patches-3.3/100-board.patch index aaa4d4193a..bd00d93064 100644 --- a/target/linux/atheros/patches-3.3/100-board.patch +++ b/target/linux/atheros/patches-3.3/100-board.patch @@ -2989,7 +2989,7 @@ +#endif --- /dev/null +++ b/arch/mips/ar231x/devices.c -@@ -0,0 +1,173 @@ +@@ -0,0 +1,168 @@ +#include +#include +#include @@ -3151,11 +3151,6 @@ + +static int __init ar231x_register_devices(void) +{ -+ static struct resource res = { -+ .start = 0xFFFFFFFF, -+ }; -+ -+ platform_device_register_simple("GPIODEV", 0, &res, 1); + ar5312_init_devices(); + ar2315_init_devices(); + diff --git a/target/linux/brcm47xx/patches-3.3/400-arch-bcm47xx.patch b/target/linux/brcm47xx/patches-3.3/400-arch-bcm47xx.patch index 784562dc74..a232bff91c 100644 --- a/target/linux/brcm47xx/patches-3.3/400-arch-bcm47xx.patch +++ b/target/linux/brcm47xx/patches-3.3/400-arch-bcm47xx.patch @@ -31,26 +31,3 @@ + return NULL; +} +EXPORT_SYMBOL(nvram_get); ---- a/arch/mips/bcm47xx/setup.c -+++ b/arch/mips/bcm47xx/setup.c -@@ -381,3 +381,20 @@ static int __init bcm47xx_register_flash - return -1; - } - fs_initcall(bcm47xx_register_flash); -+ -+static int __init bcm47xx_register_gpiodev(void) -+{ -+ static struct resource res = { -+ .start = 0xFFFFFFFF, -+ }; -+ struct platform_device *pdev; -+ -+ pdev = platform_device_register_simple("GPIODEV", 0, &res, 1); -+ if (!pdev) { -+ printk(KERN_ERR "bcm47xx: GPIODEV init failed\n"); -+ return -ENODEV; -+ } -+ -+ return 0; -+} -+device_initcall(bcm47xx_register_gpiodev); diff --git a/target/linux/cns3xxx/patches-3.3/300-laguna_support.patch b/target/linux/cns3xxx/patches-3.3/300-laguna_support.patch index ee2a60434b..dc9ca485f5 100644 --- a/target/linux/cns3xxx/patches-3.3/300-laguna_support.patch +++ b/target/linux/cns3xxx/patches-3.3/300-laguna_support.patch @@ -1,6 +1,6 @@ --- /dev/null +++ b/arch/arm/mach-cns3xxx/laguna.c -@@ -0,0 +1,936 @@ +@@ -0,0 +1,931 @@ +/* + * Gateworks Corporation Laguna Platform + * @@ -585,10 +585,6 @@ +/* + * GPIO + */ -+static struct platform_device laguna_gpio_dev = { -+ .name = "GPIODEV", -+ .id = -1, -+}; + +static struct gpio laguna_gpio_gw2391[] = { + { 0, GPIOF_IN , "*GPS_PPS" }, @@ -919,7 +915,6 @@ + laguna_gpio_leds_data.num_leds = 2; + } + platform_device_register(&laguna_gpio_leds_device); -+ platform_device_register(&laguna_gpio_dev); + } else { + // Do some defaults here, not sure what yet + } 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], +}; diff --git a/target/linux/lantiq/files/arch/mips/lantiq/svip/devices.c b/target/linux/lantiq/files/arch/mips/lantiq/svip/devices.c index f1471169e5..735b9419f7 100644 --- a/target/linux/lantiq/files/arch/mips/lantiq/svip/devices.c +++ b/target/linux/lantiq/files/arch/mips/lantiq/svip/devices.c @@ -173,14 +173,9 @@ static struct platform_device ltq_gpio = { .name = "ifxmips_gpio", }; -static struct platform_device ltq_gpiodev = { - .name = "GPIODEV", -}; - void __init svip_register_gpio(void) { platform_device_register(<q_gpio); - platform_device_register(<q_gpiodev); } /* MUX */