aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ppc
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@kernel.org>2008-02-06 04:36:36 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-06 13:41:02 -0500
commit83bad1d764b836a482b88e0a1f44d7a5c3e1fee0 (patch)
tree2fe0844d81a178ab51c22f41accef9b332ea86b6 /arch/ppc
parentb4cf9c342a2887f425780c23ad2be3077949cee2 (diff)
scheduled OSS driver removal
This patch contains the scheduled removal of OSS drivers whose config options have been removed in 2.6.23. Signed-off-by: Adrian Bunk <bunk@kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/ppc')
-rw-r--r--arch/ppc/platforms/prep_setup.c81
1 files changed, 0 insertions, 81 deletions
diff --git a/arch/ppc/platforms/prep_setup.c b/arch/ppc/platforms/prep_setup.c
index 3c56654bfc6..38449855d5f 100644
--- a/arch/ppc/platforms/prep_setup.c
+++ b/arch/ppc/platforms/prep_setup.c
@@ -91,20 +91,11 @@ extern void prep_tiger1_setup_pci(char *irq_edge_mask_lo, char *irq_edge_mask_hi
91#define cached_21 (((char *)(ppc_cached_irq_mask))[3]) 91#define cached_21 (((char *)(ppc_cached_irq_mask))[3])
92#define cached_A1 (((char *)(ppc_cached_irq_mask))[2]) 92#define cached_A1 (((char *)(ppc_cached_irq_mask))[2])
93 93
94#ifdef CONFIG_SOUND_CS4232
95long ppc_cs4232_dma, ppc_cs4232_dma2;
96#endif
97
98extern PTE *Hash, *Hash_end; 94extern PTE *Hash, *Hash_end;
99extern unsigned long Hash_size, Hash_mask; 95extern unsigned long Hash_size, Hash_mask;
100extern int probingmem; 96extern int probingmem;
101extern unsigned long loops_per_jiffy; 97extern unsigned long loops_per_jiffy;
102 98
103#ifdef CONFIG_SOUND_CS4232
104EXPORT_SYMBOL(ppc_cs4232_dma);
105EXPORT_SYMBOL(ppc_cs4232_dma2);
106#endif
107
108/* useful ISA ports */ 99/* useful ISA ports */
109#define PREP_SYSCTL 0x81c 100#define PREP_SYSCTL 0x81c
110/* present in the IBM reference design; possibly identical in Mot boxes: */ 101/* present in the IBM reference design; possibly identical in Mot boxes: */
@@ -569,74 +560,6 @@ prep_show_percpuinfo(struct seq_file *m, int i)
569 return 0; 560 return 0;
570} 561}
571 562
572#ifdef CONFIG_SOUND_CS4232
573static long __init masktoint(unsigned int i)
574{
575 int t = -1;
576 while (i >> ++t)
577 ;
578 return (t-1);
579}
580
581/*
582 * ppc_cs4232_dma and ppc_cs4232_dma2 are used in include/asm/dma.h
583 * to distinguish sound dma-channels from others. This is because
584 * blocksize on 16 bit dma-channels 5,6,7 is 128k, but
585 * the cs4232.c uses 64k like on 8 bit dma-channels 0,1,2,3
586 */
587
588static void __init prep_init_sound(void)
589{
590 PPC_DEVICE *audiodevice = NULL;
591
592 /*
593 * Get the needed resource information from residual data.
594 *
595 */
596 if (have_residual_data)
597 audiodevice = residual_find_device(~0, NULL,
598 MultimediaController, AudioController, -1, 0);
599
600 if (audiodevice != NULL) {
601 PnP_TAG_PACKET *pkt;
602
603 pkt = PnP_find_packet((unsigned char *)&res->DevicePnPHeap[audiodevice->AllocatedOffset],
604 S5_Packet, 0);
605 if (pkt != NULL)
606 ppc_cs4232_dma = masktoint(pkt->S5_Pack.DMAMask);
607 pkt = PnP_find_packet((unsigned char*)&res->DevicePnPHeap[audiodevice->AllocatedOffset],
608 S5_Packet, 1);
609 if (pkt != NULL)
610 ppc_cs4232_dma2 = masktoint(pkt->S5_Pack.DMAMask);
611 }
612
613 /*
614 * These are the PReP specs' defaults for the cs4231. We use these
615 * as fallback incase we don't have residual data.
616 * At least the IBM Thinkpad 850 with IDE DMA Channels at 6 and 7
617 * will use the other values.
618 */
619 if (audiodevice == NULL) {
620 switch (_prep_type) {
621 case _PREP_IBM:
622 ppc_cs4232_dma = 1;
623 ppc_cs4232_dma2 = -1;
624 break;
625 default:
626 ppc_cs4232_dma = 6;
627 ppc_cs4232_dma2 = 7;
628 }
629 }
630
631 /*
632 * Find a way to push this information to the cs4232 driver
633 * Give it out with printk, when not in cmd_line?
634 * Append it to cmd_line and boot_command_line?
635 * Format is cs4232=io,irq,dma,dma2
636 */
637}
638#endif /* CONFIG_SOUND_CS4232 */
639
640/* 563/*
641 * Fill out screen_info according to the residual data. This allows us to use 564 * Fill out screen_info according to the residual data. This allows us to use
642 * at least vesafb. 565 * at least vesafb.
@@ -898,10 +821,6 @@ prep_setup_arch(void)
898 } 821 }
899 } 822 }
900 823
901#ifdef CONFIG_SOUND_CS4232
902 prep_init_sound();
903#endif /* CONFIG_SOUND_CS4232 */
904
905 prep_init_vesa(); 824 prep_init_vesa();
906 825
907 switch (_prep_type) { 826 switch (_prep_type) {