Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d07e7ce9 authored Apr 27, 2010 by Jassi Brar Committed by Mark Brown May 05, 2010

ASoC: S3C: I2Sv2: Move defines closer to driver



The header for I2Sv2
   linux/arch/arm/plat-s3c/include/plat/regs-s3c2412-iis.h
contains only controller specific definitions and nothing
SoC specific. So, it could be moved to sound/soc/s3c24xx/

Signed-off-by: Jassi Brar <jassi.brar@samsung.com>
Acked-by: Ben Dooks <ben-linux@fluff.org>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

parent 985d8c4c

arch/arm/plat-samsung/include/plat/regs-s3c2412-iis.h→sound/soc/s3c24xx/regs-i2s-v2.h

+0 −0

File moved.

sound/soc/s3c24xx/s3c-i2s-v2.c

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -24,10 +24,9 @@
	#include <sound/pcm_params.h>		#include <sound/pcm_params.h>
	#include <sound/soc.h>		#include <sound/soc.h>

	#include <plat/regs-s3c2412-iis.h>

	#include <mach/dma.h>		#include <mach/dma.h>

			#include "regs-i2s-v2.h"
	#include "s3c-i2s-v2.h"		#include "s3c-i2s-v2.h"
	#include "s3c-dma.h"		#include "s3c-dma.h"

sound/soc/s3c24xx/s3c2412-i2s.c

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -32,12 +32,11 @@
	#include <sound/soc.h>		#include <sound/soc.h>
	#include <mach/hardware.h>		#include <mach/hardware.h>

	#include <plat/regs-s3c2412-iis.h>

	#include <mach/regs-gpio.h>		#include <mach/regs-gpio.h>
	#include <mach/dma.h>		#include <mach/dma.h>

	#include "s3c-dma.h"		#include "s3c-dma.h"
			#include "regs-i2s-v2.h"
	#include "s3c2412-i2s.h"		#include "s3c2412-i2s.h"

	#define S3C2412_I2S_DEBUG 0		#define S3C2412_I2S_DEBUG 0

sound/soc/s3c24xx/s3c64xx-i2s.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -18,7 +18,6 @@

	#include <sound/soc.h>		#include <sound/soc.h>

	#include <plat/regs-s3c2412-iis.h>
	#include <mach/gpio-bank-d.h>		#include <mach/gpio-bank-d.h>
	#include <mach/gpio-bank-e.h>		#include <mach/gpio-bank-e.h>
	#include <plat/gpio-cfg.h>		#include <plat/gpio-cfg.h>
	@@ -27,6 +26,7 @@
	#include <mach/dma.h>		#include <mach/dma.h>

	#include "s3c-dma.h"		#include "s3c-dma.h"
			#include "regs-i2s-v2.h"
	#include "s3c64xx-i2s.h"		#include "s3c64xx-i2s.h"

	/* The value should be set to maximum of the total number		/* The value should be set to maximum of the total number