From: Magnus Damm <magnus.damm@gmail.com>
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 07/08] ARM: shmobile: Move pm-rcar.h, cleanup r8a7779 case
Date: Tue, 20 May 2014 07:59:00 +0000 [thread overview]
Message-ID: <20140520080058.13851.83767.sendpatchset@w520> (raw)
In-Reply-To: <20140520075949.13851.42995.sendpatchset@w520>
From: Magnus Damm <damm+renesas@opensource.se>
Move most of pm-rcar.h so it can be used as #include "pm-rcar.h"
instead of the old style #include <mach/pm-rcar.h>. Also clean up
the r8a7779 case to move some unused header file cruft into a C
file.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
---
arch/arm/mach-shmobile/include/mach/pm-rcar.h | 15 ---------------
arch/arm/mach-shmobile/include/mach/r8a7779.h | 13 -------------
arch/arm/mach-shmobile/pm-r8a7779.c | 13 ++++++++++++-
arch/arm/mach-shmobile/pm-r8a7790.c | 2 +-
arch/arm/mach-shmobile/pm-rcar.c | 2 +-
arch/arm/mach-shmobile/pm-rcar.h | 15 +++++++++++++++
arch/arm/mach-shmobile/smp-r8a7779.c | 2 +-
arch/arm/mach-shmobile/smp-r8a7790.c | 2 +-
8 files changed, 31 insertions(+), 33 deletions(-)
--- 0001/arch/arm/mach-shmobile/include/mach/pm-rcar.h
+++ /dev/null 2013-06-03 21:41:10.638032047 +0900
@@ -1,15 +0,0 @@
-#ifndef PM_RCAR_H
-#define PM_RCAR_H
-
-struct rcar_sysc_ch {
- unsigned long chan_offs;
- unsigned int chan_bit;
- unsigned int isr_bit;
-};
-
-int rcar_sysc_power_down(struct rcar_sysc_ch *sysc_ch);
-int rcar_sysc_power_up(struct rcar_sysc_ch *sysc_ch);
-bool rcar_sysc_power_is_off(struct rcar_sysc_ch *sysc_ch);
-void __iomem *rcar_sysc_init(phys_addr_t base);
-
-#endif /* PM_RCAR_H */
--- 0001/arch/arm/mach-shmobile/include/mach/r8a7779.h
+++ work/arch/arm/mach-shmobile/include/mach/r8a7779.h 2014-05-20 01:13:37.000000000 +0900
@@ -1,9 +1,6 @@
#ifndef __ASM_R8A7779_H__
#define __ASM_R8A7779_H__
-#include <linux/pm_domain.h>
-#include <mach/pm-rcar.h>
-
/* HPB-DMA slave IDs */
enum {
HPBDMA_SLAVE_DUMMY,
@@ -11,16 +8,6 @@ enum {
HPBDMA_SLAVE_SDHI0_RX,
};
-struct r8a7779_pm_domain {
- struct generic_pm_domain genpd;
- struct rcar_sysc_ch ch;
-};
-
-static inline struct rcar_sysc_ch *to_r8a7779_ch(struct generic_pm_domain *d)
-{
- return &container_of(d, struct r8a7779_pm_domain, genpd)->ch;
-}
-
extern void r8a7779_init_delay(void);
extern void r8a7779_init_irq_extpin(int irlm);
extern void r8a7779_init_irq_extpin_dt(int irlm);
--- 0009/arch/arm/mach-shmobile/pm-r8a7779.c
+++ work/arch/arm/mach-shmobile/pm-r8a7779.c 2014-05-20 01:13:51.000000000 +0900
@@ -13,20 +13,31 @@
#include <linux/suspend.h>
#include <linux/err.h>
#include <linux/pm_clock.h>
+#include <linux/pm_domain.h>
#include <linux/platform_device.h>
#include <linux/delay.h>
#include <linux/irq.h>
#include <linux/interrupt.h>
#include <linux/console.h>
#include <asm/io.h>
-#include <mach/pm-rcar.h>
#include <mach/r8a7779.h>
#include "common.h"
+#include "pm-rcar.h"
/* SYSC */
#define SYSCIER 0x0c
#define SYSCIMR 0x10
+struct r8a7779_pm_domain {
+ struct generic_pm_domain genpd;
+ struct rcar_sysc_ch ch;
+};
+
+static inline struct rcar_sysc_ch *to_r8a7779_ch(struct generic_pm_domain *d)
+{
+ return &container_of(d, struct r8a7779_pm_domain, genpd)->ch;
+}
+
#if defined(CONFIG_PM) || defined(CONFIG_SMP)
static void __init r8a7779_sysc_init(void)
--- 0001/arch/arm/mach-shmobile/pm-r8a7790.c
+++ work/arch/arm/mach-shmobile/pm-r8a7790.c 2014-05-20 01:04:34.000000000 +0900
@@ -12,8 +12,8 @@
#include <linux/kernel.h>
#include <asm/io.h>
-#include <mach/pm-rcar.h>
#include <mach/r8a7790.h>
+#include "pm-rcar.h"
/* SYSC */
#define SYSCIER 0x0c
--- 0001/arch/arm/mach-shmobile/pm-rcar.c
+++ work/arch/arm/mach-shmobile/pm-rcar.c 2014-05-20 01:04:52.000000000 +0900
@@ -13,7 +13,7 @@
#include <linux/mm.h>
#include <linux/spinlock.h>
#include <asm/io.h>
-#include <mach/pm-rcar.h>
+#include "pm-rcar.h"
/* SYSC */
#define SYSCSR 0x00
--- /dev/null
+++ work/arch/arm/mach-shmobile/pm-rcar.h 2014-05-20 01:03:32.000000000 +0900
@@ -0,0 +1,15 @@
+#ifndef PM_RCAR_H
+#define PM_RCAR_H
+
+struct rcar_sysc_ch {
+ unsigned long chan_offs;
+ unsigned int chan_bit;
+ unsigned int isr_bit;
+};
+
+int rcar_sysc_power_down(struct rcar_sysc_ch *sysc_ch);
+int rcar_sysc_power_up(struct rcar_sysc_ch *sysc_ch);
+bool rcar_sysc_power_is_off(struct rcar_sysc_ch *sysc_ch);
+void __iomem *rcar_sysc_init(phys_addr_t base);
+
+#endif /* PM_RCAR_H */
--- 0009/arch/arm/mach-shmobile/smp-r8a7779.c
+++ work/arch/arm/mach-shmobile/smp-r8a7779.c 2014-05-20 01:05:10.000000000 +0900
@@ -23,13 +23,13 @@
#include <linux/spinlock.h>
#include <linux/io.h>
#include <linux/delay.h>
-#include <mach/pm-rcar.h>
#include <mach/r8a7779.h>
#include <asm/cacheflush.h>
#include <asm/smp_plat.h>
#include <asm/smp_scu.h>
#include <asm/smp_twd.h>
#include "common.h"
+#include "pm-rcar.h"
#define AVECR IOMEM(0xfe700040)
#define R8A7779_SCU_BASE 0xf0000000
--- 0009/arch/arm/mach-shmobile/smp-r8a7790.c
+++ work/arch/arm/mach-shmobile/smp-r8a7790.c 2014-05-20 01:05:53.000000000 +0900
@@ -18,9 +18,9 @@
#include <linux/smp.h>
#include <linux/io.h>
#include <asm/smp_plat.h>
-#include <mach/pm-rcar.h>
#include <mach/r8a7790.h>
#include "common.h"
+#include "pm-rcar.h"
#define RST 0xe6160000
#define CA15BAR 0x0020
next prev parent reply other threads:[~2014-05-20 7:59 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-20 7:59 [PATCH 00/08] ARM: shmobile: Rework include path (Try 2, Part 1) Magnus Damm
2014-05-20 7:58 ` [PATCH 02/08] ARM: shmobile: Move dma-register.h Magnus Damm
2014-05-20 7:58 ` [PATCH 03/08] ARM: shmobile: Move clock.h Magnus Damm
2014-05-20 7:58 ` [PATCH 04/08] ARM: shmobile: Move most of irqs.h, keep some for pinctl Magnus Damm
2014-05-20 7:58 ` [PATCH 05/08] ARM: shmobile: Move common.h Magnus Damm
2014-05-20 7:58 ` [PATCH 06/08] ARM: shmobile: Move pm-rmobile.h, cleanup sh73xx.h Magnus Damm
2014-05-20 7:59 ` Magnus Damm [this message]
2014-05-20 7:59 ` [PATCH 08/08] ARM: shmobile: Move rcar-gen2.h, cleanup r8a7790 case Magnus Damm
2014-05-20 7:59 ` [PATCH 01/08] ARM: shmobile: Move intc.h, cleanup sh_intc.h usage Magnus Damm
2014-06-06 9:11 ` [PATCH 00/08] ARM: shmobile: Rework include path (Try 2, Part 1) Geert Uytterhoeven
2014-06-06 10:14 ` Simon Horman
2014-06-06 10:24 ` Arnd Bergmann
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=20140520080058.13851.83767.sendpatchset@w520 \
--to=magnus.damm@gmail.com \
--cc=linux-arm-kernel@lists.infradead.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).