ARM: Merge for-2635/s5p-audio (1770a898) · Commits · e / devices / android_kernel_teracube_emerald

arch/arm/mach-s5p6440/Makefile

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -17,3 +17,6 @@ obj-$(CONFIG_CPU_S5P6440) += cpu.o init.o clock.o gpio.o dma.o
	# machine support		# machine support

	obj-$(CONFIG_MACH_SMDK6440) += mach-smdk6440.o		obj-$(CONFIG_MACH_SMDK6440) += mach-smdk6440.o

			# device support
			obj-y += dev-audio.o

arch/arm/mach-s5p6440/dev-audio.c

0 → 100644

+127 −0

Original line number	Original line	Diff line number	Diff line
			/* linux/arch/arm/mach-s5p6440/dev-audio.c
			*
			* Copyright (c) 2010 Samsung Electronics Co. Ltd
			* Jaswinder Singh <jassi.brar@samsung.com>
			*
			* This program is free software; you can redistribute it and/or modify
			* it under the terms of the GNU General Public License version 2 as
			* published by the Free Software Foundation.
			*/

			#include <linux/platform_device.h>
			#include <linux/dma-mapping.h>

			#include <plat/gpio-cfg.h>
			#include <plat/audio.h>

			#include <mach/gpio.h>
			#include <mach/map.h>
			#include <mach/dma.h>
			#include <mach/irqs.h>

			static int s5p6440_cfg_i2s(struct platform_device *pdev)
			{
			/* configure GPIO for i2s port */
			switch (pdev->id) {
			case -1:
			s3c_gpio_cfgpin(S5P6440_GPR(4), S3C_GPIO_SFN(5));
			s3c_gpio_cfgpin(S5P6440_GPR(5), S3C_GPIO_SFN(5));
			s3c_gpio_cfgpin(S5P6440_GPR(6), S3C_GPIO_SFN(5));
			s3c_gpio_cfgpin(S5P6440_GPR(7), S3C_GPIO_SFN(5));
			s3c_gpio_cfgpin(S5P6440_GPR(8), S3C_GPIO_SFN(5));
			s3c_gpio_cfgpin(S5P6440_GPR(13), S3C_GPIO_SFN(5));
			s3c_gpio_cfgpin(S5P6440_GPR(14), S3C_GPIO_SFN(5));
			break;

			default:
			printk(KERN_ERR "Invalid Device %d\n", pdev->id);
			return -EINVAL;
			}

			return 0;
			}

			static struct s3c_audio_pdata s3c_i2s_pdata = {
			.cfg_gpio = s5p6440_cfg_i2s,
			};

			static struct resource s5p6440_iis0_resource[] = {
			[0] = {
			.start = S5P6440_PA_I2S,
			.end = S5P6440_PA_I2S + 0x100 - 1,
			.flags = IORESOURCE_MEM,
			},
			[1] = {
			.start = DMACH_I2S0_TX,
			.end = DMACH_I2S0_TX,
			.flags = IORESOURCE_DMA,
			},
			[2] = {
			.start = DMACH_I2S0_RX,
			.end = DMACH_I2S0_RX,
			.flags = IORESOURCE_DMA,
			},
			};

			struct platform_device s5p6440_device_iis = {
			.name = "s3c64xx-iis-v4",
			.id = -1,
			.num_resources = ARRAY_SIZE(s5p6440_iis0_resource),
			.resource = s5p6440_iis0_resource,
			.dev = {
			.platform_data = &s3c_i2s_pdata,
			},
			};

			/* PCM Controller platform_devices */

			static int s5p6440_pcm_cfg_gpio(struct platform_device *pdev)
			{
			switch (pdev->id) {
			case 0:
			s3c_gpio_cfgpin(S5P6440_GPR(7), S3C_GPIO_SFN(2));
			s3c_gpio_cfgpin(S5P6440_GPR(13), S3C_GPIO_SFN(2));
			s3c_gpio_cfgpin(S5P6440_GPR(14), S3C_GPIO_SFN(2));
			s3c_gpio_cfgpin(S5P6440_GPR(8), S3C_GPIO_SFN(2));
			s3c_gpio_cfgpin(S5P6440_GPR(6), S3C_GPIO_SFN(2));
			break;

			default:
			printk(KERN_DEBUG "Invalid PCM Controller number!");
			return -EINVAL;
			}

			return 0;
			}

			static struct s3c_audio_pdata s3c_pcm_pdata = {
			.cfg_gpio = s5p6440_pcm_cfg_gpio,
			};

			static struct resource s5p6440_pcm0_resource[] = {
			[0] = {
			.start = S5P6440_PA_PCM,
			.end = S5P6440_PA_PCM + 0x100 - 1,
			.flags = IORESOURCE_MEM,
			},
			[1] = {
			.start = DMACH_PCM0_TX,
			.end = DMACH_PCM0_TX,
			.flags = IORESOURCE_DMA,
			},
			[2] = {
			.start = DMACH_PCM0_RX,
			.end = DMACH_PCM0_RX,
			.flags = IORESOURCE_DMA,
			},
			};

			struct platform_device s5p6440_device_pcm = {
			.name = "samsung-pcm",
			.id = 0,
			.num_resources = ARRAY_SIZE(s5p6440_pcm0_resource),
			.resource = s5p6440_pcm0_resource,
			.dev = {
			.platform_data = &s3c_pcm_pdata,
			},
			};

arch/arm/mach-s5p6440/include/mach/map.h

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -63,6 +63,12 @@
	#define S5P6440_PA_SDRAM (0x20000000)		#define S5P6440_PA_SDRAM (0x20000000)
	#define S5P_PA_SDRAM S5P6440_PA_SDRAM		#define S5P_PA_SDRAM S5P6440_PA_SDRAM

			/* I2S */
			#define S5P6440_PA_I2S 0xF2000000

			/* PCM */
			#define S5P6440_PA_PCM 0xF2100000

	/* compatibiltiy defines. */		/* compatibiltiy defines. */
	#define S3C_PA_UART S5P6440_PA_UART		#define S3C_PA_UART S5P6440_PA_UART
	#define S3C_PA_IIC S5P6440_PA_IIC0		#define S3C_PA_IIC S5P6440_PA_IIC0

arch/arm/mach-s5p6440/mach-smdk6440.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -84,6 +84,7 @@ static struct s3c2410_uartcfg smdk6440_uartcfgs[] __initdata = {
	};		};

	static struct platform_device *smdk6440_devices[] __initdata = {		static struct platform_device *smdk6440_devices[] __initdata = {
			&s5p6440_device_iis,
	};		};

	static void __init smdk6440_map_io(void)		static void __init smdk6440_map_io(void)

arch/arm/mach-s5p6442/Makefile

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -17,3 +17,6 @@ obj-$(CONFIG_CPU_S5P6442) += cpu.o init.o clock.o dma.o
	# machine support		# machine support

	obj-$(CONFIG_MACH_SMDK6442) += mach-smdk6442.o		obj-$(CONFIG_MACH_SMDK6442) += mach-smdk6442.o

			# device support
			obj-y += dev-audio.o