hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge commit 's3c-iis-header' into HEAD

This commit is contained in:
Mark Brown 2009-03-06 13:36:37 +00:00
parent 86027ae78c 899e6cf5e6
commit 4f5b31c3f2
17 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-s3c2410/dma.c
View File

@ -28,7 +28,7 @@
#include <mach/regs-mem.h> #include <mach/regs-mem.h>
#include <mach/regs-lcd.h> #include <mach/regs-lcd.h>
#include <mach/regs-sdi.h> #include <mach/regs-sdi.h>
#include <asm/plat-s3c24xx/regs-iis.h> #include <plat/regs-iis.h>
#include <plat/regs-spi.h> #include <plat/regs-spi.h>
static struct s3c24xx_dma_map __initdata s3c2410_dma_mappings[] = { static struct s3c24xx_dma_map __initdata s3c2410_dma_mappings[] = {

3
arch/arm/mach-s3c2410/include/mach/hardware.h
View File

@ -131,7 +131,4 @@ extern int s3c2412_gpio_set_sleepcfg(unsigned int pin, unsigned int state);
/* machine specific hardware definitions should go after this */ /* machine specific hardware definitions should go after this */
/* currently here until moved into config (todo) */
#define CONFIG_NO_MULTIWORD_IO
#endif /* __ASM_ARCH_HARDWARE_H */ #endif /* __ASM_ARCH_HARDWARE_H */

2
arch/arm/mach-s3c2410/include/mach/io.h
View File

@ -9,7 +9,7 @@
#ifndef __ASM_ARM_ARCH_IO_H #ifndef __ASM_ARM_ARCH_IO_H
#define __ASM_ARM_ARCH_IO_H #define __ASM_ARM_ARCH_IO_H
#include <mach/hardware.h> #include <mach/map.h>
#define IO_SPACE_LIMIT 0xffffffff #define IO_SPACE_LIMIT 0xffffffff

4
arch/arm/mach-s3c2412/dma.c
View File

@ -29,8 +29,8 @@
#include <mach/regs-mem.h> #include <mach/regs-mem.h>
#include <mach/regs-lcd.h> #include <mach/regs-lcd.h>
#include <mach/regs-sdi.h> #include <mach/regs-sdi.h>
#include <asm/plat-s3c24xx/regs-s3c2412-iis.h> #include <plat/regs-s3c2412-iis.h>
#include <asm/plat-s3c24xx/regs-iis.h> #include <plat/regs-iis.h>
#include <plat/regs-spi.h> #include <plat/regs-spi.h>
#define MAP(x) { (x)| DMA_CH_VALID, (x)| DMA_CH_VALID, (x)| DMA_CH_VALID, (x)| DMA_CH_VALID } #define MAP(x) { (x)| DMA_CH_VALID, (x)| DMA_CH_VALID, (x)| DMA_CH_VALID, (x)| DMA_CH_VALID }

2
arch/arm/mach-s3c2440/dma.c
View File

@ -28,7 +28,7 @@
#include <mach/regs-mem.h> #include <mach/regs-mem.h>
#include <mach/regs-lcd.h> #include <mach/regs-lcd.h>
#include <mach/regs-sdi.h> #include <mach/regs-sdi.h>
#include <asm/plat-s3c24xx/regs-iis.h> #include <plat/regs-iis.h>
#include <plat/regs-spi.h> #include <plat/regs-spi.h>
static struct s3c24xx_dma_map __initdata s3c2440_dma_mappings[] = { static struct s3c24xx_dma_map __initdata s3c2440_dma_mappings[] = {

2
arch/arm/mach-s3c2443/dma.c
View File

@ -29,7 +29,7 @@
#include <mach/regs-mem.h> #include <mach/regs-mem.h>
#include <mach/regs-lcd.h> #include <mach/regs-lcd.h>
#include <mach/regs-sdi.h> #include <mach/regs-sdi.h>
#include <asm/plat-s3c24xx/regs-iis.h> #include <plat/regs-iis.h>
#include <plat/regs-spi.h> #include <plat/regs-spi.h>
#define MAP(x) { \ #define MAP(x) { \

2
arch/arm/mach-shark/include/mach/io.h
View File

@ -14,7 +14,7 @@
#define PCIO_BASE 0xe0000000 #define PCIO_BASE 0xe0000000
#define IO_SPACE_LIMIT 0xffffffff #define IO_SPACE_LIMIT 0xffffffff
#define __io(a) ((void __iomem *)(PCIO_BASE + (a))) #define __io(a) __typesafe_io(PCIO_BASE + (a))
#define __mem_pci(addr) (addr) #define __mem_pci(addr) (addr)
#endif #endif

0
arch/arm/mach-s3c2410/include/mach/audio.h → arch/arm/plat-s3c/include/plat/audio.h
View File

0
include/asm-arm/plat-s3c24xx/regs-s3c2412-iis.h → arch/arm/plat-s3c/include/plat/regs-s3c2412-iis.h
View File

1
arch/arm/plat-s3c24xx/clock-dclk.c
View File

@ -18,6 +18,7 @@
#include <mach/regs-clock.h> #include <mach/regs-clock.h>
#include <mach/regs-gpio.h> #include <mach/regs-gpio.h>
#include <mach/hardware.h>
#include <plat/clock.h> #include <plat/clock.h>
#include <plat/cpu.h> #include <plat/cpu.h>

0
include/asm-arm/plat-s3c24xx/regs-iis.h → arch/arm/plat-s3c24xx/include/plat/regs-iis.h
View File

4
sound/soc/s3c24xx/neo1973_wm8753.c
View File

@ -29,11 +29,11 @@
#include <mach/regs-clock.h> #include <mach/regs-clock.h>
#include <mach/regs-gpio.h> #include <mach/regs-gpio.h>
#include <mach/hardware.h> #include <mach/hardware.h>
#include <mach/audio.h> #include <plat/audio.h>
#include <linux/io.h> #include <linux/io.h>
#include <mach/spi-gpio.h> #include <mach/spi-gpio.h>
#include <asm/plat-s3c24xx/regs-iis.h> #include <plat/regs-iis.h>
#include "../codecs/wm8753.h" #include "../codecs/wm8753.h"
#include "lm4857.h" #include "lm4857.h"

8
sound/soc/s3c24xx/s3c2412-i2s.c
View File

@ -22,6 +22,7 @@
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/io.h>
#include <sound/core.h> #include <sound/core.h>
#include <sound/pcm.h> #include <sound/pcm.h>
@ -30,13 +31,10 @@
#include <sound/soc.h> #include <sound/soc.h>
#include <mach/hardware.h> #include <mach/hardware.h>
#include <linux/io.h> #include <plat/regs-s3c2412-iis.h>
#include <asm/dma.h>
#include <asm/plat-s3c24xx/regs-s3c2412-iis.h>
#include <mach/regs-gpio.h> #include <mach/regs-gpio.h>
#include <mach/audio.h> #include <plat/audio.h>
#include <mach/dma.h> #include <mach/dma.h>
#include "s3c24xx-pcm.h" #include "s3c24xx-pcm.h"

2
sound/soc/s3c24xx/s3c2443-ac97.c
View File

@ -31,7 +31,7 @@
#include <plat/regs-ac97.h> #include <plat/regs-ac97.h>
#include <mach/regs-gpio.h> #include <mach/regs-gpio.h>
#include <mach/regs-clock.h> #include <mach/regs-clock.h>
#include <mach/audio.h> #include <plat/audio.h>
#include <asm/dma.h> #include <asm/dma.h>
#include <mach/dma.h> #include <mach/dma.h>

4
sound/soc/s3c24xx/s3c24xx-i2s.c
View File

@ -30,11 +30,11 @@
#include <mach/hardware.h> #include <mach/hardware.h>
#include <mach/regs-gpio.h> #include <mach/regs-gpio.h>
#include <mach/regs-clock.h> #include <mach/regs-clock.h>
#include <mach/audio.h> #include <plat/audio.h>
#include <asm/dma.h> #include <asm/dma.h>
#include <mach/dma.h> #include <mach/dma.h>
#include <asm/plat-s3c24xx/regs-iis.h> #include <plat/regs-iis.h>
#include "s3c24xx-pcm.h" #include "s3c24xx-pcm.h"
#include "s3c24xx-i2s.h" #include "s3c24xx-i2s.h"

2
sound/soc/s3c24xx/s3c24xx-pcm.c
View File

@ -29,7 +29,7 @@
#include <asm/dma.h> #include <asm/dma.h>
#include <mach/hardware.h> #include <mach/hardware.h>
#include <mach/dma.h> #include <mach/dma.h>
#include <mach/audio.h> #include <plat/audio.h>
#include "s3c24xx-pcm.h" #include "s3c24xx-pcm.h"

2
sound/soc/s3c24xx/s3c24xx_uda134x.c
View File

@ -22,7 +22,7 @@
#include <sound/s3c24xx_uda134x.h> #include <sound/s3c24xx_uda134x.h>
#include <sound/uda134x.h> #include <sound/uda134x.h>
#include <asm/plat-s3c24xx/regs-iis.h> #include <plat/regs-iis.h>
#include "s3c24xx-pcm.h" #include "s3c24xx-pcm.h"
#include "s3c24xx-i2s.h" #include "s3c24xx-i2s.h"