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

Commit 3db3ae5e authored by Kukjin Kim's avatar Kukjin Kim
Browse files

ARM: EXYNOS4: Update device support 



This patch updates device support of EXYNOS4 according to the change of
ARCH name, EXYNOS4.

Cc: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent 3c31336d

arch/arm/mach-s5pv310/dev-audio.c→arch/arm/mach-exynos4/dev-audio.c

+73 −70
Original line number Diff line number Diff line 
/* linux/arch/arm/mach-s5pv310/dev-audio.c

/* linux/arch/arm/mach-exynos4/dev-audio.c

 *

 * Copyright (c) 2011 Samsung Electronics Co., Ltd.

 *		http://www.samsung.com

 *

 * Copyright (c) 2010 Samsung Electronics Co. Ltd

 *	Jaswinder Singh <jassi.brar@samsung.com>
@@ -24,18 +27,18 @@ static const char *rclksrc[] = { 
	[1] = "i2sclk",

};



static int s5pv310_cfg_i2s(struct platform_device *pdev)

static int exynos4_cfg_i2s(struct platform_device *pdev)

{

	/* configure GPIO for i2s port */

	switch (pdev->id) {

	case 0:

		s3c_gpio_cfgpin_range(S5PV310_GPZ(0), 7, S3C_GPIO_SFN(2));

		s3c_gpio_cfgpin_range(EXYNOS4_GPZ(0), 7, S3C_GPIO_SFN(2));

		break;

	case 1:

		s3c_gpio_cfgpin_range(S5PV310_GPC0(0), 5, S3C_GPIO_SFN(2));

		s3c_gpio_cfgpin_range(EXYNOS4_GPC0(0), 5, S3C_GPIO_SFN(2));

		break;

	case 2:

		s3c_gpio_cfgpin_range(S5PV310_GPC1(0), 5, S3C_GPIO_SFN(4));

		s3c_gpio_cfgpin_range(EXYNOS4_GPC1(0), 5, S3C_GPIO_SFN(4));

		break;

	default:

		printk(KERN_ERR "Invalid Device %d\n", pdev->id);
@@ -46,7 +49,7 @@ static int s5pv310_cfg_i2s(struct platform_device *pdev) 
}



static struct s3c_audio_pdata i2sv5_pdata = {

	.cfg_gpio = s5pv310_cfg_i2s,

	.cfg_gpio = exynos4_cfg_i2s,

