diff options
author | Mike Frysinger <vapier.adi@gmail.com> | 2008-08-05 06:41:20 -0400 |
---|---|---|
committer | Bryan Wu <cooloney@kernel.org> | 2008-08-05 06:41:20 -0400 |
commit | 908089118dd5b20c6694e9543fccd9b2490b1c6b (patch) | |
tree | 905de1edbae265c3daf62bb9b7cca908be78144a /arch/blackfin/mach-bf527 | |
parent | b9da3b9240f175a29274abb8a94d962b67bbabf6 (diff) |
Blackfin arch: remove pata resources from generic board
these are highly board specific, so putting into generic doesnt make much sense
Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
Diffstat (limited to 'arch/blackfin/mach-bf527')
-rw-r--r-- | arch/blackfin/mach-bf527/boards/cm_bf527.c | 46 | ||||
-rw-r--r-- | arch/blackfin/mach-bf527/boards/ezkit.c | 46 |
2 files changed, 0 insertions, 92 deletions
diff --git a/arch/blackfin/mach-bf527/boards/cm_bf527.c b/arch/blackfin/mach-bf527/boards/cm_bf527.c index 749f4a806b5f..d22bc7773717 100644 --- a/arch/blackfin/mach-bf527/boards/cm_bf527.c +++ b/arch/blackfin/mach-bf527/boards/cm_bf527.c | |||
@@ -39,7 +39,6 @@ | |||
39 | #if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE) | 39 | #if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE) |
40 | #include <linux/usb/isp1362.h> | 40 | #include <linux/usb/isp1362.h> |
41 | #endif | 41 | #endif |
42 | #include <linux/pata_platform.h> | ||
43 | #include <linux/i2c.h> | 42 | #include <linux/i2c.h> |
44 | #include <linux/irq.h> | 43 | #include <linux/irq.h> |
45 | #include <linux/interrupt.h> | 44 | #include <linux/interrupt.h> |
@@ -799,43 +798,6 @@ static struct platform_device bfin_sport1_uart_device = { | |||
799 | }; | 798 | }; |
800 | #endif | 799 | #endif |
801 | 800 | ||
802 | #if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE) | ||
803 | #define PATA_INT 55 | ||
804 | |||
805 | static struct pata_platform_info bfin_pata_platform_data = { | ||
806 | .ioport_shift = 1, | ||
807 | .irq_type = IRQF_TRIGGER_HIGH | IRQF_DISABLED, | ||
808 | }; | ||
809 | |||
810 | static struct resource bfin_pata_resources[] = { | ||
811 | { | ||
812 | .start = 0x20314020, | ||
813 | .end = 0x2031403F, | ||
814 | .flags = IORESOURCE_MEM, | ||
815 | }, | ||
816 | { | ||
817 | .start = 0x2031401C, | ||
818 | .end = 0x2031401F, | ||
819 | .flags = IORESOURCE_MEM, | ||
820 | }, | ||
821 | { | ||
822 | .start = PATA_INT, | ||
823 | .end = PATA_INT, | ||
824 | .flags = IORESOURCE_IRQ, | ||
825 | }, | ||
826 | }; | ||
827 | |||
828 | static struct platform_device bfin_pata_device = { | ||
829 | .name = "pata_platform", | ||
830 | .id = -1, | ||
831 | .num_resources = ARRAY_SIZE(bfin_pata_resources), | ||
832 | .resource = bfin_pata_resources, | ||
833 | .dev = { | ||
834 | .platform_data = &bfin_pata_platform_data, | ||
835 | } | ||
836 | }; | ||
837 | #endif | ||
838 | |||
839 | #if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE) | 801 | #if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE) |
840 | #include <linux/input.h> | 802 | #include <linux/input.h> |
841 | #include <linux/gpio_keys.h> | 803 | #include <linux/gpio_keys.h> |
@@ -961,10 +923,6 @@ static struct platform_device *stamp_devices[] __initdata = { | |||
961 | &bfin_sport1_uart_device, | 923 | &bfin_sport1_uart_device, |
962 | #endif | 924 | #endif |
963 | 925 | ||
964 | #if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE) | ||
965 | &bfin_pata_device, | ||
966 | #endif | ||
967 | |||
968 | #if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE) | 926 | #if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE) |
969 | &bfin_device_gpiokeys, | 927 | &bfin_device_gpiokeys, |
970 | #endif | 928 | #endif |
@@ -987,10 +945,6 @@ static int __init stamp_init(void) | |||
987 | 945 | ||
988 | platform_add_devices(stamp_devices, ARRAY_SIZE(stamp_devices)); | 946 | platform_add_devices(stamp_devices, ARRAY_SIZE(stamp_devices)); |
989 | spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info)); | 947 | spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info)); |
990 | |||
991 | #if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE) | ||
992 | irq_desc[PATA_INT].status |= IRQ_NOAUTOEN; | ||
993 | #endif | ||
994 | return 0; | 948 | return 0; |
995 | } | 949 | } |
996 | 950 | ||
diff --git a/arch/blackfin/mach-bf527/boards/ezkit.c b/arch/blackfin/mach-bf527/boards/ezkit.c index cbd47bce6893..762f754c06cc 100644 --- a/arch/blackfin/mach-bf527/boards/ezkit.c +++ b/arch/blackfin/mach-bf527/boards/ezkit.c | |||
@@ -38,7 +38,6 @@ | |||
38 | #if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE) | 38 | #if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE) |
39 | #include <linux/usb/isp1362.h> | 39 | #include <linux/usb/isp1362.h> |
40 | #endif | 40 | #endif |
41 | #include <linux/ata_platform.h> | ||
42 | #include <linux/i2c.h> | 41 | #include <linux/i2c.h> |
43 | #include <linux/irq.h> | 42 | #include <linux/irq.h> |
44 | #include <linux/interrupt.h> | 43 | #include <linux/interrupt.h> |
@@ -825,43 +824,6 @@ static struct platform_device bfin_sport1_uart_device = { | |||
825 | }; | 824 | }; |
826 | #endif | 825 | #endif |
827 | 826 | ||
828 | #if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE) | ||
829 | #define PATA_INT 55 | ||
830 | |||
831 | static struct pata_platform_info bfin_pata_platform_data = { | ||
832 | .ioport_shift = 1, | ||
833 | .irq_type = IRQF_TRIGGER_HIGH | IRQF_DISABLED, | ||
834 | }; | ||
835 | |||
836 | static struct resource bfin_pata_resources[] = { | ||
837 | { | ||
838 | .start = 0x20314020, | ||
839 | .end = 0x2031403F, | ||
840 | .flags = IORESOURCE_MEM, | ||
841 | }, | ||
842 | { | ||
843 | .start = 0x2031401C, | ||
844 | .end = 0x2031401F, | ||
845 | .flags = IORESOURCE_MEM, | ||
846 | }, | ||
847 | { | ||
848 | .start = PATA_INT, | ||
849 | .end = PATA_INT, | ||
850 | .flags = IORESOURCE_IRQ, | ||
851 | }, | ||
852 | }; | ||
853 | |||
854 | static struct platform_device bfin_pata_device = { | ||
855 | .name = "pata_platform", | ||
856 | .id = -1, | ||
857 | .num_resources = ARRAY_SIZE(bfin_pata_resources), | ||
858 | .resource = bfin_pata_resources, | ||
859 | .dev = { | ||
860 | .platform_data = &bfin_pata_platform_data, | ||
861 | } | ||
862 | }; | ||
863 | #endif | ||
864 | |||
865 | #if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE) | 827 | #if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE) |
866 | #include <linux/input.h> | 828 | #include <linux/input.h> |
867 | #include <linux/gpio_keys.h> | 829 | #include <linux/gpio_keys.h> |
@@ -996,10 +958,6 @@ static struct platform_device *stamp_devices[] __initdata = { | |||
996 | &bfin_sport1_uart_device, | 958 | &bfin_sport1_uart_device, |
997 | #endif | 959 | #endif |
998 | 960 | ||
999 | #if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE) | ||
1000 | &bfin_pata_device, | ||
1001 | #endif | ||
1002 | |||
1003 | #if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE) | 961 | #if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE) |
1004 | &bfin_device_gpiokeys, | 962 | &bfin_device_gpiokeys, |
1005 | #endif | 963 | #endif |
@@ -1022,10 +980,6 @@ static int __init stamp_init(void) | |||
1022 | 980 | ||
1023 | platform_add_devices(stamp_devices, ARRAY_SIZE(stamp_devices)); | 981 | platform_add_devices(stamp_devices, ARRAY_SIZE(stamp_devices)); |
1024 | spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info)); | 982 | spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info)); |
1025 | |||
1026 | #if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE) | ||
1027 | irq_desc[PATA_INT].status |= IRQ_NOAUTOEN; | ||
1028 | #endif | ||
1029 | return 0; | 983 | return 0; |
1030 | } | 984 | } |
1031 | 985 | ||