Skip to contentSkip to conversation

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

PATCH New Kukjin Kim 3 participants 6 messages May 18, 2010 – May 19, 2010

Subsystems (3)
lore
Share & tools
lore

Kukjin Kim

author
#0 lore raw

PATCH 1/8 ARM: SAMSUNG: Move RTC device definitions in plat-samsung

From: Atul Dahiya <[email protected]>

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

---
 arch/arm/mach-s3c64xx/Makefile                    |    1 -
 arch/arm/mach-s3c64xx/include/mach/map.h          |    1 +
 arch/arm/plat-samsung/Kconfig                     |    5 +++
 arch/arm/plat-samsung/Makefile                    |    1 +
 arch/arm/{mach-s3c64xx => plat-samsung}/dev-rtc.c |   28 ++++++++++----------
 5 files changed, 21 insertions(+), 15 deletions(-)
 rename arch/arm/{mach-s3c64xx => plat-samsung}/dev-rtc.c (58%)
arch/arm/mach-s3c64xx/Makefile +0 -1
index a690a9d..e7ac812 100644
@@ -56,7 +56,6 @@ obj-$(CONFIG_MACH_HMT)		+= mach-hmt.o
 # device support
 
 obj-y				+= dev-uart.o
-obj-y				+= dev-rtc.o
 obj-y				+= dev-audio.o
 obj-$(CONFIG_S3C_ADC)		+= dev-adc.o
 obj-$(CONFIG_S3C64XX_DEV_SPI)	+= dev-spi.o
arch/arm/mach-s3c64xx/include/mach/map.h +1 -0
index 801c1c0..cce28a9 100644
@@ -103,5 +103,6 @@
 #define S3C_PA_USBHOST		S3C64XX_PA_USBHOST
 #define S3C_PA_USB_HSOTG	S3C64XX_PA_USB_HSOTG
 #define S3C_VA_USB_HSPHY	S3C64XX_VA_USB_HSPHY
+#define S3C_PA_RTC		S3C64XX_PA_RTC
 
 #endif /* __ASM_ARCH_6400_MAP_H */
arch/arm/plat-samsung/Kconfig +5 -0
index 287e6f7..29e2800 100644
@@ -190,6 +190,11 @@ config S3C_DEV_NAND
 	help
 	  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
 	bool
 	help
arch/arm/plat-samsung/Makefile +1 -0
index 0ad820a..af17434 100644
@@ -41,6 +41,7 @@ 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_NAND)	+= dev-nand.o
+obj-$(CONFIG_S3C_DEV_RTC)	+= dev-rtc.o
 
 # DMA support
 