	.type = {

		.i2s = {

			.quirks = QUIRK_PRI_6CHAN | QUIRK_SEC_DAI
@@ -56,10 +59,10 @@ static struct s3c_audio_pdata i2sv5_pdata = { 
	},

};



static struct resource s5pv310_i2s0_resource[] = {

static struct resource exynos4_i2s0_resource[] = {

	[0] = {

		.start	= S5PV310_PA_I2S0,

		.end	= S5PV310_PA_I2S0 + 0x100 - 1,

		.start	= EXYNOS4_PA_I2S0,

		.end	= EXYNOS4_PA_I2S0 + 0x100 - 1,

		.flags	= IORESOURCE_MEM,

	},

	[1] = {
@@ -79,11 +82,11 @@ static struct resource s5pv310_i2s0_resource[] = { 
	},

};



struct platform_device s5pv310_device_i2s0 = {

struct platform_device exynos4_device_i2s0 = {

	.name = "samsung-i2s",

	.id = 0,

	.num_resources = ARRAY_SIZE(s5pv310_i2s0_resource),

	.resource = s5pv310_i2s0_resource,

	.num_resources = ARRAY_SIZE(exynos4_i2s0_resource),

	.resource = exynos4_i2s0_resource,

	.dev = {

		.platform_data = &i2sv5_pdata,

	},
@@ -95,7 +98,7 @@ static const char *rclksrc_v3[] = { 
};



static struct s3c_audio_pdata i2sv3_pdata = {

	.cfg_gpio = s5pv310_cfg_i2s,

	.cfg_gpio = exynos4_cfg_i2s,

	.type = {

		.i2s = {

			.quirks = QUIRK_NO_MUXPSR,
@@ -104,10 +107,10 @@ static struct s3c_audio_pdata i2sv3_pdata = { 
	},

};



static struct resource s5pv310_i2s1_resource[] = {

static struct resource exynos4_i2s1_resource[] = {

	[0] = {

		.start	= S5PV310_PA_I2S1,

		.end	= S5PV310_PA_I2S1 + 0x100 - 1,

		.start	= EXYNOS4_PA_I2S1,

		.end	= EXYNOS4_PA_I2S1 + 0x100 - 1,

		.flags	= IORESOURCE_MEM,

	},

	[1] = {
@@ -122,20 +125,20 @@ static struct resource s5pv310_i2s1_resource[] = { 
	},

};



struct platform_device s5pv310_device_i2s1 = {

struct platform_device exynos4_device_i2s1 = {

	.name = "samsung-i2s",

	.id = 1,

	.num_resources = ARRAY_SIZE(s5pv310_i2s1_resource),

	.resource = s5pv310_i2s1_resource,

	.num_resources = ARRAY_SIZE(exynos4_i2s1_resource),

	.resource = exynos4_i2s1_resource,

	.dev = {

		.platform_data = &i2sv3_pdata,

	},

};



static struct resource s5pv310_i2s2_resource[] = {

static struct resource exynos4_i2s2_resource[] = {

	[0] = {

		.start	= S5PV310_PA_I2S2,

		.end	= S5PV310_PA_I2S2 + 0x100 - 1,

		.start	= EXYNOS4_PA_I2S2,

		.end	= EXYNOS4_PA_I2S2 + 0x100 - 1,

		.flags	= IORESOURCE_MEM,

	},

	[1] = {
@@ -150,11 +153,11 @@ static struct resource s5pv310_i2s2_resource[] = { 
	},

};



struct platform_device s5pv310_device_i2s2 = {

struct platform_device exynos4_device_i2s2 = {

	.name = "samsung-i2s",

	.id = 2,

	.num_resources = ARRAY_SIZE(s5pv310_i2s2_resource),

	.resource = s5pv310_i2s2_resource,

	.num_resources = ARRAY_SIZE(exynos4_i2s2_resource),

	.resource = exynos4_i2s2_resource,

	.dev = {

		.platform_data = &i2sv3_pdata,

	},
@@ -162,17 +165,17 @@ struct platform_device s5pv310_device_i2s2 = { 


/* PCM Controller platform_devices */



static int s5pv310_pcm_cfg_gpio(struct platform_device *pdev)

static int exynos4_pcm_cfg_gpio(struct platform_device *pdev)

{

	switch (pdev->id) {

	case 0:

		s3c_gpio_cfgpin_range(S5PV310_GPZ(0), 5, S3C_GPIO_SFN(3));

		s3c_gpio_cfgpin_range(EXYNOS4_GPZ(0), 5, S3C_GPIO_SFN(3));

		break;

	case 1:

		s3c_gpio_cfgpin_range(S5PV310_GPC0(0), 5, S3C_GPIO_SFN(3));

		s3c_gpio_cfgpin_range(EXYNOS4_GPC0(0), 5, S3C_GPIO_SFN(3));

		break;

	case 2:

		s3c_gpio_cfgpin_range(S5PV310_GPC1(0), 5, S3C_GPIO_SFN(3));

		s3c_gpio_cfgpin_range(EXYNOS4_GPC1(0), 5, S3C_GPIO_SFN(3));

		break;

	default:

		printk(KERN_DEBUG "Invalid PCM Controller number!");
@@ -183,13 +186,13 @@ static int s5pv310_pcm_cfg_gpio(struct platform_device *pdev) 
}



static struct s3c_audio_pdata s3c_pcm_pdata = {

	.cfg_gpio = s5pv310_pcm_cfg_gpio,

	.cfg_gpio = exynos4_pcm_cfg_gpio,

};



static struct resource s5pv310_pcm0_resource[] = {

static struct resource exynos4_pcm0_resource[] = {

	[0] = {

		.start	= S5PV310_PA_PCM0,

		.end	= S5PV310_PA_PCM0 + 0x100 - 1,

		.start	= EXYNOS4_PA_PCM0,

		.end	= EXYNOS4_PA_PCM0 + 0x100 - 1,

		.flags	= IORESOURCE_MEM,

	},

	[1] = {
@@ -204,20 +207,20 @@ static struct resource s5pv310_pcm0_resource[] = { 
	},

};



struct platform_device s5pv310_device_pcm0 = {

struct platform_device exynos4_device_pcm0 = {

	.name = "samsung-pcm",

	.id = 0,

	.num_resources = ARRAY_SIZE(s5pv310_pcm0_resource),

	.resource = s5pv310_pcm0_resource,

	.num_resources = ARRAY_SIZE(exynos4_pcm0_resource),

	.resource = exynos4_pcm0_resource,

	.dev = {

		.platform_data = &s3c_pcm_pdata,

	},

};



static struct resource s5pv310_pcm1_resource[] = {

static struct resource exynos4_pcm1_resource[] = {

	[0] = {

		.start	= S5PV310_PA_PCM1,

		.end	= S5PV310_PA_PCM1 + 0x100 - 1,

		.start	= EXYNOS4_PA_PCM1,

		.end	= EXYNOS4_PA_PCM1 + 0x100 - 1,

		.flags	= IORESOURCE_MEM,

	},

	[1] = {
@@ -232,20 +235,20 @@ static struct resource s5pv310_pcm1_resource[] = { 
	},

};



struct platform_device s5pv310_device_pcm1 = {

struct platform_device exynos4_device_pcm1 = {

	.name = "samsung-pcm",

	.id = 1,

	.num_resources = ARRAY_SIZE(s5pv310_pcm1_resource),

	.resource = s5pv310_pcm1_resource,

	.num_resources = ARRAY_SIZE(exynos4_pcm1_resource),

	.resource = exynos4_pcm1_resource,

	.dev = {

		.platform_data = &s3c_pcm_pdata,

	},

};



static struct resource s5pv310_pcm2_resource[] = {

static struct resource exynos4_pcm2_resource[] = {

	[0] = {

		.start	= S5PV310_PA_PCM2,

		.end	= S5PV310_PA_PCM2 + 0x100 - 1,

		.start	= EXYNOS4_PA_PCM2,

		.end	= EXYNOS4_PA_PCM2 + 0x100 - 1,

		.flags	= IORESOURCE_MEM,

	},

	[1] = {
@@ -260,11 +263,11 @@ static struct resource s5pv310_pcm2_resource[] = { 
	},

};



struct platform_device s5pv310_device_pcm2 = {

struct platform_device exynos4_device_pcm2 = {

	.name = "samsung-pcm",

	.id = 2,

	.num_resources = ARRAY_SIZE(s5pv310_pcm2_resource),

	.resource = s5pv310_pcm2_resource,

	.num_resources = ARRAY_SIZE(exynos4_pcm2_resource),

	.resource = exynos4_pcm2_resource,

	.dev = {

		.platform_data = &s3c_pcm_pdata,

	},
@@ -272,15 +275,15 @@ struct platform_device s5pv310_device_pcm2 = { 


/* AC97 Controller platform devices */



static int s5pv310_ac97_cfg_gpio(struct platform_device *pdev)

static int exynos4_ac97_cfg_gpio(struct platform_device *pdev)

{

	return s3c_gpio_cfgpin_range(S5PV310_GPC0(0), 5, S3C_GPIO_SFN(4));

	return s3c_gpio_cfgpin_range(EXYNOS4_GPC0(0), 5, S3C_GPIO_SFN(4));

}



static struct resource s5pv310_ac97_resource[] = {

static struct resource exynos4_ac97_resource[] = {

	[0] = {

		.start	= S5PV310_PA_AC97,

		.end	= S5PV310_PA_AC97 + 0x100 - 1,

		.start	= EXYNOS4_PA_AC97,

		.end	= EXYNOS4_PA_AC97 + 0x100 - 1,

		.flags	= IORESOURCE_MEM,

	},

	[1] = {
@@ -306,36 +309,36 @@ static struct resource s5pv310_ac97_resource[] = { 
};



static struct s3c_audio_pdata s3c_ac97_pdata = {

	.cfg_gpio = s5pv310_ac97_cfg_gpio,

	.cfg_gpio = exynos4_ac97_cfg_gpio,

};



static u64 s5pv310_ac97_dmamask = DMA_BIT_MASK(32);

static u64 exynos4_ac97_dmamask = DMA_BIT_MASK(32);



struct platform_device s5pv310_device_ac97 = {

struct platform_device exynos4_device_ac97 = {

	.name = "samsung-ac97",

	.id = -1,

	.num_resources = ARRAY_SIZE(s5pv310_ac97_resource),

	.resource = s5pv310_ac97_resource,

	.num_resources = ARRAY_SIZE(exynos4_ac97_resource),

	.resource = exynos4_ac97_resource,

	.dev = {

		.platform_data = &s3c_ac97_pdata,

		.dma_mask = &s5pv310_ac97_dmamask,

		.dma_mask = &exynos4_ac97_dmamask,

		.coherent_dma_mask = DMA_BIT_MASK(32),

	},

};



/* S/PDIF Controller platform_device */



static int s5pv310_spdif_cfg_gpio(struct platform_device *pdev)

static int exynos4_spdif_cfg_gpio(struct platform_device *pdev)

{

	s3c_gpio_cfgpin_range(S5PV310_GPC1(0), 2, S3C_GPIO_SFN(3));

	s3c_gpio_cfgpin_range(EXYNOS4_GPC1(0), 2, S3C_GPIO_SFN(3));



	return 0;

}



static struct resource s5pv310_spdif_resource[] = {

static struct resource exynos4_spdif_resource[] = {

	[0] = {

		.start	= S5PV310_PA_SPDIF,

		.end	= S5PV310_PA_SPDIF + 0x100 - 1,

		.start	= EXYNOS4_PA_SPDIF,

		.end	= EXYNOS4_PA_SPDIF + 0x100 - 1,

		.flags	= IORESOURCE_MEM,

	},

	[1] = {
@@ -346,19 +349,19 @@ static struct resource s5pv310_spdif_resource[] = { 
};



static struct s3c_audio_pdata samsung_spdif_pdata = {

	.cfg_gpio = s5pv310_spdif_cfg_gpio,

	.cfg_gpio = exynos4_spdif_cfg_gpio,

};



static u64 s5pv310_spdif_dmamask = DMA_BIT_MASK(32);

static u64 exynos4_spdif_dmamask = DMA_BIT_MASK(32);



struct platform_device s5pv310_device_spdif = {

struct platform_device exynos4_device_spdif = {

	.name = "samsung-spdif",

	.id = -1,

	.num_resources = ARRAY_SIZE(s5pv310_spdif_resource),

	.resource = s5pv310_spdif_resource,

	.num_resources = ARRAY_SIZE(exynos4_spdif_resource),

	.resource = exynos4_spdif_resource,

	.dev = {

		.platform_data = &samsung_spdif_pdata,

		.dma_mask = &s5pv310_spdif_dmamask,

		.dma_mask = &exynos4_spdif_dmamask,

		.coherent_dma_mask = DMA_BIT_MASK(32),

	},

};

arch/arm/mach-s5pv310/dev-pd.c→arch/arm/mach-exynos4/dev-pd.c

+20 −20
Original line number Diff line number Diff line 
/* linux/arch/arm/mach-s5pv310/dev-pd.c

/* linux/arch/arm/mach-exynos4/dev-pd.c

 *

 * Copyright (c) 2010 Samsung Electronics Co., Ltd.

 * Copyright (c) 2010-2011 Samsung Electronics Co., Ltd.

 *		http://www.samsung.com

 *

 * S5PV310 - Power Domain support

 * EXYNOS4 - Power Domain support

 *

 * 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
@@ -19,7 +19,7 @@ 


#include <plat/pd.h>



static int s5pv310_pd_enable(struct device *dev)

static int exynos4_pd_enable(struct device *dev)

{

	struct samsung_pd_info *pdata =  dev->platform_data;

	u32 timeout;
@@ -42,7 +42,7 @@ static int s5pv310_pd_enable(struct device *dev) 
	return 0;

}



static int s5pv310_pd_disable(struct device *dev)

static int exynos4_pd_disable(struct device *dev)

{

	struct samsung_pd_info *pdata =  dev->platform_data;

	u32 timeout;
@@ -64,14 +64,14 @@ static int s5pv310_pd_disable(struct device *dev) 
	return 0;

}



struct platform_device s5pv310_device_pd[] = {

struct platform_device exynos4_device_pd[] = {

	{

		.name		= "samsung-pd",

		.id		= 0,

		.dev = {

			.platform_data = &(struct samsung_pd_info) {

				.enable		= s5pv310_pd_enable,

				.disable	= s5pv310_pd_disable,

				.enable		= exynos4_pd_enable,

				.disable	= exynos4_pd_disable,

				.base		= S5P_PMU_MFC_CONF,

			},

		},
@@ -80,8 +80,8 @@ struct platform_device s5pv310_device_pd[] = { 
		.id		= 1,

		.dev = {

			.platform_data = &(struct samsung_pd_info) {

				.enable		= s5pv310_pd_enable,

				.disable	= s5pv310_pd_disable,

				.enable		= exynos4_pd_enable,

				.disable	= exynos4_pd_disable,

				.base		= S5P_PMU_G3D_CONF,

			},

		},
@@ -90,8 +90,8 @@ struct platform_device s5pv310_device_pd[] = { 
		.id		= 2,

		.dev = {

			.platform_data = &(struct samsung_pd_info) {

				.enable		= s5pv310_pd_enable,

				.disable	= s5pv310_pd_disable,

				.enable		= exynos4_pd_enable,

				.disable	= exynos4_pd_disable,

				.base		= S5P_PMU_LCD0_CONF,

			},

		},
@@ -100,8 +100,8 @@ struct platform_device s5pv310_device_pd[] = { 
		.id		= 3,

		.dev = {

			.platform_data = &(struct samsung_pd_info) {

				.enable		= s5pv310_pd_enable,

				.disable	= s5pv310_pd_disable,

				.enable		= exynos4_pd_enable,

				.disable	= exynos4_pd_disable,

				.base		= S5P_PMU_LCD1_CONF,

			},

		},
@@ -110,8 +110,8 @@ struct platform_device s5pv310_device_pd[] = { 
		.id		= 4,

		.dev = {

			.platform_data = &(struct samsung_pd_info) {

				.enable		= s5pv310_pd_enable,

				.disable	= s5pv310_pd_disable,

				.enable		= exynos4_pd_enable,

				.disable	= exynos4_pd_disable,

				.base		= S5P_PMU_TV_CONF,

			},

		},
@@ -120,8 +120,8 @@ struct platform_device s5pv310_device_pd[] = { 
		.id		= 5,

		.dev = {

			.platform_data = &(struct samsung_pd_info) {

				.enable		= s5pv310_pd_enable,

				.disable	= s5pv310_pd_disable,

				.enable		= exynos4_pd_enable,

				.disable	= exynos4_pd_disable,

				.base		= S5P_PMU_CAM_CONF,

			},

		},
@@ -130,8 +130,8 @@ struct platform_device s5pv310_device_pd[] = { 
		.id		= 6,

		.dev = {

			.platform_data = &(struct samsung_pd_info) {

				.enable		= s5pv310_pd_enable,

				.disable	= s5pv310_pd_disable,

				.enable		= exynos4_pd_enable,

				.disable	= exynos4_pd_disable,

				.base		= S5P_PMU_GPS_CONF,

			},

		},

arch/arm/mach-s5pv310/dev-sysmmu.c→arch/arm/mach-exynos4/dev-sysmmu.c

+40 −38
Original line number Diff line number Diff line 
/* linux/arch/arm/mach-s5pv310/dev-sysmmu.c

/* linux/arch/arm/mach-exynos4/dev-sysmmu.c

 *

 * Copyright (c) 2010 Samsung Electronics Co., Ltd.

 *		http://www.samsung.com

 *

 * EXYNOS4 - System MMU support

 *

 * 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.
@@ -14,10 +16,10 @@ 
#include <mach/map.h>

#include <mach/irqs.h>



static struct resource s5pv310_sysmmu_resource[] = {

static struct resource exynos4_sysmmu_resource[] = {

	[0] = {

		.start	= S5PV310_PA_SYSMMU_MDMA,

		.end	= S5PV310_PA_SYSMMU_MDMA + SZ_64K - 1,

		.start	= EXYNOS4_PA_SYSMMU_MDMA,

		.end	= EXYNOS4_PA_SYSMMU_MDMA + SZ_64K - 1,

		.flags	= IORESOURCE_MEM,

	},

	[1] = {
@@ -26,8 +28,8 @@ static struct resource s5pv310_sysmmu_resource[] = { 
		.flags	= IORESOURCE_IRQ,

	},

	[2] = {

		.start	= S5PV310_PA_SYSMMU_SSS,

		.end	= S5PV310_PA_SYSMMU_SSS + SZ_64K - 1,

		.start	= EXYNOS4_PA_SYSMMU_SSS,

		.end	= EXYNOS4_PA_SYSMMU_SSS + SZ_64K - 1,

		.flags	= IORESOURCE_MEM,

	},

	[3] = {
@@ -36,8 +38,8 @@ static struct resource s5pv310_sysmmu_resource[] = { 
		.flags	= IORESOURCE_IRQ,

	},

	[4] = {

		.start	= S5PV310_PA_SYSMMU_FIMC0,

		.end	= S5PV310_PA_SYSMMU_FIMC0 + SZ_64K - 1,

		.start	= EXYNOS4_PA_SYSMMU_FIMC0,

		.end	= EXYNOS4_PA_SYSMMU_FIMC0 + SZ_64K - 1,

		.flags	= IORESOURCE_MEM,

	},

	[5] = {
@@ -46,8 +48,8 @@ static struct resource s5pv310_sysmmu_resource[] = { 
		.flags	= IORESOURCE_IRQ,

	},

	[6] = {

		.start	= S5PV310_PA_SYSMMU_FIMC1,

		.end	= S5PV310_PA_SYSMMU_FIMC1 + SZ_64K - 1,

		.start	= EXYNOS4_PA_SYSMMU_FIMC1,

		.end	= EXYNOS4_PA_SYSMMU_FIMC1 + SZ_64K - 1,

		.flags	= IORESOURCE_MEM,

	},

	[7] = {
@@ -56,8 +58,8 @@ static struct resource s5pv310_sysmmu_resource[] = { 
		.flags	= IORESOURCE_IRQ,

	},

	[8] = {

		.start	= S5PV310_PA_SYSMMU_FIMC2,

		.end	= S5PV310_PA_SYSMMU_FIMC2 + SZ_64K - 1,

		.start	= EXYNOS4_PA_SYSMMU_FIMC2,

		.end	= EXYNOS4_PA_SYSMMU_FIMC2 + SZ_64K - 1,

		.flags	= IORESOURCE_MEM,

	},

	[9] = {
@@ -66,8 +68,8 @@ static struct resource s5pv310_sysmmu_resource[] = { 
		.flags	= IORESOURCE_IRQ,

	},

	[10] = {

		.start	= S5PV310_PA_SYSMMU_FIMC3,

		.end	= S5PV310_PA_SYSMMU_FIMC3 + SZ_64K - 1,

		.start	= EXYNOS4_PA_SYSMMU_FIMC3,

		.end	= EXYNOS4_PA_SYSMMU_FIMC3 + SZ_64K - 1,

		.flags	= IORESOURCE_MEM,

	},

	[11] = {
@@ -76,8 +78,8 @@ static struct resource s5pv310_sysmmu_resource[] = { 
		.flags	= IORESOURCE_IRQ,

	},

	[12] = {

		.start	= S5PV310_PA_SYSMMU_JPEG,

		.end	= S5PV310_PA_SYSMMU_JPEG + SZ_64K - 1,

		.start	= EXYNOS4_PA_SYSMMU_JPEG,

		.end	= EXYNOS4_PA_SYSMMU_JPEG + SZ_64K - 1,

		.flags	= IORESOURCE_MEM,

	},

	[13] = {
@@ -86,8 +88,8 @@ static struct resource s5pv310_sysmmu_resource[] = { 
		.flags	= IORESOURCE_IRQ,

	},

	[14] = {

		.start	= S5PV310_PA_SYSMMU_FIMD0,

		.end	= S5PV310_PA_SYSMMU_FIMD0 + SZ_64K - 1,

		.start	= EXYNOS4_PA_SYSMMU_FIMD0,

		.end	= EXYNOS4_PA_SYSMMU_FIMD0 + SZ_64K - 1,

		.flags	= IORESOURCE_MEM,

	},

	[15] = {
@@ -96,8 +98,8 @@ static struct resource s5pv310_sysmmu_resource[] = { 
		.flags	= IORESOURCE_IRQ,

	},

	[16] = {

		.start	= S5PV310_PA_SYSMMU_FIMD1,

		.end	= S5PV310_PA_SYSMMU_FIMD1 + SZ_64K - 1,

		.start	= EXYNOS4_PA_SYSMMU_FIMD1,

		.end	= EXYNOS4_PA_SYSMMU_FIMD1 + SZ_64K - 1,

		.flags	= IORESOURCE_MEM,

	},

	[17] = {
@@ -106,8 +108,8 @@ static struct resource s5pv310_sysmmu_resource[] = { 
		.flags	= IORESOURCE_IRQ,

	},

	[18] = {

		.start	= S5PV310_PA_SYSMMU_PCIe,

		.end	= S5PV310_PA_SYSMMU_PCIe + SZ_64K - 1,

		.start	= EXYNOS4_PA_SYSMMU_PCIe,

		.end	= EXYNOS4_PA_SYSMMU_PCIe + SZ_64K - 1,

		.flags	= IORESOURCE_MEM,

	},

	[19] = {
@@ -116,8 +118,8 @@ static struct resource s5pv310_sysmmu_resource[] = { 
		.flags	= IORESOURCE_IRQ,

	},

	[20] = {

		.start	= S5PV310_PA_SYSMMU_G2D,

		.end	= S5PV310_PA_SYSMMU_G2D + SZ_64K - 1,

		.start	= EXYNOS4_PA_SYSMMU_G2D,

		.end	= EXYNOS4_PA_SYSMMU_G2D + SZ_64K - 1,

		.flags	= IORESOURCE_MEM,

	},

	[21] = {
@@ -126,8 +128,8 @@ static struct resource s5pv310_sysmmu_resource[] = { 
		.flags	= IORESOURCE_IRQ,

	},

	[22] = {

		.start	= S5PV310_PA_SYSMMU_ROTATOR,

		.end	= S5PV310_PA_SYSMMU_ROTATOR + SZ_64K - 1,

		.start	= EXYNOS4_PA_SYSMMU_ROTATOR,

		.end	= EXYNOS4_PA_SYSMMU_ROTATOR + SZ_64K - 1,

		.flags	= IORESOURCE_MEM,

	},

	[23] = {
@@ -136,8 +138,8 @@ static struct resource s5pv310_sysmmu_resource[] = { 
		.flags	= IORESOURCE_IRQ,

	},

	[24] = {

		.start	= S5PV310_PA_SYSMMU_MDMA2,

		.end	= S5PV310_PA_SYSMMU_MDMA2 + SZ_64K - 1,

		.start	= EXYNOS4_PA_SYSMMU_MDMA2,

		.end	= EXYNOS4_PA_SYSMMU_MDMA2 + SZ_64K - 1,

		.flags	= IORESOURCE_MEM,

	},

	[25] = {
@@ -146,8 +148,8 @@ static struct resource s5pv310_sysmmu_resource[] = { 
		.flags	= IORESOURCE_IRQ,

	},

	[26] = {

		.start	= S5PV310_PA_SYSMMU_TV,

		.end	= S5PV310_PA_SYSMMU_TV + SZ_64K - 1,

		.start	= EXYNOS4_PA_SYSMMU_TV,

		.end	= EXYNOS4_PA_SYSMMU_TV + SZ_64K - 1,

		.flags	= IORESOURCE_MEM,

	},

	[27] = {
@@ -156,8 +158,8 @@ static struct resource s5pv310_sysmmu_resource[] = { 
		.flags	= IORESOURCE_IRQ,

	},

	[28] = {

		.start	= S5PV310_PA_SYSMMU_MFC_L,

		.end	= S5PV310_PA_SYSMMU_MFC_L + SZ_64K - 1,

		.start	= EXYNOS4_PA_SYSMMU_MFC_L,

		.end	= EXYNOS4_PA_SYSMMU_MFC_L + SZ_64K - 1,

		.flags	= IORESOURCE_MEM,

	},

	[29] = {
@@ -166,8 +168,8 @@ static struct resource s5pv310_sysmmu_resource[] = { 
		.flags	= IORESOURCE_IRQ,

	},

	[30] = {

		.start	= S5PV310_PA_SYSMMU_MFC_R,

		.end	= S5PV310_PA_SYSMMU_MFC_R + SZ_64K - 1,

		.start	= EXYNOS4_PA_SYSMMU_MFC_R,

		.end	= EXYNOS4_PA_SYSMMU_MFC_R + SZ_64K - 1,

		.flags	= IORESOURCE_MEM,

	},

	[31] = {
@@ -177,11 +179,11 @@ static struct resource s5pv310_sysmmu_resource[] = { 
	},

};



struct platform_device s5pv310_device_sysmmu = {

struct platform_device exynos4_device_sysmmu = {

	.name		= "s5p-sysmmu",

	.id		= 32,

	.num_resources	= ARRAY_SIZE(s5pv310_sysmmu_resource),

	.resource	= s5pv310_sysmmu_resource,

	.num_resources	= ARRAY_SIZE(exynos4_sysmmu_resource),

	.resource	= exynos4_sysmmu_resource,

};



EXPORT_SYMBOL(s5pv310_device_sysmmu);
 
EXPORT_SYMBOL(exynos4_device_sysmmu);

arch/arm/mach-s5pv310/setup-i2c1.c→arch/arm/mach-exynos4/setup-i2c1.c

+2 −2
Original line number Diff line number Diff line 
/*

 * linux/arch/arm/mach-s5pv310/setup-i2c1.c

 * linux/arch/arm/mach-exynos4/setup-i2c1.c

 *

 * Copyright (C) 2010 Samsung Electronics Co., Ltd.

 *
@@ -18,6 +18,6 @@ struct platform_device; /* don't need the contents */ 


void s3c_i2c1_cfg_gpio(struct platform_device *dev)

{

	s3c_gpio_cfgall_range(S5PV310_GPD1(2), 2,

	s3c_gpio_cfgall_range(EXYNOS4_GPD1(2), 2,

			      S3C_GPIO_SFN(2), S3C_GPIO_PULL_UP);

}

arch/arm/mach-s5pv310/setup-i2c2.c→arch/arm/mach-exynos4/setup-i2c2.c

+2 −2
Original line number Diff line number Diff line 
/*

 * linux/arch/arm/mach-s5pv310/setup-i2c2.c

 * linux/arch/arm/mach-exynos4/setup-i2c2.c

 *

 * Copyright (c) 2009-2010 Samsung Electronics Co., Ltd.

 *
@@ -18,6 +18,6 @@ struct platform_device; /* don't need the contents */ 


void s3c_i2c2_cfg_gpio(struct platform_device *dev)

{

	s3c_gpio_cfgall_range(S5PV310_GPA0(6), 2,

	s3c_gpio_cfgall_range(EXYNOS4_GPA0(6), 2,

			      S3C_GPIO_SFN(3), S3C_GPIO_PULL_UP);

}