Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 082c44d20eb4c6c4aa60ae7429ea184854cb0610

Authored by Paul Mundt
1 parent 4a58eaca7c
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

sh: Cleanup board header directories. 

Now with the ide.h mess sorted out, most of these boards
don't need their own directory. Move the headers out, and
update the driver paths.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

Showing 27 changed files with 36 additions and 504 deletions Side-by-side Diff

arch/sh/boards/hp6xx/hp6xx_apm.c
Diff comments   View file @ 082c44d
... ... @@ -14,7 +14,7 @@
14 14 #include <asm/io.h>
15 15 #include <asm/apm.h>
16 16 #include <asm/adc.h>
17   -#include <asm/hp6xx/hp6xx.h>
  17 +#include <asm/hp6xx.h>
18 18  
19 19 #define SH7709_PGDR 0xa400012c
20 20  
arch/sh/boards/hp6xx/pm.c
Diff comments   View file @ 082c44d
... ... @@ -12,7 +12,7 @@
12 12 #include <linux/time.h>
13 13 #include <asm/io.h>
14 14 #include <asm/hd64461.h>
15   -#include <asm/hp6xx/hp6xx.h>
  15 +#include <asm/hp6xx.h>
16 16 #include <asm/cpu/dac.h>
17 17 #include <asm/pm.h>
18 18  
arch/sh/boards/hp6xx/setup.c
Diff comments   View file @ 082c44d
... ... @@ -13,7 +13,7 @@
13 13 #include <asm/hd64461.h>
14 14 #include <asm/io.h>
15 15 #include <asm/irq.h>
16   -#include <asm/hp6xx/hp6xx.h>
  16 +#include <asm/hp6xx.h>
17 17 #include <asm/cpu/dac.h>
18 18  
19 19 #define SCPCR 0xa4000116
arch/sh/boards/renesas/hs7751rvoip/io.c
Diff comments   View file @ 082c44d
... ... @@ -15,7 +15,7 @@
15 15 #include <linux/module.h>
16 16 #include <linux/pci.h>
17 17 #include <asm/io.h>
18   -#include <asm/hs7751rvoip/hs7751rvoip.h>
  18 +#include <asm/hs7751rvoip.h>
19 19 #include <asm/addrspace.h>
20 20  
21 21 extern void *area6_io8_base; /* Area 6 8bit I/O Base address */
arch/sh/boards/renesas/hs7751rvoip/irq.c
Diff comments   View file @ 082c44d
... ... @@ -14,7 +14,7 @@
14 14 #include <linux/irq.h>
15 15 #include <asm/io.h>
16 16 #include <asm/irq.h>
17   -#include <asm/hs7751rvoip/hs7751rvoip.h>
  17 +#include <asm/hs7751rvoip.h>
18 18  
19 19 static int mask_pos[] = {8, 9, 10, 11, 12, 13, 0, 1, 2, 3, 4, 5, 6, 7};
20 20  
arch/sh/boards/renesas/hs7751rvoip/setup.c
Diff comments   View file @ 082c44d
... ... @@ -10,15 +10,10 @@
10 10 #include <linux/init.h>
11 11 #include <linux/irq.h>
12 12 #include <linux/mm.h>
13   -#include <linux/vmalloc.h>
14   -#include <linux/hdreg.h>
15   -#include <linux/ide.h>
16 13 #include <linux/pm.h>
  14 +#include <asm/hs7751rvoip.h>
