* [PATCH 1/1] ARM: S3C24XX: Move rtc-core.h from plat to mach
@ 2013-12-30 10:40 Sachin Kamat
2014-01-15 21:34 ` Heiko Stübner
0 siblings, 1 reply; 3+ messages in thread
From: Sachin Kamat @ 2013-12-30 10:40 UTC (permalink / raw)
To: linux-samsung-soc; +Cc: kgene.kim, sachin.kamat, patches, Heiko Stuebner
plat/rtc-core.h is only referenced from mach-s3c24xx. Hence
move it there to de-populate the plat directory. While at it
also do some cleanup of the header file.
Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Cc: Heiko Stuebner <heiko@sntech.de>
---
.../plat => mach-s3c24xx/include/mach}/rtc-core.h | 13 ++++++-------
arch/arm/mach-s3c24xx/s3c2416.c | 2 +-
arch/arm/mach-s3c24xx/s3c2443.c | 2 +-
3 files changed, 8 insertions(+), 9 deletions(-)
rename arch/arm/{plat-samsung/include/plat => mach-s3c24xx/include/mach}/rtc-core.h (69%)
diff --git a/arch/arm/plat-samsung/include/plat/rtc-core.h b/arch/arm/mach-s3c24xx/include/mach/rtc-core.h
similarity index 69%
rename from arch/arm/plat-samsung/include/plat/rtc-core.h
rename to arch/arm/mach-s3c24xx/include/mach/rtc-core.h
index 7b542f7b7938..4d5f5768f700 100644
--- a/arch/arm/plat-samsung/include/plat/rtc-core.h
+++ b/arch/arm/mach-s3c24xx/include/mach/rtc-core.h
@@ -1,5 +1,4 @@
-/* linux/arch/arm/plat-samsung/include/plat/rtc-core.h
- *
+/*
* Copyright (c) 2011 Heiko Stuebner <heiko@sntech.de>
*
* Samsung RTC Controller core functions
@@ -9,19 +8,19 @@
* published by the Free Software Foundation.
*/
-#ifndef __ASM_PLAT_RTC_CORE_H
-#define __ASM_PLAT_RTC_CORE_H __FILE__
+#ifndef __RTC_CORE_H
+#define __RTC_CORE_H __FILE__
/* These functions are only for use with the core support code, such as
* the cpu specific initialisation code
*/
+extern struct platform_device s3c_device_rtc;
+
/* re-define device name depending on support. */
static inline void s3c_rtc_setname(char *name)
{
-#if defined(CONFIG_S3C_DEV_RTC) || defined(CONFIG_PLAT_S3C24XX)
s3c_device_rtc.name = name;
-#endif
}
-#endif /* __ASM_PLAT_RTC_CORE_H */
+#endif /* __RTC_CORE_H */
diff --git a/arch/arm/mach-s3c24xx/s3c2416.c b/arch/arm/mach-s3c24xx/s3c2416.c
index cb77880029f7..a0b787505c02 100644
--- a/arch/arm/mach-s3c24xx/s3c2416.c
+++ b/arch/arm/mach-s3c24xx/s3c2416.c
@@ -48,6 +48,7 @@
#include <asm/system_misc.h>
#include <mach/regs-s3c2443-clock.h>
+#include <mach/rtc-core.h>
#include <plat/gpio-core.h>
#include <plat/gpio-cfg.h>
@@ -61,7 +62,6 @@
#include <plat/fb-core.h>
#include <plat/nand-core.h>
#include <plat/adc-core.h>
-#include <plat/rtc-core.h>
#include <plat/spi-core.h>
#include "common.h"
diff --git a/arch/arm/mach-s3c24xx/s3c2443.c b/arch/arm/mach-s3c24xx/s3c2443.c
index faa1086924c4..4af858457b2f 100644
--- a/arch/arm/mach-s3c24xx/s3c2443.c
+++ b/arch/arm/mach-s3c24xx/s3c2443.c
@@ -34,6 +34,7 @@
#include <asm/system_misc.h>
#include <mach/regs-s3c2443-clock.h>
+#include <mach/rtc-core.h>
#include <plat/gpio-core.h>
#include <plat/gpio-cfg.h>
@@ -43,7 +44,6 @@
#include <plat/fb-core.h>
#include <plat/nand-core.h>
#include <plat/adc-core.h>
-#include <plat/rtc-core.h>
#include <plat/spi-core.h>
static struct map_desc s3c2443_iodesc[] __initdata = {
--
1.7.9.5
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 1/1] ARM: S3C24XX: Move rtc-core.h from plat to mach
2013-12-30 10:40 [PATCH 1/1] ARM: S3C24XX: Move rtc-core.h from plat to mach Sachin Kamat
@ 2014-01-15 21:34 ` Heiko Stübner
2014-01-23 1:24 ` kgene
0 siblings, 1 reply; 3+ messages in thread
From: Heiko Stübner @ 2014-01-15 21:34 UTC (permalink / raw)
To: Sachin Kamat; +Cc: linux-samsung-soc, kgene.kim, patches
Am Montag, 30. Dezember 2013, 16:10:08 schrieb Sachin Kamat:
> plat/rtc-core.h is only referenced from mach-s3c24xx. Hence
> move it there to de-populate the plat directory. While at it
> also do some cleanup of the header file.
>
> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
> Cc: Heiko Stuebner <heiko@sntech.de>
late, but as the patch is not merged yet:
Acked-by: Heiko Stuebner <heiko@sntech.de>
> ---
> .../plat => mach-s3c24xx/include/mach}/rtc-core.h | 13 ++++++-------
> arch/arm/mach-s3c24xx/s3c2416.c | 2 +-
> arch/arm/mach-s3c24xx/s3c2443.c | 2 +-
> 3 files changed, 8 insertions(+), 9 deletions(-)
> rename arch/arm/{plat-samsung/include/plat =>
> mach-s3c24xx/include/mach}/rtc-core.h (69%)
>
> diff --git a/arch/arm/plat-samsung/include/plat/rtc-core.h
> b/arch/arm/mach-s3c24xx/include/mach/rtc-core.h similarity index 69%
> rename from arch/arm/plat-samsung/include/plat/rtc-core.h
> rename to arch/arm/mach-s3c24xx/include/mach/rtc-core.h
> index 7b542f7b7938..4d5f5768f700 100644
> --- a/arch/arm/plat-samsung/include/plat/rtc-core.h
> +++ b/arch/arm/mach-s3c24xx/include/mach/rtc-core.h
> @@ -1,5 +1,4 @@
> -/* linux/arch/arm/plat-samsung/include/plat/rtc-core.h
> - *
> +/*
> * Copyright (c) 2011 Heiko Stuebner <heiko@sntech.de>
> *
> * Samsung RTC Controller core functions
> @@ -9,19 +8,19 @@
> * published by the Free Software Foundation.
> */
>
> -#ifndef __ASM_PLAT_RTC_CORE_H
> -#define __ASM_PLAT_RTC_CORE_H __FILE__
> +#ifndef __RTC_CORE_H
> +#define __RTC_CORE_H __FILE__
>
> /* These functions are only for use with the core support code, such as
> * the cpu specific initialisation code
> */
>
> +extern struct platform_device s3c_device_rtc;
> +
> /* re-define device name depending on support. */
> static inline void s3c_rtc_setname(char *name)
> {
> -#if defined(CONFIG_S3C_DEV_RTC) || defined(CONFIG_PLAT_S3C24XX)
> s3c_device_rtc.name = name;
> -#endif
> }
>
> -#endif /* __ASM_PLAT_RTC_CORE_H */
> +#endif /* __RTC_CORE_H */
> diff --git a/arch/arm/mach-s3c24xx/s3c2416.c
> b/arch/arm/mach-s3c24xx/s3c2416.c index cb77880029f7..a0b787505c02 100644
> --- a/arch/arm/mach-s3c24xx/s3c2416.c
> +++ b/arch/arm/mach-s3c24xx/s3c2416.c
> @@ -48,6 +48,7 @@
> #include <asm/system_misc.h>
>
> #include <mach/regs-s3c2443-clock.h>
> +#include <mach/rtc-core.h>
>
> #include <plat/gpio-core.h>
> #include <plat/gpio-cfg.h>
> @@ -61,7 +62,6 @@
> #include <plat/fb-core.h>
> #include <plat/nand-core.h>
> #include <plat/adc-core.h>
> -#include <plat/rtc-core.h>
> #include <plat/spi-core.h>
>
> #include "common.h"
> diff --git a/arch/arm/mach-s3c24xx/s3c2443.c
> b/arch/arm/mach-s3c24xx/s3c2443.c index faa1086924c4..4af858457b2f 100644
> --- a/arch/arm/mach-s3c24xx/s3c2443.c
> +++ b/arch/arm/mach-s3c24xx/s3c2443.c
> @@ -34,6 +34,7 @@
> #include <asm/system_misc.h>
>
> #include <mach/regs-s3c2443-clock.h>
> +#include <mach/rtc-core.h>
>
> #include <plat/gpio-core.h>
> #include <plat/gpio-cfg.h>
> @@ -43,7 +44,6 @@
> #include <plat/fb-core.h>
> #include <plat/nand-core.h>
> #include <plat/adc-core.h>
> -#include <plat/rtc-core.h>
> #include <plat/spi-core.h>
>
> static struct map_desc s3c2443_iodesc[] __initdata = {
^ permalink raw reply [flat|nested] 3+ messages in thread
* RE: [PATCH 1/1] ARM: S3C24XX: Move rtc-core.h from plat to mach
2014-01-15 21:34 ` Heiko Stübner
@ 2014-01-23 1:24 ` kgene
0 siblings, 0 replies; 3+ messages in thread
From: kgene @ 2014-01-23 1:24 UTC (permalink / raw)
To: 'Heiko Stübner', 'Sachin Kamat'
Cc: linux-samsung-soc, patches
Heiko Stübner wrote:
>
> Am Montag, 30. Dezember 2013, 16:10:08 schrieb Sachin Kamat:
> > plat/rtc-core.h is only referenced from mach-s3c24xx. Hence
> > move it there to de-populate the plat directory. While at it
> > also do some cleanup of the header file.
> >
> > Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
> > Cc: Heiko Stuebner <heiko@sntech.de>
>
> late, but as the patch is not merged yet:
>
> Acked-by: Heiko Stuebner <heiko@sntech.de>
>
Applied into cleanup, thanks.
- Kukjin
> > ---
> > .../plat => mach-s3c24xx/include/mach}/rtc-core.h | 13 ++++++-------
> > arch/arm/mach-s3c24xx/s3c2416.c | 2 +-
> > arch/arm/mach-s3c24xx/s3c2443.c | 2 +-
> > 3 files changed, 8 insertions(+), 9 deletions(-)
> > rename arch/arm/{plat-samsung/include/plat =>
> > mach-s3c24xx/include/mach}/rtc-core.h (69%)
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-01-23 1:24 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-12-30 10:40 [PATCH 1/1] ARM: S3C24XX: Move rtc-core.h from plat to mach Sachin Kamat
2014-01-15 21:34 ` Heiko Stübner
2014-01-23 1:24 ` kgene
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox