From 6993e195328353fe02c525ded684f134edc6e81a Mon Sep 17 00:00:00 2001 From: John Crispin Date: Wed, 17 Oct 2012 21:53:37 +0000 Subject: drop GPIODEV platform code SVN-Revision: 33825 --- .../files/arch/mips/adm5120/common/platform.c | 20 -------------------- .../adm5120/files/arch/mips/adm5120/compex/compex.c | 4 ---- .../adm5120/files/arch/mips/adm5120/edimax/br-61xx.c | 4 ---- .../files/arch/mips/adm5120/generic/eb-214a.c | 3 --- .../files/arch/mips/adm5120/mikrotik/rb-11x.c | 1 - .../files/arch/mips/adm5120/mikrotik/rb-133.c | 1 - .../files/arch/mips/adm5120/mikrotik/rb-133c.c | 1 - .../files/arch/mips/adm5120/mikrotik/rb-150.c | 6 ------ .../files/arch/mips/adm5120/mikrotik/rb-153.c | 5 ----- .../files/arch/mips/adm5120/mikrotik/rb-192.c | 1 - .../adm5120/files/arch/mips/adm5120/zyxel/p-33x.c | 4 ---- .../mips/include/asm/mach-adm5120/adm5120_platform.h | 1 - 12 files changed, 51 deletions(-) (limited to 'target/linux/adm5120/files/arch') 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, -- cgit v1.2.3