From: Kukjin Kim <kgene.kim@samsung.com>
To: linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org
Cc: Kukjin Kim <kgene.kim@samsung.com>
Subject: [PATCH 24/26] ARM: S3C64XX: make regs-srom.h local
Date: Wed, 02 Jan 2013 14:24:01 -0800 [thread overview]
Message-ID: <1357165443-3716-25-git-send-email-kgene.kim@samsung.com> (raw)
In-Reply-To: <1357165443-3716-1-git-send-email-kgene.kim@samsung.com>
The header file can be local in mach-s3c64xx/.
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
---
arch/arm/mach-s3c64xx/mach-mini6410.c | 2 +-
arch/arm/mach-s3c64xx/mach-real6410.c | 2 +-
arch/arm/mach-s3c64xx/mach-smdk6410.c | 2 +-
arch/arm/mach-s3c64xx/{include/mach => }/regs-srom.h | 11 +++++------
4 files changed, 8 insertions(+), 9 deletions(-)
rename arch/arm/mach-s3c64xx/{include/mach => }/regs-srom.h (90%)
diff --git a/arch/arm/mach-s3c64xx/mach-mini6410.c b/arch/arm/mach-s3c64xx/mach-mini6410.c
index 67881e6d..7cec86c 100644
--- a/arch/arm/mach-s3c64xx/mach-mini6410.c
+++ b/arch/arm/mach-s3c64xx/mach-mini6410.c
@@ -31,7 +31,6 @@
#include <mach/map.h>
#include <mach/regs-gpio.h>
-#include <mach/regs-srom.h>
#include <plat/adc.h>
#include <plat/cpu.h>
@@ -46,6 +45,7 @@
#include "common.h"
#include "regs-modem.h"
+#include "regs-srom.h"
#define UCON S3C2410_UCON_DEFAULT
#define ULCON (S3C2410_LCON_CS8 | S3C2410_LCON_PNONE | S3C2410_LCON_STOPB)
diff --git a/arch/arm/mach-s3c64xx/mach-real6410.c b/arch/arm/mach-s3c64xx/mach-real6410.c
index f620b89..215693c 100644
--- a/arch/arm/mach-s3c64xx/mach-real6410.c
+++ b/arch/arm/mach-s3c64xx/mach-real6410.c
@@ -32,7 +32,6 @@
#include <mach/map.h>
#include <mach/regs-gpio.h>
-#include <mach/regs-srom.h>
#include <plat/adc.h>
#include <plat/cpu.h>
@@ -47,6 +46,7 @@
#include "common.h"
#include "regs-modem.h"
+#include "regs-srom.h"
#define UCON S3C2410_UCON_DEFAULT
#define ULCON (S3C2410_LCON_CS8 | S3C2410_LCON_PNONE | S3C2410_LCON_STOPB)
diff --git a/arch/arm/mach-s3c64xx/mach-smdk6410.c b/arch/arm/mach-s3c64xx/mach-smdk6410.c
index f49ecae..dcf41bd 100644
--- a/arch/arm/mach-s3c64xx/mach-smdk6410.c
+++ b/arch/arm/mach-s3c64xx/mach-smdk6410.c
@@ -59,7 +59,6 @@
#include <plat/regs-serial.h>
#include <mach/regs-gpio.h>
#include <mach/regs-sys.h>
-#include <mach/regs-srom.h>
#include <linux/platform_data/ata-samsung_cf.h>
#include <linux/platform_data/i2c-s3c2410.h>
#include <plat/fb.h>
@@ -75,6 +74,7 @@
#include "common.h"
#include "regs-modem.h"
+#include "regs-srom.h"
#define UCON S3C2410_UCON_DEFAULT | S3C2410_UCON_UCLK
#define ULCON S3C2410_LCON_CS8 | S3C2410_LCON_PNONE | S3C2410_LCON_STOPB
diff --git a/arch/arm/mach-s3c64xx/include/mach/regs-srom.h b/arch/arm/mach-s3c64xx/regs-srom.h
similarity index 90%
rename from arch/arm/mach-s3c64xx/include/mach/regs-srom.h
rename to arch/arm/mach-s3c64xx/regs-srom.h
index 756731b..d56f338 100644
--- a/arch/arm/mach-s3c64xx/include/mach/regs-srom.h
+++ b/arch/arm/mach-s3c64xx/regs-srom.h
@@ -1,5 +1,4 @@
-/* arch/arm/plat-s3c64xx/include/plat/regs-srom.h
- *
+/*
* Copyright 2009 Andy Green <andy@warmcat.com>
*
* S3C64XX SROM definitions
@@ -9,8 +8,8 @@
* published by the Free Software Foundation.
*/
-#ifndef __PLAT_REGS_SROM_H
-#define __PLAT_REGS_SROM_H __FILE__
+#ifndef __MACH_S3C64XX_REGS_SROM_H
+#define __MACH_S3C64XX_REGS_SROM_H __FILE__
#define S3C64XX_SROMREG(x) (S3C_VA_MEM + (x))
@@ -29,7 +28,7 @@
#define S3C64XX_SROM_BW__DATAWIDTH__SHIFT 0
#define S3C64XX_SROM_BW__WAITENABLE__SHIFT 2
#define S3C64XX_SROM_BW__BYTEENABLE__SHIFT 3
-#define S3C64XX_SROM_BW__CS_MASK 0xf
+#define S3C64XX_SROM_BW__CS_MASK 0xf
#define S3C64XX_SROM_BW__NCS0__SHIFT 0
#define S3C64XX_SROM_BW__NCS1__SHIFT 4
@@ -56,4 +55,4 @@
#define S3C64XX_SROM_BCX__TACS__SHIFT 28
#define S3C64XX_SROM_BCX__TACS__MASK 0xf
-#endif /* _PLAT_REGS_SROM_H */
+#endif /* __MACH_S3C64XX_REGS_SROM_H */
--
1.7.10.4
WARNING: multiple messages have this Message-ID (diff)
From: kgene.kim@samsung.com (Kukjin Kim)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 24/26] ARM: S3C64XX: make regs-srom.h local
Date: Wed, 02 Jan 2013 14:24:01 -0800 [thread overview]
Message-ID: <1357165443-3716-25-git-send-email-kgene.kim@samsung.com> (raw)
In-Reply-To: <1357165443-3716-1-git-send-email-kgene.kim@samsung.com>
The header file can be local in mach-s3c64xx/.
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
---
arch/arm/mach-s3c64xx/mach-mini6410.c | 2 +-
arch/arm/mach-s3c64xx/mach-real6410.c | 2 +-
arch/arm/mach-s3c64xx/mach-smdk6410.c | 2 +-
arch/arm/mach-s3c64xx/{include/mach => }/regs-srom.h | 11 +++++------
4 files changed, 8 insertions(+), 9 deletions(-)
rename arch/arm/mach-s3c64xx/{include/mach => }/regs-srom.h (90%)
diff --git a/arch/arm/mach-s3c64xx/mach-mini6410.c b/arch/arm/mach-s3c64xx/mach-mini6410.c
index 67881e6d..7cec86c 100644
--- a/arch/arm/mach-s3c64xx/mach-mini6410.c
+++ b/arch/arm/mach-s3c64xx/mach-mini6410.c
@@ -31,7 +31,6 @@
#include <mach/map.h>
#include <mach/regs-gpio.h>
-#include <mach/regs-srom.h>
#include <plat/adc.h>
#include <plat/cpu.h>
@@ -46,6 +45,7 @@
#include "common.h"
#include "regs-modem.h"
+#include "regs-srom.h"
#define UCON S3C2410_UCON_DEFAULT
#define ULCON (S3C2410_LCON_CS8 | S3C2410_LCON_PNONE | S3C2410_LCON_STOPB)
diff --git a/arch/arm/mach-s3c64xx/mach-real6410.c b/arch/arm/mach-s3c64xx/mach-real6410.c
index f620b89..215693c 100644
--- a/arch/arm/mach-s3c64xx/mach-real6410.c
+++ b/arch/arm/mach-s3c64xx/mach-real6410.c
@@ -32,7 +32,6 @@
#include <mach/map.h>
#include <mach/regs-gpio.h>
-#include <mach/regs-srom.h>
#include <plat/adc.h>
#include <plat/cpu.h>
@@ -47,6 +46,7 @@
#include "common.h"
#include "regs-modem.h"
+#include "regs-srom.h"
#define UCON S3C2410_UCON_DEFAULT
#define ULCON (S3C2410_LCON_CS8 | S3C2410_LCON_PNONE | S3C2410_LCON_STOPB)
diff --git a/arch/arm/mach-s3c64xx/mach-smdk6410.c b/arch/arm/mach-s3c64xx/mach-smdk6410.c
index f49ecae..dcf41bd 100644
--- a/arch/arm/mach-s3c64xx/mach-smdk6410.c
+++ b/arch/arm/mach-s3c64xx/mach-smdk6410.c
@@ -59,7 +59,6 @@
#include <plat/regs-serial.h>
#include <mach/regs-gpio.h>
#include <mach/regs-sys.h>
-#include <mach/regs-srom.h>
#include <linux/platform_data/ata-samsung_cf.h>
#include <linux/platform_data/i2c-s3c2410.h>
#include <plat/fb.h>
@@ -75,6 +74,7 @@
#include "common.h"
#include "regs-modem.h"
+#include "regs-srom.h"
#define UCON S3C2410_UCON_DEFAULT | S3C2410_UCON_UCLK
#define ULCON S3C2410_LCON_CS8 | S3C2410_LCON_PNONE | S3C2410_LCON_STOPB
diff --git a/arch/arm/mach-s3c64xx/include/mach/regs-srom.h b/arch/arm/mach-s3c64xx/regs-srom.h
similarity index 90%
rename from arch/arm/mach-s3c64xx/include/mach/regs-srom.h
rename to arch/arm/mach-s3c64xx/regs-srom.h
index 756731b..d56f338 100644
--- a/arch/arm/mach-s3c64xx/include/mach/regs-srom.h
+++ b/arch/arm/mach-s3c64xx/regs-srom.h
@@ -1,5 +1,4 @@
-/* arch/arm/plat-s3c64xx/include/plat/regs-srom.h
- *
+/*
* Copyright 2009 Andy Green <andy@warmcat.com>
*
* S3C64XX SROM definitions
@@ -9,8 +8,8 @@
* published by the Free Software Foundation.
*/
-#ifndef __PLAT_REGS_SROM_H
-#define __PLAT_REGS_SROM_H __FILE__
+#ifndef __MACH_S3C64XX_REGS_SROM_H
+#define __MACH_S3C64XX_REGS_SROM_H __FILE__
#define S3C64XX_SROMREG(x) (S3C_VA_MEM + (x))
@@ -29,7 +28,7 @@
#define S3C64XX_SROM_BW__DATAWIDTH__SHIFT 0
#define S3C64XX_SROM_BW__WAITENABLE__SHIFT 2
#define S3C64XX_SROM_BW__BYTEENABLE__SHIFT 3
-#define S3C64XX_SROM_BW__CS_MASK 0xf
+#define S3C64XX_SROM_BW__CS_MASK 0xf
#define S3C64XX_SROM_BW__NCS0__SHIFT 0
#define S3C64XX_SROM_BW__NCS1__SHIFT 4
@@ -56,4 +55,4 @@
#define S3C64XX_SROM_BCX__TACS__SHIFT 28
#define S3C64XX_SROM_BCX__TACS__MASK 0xf
-#endif /* _PLAT_REGS_SROM_H */
+#endif /* __MACH_S3C64XX_REGS_SROM_H */
--
1.7.10.4
next prev parent reply other threads:[~2013-01-02 22:25 UTC|newest]
Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-02 22:23 [PATCH 00/26] ARM: SAMSUNG: cleanup header files Kukjin Kim
2013-01-02 22:23 ` Kukjin Kim
2013-01-02 22:23 ` [PATCH 01/26] gpio: samsung: remove inclusion <mach/regs-clock.h> Kukjin Kim
2013-01-02 22:23 ` Kukjin Kim
2013-01-10 10:52 ` Linus Walleij
2013-01-10 10:52 ` Linus Walleij
2013-01-10 18:41 ` Kukjin Kim
2013-01-10 18:41 ` Kukjin Kim
2013-01-17 10:50 ` Linus Walleij
2013-01-17 10:50 ` Linus Walleij
2013-01-02 22:23 ` [PATCH 02/26] cpufreq: exynos: cleanup exynos-cpufreq header Kukjin Kim
2013-01-02 22:23 ` Kukjin Kim
2013-01-02 22:23 ` [PATCH 03/26] ARM: S5P64X0: remove gpiolib.c file in mach-s5p64x0 Kukjin Kim
2013-01-02 22:23 ` Kukjin Kim
2013-01-02 22:23 ` [PATCH 04/26] ARM: S5P64X0: move i2c.h into local directory Kukjin Kim
2013-01-02 22:23 ` Kukjin Kim
2013-01-02 22:23 ` [PATCH 05/26] ARM: S5P64X0: move s5p64x0-clock.h " Kukjin Kim
2013-01-02 22:23 ` Kukjin Kim
2013-01-02 22:23 ` [PATCH 06/26] ARM: S5PV210: move regs-sys.h into setup-usb-phy.c file Kukjin Kim
2013-01-02 22:23 ` Kukjin Kim
2013-01-02 22:23 ` [PATCH 07/26] ARM: EXYNOS: move mach/pmu.h file into common.h Kukjin Kim
2013-01-02 22:23 ` Kukjin Kim
2013-01-02 22:23 ` [PATCH 08/26] ARM: SAMSUNG: cleanup mach/regs-audss.h file Kukjin Kim
2013-01-02 22:23 ` Kukjin Kim
2013-01-02 22:23 ` [PATCH 09/26] ARM: SAMSUNG: cleanup mach/gpio-fns.h gpio-track.h and gpio-nrs.h Kukjin Kim
2013-01-02 22:23 ` Kukjin Kim
2013-01-10 10:53 ` Linus Walleij
2013-01-10 10:53 ` Linus Walleij
2013-01-10 18:44 ` Kukjin Kim
2013-01-10 18:44 ` Kukjin Kim
2013-01-02 22:23 ` [PATCH 10/26] ARM: S3C24XX: make anubis-cpld, anubis-irq and anubis-map local Kukjin Kim
2013-01-02 22:23 ` Kukjin Kim
2013-01-02 22:23 ` [PATCH 11/26] ARM: S3C24XX: make bast-cpld.h, bast-irq.h and bast-map.h local Kukjin Kim
2013-01-02 22:23 ` Kukjin Kim
2013-01-02 22:23 ` [PATCH 12/26] ARM: S3C24XX: make gta02.h local Kukjin Kim
2013-01-02 22:23 ` Kukjin Kim
2013-01-02 22:23 ` [PATCH 13/26] ARM: S3C24XX: make h1940.h and h1940-latch.h local Kukjin Kim
2013-01-02 22:23 ` Kukjin Kim
2013-01-02 22:23 ` [PATCH 14/26] ARM: S3C24XX: make osiris-cpld.h and osiris-map.h local Kukjin Kim
2013-01-02 22:23 ` Kukjin Kim
2013-01-02 22:23 ` [PATCH 15/26] ARM: S3C24XX: make otom-map.h local Kukjin Kim
2013-01-02 22:23 ` Kukjin Kim
2013-01-02 22:23 ` [PATCH 16/26] ARM: S3C24XX: make vr1000-cpld.h, vr1000-irq.h and vr1000-map.h local Kukjin Kim
2013-01-02 22:23 ` Kukjin Kim
2013-01-02 22:23 ` [PATCH 17/26] ARM: S3C2416: remove regs-s3c2416-mem.h and regs-s3c2416.h Kukjin Kim
2013-01-02 22:23 ` Kukjin Kim
2013-01-02 22:23 ` [PATCH 18/26] ARM: S3C2412: cleanup regs-s3c2412.h Kukjin Kim
2013-01-02 22:23 ` Kukjin Kim
2013-01-02 22:23 ` [PATCH 19/26] ARM: S3C24XX: remove idle.h Kukjin Kim
2013-01-02 22:23 ` Kukjin Kim
2013-01-02 22:23 ` [PATCH 20/26] ARM: S3C24XX: remove dsc.c and make regs-dsc.h local Kukjin Kim
2013-01-02 22:23 ` Kukjin Kim
2013-01-02 22:23 ` [PATCH 21/26] ARM: S3C64XX: make crag6410.h local Kukjin Kim
2013-01-02 22:23 ` Kukjin Kim
2013-01-02 22:23 ` [PATCH 22/26] ARM: S3C64XX: make regs-gpio-memport.h local Kukjin Kim
2013-01-02 22:23 ` Kukjin Kim
2013-01-02 22:24 ` [PATCH 23/26] ARM: S3C64XX: make regs-modem.h local Kukjin Kim
2013-01-02 22:24 ` Kukjin Kim
2013-01-02 22:24 ` Kukjin Kim [this message]
2013-01-02 22:24 ` [PATCH 24/26] ARM: S3C64XX: make regs-srom.h local Kukjin Kim
2013-01-02 22:24 ` [PATCH 25/26] ARM: S3C64XX: make regs-sys.h local Kukjin Kim
2013-01-02 22:24 ` Kukjin Kim
2013-01-02 22:24 ` [PATCH 26/26] ARM: S3C64XX: make regs-syscon-power.h local Kukjin Kim
2013-01-02 22:24 ` Kukjin Kim
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1357165443-3716-25-git-send-email-kgene.kim@samsung.com \
--to=kgene.kim@samsung.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-samsung-soc@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.