17 15 #include <asm/io.h>
18   -#include <asm/hs7751rvoip/hs7751rvoip.h>
19 16 #include <asm/machvec.h>
20   -#include <asm/rtc.h>
21   -#include <asm/irq.h>
22 17  
23 18 static void __init hs7751rvoip_init_irq(void)
24 19 {
arch/sh/boards/renesas/r7780rp/io.c
Diff comments   View file @ 082c44d
... ... @@ -11,7 +11,7 @@
11 11 #include <linux/pci.h>
12 12 #include <linux/kernel.h>
13 13 #include <linux/types.h>
14   -#include <asm/r7780rp/r7780rp.h>
  14 +#include <asm/r7780rp.h>
15 15 #include <asm/addrspace.h>
16 16 #include <asm/io.h>
17 17  
arch/sh/boards/renesas/r7780rp/irq.c
Diff comments   View file @ 082c44d
... ... @@ -10,7 +10,8 @@
10 10 */
11 11 #include <linux/init.h>
12 12 #include <linux/irq.h>
13   -#include <asm/io.h>
  13 +#include <linux/io.h>
  14 +#include <asm/r7780rp.h>
14 15  
15 16 #ifdef CONFIG_SH_R7780MP
16 17 static int mask_pos[] = {12, 11, 9, 14, 15, 8, 13, 6, 5, 4, 3, 2, 0, 0, 1, 0};
arch/sh/boards/renesas/r7780rp/setup.c
Diff comments   View file @ 082c44d
... ... @@ -13,7 +13,7 @@
13 13 #include <linux/init.h>
14 14 #include <linux/platform_device.h>
15 15 #include <asm/machvec.h>
16   -#include <asm/r7780rp/r7780rp.h>
  16 +#include <asm/r7780rp.h>
17 17 #include <asm/clock.h>
18 18 #include <asm/io.h>
19 19  
arch/sh/boards/renesas/rts7751r2d/io.c
Diff comments   View file @ 082c44d
... ... @@ -11,8 +11,8 @@
11 11 #include <linux/kernel.h>
12 12 #include <linux/types.h>
13 13 #include <linux/pci.h>
14   -#include <asm/rts7751r2d/rts7751r2d.h>
15   -#include <asm/io.h>
  14 +#include <linux/io.h>
  15 +#include <asm/rts7751r2d.h>
16 16 #include <asm/addrspace.h>
17 17  
18 18 /*
arch/sh/boards/renesas/rts7751r2d/irq.c
Diff comments   View file @ 082c44d
... ... @@ -8,12 +8,10 @@
8 8 * Modified for RTS7751R2D by
9 9 * Atom Create Engineering Co., Ltd. 2002.
10 10 */
11   -
12 11 #include <linux/init.h>
13 12 #include <linux/irq.h>
14   -#include <asm/io.h>
15   -#include <asm/irq.h>
16   -#include <asm/rts7751r2d/rts7751r2d.h>
  13 +#include <linux/io.h>
  14 +#include <asm/rts7751r2d.h>
17 15  
18 16 #if defined(CONFIG_RTS7751R2D_REV11)
19 17 static int mask_pos[] = {11, 9, 8, 12, 10, 6, 5, 4, 7, 14, 13, 0, 0, 0, 0};
arch/sh/boards/renesas/rts7751r2d/led.c
Diff comments   View file @ 082c44d
... ... @@ -8,13 +8,9 @@
8 8 *
9 9 * This file contains Renesas Technology Sales RTS7751R2D specific LED code.
10 10 */
11   -
12   -#include <asm/io.h>
13   -#include <asm/rts7751r2d/rts7751r2d.h>
14   -
15   -#ifdef CONFIG_HEARTBEAT
16   -
  11 +#include <linux/io.h>
17 12 #include <linux/sched.h>
  13 +#include <asm/rts7751r2d.h>
18 14  
19 15 /* Cycle the LED's in the clasic Knightriger/Sun pattern */
20 16 void heartbeat_rts7751r2d(void)
... ... @@ -45,11 +41,5 @@
45 41 up = 1;
46 42 else
47 43 bit--;
48   -}
49   -#endif /* CONFIG_HEARTBEAT */
50   -
51   -void rts7751r2d_led(unsigned short value)
52   -{
53   - ctrl_outw(value, PA_OUTPORT);
54 44 }
arch/sh/boards/renesas/rts7751r2d/setup.c
Diff comments   View file @ 082c44d
... ... @@ -12,9 +12,9 @@
12 12 #include <linux/platform_device.h>
13 13 #include <linux/serial_8250.h>
14 14 #include <linux/pm.h>
15   -#include <asm/io.h>
16 15 #include <asm/machvec.h>
17 16 #include <asm/mach/rts7751r2d.h>
  17 +#include <asm/io.h>
18 18 #include <asm/voyagergx.h>
19 19  
20 20 extern void heartbeat_rts7751r2d(void);
arch/sh/boards/shmin/setup.c
Diff comments   View file @ 082c44d
... ... @@ -7,7 +7,7 @@
7 7 */
8 8 #include <linux/init.h>
9 9 #include <asm/machvec.h>
10   -#include <asm/shmin/shmin.h>
  10 +#include <asm/shmin.h>
11 11 #include <asm/clock.h>
12 12 #include <asm/irq.h>
13 13 #include <asm/io.h>
arch/sh/cchips/voyagergx/irq.c
Diff comments   View file @ 082c44d
... ... @@ -17,29 +17,18 @@
17 17  
18 18 Copyright 2003 (c) Lineo uSolutions,Inc.
19 19 */
20   -/* -------------------------------------------------------------------- */
21   -
22   -#undef DEBUG
23   -
24   -#include <linux/sched.h>
25   -#include <linux/module.h>
26   -#include <linux/kernel.h>
27   -#include <linux/param.h>
28   -#include <linux/ioport.h>
29 20 #include <linux/interrupt.h>
30 21 #include <linux/init.h>
31   -#include <linux/irq.h>
32   -
33   -#include <asm/io.h>
34   -#include <asm/irq.h>
  22 +#include <linux/io.h>
35 23 #include <asm/voyagergx.h>
  24 +#include <asm/rts7751r2d.h>
36 25  
37 26 static void disable_voyagergx_irq(unsigned int irq)
38 27 {
39 28 unsigned long val;
40 29 unsigned long mask = 1 << (irq - VOYAGER_IRQ_BASE);
41 30  
42   - pr_debug("disable_voyagergx_irq(%d): mask=%x\n", irq, mask);
  31 + pr_debug("disable_voyagergx_irq(%d): mask=%lx\n", irq, mask);
43 32 val = inl(VOYAGER_INT_MASK);
44 33 val &= ~mask;
45 34 outl(val, VOYAGER_INT_MASK);
... ... @@ -50,7 +39,7 @@
50 39 unsigned long val;
51 40 unsigned long mask = 1 << (irq - VOYAGER_IRQ_BASE);
52 41  
53   - pr_debug("disable_voyagergx_irq(%d): mask=%x\n", irq, mask);
  42 + pr_debug("disable_voyagergx_irq(%d): mask=%lx\n", irq, mask);
54 43 val = inl(VOYAGER_INT_MASK);
55 44 val |= mask;
56 45 outl(val, VOYAGER_INT_MASK);
... ... @@ -137,7 +126,7 @@
137 126 } else {
138 127 printk("Unexpected IRQ irq = %d status = 0x%08lx\n", irq, val);
139 128 }
140   - pr_debug("voyagergx_irq_demux %d \n", i);
  129 + pr_debug("voyagergx_irq_demux %ld\n", i);
