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

Commit adc0950c authored May 18, 2010 by Atul Dahiya Committed by Ben Dooks May 18, 2010

ARM: SAMSUNG: Move RTC device definitions in plat-samsung



This patch moves RTC device definitions from mach-s3c64xx
to plat-samsung, to enable the other SoCs to use same device
definition.

Signed-off-by: Atul Dahiya <atul.dahiya@samsung.com>
Signed-off-by: Sangbeom Kim <sbkim73@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>

parent 7ebd4675

arch/arm/mach-s3c64xx/Makefile

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -56,7 +56,6 @@ obj-$(CONFIG_MACH_HMT) += mach-hmt.o
	# device support		# device support

	obj-y += dev-uart.o		obj-y += dev-uart.o
	obj-y += dev-rtc.o
	obj-y += dev-audio.o		obj-y += dev-audio.o
	obj-$(CONFIG_S3C_ADC) += dev-adc.o		obj-$(CONFIG_S3C_ADC) += dev-adc.o
	obj-$(CONFIG_S3C64XX_DEV_SPI) += dev-spi.o		obj-$(CONFIG_S3C64XX_DEV_SPI) += dev-spi.o

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

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -103,5 +103,6 @@
	#define S3C_PA_USBHOST S3C64XX_PA_USBHOST		#define S3C_PA_USBHOST S3C64XX_PA_USBHOST
	#define S3C_PA_USB_HSOTG S3C64XX_PA_USB_HSOTG		#define S3C_PA_USB_HSOTG S3C64XX_PA_USB_HSOTG
	#define S3C_VA_USB_HSPHY S3C64XX_VA_USB_HSPHY		#define S3C_VA_USB_HSPHY S3C64XX_VA_USB_HSPHY
			#define S3C_PA_RTC S3C64XX_PA_RTC

	#endif /* __ASM_ARCH_6400_MAP_H */		#endif /* __ASM_ARCH_6400_MAP_H */

arch/arm/plat-samsung/Kconfig

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -185,6 +185,11 @@ config S3C_DEV_NAND
	help		help
	Compile in platform device definition for NAND controller		Compile in platform device definition for NAND controller

			config S3C_DEV_RTC
			bool
			help
			Complie in platform device definition for RTC

	config S3C64XX_DEV_SPI		config S3C64XX_DEV_SPI
	bool		bool
	help		help

arch/arm/plat-samsung/Makefile

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -40,6 +40,7 @@ obj-y += dev-uart.o
	obj-$(CONFIG_S3C_DEV_USB_HOST) += dev-usb.o		obj-$(CONFIG_S3C_DEV_USB_HOST) += dev-usb.o
	obj-$(CONFIG_S3C_DEV_USB_HSOTG) += dev-usb-hsotg.o		obj-$(CONFIG_S3C_DEV_USB_HSOTG) += dev-usb-hsotg.o
	obj-$(CONFIG_S3C_DEV_NAND) += dev-nand.o		obj-$(CONFIG_S3C_DEV_NAND) += dev-nand.o
			obj-$(CONFIG_S3C_DEV_RTC) += dev-rtc.o

	# DMA support		# DMA support

arch/arm/mach-s3c64xx/dev-rtc.c→arch/arm/plat-samsung/dev-rtc.c

+14 −14

Original line number	Original line	Diff line number	Diff line
	/* linux/arch/arm/plat-s3c64xx/dev-rtc.c		/* linux/arch/arm/plat-samsung/dev-rtc.c
	*		*
	* Copyright 2009 by Maurus Cuelenaere <mcuelenaere@gmail.com>		* Copyright 2009 by Maurus Cuelenaere <mcuelenaere@gmail.com>
	*		*
	@@ -18,8 +18,8 @@

	static struct resource s3c_rtc_resource[] = {		static struct resource s3c_rtc_resource[] = {
	[0] = {		[0] = {
	.start = S3C64XX_PA_RTC,		.start = S3C_PA_RTC,
	.end = S3C64XX_PA_RTC + 0xff,		.end = S3C_PA_RTC + 0xff,
	.flags = IORESOURCE_MEM,		.flags = IORESOURCE_MEM,
	},		},
	[1] = {		[1] = {