diff options
Diffstat (limited to 'arch/ppc/platforms/pplus.c')
| -rw-r--r-- | arch/ppc/platforms/pplus.c | 58 |
1 files changed, 0 insertions, 58 deletions
diff --git a/arch/ppc/platforms/pplus.c b/arch/ppc/platforms/pplus.c index 8a1788c48155..cbcac85c7a78 100644 --- a/arch/ppc/platforms/pplus.c +++ b/arch/ppc/platforms/pplus.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | #include <linux/ioport.h> | 19 | #include <linux/ioport.h> |
| 20 | #include <linux/console.h> | 20 | #include <linux/console.h> |
| 21 | #include <linux/pci.h> | 21 | #include <linux/pci.h> |
| 22 | #include <linux/ide.h> | ||
| 23 | #include <linux/seq_file.h> | 22 | #include <linux/seq_file.h> |
| 24 | #include <linux/root_dev.h> | 23 | #include <linux/root_dev.h> |
| 25 | 24 | ||
| @@ -668,57 +667,6 @@ static void __init pplus_init_IRQ(void) | |||
| 668 | ppc_md.progress("init_irq: exit", 0); | 667 | ppc_md.progress("init_irq: exit", 0); |
| 669 | } | 668 | } |
| 670 | 669 | ||
| 671 | #if defined(CONFIG_BLK_DEV_IDE) || defined(CONFIG_BLK_DEV_IDE_MODULE) | ||
| 672 | /* | ||
| 673 | * IDE stuff. | ||
| 674 | */ | ||
| 675 | static int pplus_ide_default_irq(unsigned long base) | ||
| 676 | { | ||
| 677 | switch (base) { | ||
| 678 | case 0x1f0: | ||
| 679 | return 14; | ||
| 680 | case 0x170: | ||
| 681 | return 15; | ||
| 682 | default: | ||
| 683 | return 0; | ||
| 684 | } | ||
| 685 | } | ||
| 686 | |||
| 687 | static unsigned long pplus_ide_default_io_base(int index) | ||
| 688 | { | ||
| 689 | switch (index) { | ||
| 690 | case 0: | ||
| 691 | return 0x1f0; | ||
| 692 | case 1: | ||
| 693 | return 0x170; | ||
| 694 | default: | ||
| 695 | return 0; | ||
| 696 | } | ||
| 697 | } | ||
| 698 | |||
| 699 | static void __init | ||
| 700 | pplus_ide_init_hwif_ports(hw_regs_t * hw, unsigned long data_port, | ||
| 701 | unsigned long ctrl_port, int *irq) | ||
| 702 | { | ||
| 703 | unsigned long reg = data_port; | ||
| 704 | int i; | ||
| 705 | |||
| 706 | for (i = IDE_DATA_OFFSET; i <= IDE_STATUS_OFFSET; i++) { | ||
| 707 | hw->io_ports[i] = reg; | ||
| 708 | reg += 1; | ||
| 709 | } | ||
| 710 | |||
| 711 | if (ctrl_port) | ||
| 712 | hw->io_ports[IDE_CONTROL_OFFSET] = ctrl_port; | ||
| 713 | else | ||
| 714 | hw->io_ports[IDE_CONTROL_OFFSET] = | ||
| 715 | hw->io_ports[IDE_DATA_OFFSET] + 0x206; | ||
| 716 | |||
| 717 | if (irq != NULL) | ||
| 718 | *irq = pplus_ide_default_irq(data_port); | ||
| 719 | } | ||
| 720 | #endif | ||
| 721 | |||
| 722 | #ifdef CONFIG_SMP | 670 | #ifdef CONFIG_SMP |
| 723 | /* PowerPlus (MTX) support */ | 671 | /* PowerPlus (MTX) support */ |
| 724 | static int __init smp_pplus_probe(void) | 672 | static int __init smp_pplus_probe(void) |
| @@ -884,12 +832,6 @@ platform_init(unsigned long r3, unsigned long r4, unsigned long r5, | |||
| 884 | ppc_md.find_end_of_memory = pplus_find_end_of_memory; | 832 | ppc_md.find_end_of_memory = pplus_find_end_of_memory; |
| 885 | ppc_md.setup_io_mappings = pplus_map_io; | 833 | ppc_md.setup_io_mappings = pplus_map_io; |
| 886 | 834 | ||
| 887 | #if defined(CONFIG_BLK_DEV_IDE) || defined(CONFIG_BLK_DEV_IDE_MODULE) | ||
| 888 | ppc_ide_md.default_irq = pplus_ide_default_irq; | ||
| 889 | ppc_ide_md.default_io_base = pplus_ide_default_io_base; | ||
| 890 | ppc_ide_md.ide_init_hwif = pplus_ide_init_hwif_ports; | ||
| 891 | #endif | ||
| 892 | |||
| 893 | #ifdef CONFIG_SERIAL_TEXT_DEBUG | 835 | #ifdef CONFIG_SERIAL_TEXT_DEBUG |
| 894 | ppc_md.progress = gen550_progress; | 836 | ppc_md.progress = gen550_progress; |
| 895 | #endif /* CONFIG_SERIAL_TEXT_DEBUG */ | 837 | #endif /* CONFIG_SERIAL_TEXT_DEBUG */ |