arch/arm/plat-samsung/dev-rtc.c renamed from arch/arm/mach-s3c64xx/dev-rtc.c +14 -14
similarity index 58%
rename from arch/arm/mach-s3c64xx/dev-rtc.c
rename to arch/arm/plat-samsung/dev-rtc.c
index b9e7a05..bf4e226 100644
@@ -1,4 +1,4 @@
-/* linux/arch/arm/plat-s3c64xx/dev-rtc.c
+/* linux/arch/arm/plat-samsung/dev-rtc.c
  *
  * Copyright 2009 by Maurus Cuelenaere <[email protected]>
  *
@@ -18,26 +18,26 @@
 
 static struct resource s3c_rtc_resource[] = {
 	[0] = {
-		.start = S3C64XX_PA_RTC,
-		.end   = S3C64XX_PA_RTC + 0xff,
-		.flags = IORESOURCE_MEM,
+		.start	= S3C_PA_RTC,
+		.end	= S3C_PA_RTC + 0xff,
+		.flags	= IORESOURCE_MEM,
 	},
 	[1] = {
-		.start = IRQ_RTC_ALARM,
-		.end   = IRQ_RTC_ALARM,
-		.flags = IORESOURCE_IRQ,
+		.start	= IRQ_RTC_ALARM,
+		.end	= IRQ_RTC_ALARM,
+		.flags	= IORESOURCE_IRQ,
 	},
 	[2] = {
-		.start = IRQ_RTC_TIC,
-		.end   = IRQ_RTC_TIC,
-		.flags = IORESOURCE_IRQ
+		.start	= IRQ_RTC_TIC,
+		.end	= IRQ_RTC_TIC,
+		.flags	= IORESOURCE_IRQ
 	}
 };
 
 struct platform_device s3c_device_rtc = {
-	.name		  = "s3c64xx-rtc",
-	.id		  = -1,
-	.num_resources	  = ARRAY_SIZE(s3c_rtc_resource),
-	.resource	  = s3c_rtc_resource,
+	.name		= "s3c64xx-rtc",
+	.id		= -1,
+	.num_resources	= ARRAY_SIZE(s3c_rtc_resource),
+	.resource	= s3c_rtc_resource,
 };
 EXPORT_SYMBOL(s3c_device_rtc);
Signature · 1 line
1.6.2.5
#1 lore raw

PATCH 1/8 ARM: SAMSUNG: Move RTC device definitions in plat-samsung

Quoted 9 lines · Kukjin Kim

From: Atul Dahiya <[email protected]>

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

ok, will apply to a branch.

Quoted 120 lines
---
 arch/arm/mach-s3c64xx/Makefile                    |    1 -
 arch/arm/mach-s3c64xx/include/mach/map.h          |    1 +
 arch/arm/plat-samsung/Kconfig                     |    5 +++
 arch/arm/plat-samsung/Makefile                    |    1 +
 arch/arm/{mach-s3c64xx => plat-samsung}/dev-rtc.c |   28 ++++++++++----------
 5 files changed, 21 insertions(+), 15 deletions(-)
 rename arch/arm/{mach-s3c64xx => plat-samsung}/dev-rtc.c (58%)
arch/arm/mach-s3c64xx/Makefile +0 -1
index a690a9d..e7ac812 100644
@@ -56,7 +56,6 @@ obj-$(CONFIG_MACH_HMT)		+= mach-hmt.o
 # device support
 
 obj-y				+= dev-uart.o
-obj-y				+= dev-rtc.o
 obj-y				+= dev-audio.o
 obj-$(CONFIG_S3C_ADC)		+= dev-adc.o
 obj-$(CONFIG_S3C64XX_DEV_SPI)	+= dev-spi.o
arch/arm/mach-s3c64xx/include/mach/map.h +1 -0
index 801c1c0..cce28a9 100644
@@ -103,5 +103,6 @@
 #define S3C_PA_USBHOST		S3C64XX_PA_USBHOST
 #define S3C_PA_USB_HSOTG	S3C64XX_PA_USB_HSOTG
 #define S3C_VA_USB_HSPHY	S3C64XX_VA_USB_HSPHY
+#define S3C_PA_RTC		S3C64XX_PA_RTC
 
 #endif /* __ASM_ARCH_6400_MAP_H */
arch/arm/plat-samsung/Kconfig +5 -0
index 287e6f7..29e2800 100644
@@ -190,6 +190,11 @@ config S3C_DEV_NAND
 	help
 	  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
 	bool
 	help
arch/arm/plat-samsung/Makefile +1 -0
index 0ad820a..af17434 100644
@@ -41,6 +41,7 @@ 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_NAND)	+= dev-nand.o
+obj-$(CONFIG_S3C_DEV_RTC)	+= dev-rtc.o
 
 # DMA support
 
