adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-29 12:16:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

S3C24XX: Move and update IIS headers

Browse source 
Move the IIS headers to their correct place.

Signed-off-by: Ben Dooks <ben@simtec.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Ben Dooks 2009-03-04 00:49:26 +00:00 committed by Mark Brown
parent c59765042f
commit 8150bc886b
14 changed files with 13 additions and 17 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
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

2
sound/soc/s3c24xx/neo1973_wm8753.c
View file

@ -33,7 +33,7 @@
#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"

6
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,10 +31,7 @@
#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 <mach/audio.h>

2
sound/soc/s3c24xx/s3c24xx-i2s.c
View file

@ -34,7 +34,7 @@
#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_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"