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

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

ARM: S5P: To merge devs.c files to one devs.c 



This patch moves regarding s5p dev files to one devs.c file
in plat-samsung directory and this help to keep it more
easily.

Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent 0523ec3a

arch/arm/mach-exynos4/include/mach/i2c-hdmiphy.h

deleted100644 → 0
+0 −16
Original line number Diff line number Diff line 
/*

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

 *

 * S5P series i2c hdmiphy helper definitions

 *

 * 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.

 */



#ifndef PLAT_S5P_I2C_HDMIPHY_H_

#define PLAT_S5P_I2C_HDMIPHY_H_



#define S5P_I2C_HDMIPHY_BUS_NUM		(8)



#endif

arch/arm/mach-s5pv210/include/mach/i2c-hdmiphy.h

deleted100644 → 0
+0 −16
Original line number Diff line number Diff line 
/*

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

 *

 * S5P series i2c hdmiphy helper definitions

 *

 * 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.

 */



#ifndef PLAT_S5P_I2C_HDMIPHY_H_

#define PLAT_S5P_I2C_HDMIPHY_H_



#define S5P_I2C_HDMIPHY_BUS_NUM		(3)



#endif

arch/arm/plat-s5p/Makefile

+0 −12
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ obj- := 


# Core files



obj-y				+= dev-pmu.o

obj-y				+= dev-uart.o

obj-y				+= cpu.o

obj-y				+= clock.o
@@ -26,15 +25,4 @@ obj-$(CONFIG_S5P_HRT) += s5p-time.o 


# devices

obj-$(CONFIG_S5P_DEV_MFC)	+= dev-mfc.o

obj-$(CONFIG_S5P_DEV_FIMC0)	+= dev-fimc0.o

obj-$(CONFIG_S5P_DEV_FIMC1)	+= dev-fimc1.o

obj-$(CONFIG_S5P_DEV_FIMC2)	+= dev-fimc2.o

obj-$(CONFIG_S5P_DEV_FIMC3)	+= dev-fimc3.o

obj-$(CONFIG_S5P_DEV_FIMD0)	+= dev-fimd0.o

obj-$(CONFIG_S5P_DEV_I2C_HDMIPHY) += dev-i2c-hdmiphy.o

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

obj-$(CONFIG_S5P_DEV_CSIS0)	+= dev-csis0.o

obj-$(CONFIG_S5P_DEV_CSIS1)	+= dev-csis1.o

obj-$(CONFIG_S5P_DEV_TV)	+= dev-tv.o

obj-$(CONFIG_S5P_DEV_USB_EHCI)	+= dev-ehci.o

obj-$(CONFIG_S5P_SETUP_MIPIPHY)	+= setup-mipiphy.o

arch/arm/plat-s5p/dev-csis0.c

deleted100644 → 0
+0 −34
Original line number Diff line number Diff line 
/*

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

 *

 * S5P series device definition for MIPI-CSIS channel 0

 *

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

#include <linux/platform_device.h>

#include <mach/map.h>



static struct resource s5p_mipi_csis0_resource[] = {

	[0] = {

		.start = S5P_PA_MIPI_CSIS0,

		.end   = S5P_PA_MIPI_CSIS0 + SZ_4K - 1,

		.flags = IORESOURCE_MEM,

	},

	[1] = {

		.start = IRQ_MIPI_CSIS0,

		.end   = IRQ_MIPI_CSIS0,

		.flags = IORESOURCE_IRQ,

	}

};



struct platform_device s5p_device_mipi_csis0 = {

	.name		  = "s5p-mipi-csis",

	.id		  = 0,

	.num_resources	  = ARRAY_SIZE(s5p_mipi_csis0_resource),

	.resource	  = s5p_mipi_csis0_resource,

};

arch/arm/plat-s5p/dev-csis1.c

deleted100644 → 0
+0 −34
Original line number Diff line number Diff line 
/*

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

 *

 * S5P series device definition for MIPI-CSIS channel 1

 *

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

#include <linux/platform_device.h>

#include <mach/map.h>



static struct resource s5p_mipi_csis1_resource[] = {

	[0] = {

		.start = S5P_PA_MIPI_CSIS1,

		.end   = S5P_PA_MIPI_CSIS1 + SZ_4K - 1,

		.flags = IORESOURCE_MEM,

	},

	[1] = {

		.start = IRQ_MIPI_CSIS1,

		.end   = IRQ_MIPI_CSIS1,

		.flags = IORESOURCE_IRQ,

	},

};



struct platform_device s5p_device_mipi_csis1 = {

	.name		  = "s5p-mipi-csis",

	.id		  = 1,

	.num_resources	  = ARRAY_SIZE(s5p_mipi_csis1_resource),

	.resource	  = s5p_mipi_csis1_resource,

};