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

Commit bad1e6aa authored by Kukjin Kim's avatar Kukjin Kim
Browse files

ARM: SAMSUNG: Cleanup plat-samsung/devs.c and devs.h 



This patch merges each dev files to one devs.c file in
plat-samsung directory and this help to keep it more
easily to reduce plat- directories such as plat-s3c24xx
and plat-s5p.

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

arch/arm/plat-samsung/Makefile

+1 −27
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ obj-y += init.o cpu.o 
obj-$(CONFIG_ARCH_USES_GETTIMEOFFSET)   += time.o

obj-y				+= clock.o

obj-y				+= pwm-clock.o

obj-y				+= dev-asocdma.o



obj-$(CONFIG_SAMSUNG_CLKSRC)	+= clock-clksrc.o
@@ -31,33 +30,8 @@ obj-$(CONFIG_S3C_ADC) += adc.o 
obj-y				+= platformdata.o



obj-y				+= devs.o

obj-$(CONFIG_S3C_DEV_HSMMC)	+= dev-hsmmc.o

obj-$(CONFIG_S3C_DEV_HSMMC1)	+= dev-hsmmc1.o

obj-$(CONFIG_S3C_DEV_HSMMC2)	+= dev-hsmmc2.o

obj-$(CONFIG_S3C_DEV_HSMMC3)	+= dev-hsmmc3.o

obj-$(CONFIG_S3C_DEV_HWMON)	+= dev-hwmon.o

obj-y				+= dev-i2c0.o

obj-$(CONFIG_S3C_DEV_I2C1)	+= dev-i2c1.o

obj-$(CONFIG_S3C_DEV_I2C2)	+= dev-i2c2.o

obj-$(CONFIG_S3C_DEV_I2C3)	+= dev-i2c3.o

obj-$(CONFIG_S3C_DEV_I2C4)	+= dev-i2c4.o

obj-$(CONFIG_S3C_DEV_I2C5)	+= dev-i2c5.o

obj-$(CONFIG_S3C_DEV_I2C6)	+= dev-i2c6.o

obj-$(CONFIG_S3C_DEV_I2C7)	+= dev-i2c7.o

obj-$(CONFIG_S3C_DEV_FB)	+= dev-fb.o

obj-y				+= dev-uart.o

obj-$(CONFIG_S3C_DEV_USB_HOST)	+= dev-usb.o

obj-$(CONFIG_S3C_DEV_USB_HSOTG)	+= dev-usb-hsotg.o

obj-$(CONFIG_S3C_DEV_WDT)	+= dev-wdt.o

obj-$(CONFIG_S3C_DEV_NAND)	+= dev-nand.o

obj-$(CONFIG_S3C_DEV_ONENAND)	+= dev-onenand.o

obj-$(CONFIG_S3C_DEV_RTC)	+= dev-rtc.o



obj-$(CONFIG_SAMSUNG_DEV_ADC)	+= dev-adc.o

obj-$(CONFIG_SAMSUNG_DEV_IDE)	+= dev-ide.o

obj-$(CONFIG_SAMSUNG_DEV_TS)	+= dev-ts.o

obj-$(CONFIG_SAMSUNG_DEV_KEYPAD)	+= dev-keypad.o

obj-$(CONFIG_SAMSUNG_DEV_PWM)	+= dev-pwm.o



obj-$(CONFIG_SAMSUNG_DEV_BACKLIGHT)	+= dev-backlight.o



# DMA support

arch/arm/plat-samsung/dev-adc.c