arch/arm/plat-samsung/dev-rtc.c renamed from arch/arm/mach-s3c64xx/dev-rtc.c +14 -14
similarity index 58%
rename from arch/arm/mach-s3c64xx/dev-rtc.c
rename to arch/arm/plat-samsung/dev-rtc.c
index b9e7a05..bf4e226 100644
@@ -1,4 +1,4 @@
-/* linux/arch/arm/plat-s3c64xx/dev-rtc.c
+/* linux/arch/arm/plat-samsung/dev-rtc.c
  *
  * Copyright 2009 by Maurus Cuelenaere <[email protected]>
  *
@@ -18,26 +18,26 @@
 
 static struct resource s3c_rtc_resource[] = {
 	[0] = {
-		.start = S3C64XX_PA_RTC,
-		.end   = S3C64XX_PA_RTC + 0xff,
-		.flags = IORESOURCE_MEM,
+		.start	= S3C_PA_RTC,
+		.end	= S3C_PA_RTC + 0xff,
+		.flags	= IORESOURCE_MEM,
 	},
 	[1] = {
-		.start = IRQ_RTC_ALARM,
-		.end   = IRQ_RTC_ALARM,
-		.flags = IORESOURCE_IRQ,
+		.start	= IRQ_RTC_ALARM,
+		.end	= IRQ_RTC_ALARM,
+		.flags	= IORESOURCE_IRQ,
 	},
 	[2] = {
-		.start = IRQ_RTC_TIC,
-		.end   = IRQ_RTC_TIC,
-		.flags = IORESOURCE_IRQ
+		.start	= IRQ_RTC_TIC,
+		.end	= IRQ_RTC_TIC,
+		.flags	= IORESOURCE_IRQ
 	}
 };
 
 struct platform_device s3c_device_rtc = {
-	.name		  = "s3c64xx-rtc",
-	.id		  = -1,
-	.num_resources	  = ARRAY_SIZE(s3c_rtc_resource),
-	.resource	  = s3c_rtc_resource,
+	.name		= "s3c64xx-rtc",
+	.id		= -1,
+	.num_resources	= ARRAY_SIZE(s3c_rtc_resource),
+	.resource	= s3c_rtc_resource,
 };
 EXPORT_SYMBOL(s3c_device_rtc);
Signature · 6 lines
1.6.2.5

--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Signature · 5 lines
-- 
Ben

Q:      What's a light-year?
A:      One-third less calories than a regular year.
#2 lore raw

PATCH 1/8 ARM: SAMSUNG: Move RTC device definitions in plat-samsung

In reply to Kukjin Kim

On Tue, May 18, 2010 at 02:58:56PM +0900, Kukjin Kim wrote:

[snip]

it would be really helpful if you composed a covering message for patch series so that any general comments can be attached there... also it means the series doesn't end up getting fragmeneted in my mailbox.

Signature · 1 line
Ben
#3 lore raw

PATCH 1/8 ARM: SAMSUNG: Move RTC device definitions in plat-samsung

Quoted 4 lines · Ben Dooks

it would be really helpful if you composed a covering message for patch series so that any general comments can be attached there... also it means the series doesn't end up getting fragmeneted in my mailbox.

There's more going on here - none of the messages are threaded with each other, which git send-mail does by default even if there isn't a cover letter.

#4 lore raw

PATCH 1/8 ARM: SAMSUNG: Move RTC device definitions in plat-samsung

Quoted 10 lines · Mark Brown
Quoted 4 lines · Ben Dooks

it would be really helpful if you composed a covering message for patch series so that any general comments can be attached there... also it means the series doesn't end up getting fragmeneted in my mailbox.

There's more going on here - none of the messages are threaded with each other, which git send-mail does by default even if there isn't a cover letter.

git send-email has a --no-thread option as well, so if possible it would be really helpful to ensure that this isn't set either...

Signature · 4 lines
Ben

Q:      What's a light-year?
A:      One-third less calories than a regular year.
#5 lore raw

PATCH 1/8 ARM: SAMSUNG: Move RTC device definitions in plat-samsung

Quoted 2 lines · Ben Dooks

git send-email has a --no-thread option as well, so if possible it would be really helpful to ensure that this isn't set either...

Yup. As of v1.7 this is the default, which means it's much more likely that people will do the right thing.