141 130 #else
142 131 for (bit = 1, i = 0 ; i < VOYAGER_IRQ_NUM ; bit <<= 1, i++)
143 132 if (val & bit)
arch/sh/drivers/pci/ops-r7780rp.c
Diff comments   View file @ 082c44d
... ... @@ -13,7 +13,7 @@
13 13 #include <linux/init.h>
14 14 #include <linux/delay.h>
15 15 #include <linux/pci.h>
16   -#include <asm/r7780rp/r7780rp.h>
  16 +#include <asm/r7780rp.h>
17 17 #include <asm/io.h>
18 18 #include "pci-sh4.h"
19 19  
arch/sh/drivers/pci/ops-rts7751r2d.c
Diff comments   View file @ 082c44d
... ... @@ -10,28 +10,24 @@
10 10 *
11 11 * PCI initialization for the Renesas SH7751R RTS7751R2D board
12 12 */
13   -
14 13 #include <linux/kernel.h>
15 14 #include <linux/types.h>
16 15 #include <linux/init.h>
17   -#include <linux/delay.h>
18 16 #include <linux/pci.h>
19   -#include <linux/module.h>
20   -#include <asm/rts7751r2d/rts7751r2d.h>
21   -#include <asm/io.h>
  17 +#include <linux/io.h>
  18 +#include <asm/rts7751r2d.h>
22 19 #include "pci-sh4.h"
23 20  
  21 +static u8 rts7751r2d_irq_tab[] __initdata = {
  22 + IRQ_PCISLOT1,
  23 + IRQ_PCISLOT2,
  24 + IRQ_PCMCIA,
  25 + IRQ_PCIETH,
  26 +};
  27 +