deleted100644 → 0
+0 −46
Original line number Diff line number Diff line 
/* linux/arch/arm/plat-samsung/dev-adc.c

 *

 * Copyright 2010 Maurus Cuelenaere

 *

 * S3C64xx series device definition for ADC device

 *

 * 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/kernel.h>

#include <linux/string.h>

#include <linux/platform_device.h>



#include <mach/irqs.h>

#include <mach/map.h>



#include <plat/adc.h>

#include <plat/devs.h>

#include <plat/cpu.h>



static struct resource s3c_adc_resource[] = {

	[0] = {

		.start = SAMSUNG_PA_ADC,

		.end   = SAMSUNG_PA_ADC + SZ_256 - 1,

		.flags = IORESOURCE_MEM,

	},

	[1] = {

		.start = IRQ_TC,

		.end   = IRQ_TC,

		.flags = IORESOURCE_IRQ,

	},

	[2] = {

		.start = IRQ_ADC,

		.end   = IRQ_ADC,

		.flags = IORESOURCE_IRQ,

	},

};



struct platform_device s3c_device_adc = {

	.name		= "samsung-adc",

	.id		= -1,

	.num_resources	= ARRAY_SIZE(s3c_adc_resource),

	.resource	= s3c_adc_resource,

};

arch/arm/plat-samsung/dev-asocdma.c

deleted100644 → 0
+0 −35
Original line number Diff line number Diff line 
/* linux/arch/arm/plat-samsung/dev-asocdma.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/devs.h>



static u64 audio_dmamask = DMA_BIT_MASK(32);



struct platform_device samsung_asoc_dma = {

	.name		  = "samsung-audio",

	.id		  = -1,

	.dev              = {

		.dma_mask = &audio_dmamask,

		.coherent_dma_mask = DMA_BIT_MASK(32),

	}

};

EXPORT_SYMBOL(samsung_asoc_dma);



struct platform_device samsung_asoc_idma = {

	.name		= "samsung-idma",

	.id		= -1,

	.dev		= {

		.dma_mask		= &audio_dmamask,

		.coherent_dma_mask	= DMA_BIT_MASK(32),

	}

};

EXPORT_SYMBOL(samsung_asoc_idma);

arch/arm/plat-samsung/dev-fb.c

deleted100644 → 0
+0 −63
Original line number Diff line number Diff line 
/* linux/arch/arm/plat-s3c/dev-fb.c

 *

 * Copyright 2008 Simtec Electronics

 *	Ben Dooks <ben@simtec.co.uk>

 *	http://armlinux.simtec.co.uk/

 *

 * S3C series device definition for framebuffer device

 *

 * 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/kernel.h>

#include <linux/string.h>

#include <linux/platform_device.h>

#include <linux/fb.h>

#include <linux/gfp.h>



#include <mach/irqs.h>

#include <mach/map.h>



#include <plat/fb.h>

#include <plat/devs.h>

#include <plat/cpu.h>



static struct resource s3c_fb_resource[] = {

	[0] = {

		.start = S3C_PA_FB,

		.end   = S3C_PA_FB + SZ_16K - 1,

		.flags = IORESOURCE_MEM,

	},

	[1] = {

		.start = IRQ_LCD_VSYNC,

		.end   = IRQ_LCD_VSYNC,

		.flags = IORESOURCE_IRQ,

	},

	[2] = {

		.start = IRQ_LCD_FIFO,

		.end   = IRQ_LCD_FIFO,

		.flags = IORESOURCE_IRQ,

	},

	[3] = {

		.start = IRQ_LCD_SYSTEM,

		.end   = IRQ_LCD_SYSTEM,

		.flags = IORESOURCE_IRQ,

	},

};



struct platform_device s3c_device_fb = {

	.name		  = "s3c-fb",

	.id		  = -1,

	.num_resources	  = ARRAY_SIZE(s3c_fb_resource),

	.resource	  = s3c_fb_resource,

	.dev.dma_mask	  = &s3c_device_fb.dev.coherent_dma_mask,

	.dev.coherent_dma_mask = 0xffffffffUL,

};



void __init s3c_fb_set_platdata(struct s3c_fb_platdata *pd)

{

	s3c_set_platdata(pd, sizeof(struct s3c_fb_platdata),

			 &s3c_device_fb);

}

arch/arm/plat-samsung/dev-hsmmc.c

deleted100644 → 0
+0 −62
Original line number Diff line number Diff line 
/* linux/arch/arm/plat-s3c/dev-hsmmc.c

 *

 * Copyright (c) 2008 Simtec Electronics

 *	Ben Dooks <ben@simtec.co.uk>

 *	http://armlinux.simtec.co.uk/

 *

 * S3C series device definition for hsmmc devices

 *

 * 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/kernel.h>

#include <linux/platform_device.h>

#include <linux/mmc/host.h>



#include <mach/map.h>

#include <plat/sdhci.h>

#include <plat/devs.h>

#include <plat/cpu.h>



#define S3C_SZ_HSMMC	(0x1000)



static struct resource s3c_hsmmc_resource[] = {

	[0] = {

		.start = S3C_PA_HSMMC0,

		.end   = S3C_PA_HSMMC0 + S3C_SZ_HSMMC - 1,

		.flags = IORESOURCE_MEM,

	},

	[1] = {

		.start = IRQ_HSMMC0,

		.end   = IRQ_HSMMC0,

		.flags = IORESOURCE_IRQ,

	}

};



static u64 s3c_device_hsmmc_dmamask = 0xffffffffUL;



struct s3c_sdhci_platdata s3c_hsmmc0_def_platdata = {

	.max_width	= 4,

	.host_caps	= (MMC_CAP_4_BIT_DATA |

			   MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED),

	.clk_type	= S3C_SDHCI_CLK_DIV_INTERNAL,

};



struct platform_device s3c_device_hsmmc0 = {

	.name		= "s3c-sdhci",

	.id		= 0,

	.num_resources	= ARRAY_SIZE(s3c_hsmmc_resource),

	.resource	= s3c_hsmmc_resource,

	.dev		= {

		.dma_mask		= &s3c_device_hsmmc_dmamask,

		.coherent_dma_mask	= 0xffffffffUL,

		.platform_data		= &s3c_hsmmc0_def_platdata,

	},

};



void s3c_sdhci0_set_platdata(struct s3c_sdhci_platdata *pd)

{

	s3c_sdhci_set_platdata(pd, &s3c_hsmmc0_def_platdata);

}