24 28 int __init pcibios_map_platform_irq(struct pci_dev *pdev, u8 slot, u8 pin)
25 29 {
26   - switch (slot) {
27   - case 0: return IRQ_PCISLOT1; /* PCI Extend slot #1 */
28   - case 1: return IRQ_PCISLOT2; /* PCI Extend slot #2 */
29   - case 2: return IRQ_PCMCIA; /* PCI Cardbus Bridge */
30   - case 3: return IRQ_PCIETH; /* Realtek Ethernet controller */
31   - default:
32   - printk("PCI: Bad IRQ mapping request for slot %d\n", slot);
33   - return -1;
34   - }
  30 + return rts7751r2d_irq_tab[slot];
35 31 }
36 32  
37 33 static struct resource sh7751_io_resource = {
drivers/input/touchscreen/hp680_ts_input.c
Diff comments   View file @ 082c44d
... ... @@ -6,7 +6,7 @@
6 6 #include <asm/io.h>
7 7 #include <asm/delay.h>
8 8 #include <asm/adc.h>
9   -#include <asm/hp6xx/hp6xx.h>
  9 +#include <asm/hp6xx.h>
10 10  
11 11 #define MODNAME "hp680_ts_input"
12 12  
drivers/video/hitfb.c
Diff comments   View file @ 082c44d
... ... @@ -29,7 +29,6 @@
29 29 #include <asm/io.h>
30 30 #include <asm/hd64461.h>
31 31 #include <asm/cpu/dac.h>
32   -#include <asm/hp6xx/hp6xx.h>
33 32  
34 33 #define WIDTH 640
35 34  
include/asm-sh/edosk7705/io.h
View file @ 082c44d
1   -/*
2   - * include/asm-sh/edosk7705/io.h
3   - *
4   - * Modified version of io_se.h for the EDOSK7705 specific functions.
5   - *
6   - * May be copied or modified under the terms of the GNU General Public
7   - * License. See linux/COPYING for more information.
8   - *
9   - * IO functions for an Hitachi EDOSK7705 development board
10   - */
11   -
12   -#ifndef __ASM_SH_EDOSK7705_IO_H
13   -#define __ASM_SH_EDOSK7705_IO_H
14   -
15   -#include <asm/io_generic.h>
16   -
17   -extern unsigned char sh_edosk7705_inb(unsigned long port);
18   -extern unsigned int sh_edosk7705_inl(unsigned long port);
19   -
20   -extern void sh_edosk7705_outb(unsigned char value, unsigned long port);
21   -extern void sh_edosk7705_outl(unsigned int value, unsigned long port);
22   -
23   -extern void sh_edosk7705_insb(unsigned long port, void *addr, unsigned long count);
24   -extern void sh_edosk7705_insl(unsigned long port, void *addr, unsigned long count);
25   -extern void sh_edosk7705_outsb(unsigned long port, const void *addr, unsigned long count);
26   -extern void sh_edosk7705_outsl(unsigned long port, const void *addr, unsigned long count);
27   -
28   -extern unsigned long sh_edosk7705_isa_port2addr(unsigned long offset);
29   -
30   -#endif /* __ASM_SH_EDOSK7705_IO_H */
include/asm-sh/hp6xx/hp6xx.h
View file @ 082c44d
1   -#ifndef __ASM_SH_HP6XX_H
2   -#define __ASM_SH_HP6XX_H
3   -
4   -/*
5   - * Copyright (C) 2003, 2004, 2005 Andriy Skulysh
6   - *
7   - * This file is subject to the terms and conditions of the GNU General Public
8   - * License. See the file "COPYING" in the main directory of this archive
9   - * for more details.
10   - *
11   - */
12   -
13   -#define HP680_BTN_IRQ IRQ0_IRQ
14   -#define HP680_TS_IRQ IRQ3_IRQ
15   -#define HP680_HD64461_IRQ IRQ4_IRQ
16   -
17   -#define DAC_LCD_BRIGHTNESS 0
18   -#define DAC_SPEAKER_VOLUME 1
19   -
20   -#define PGDR_OPENED 0x01
21   -#define PGDR_MAIN_BATTERY_OUT 0x04
22   -#define PGDR_PLAY_BUTTON 0x08
23   -#define PGDR_REWIND_BUTTON 0x10
24   -#define PGDR_RECORD_BUTTON 0x20
25   -
26   -#define PHDR_TS_PEN_DOWN 0x08
27   -
28   -#define PJDR_LED_BLINK 0x02
29   -
30   -#define PKDR_LED_GREEN 0x10
31   -
32   -#define SCPDR_TS_SCAN_ENABLE 0x20
33   -#define SCPDR_TS_SCAN_Y 0x02
34   -#define SCPDR_TS_SCAN_X 0x01
35   -
36   -#define SCPCR_TS_ENABLE 0x405
37   -#define SCPCR_TS_MASK 0xc0f
38   -
39   -#define ADC_CHANNEL_TS_Y 1
40   -#define ADC_CHANNEL_TS_X 2
41   -#define ADC_CHANNEL_BATTERY 3
42   -#define ADC_CHANNEL_BACKUP 4
43   -#define ADC_CHANNEL_CHARGE 5
44   -
45   -#define HD64461_GPADR_SPEAKER 0x01
46   -#define HD64461_GPADR_PCMCIA0 (0x02|0x08)
47   -
48   -#define HD64461_GPBDR_LCDOFF 0x01
49   -#define HD64461_GPBDR_LCD_CONTRAST_MASK 0x78
50   -#define HD64461_GPBDR_LED_RED 0x80
51   -
52   -#include <asm/hd64461.h>
53   -#include <asm/io.h>
54   -
55   -#define PJDR 0xa4000130
56   -#define PKDR 0xa4000132
57   -
58   -static inline void hp6xx_led_red(int on)
59   -{
60   - u16 v16;
61   - v16 = ctrl_inw(CONFIG_HD64461_IOBASE + HD64461_GPBDR - 0x10000);
62   - if (on)
63   - ctrl_outw(v16 & (~HD64461_GPBDR_LED_RED), CONFIG_HD64461_IOBASE + HD64461_GPBDR - 0x10000);
64   - else
65   - ctrl_outw(v16 | HD64461_GPBDR_LED_RED, CONFIG_HD64461_IOBASE + HD64461_GPBDR - 0x10000);
66   -}
67   -
68   -static inline void hp6xx_led_green(int on)
69   -{
70   - u8 v8;
71   -
72   - v8 = ctrl_inb(PKDR);
73   - if (on)
74   - ctrl_outb(v8 & (~PKDR_LED_GREEN), PKDR);
75   - else
76   - ctrl_outb(v8 | PKDR_LED_GREEN, PKDR);
77   -}
78   -
79   -
80   -#endif /* __ASM_SH_HP6XX_H */
include/asm-sh/hp6xx/io.h
View file @ 082c44d
1   -#ifndef __ASM_SH_HP6XX_IO_H
2   -#define __ASM_SH_HP6XX_IO_H
3   -
4   -/*
5   - * Nothing special here.. just use the generic cchip io routines.
6   - */
7   -#include <asm/hd64461.h>
8   -
9   -#endif /* __ASM_SH_HP6XX_IO_H */
include/asm-sh/hs7751rvoip/hs7751rvoip.h
View file @ 082c44d
1   -#ifndef __ASM_SH_RENESAS_HS7751RVOIP_H
2   -#define __ASM_SH_RENESAS_HS7751RVOIP_H
3   -
4   -/*
5   - * linux/include/asm-sh/hs7751rvoip/hs7751rvoip.h
6   - *
7   - * Copyright (C) 2000 Atom Create Engineering Co., Ltd.
8   - *
9   - * Renesas Technology Sales HS7751RVoIP support
10   - */
11   -
12   -/* Box specific addresses. */
13   -
14   -#define PA_BCR 0xa4000000 /* FPGA */
15   -#define PA_SLICCNTR1 0xa4000006 /* SLIC PIO Control 1 */
16   -#define PA_SLICCNTR2 0xa4000008 /* SLIC PIO Control 2 */
17   -#define PA_DMACNTR 0xa400000a /* USB DMA Control */
18   -#define PA_INPORTR 0xa400000c /* Input Port Register */
19   -#define PA_OUTPORTR 0xa400000e /* Output Port Reguster */
20   -#define PA_VERREG 0xa4000014 /* FPGA Version Register */
21   -
22   -#define PA_IDE_OFFSET 0x1f0 /* CF IDE Offset */
23   -
24   -#define IRLCNTR1 (PA_BCR + 0) /* Interrupt Control Register1 */
25   -#define IRLCNTR2 (PA_BCR + 2) /* Interrupt Control Register2 */
26   -#define IRLCNTR3 (PA_BCR + 4) /* Interrupt Control Register3 */
27   -#define IRLCNTR4 (PA_BCR + 16) /* Interrupt Control Register4 */
28   -#define IRLCNTR5 (PA_BCR + 18) /* Interrupt Control Register5 */
29   -
30   -#define IRQ_PCIETH 6 /* PCI Ethernet IRQ */
31   -#define IRQ_PCIHUB 7 /* PCI Ethernet Hub IRQ */
32   -#define IRQ_USBCOM 8 /* USB Comunication IRQ */
33   -#define IRQ_USBCON 9 /* USB Connect IRQ */
34   -#define IRQ_USBDMA 10 /* USB DMA IRQ */
35   -#define IRQ_CFCARD 11 /* CF Card IRQ */
36   -#define IRQ_PCMCIA 12 /* PCMCIA IRQ */
37   -#define IRQ_PCISLOT 13 /* PCI Slot #1 IRQ */
38   -#define IRQ_ONHOOK1 0 /* ON HOOK1 IRQ */
39   -#define IRQ_OFFHOOK1 1 /* OFF HOOK1 IRQ */
40   -#define IRQ_ONHOOK2 2 /* ON HOOK2 IRQ */
41   -#define IRQ_OFFHOOK2 3 /* OFF HOOK2 IRQ */
42   -#define IRQ_RINGING 4 /* Ringing IRQ */
43   -#define IRQ_CODEC 5 /* CODEC IRQ */
44   -
45   -#define __IO_PREFIX hs7751rvoip
46   -#include <asm/io_generic.h>
47   -
48   -/* arch/sh/boards/renesas/hs7751rvoip/irq.c */
49   -void init_hs7751rvoip_IRQ(void);
50   -
51   -/* arch/sh/boards/renesas/hs7751rvoip/io.c */
52   -void *hs7751rvoip_ioremap(unsigned long, unsigned long);
53   -
54   -#endif /* __ASM_SH_RENESAS_HS7751RVOIP */
include/asm-sh/r7780rp/r7780rp.h
View file @ 082c44d
1   -#ifndef __ASM_SH_RENESAS_R7780RP_H
2   -#define __ASM_SH_RENESAS_R7780RP_H
3   -
4   -/*
5   - * linux/include/asm-sh/r7780rp.h
6   - *
7   - * Copyright (C) 2000 Atom Create Engineering Co., Ltd.
8   - *
9   - * Renesas Solutions Highlander R7780RP support
10   - */
11   -
12   -/* Box specific addresses. */
13   -#if defined(CONFIG_SH_R7780MP)
14   -#define PA_BCR 0xa4000000 /* FPGA */
15   -#define PA_IRLMSK (PA_BCR+0x0000) /* Interrupt Mask control */
16   -#define PA_IRLMON (PA_BCR+0x0002) /* Interrupt Status control */
17   -#define PA_IRLPRI1 (PA_BCR+0x0004) /* Interrupt Priorty 1 */
18   -#define PA_IRLPRI2 (PA_BCR+0x0006) /* Interrupt Priorty 2 */
19   -#define PA_IRLPRI3 (PA_BCR+0x0008) /* Interrupt Priorty 3 */
20   -#define PA_IRLPRI4 (PA_BCR+0x000a) /* Interrupt Priorty 4 */
21   -#define PA_RSTCTL (PA_BCR+0x000c) /* Reset Control */
22   -#define PA_PCIBD (PA_BCR+0x000e) /* PCI Board detect control */
23   -#define PA_PCICD (PA_BCR+0x0010) /* PCI Conector detect control */
24   -#define PA_EXTGIO (PA_BCR+0x0016) /* Extension GPIO Control */
25   -#define PA_IVDRMON (PA_BCR+0x0018) /* iVDR Moniter control */
26   -#define PA_IVDRCTL (PA_BCR+0x001a) /* iVDR control */
27   -#define PA_OBLED (PA_BCR+0x001c) /* On Board LED control */
28   -#define PA_OBSW (PA_BCR+0x001e) /* On Board Switch control */
29   -#define PA_AUDIOSEL (PA_BCR+0x0020) /* Sound Interface Select control */
30   -#define PA_EXTPLR (PA_BCR+0x001e) /* Extention Pin Polarity control */
31   -#define PA_TPCTL (PA_BCR+0x0100) /* Touch Panel Access control */
32   -#define PA_TPDCKCTL (PA_BCR+0x0102) /* Touch Panel Access data control */
33   -#define PA_TPCTLCLR (PA_BCR+0x0104) /* Touch Panel Access control */
34   -#define PA_TPXPOS (PA_BCR+0x0106) /* Touch Panel X position control */
35   -#define PA_TPYPOS (PA_BCR+0x0108) /* Touch Panel Y position control */
36   -#define PA_DBSW (PA_BCR+0x0200) /* Debug Board Switch control */
37   -#define PA_CFCTL (PA_BCR+0x0300) /* CF Timing control */
38   -#define PA_CFPOW (PA_BCR+0x0302) /* CF Power control */
39   -#define PA_CFCDINTCLR (PA_BCR+0x0304) /* CF Insert Interrupt clear */
40   -#define PA_SCSMR0 (PA_BCR+0x0400) /* SCIF0 Serial mode control */
41   -#define PA_SCBRR0 (PA_BCR+0x0404) /* SCIF0 Bit rate control */
42   -#define PA_SCSCR0 (PA_BCR+0x0408) /* SCIF0 Serial control */
43   -#define PA_SCFTDR0 (PA_BCR+0x040c) /* SCIF0 Send FIFO control */
44   -#define PA_SCFSR0 (PA_BCR+0x0410) /* SCIF0 Serial status control */
45   -#define PA_SCFRDR0 (PA_BCR+0x0414) /* SCIF0 Receive FIFO control */
46   -#define PA_SCFCR0 (PA_BCR+0x0418) /* SCIF0 FIFO control */
47   -#define PA_SCTFDR0 (PA_BCR+0x041c) /* SCIF0 Send FIFO data control */
48   -#define PA_SCRFDR0 (PA_BCR+0x0420) /* SCIF0 Receive FIFO data control */
49   -#define PA_SCSPTR0 (PA_BCR+0x0424) /* SCIF0 Serial Port control */
50   -#define PA_SCLSR0 (PA_BCR+0x0428) /* SCIF0 Line Status control */
51   -#define PA_SCRER0 (PA_BCR+0x042c) /* SCIF0 Serial Error control */
52   -#define PA_SCSMR1 (PA_BCR+0x0500) /* SCIF1 Serial mode control */
53   -#define PA_SCBRR1 (PA_BCR+0x0504) /* SCIF1 Bit rate control */
54   -#define PA_SCSCR1 (PA_BCR+0x0508) /* SCIF1 Serial control */
55   -#define PA_SCFTDR1 (PA_BCR+0x050c) /* SCIF1 Send FIFO control */
56   -#define PA_SCFSR1 (PA_BCR+0x0510) /* SCIF1 Serial status control */
57   -#define PA_SCFRDR1 (PA_BCR+0x0514) /* SCIF1 Receive FIFO control */
58   -#define PA_SCFCR1 (PA_BCR+0x0518) /* SCIF1 FIFO control */
59   -#define PA_SCTFDR1 (PA_BCR+0x051c) /* SCIF1 Send FIFO data control */
60   -#define PA_SCRFDR1 (PA_BCR+0x0520) /* SCIF1 Receive FIFO data control */
61   -#define PA_SCSPTR1 (PA_BCR+0x0524) /* SCIF1 Serial Port control */
62   -#define PA_SCLSR1 (PA_BCR+0x0528) /* SCIF1 Line Status control */
63   -#define PA_SCRER1 (PA_BCR+0x052c) /* SCIF1 Serial Error control */
64   -#define PA_ICCR (PA_BCR+0x0600) /* Serial control */
65   -#define PA_SAR (PA_BCR+0x0602) /* Serial Slave control */
66   -#define PA_MDR (PA_BCR+0x0604) /* Serial Mode control */
67   -#define PA_ADR1 (PA_BCR+0x0606) /* Serial Address1 control */
68   -#define PA_DAR1 (PA_BCR+0x0646) /* Serial Data1 control */
69   -#define PA_VERREG (PA_BCR+0x0700) /* FPGA Version Register */
70   -#define PA_POFF (PA_BCR+0x0800) /* System Power Off control */
71   -#define PA_PMR (PA_BCR+0x0900) /* */
72   -
73   -#define PA_AX88796L 0xa4100400 /* AX88796L Area */
74   -#define PA_SC1602BSLB 0xa6000000 /* SC1602BSLB Area */
75   -#define PA_AREA5_IO 0xb4000000 /* Area 5 IO Memory */
76   -#define PA_AREA6_IO 0xb8000000 /* Area 6 IO Memory */
77   -#define PA_IDE_OFFSET 0x1f0 /* CF IDE Offset */
78   -#define AX88796L_IO_BASE 0x1000 /* AX88796L IO Base Address */
79   -
80   -#define IRLCNTR1 (PA_BCR + 0) /* Interrupt Control Register1 */
81   -
82   -#define IRQ_PCISLOT1 65 /* PCI Slot #1 IRQ */
83   -#define IRQ_PCISLOT2 66 /* PCI Slot #2 IRQ */
84   -#define IRQ_PCISLOT3 67 /* PCI Slot #3 IRQ */
85   -#define IRQ_PCISLOT4 68 /* PCI Slot #4 IRQ */
86   -#define IRQ_CFCARD 1 /* CF Card IRQ */
87   -// #define IRQ_CFINST 0 /* CF Card Insert IRQ */
88   -#define IRQ_TP 2 /* Touch Panel IRQ */
89   -#define IRQ_SCI1 3 /* SCI1 IRQ */
90   -#define IRQ_SCI0 4 /* SCI0 IRQ */
91   -#define IRQ_2SERIAL 5 /* Serial IRQ */
92   -#define IRQ_RTC 6 /* RTC A / B IRQ */
93   -#define IRQ_EXTENTION6 7 /* EXT6n IRQ */
94   -#define IRQ_EXTENTION5 8 /* EXT5n IRQ */
95   -#define IRQ_EXTENTION4 9 /* EXT4n IRQ */
96   -#define IRQ_EXTENTION2 10 /* EXT2n IRQ */
97   -#define IRQ_EXTENTION1 11 /* EXT1n IRQ */
98   -#define IRQ_ONETH 13 /* On board Ethernet IRQ */
99   -#define IRQ_PSW 14 /* Push Switch IRQ */
100   -
101   -#else /* R7780RP */
102   -
103   -#define PA_BCR 0xa5000000 /* FPGA */
104   -#define PA_IRLMSK (PA_BCR+0x0000) /* Interrupt Mask control */
105   -#define PA_IRLMON (PA_BCR+0x0002) /* Interrupt Status control */
106   -#define PA_SDPOW (PA_BCR+0x0004) /* SD Power control */
107   -#define PA_RSTCTL (PA_BCR+0x0006) /* Device Reset control */
108   -#define PA_PCIBD (PA_BCR+0x0008) /* PCI Board detect control */
109   -#define PA_PCICD (PA_BCR+0x000a) /* PCI Conector detect control */
110   -#define PA_ZIGIO1 (PA_BCR+0x000c) /* Zigbee IO control 1 */
111   -#define PA_ZIGIO2 (PA_BCR+0x000e) /* Zigbee IO control 2 */
112   -#define PA_ZIGIO3 (PA_BCR+0x0010) /* Zigbee IO control 3 */
113   -#define PA_ZIGIO4 (PA_BCR+0x0012) /* Zigbee IO control 4 */
114   -#define PA_IVDRMON (PA_BCR+0x0014) /* iVDR Moniter control */
115   -#define PA_IVDRCTL (PA_BCR+0x0016) /* iVDR control */
116   -#define PA_OBLED (PA_BCR+0x0018) /* On Board LED control */
117   -#define PA_OBSW (PA_BCR+0x001a) /* On Board Switch control */
118   -#define PA_AUDIOSEL (PA_BCR+0x001c) /* Sound Interface Select control */
119   -#define PA_EXTPLR (PA_BCR+0x001e) /* Extention Pin Polarity control */
120   -#define PA_TPCTL (PA_BCR+0x0100) /* Touch Panel Access control */
121   -#define PA_TPDCKCTL (PA_BCR+0x0102) /* Touch Panel Access data control */
122   -#define PA_TPCTLCLR (PA_BCR+0x0104) /* Touch Panel Access control */
123   -#define PA_TPXPOS (PA_BCR+0x0106) /* Touch Panel X position control */
124   -#define PA_TPYPOS (PA_BCR+0x0108) /* Touch Panel Y position control */
125   -#define PA_DBDET (PA_BCR+0x0200) /* Debug Board detect control */
126   -#define PA_DBDISPCTL (PA_BCR+0x0202) /* Debug Board Dot timing control */
127   -#define PA_DBSW (PA_BCR+0x0204) /* Debug Board Switch control */
128   -#define PA_CFCTL (PA_BCR+0x0300) /* CF Timing control */
129   -#define PA_CFPOW (PA_BCR+0x0302) /* CF Power control */
130   -#define PA_CFCDINTCLR (PA_BCR+0x0304) /* CF Insert Interrupt clear */
131   -#define PA_SCSMR (PA_BCR+0x0400) /* SCIF Serial mode control */
132   -#define PA_SCBRR (PA_BCR+0x0402) /* SCIF Bit rate control */
133   -#define PA_SCSCR (PA_BCR+0x0404) /* SCIF Serial control */
134   -#define PA_SCFDTR (PA_BCR+0x0406) /* SCIF Send FIFO control */
135   -#define PA_SCFSR (PA_BCR+0x0408) /* SCIF Serial status control */
136   -#define PA_SCFRDR (PA_BCR+0x040a) /* SCIF Receive FIFO control */
137   -#define PA_SCFCR (PA_BCR+0x040c) /* SCIF FIFO control */
138   -#define PA_SCFDR (PA_BCR+0x040e) /* SCIF FIFO data control */
139   -#define PA_SCLSR (PA_BCR+0x0412) /* SCIF Line Status control */
140   -#define PA_ICCR (PA_BCR+0x0500) /* Serial control */
141   -#define PA_SAR (PA_BCR+0x0502) /* Serial Slave control */
142   -#define PA_MDR (PA_BCR+0x0504) /* Serial Mode control */
143   -#define PA_ADR1 (PA_BCR+0x0506) /* Serial Address1 control */
144   -#define PA_DAR1 (PA_BCR+0x0546) /* Serial Data1 control */
145   -#define PA_VERREG (PA_BCR+0x0600) /* FPGA Version Register */
146   -
147   -#define PA_AX88796L 0xa5800400 /* AX88796L Area */
148   -#define PA_SC1602BSLB 0xa6000000 /* SC1602BSLB Area */
149   -#define PA_AREA5_IO 0xb4000000 /* Area 5 IO Memory */
150   -#define PA_AREA6_IO 0xb8000000 /* Area 6 IO Memory */
151   -#define PA_IDE_OFFSET 0x1f0 /* CF IDE Offset */
152   -#define AX88796L_IO_BASE 0x1000 /* AX88796L IO Base Address */
153   -
154   -#define IRLCNTR1 (PA_BCR + 0) /* Interrupt Control Register1 */
155   -
156   -#define IRQ_PCISLOT1 0 /* PCI Slot #1 IRQ */
157   -#define IRQ_PCISLOT2 1 /* PCI Slot #2 IRQ */
158   -#define IRQ_PCISLOT3 2 /* PCI Slot #3 IRQ */
159   -#define IRQ_PCISLOT4 3 /* PCI Slot #4 IRQ */
160   -#define IRQ_CFCARD 4 /* CF Card IRQ */
161   -#define IRQ_CFINST 5 /* CF Card Insert IRQ */
162   -#define IRQ_M66596 6 /* M66596 IRQ */
163   -#define IRQ_SDCARD 7 /* SD Card IRQ */
164   -#define IRQ_TUCHPANEL 8 /* Touch Panel IRQ */
165   -#define IRQ_SCI 9 /* SCI IRQ */
166   -#define IRQ_2SERIAL 10 /* Serial IRQ */
167   -#define IRQ_EXTENTION 11 /* EXTn IRQ */
168   -#define IRQ_ONETH 12 /* On board Ethernet IRQ */
169   -#define IRQ_PSW 13 /* Push Switch IRQ */
170   -#define IRQ_ZIGBEE 14 /* Ziggbee IO IRQ */
171   -
172   -#endif /* CONFIG_SH_R7780MP */
173   -
174   -#define __IO_PREFIX r7780rp
175   -#include <asm/io_generic.h>
176   -
177   -#endif /* __ASM_SH_RENESAS_R7780RP */
include/asm-sh/rts7751r2d/rts7751r2d.h
View file @ 082c44d
1   -#ifndef __ASM_SH_RENESAS_RTS7751R2D_H
2   -#define __ASM_SH_RENESAS_RTS7751R2D_H
3   -
4   -/*
5   - * linux/include/asm-sh/renesas_rts7751r2d.h
6   - *
7   - * Copyright (C) 2000 Atom Create Engineering Co., Ltd.
8   - *
9   - * Renesas Technology Sales RTS7751R2D support
10   - */
11   -
12   -/* Box specific addresses. */
13   -
14   -#define PA_BCR 0xa4000000 /* FPGA */
15   -#define PA_IRLMON 0xa4000002 /* Interrupt Status control */
16   -#define PA_CFCTL 0xa4000004 /* CF Timing control */
17   -#define PA_CFPOW 0xa4000006 /* CF Power control */
18   -#define PA_DISPCTL 0xa4000008 /* Display Timing control */
19   -#define PA_SDMPOW 0xa400000a /* SD Power control */
20   -#define PA_RTCCE 0xa400000c /* RTC(9701) Enable control */
21   -#define PA_PCICD 0xa400000e /* PCI Extention detect control */
22   -#define PA_VOYAGERRTS 0xa4000020 /* VOYAGER Reset control */
23   -#if defined(CONFIG_RTS7751R2D_REV11)
24   -#define PA_AXRST 0xa4000022 /* AX_LAN Reset control */
25   -#define PA_CFRST 0xa4000024 /* CF Reset control */
26   -#define PA_ADMRTS 0xa4000026 /* SD Reset control */
27   -#define PA_EXTRST 0xa4000028 /* Extention Reset control */
28   -#define PA_CFCDINTCLR 0xa400002a /* CF Insert Interrupt clear */
29   -#else
30   -#define PA_CFRST 0xa4000022 /* CF Reset control */
31   -#define PA_ADMRTS 0xa4000024 /* SD Reset control */
32   -#define PA_EXTRST 0xa4000026 /* Extention Reset control */
33   -#define PA_CFCDINTCLR 0xa4000028 /* CF Insert Interrupt clear */
34   -#define PA_KEYCTLCLR 0xa400002a /* Key Interrupt clear */
35   -#endif
36   -#define PA_POWOFF 0xa4000030 /* Board Power OFF control */
37   -#define PA_VERREG 0xa4000032 /* FPGA Version Register */
38   -#define PA_INPORT 0xa4000034 /* KEY Input Port control */
39   -#define PA_OUTPORT 0xa4000036 /* LED control */
40   -#define PA_DMPORT 0xa4000038 /* DM270 Output Port control */
41   -
42   -#define PA_AX88796L 0xaa000400 /* AX88796L Area */
43   -#define PA_VOYAGER 0xab000000 /* VOYAGER GX Area */
44   -#define PA_IDE_OFFSET 0x1f0 /* CF IDE Offset */
45   -#define AX88796L_IO_BASE 0x1000 /* AX88796L IO Base Address */
46   -
47   -#define IRLCNTR1 (PA_BCR + 0) /* Interrupt Control Register1 */
48   -
49   -#if defined(CONFIG_RTS7751R2D_REV11)
50   -#define IRQ_PCIETH 0 /* PCI Ethernet IRQ */
51   -#define IRQ_CFCARD 1 /* CF Card IRQ */
52   -#define IRQ_CFINST 2 /* CF Card Insert IRQ */
53   -#define IRQ_PCMCIA 3 /* PCMCIA IRQ */
54   -#define IRQ_VOYAGER 4 /* VOYAGER IRQ */
55   -#define IRQ_ONETH 5 /* On board Ethernet IRQ */
56   -#else
57   -#define IRQ_KEYIN 0 /* Key Input IRQ */
58   -#define IRQ_PCIETH 1 /* PCI Ethernet IRQ */
59   -#define IRQ_CFCARD 2 /* CF Card IRQ */
60   -#define IRQ_CFINST 3 /* CF Card Insert IRQ */
61   -#define IRQ_PCMCIA 4 /* PCMCIA IRQ */
62   -#define IRQ_VOYAGER 5 /* VOYAGER IRQ */
63   -#endif
64   -#define IRQ_RTCALM 6 /* RTC Alarm IRQ */
65   -#define IRQ_RTCTIME 7 /* RTC Timer IRQ */
66   -#define IRQ_SDCARD 8 /* SD Card IRQ */
67   -#define IRQ_PCISLOT1 9 /* PCI Slot #1 IRQ */
68   -#define IRQ_PCISLOT2 10 /* PCI Slot #2 IRQ */
69   -#define IRQ_EXTENTION 11 /* EXTn IRQ */
70   -
71   -#define __IO_PREFIX rts7751r2d
72   -#include <asm/io_generic.h>
73   -
74   -#endif /* __ASM_SH_RENESAS_RTS7751R2D */
include/asm-sh/shmin/shmin.h
View file @ 082c44d
1   -#ifndef __ASM_SH_SHMIN_H
2   -#define __ASM_SH_SHMIN_H
3   -
4   -#define SHMIN_IO_BASE 0xb0000000UL
5   -
6   -#define SHMIN_NE_IRQ IRQ2_IRQ
7   -#define SHMIN_NE_BASE 0x300
8   -
9   -#endif
sound/oss/sh_dac_audio.c
Diff comments   View file @ 082c44d
... ... @@ -26,7 +26,7 @@
26 26 #include <asm/cpu/dac.h>
27 27 #include <asm/cpu/timer.h>
28 28 #include <asm/machvec.h>
29   -#include <asm/hp6xx/hp6xx.h>
  29 +#include <asm/hp6xx.h>
30 30 #include <asm/hd64461.h>
31 31  
32 32 #define MODNAME "sh_dac_audio"