* [PATCH 1/9] ARM: shmobile: Introduce a Kconfig entry for R-Mobile
2014-09-04 1:12 [GIT PULL] Renesas ARM Based SoC Kconfig Cleanups for v3.18 Simon Horman
@ 2014-09-04 1:12 ` Simon Horman
2014-09-04 1:12 ` [PATCH 2/9] ARM: shmobile: Introduce a Kconfig entry for R-Car Gen1 Simon Horman
` (8 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Simon Horman @ 2014-09-04 1:12 UTC (permalink / raw)
To: linux-arm-kernel
From: Magnus Damm <damm+renesas@opensource.se>
Add a Kconfig entry for R-Mobile SoCs that enables
both CMT and TMU timers. Interrupt controller varies
with SoC version so it is excluded.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/Kconfig | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig
index 1e6c51c..6de3058 100644
--- a/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@ -1,6 +1,11 @@
config ARCH_SHMOBILE
bool
+config ARCH_RMOBILE
+ bool
+ select SYS_SUPPORTS_SH_CMT
+ select SYS_SUPPORTS_SH_TMU
+
menuconfig ARCH_SHMOBILE_MULTI
bool "Renesas ARM SoCs" if ARCH_MULTI_V7
depends on MMU
@@ -71,16 +76,16 @@ comment "Renesas ARM SoCs System Type"
config ARCH_SH7372
bool "SH-Mobile AP4 (SH7372)"
+ select ARCH_RMOBILE
select ARCH_WANT_OPTIONAL_GPIOLIB
select ARM_CPU_SUSPEND if PM || CPU_IDLE
select CPU_V7
select SH_CLK_CPG
select SH_INTC
- select SYS_SUPPORTS_SH_CMT
- select SYS_SUPPORTS_SH_TMU
config ARCH_SH73A0
bool "SH-Mobile AG5 (R8A73A00)"
+ select ARCH_RMOBILE
select ARCH_WANT_OPTIONAL_GPIOLIB
select ARM_GIC
select CPU_V7
@@ -88,28 +93,24 @@ config ARCH_SH73A0
select SH_CLK_CPG
select SH_INTC
select RENESAS_INTC_IRQPIN
- select SYS_SUPPORTS_SH_CMT
- select SYS_SUPPORTS_SH_TMU
config ARCH_R8A73A4
bool "R-Mobile APE6 (R8A73A40)"
+ select ARCH_RMOBILE
select ARCH_WANT_OPTIONAL_GPIOLIB
select ARM_GIC
select CPU_V7
select SH_CLK_CPG
select RENESAS_IRQC
- select SYS_SUPPORTS_SH_CMT
- select SYS_SUPPORTS_SH_TMU
config ARCH_R8A7740
bool "R-Mobile A1 (R8A77400)"
+ select ARCH_RMOBILE
select ARCH_WANT_OPTIONAL_GPIOLIB
select ARM_GIC
select CPU_V7
select SH_CLK_CPG
select RENESAS_INTC_IRQPIN
- select SYS_SUPPORTS_SH_CMT
- select SYS_SUPPORTS_SH_TMU
config ARCH_R8A7778
bool "R-Car M1A (R8A77781)"
--
2.0.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 2/9] ARM: shmobile: Introduce a Kconfig entry for R-Car Gen1
2014-09-04 1:12 [GIT PULL] Renesas ARM Based SoC Kconfig Cleanups for v3.18 Simon Horman
2014-09-04 1:12 ` [PATCH 1/9] ARM: shmobile: Introduce a Kconfig entry for R-Mobile Simon Horman
@ 2014-09-04 1:12 ` Simon Horman
2014-09-04 1:12 ` [PATCH 3/9] ARM: shmobile: Introduce a Kconfig entry for R-Car Gen2 Simon Horman
` (7 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Simon Horman @ 2014-09-04 1:12 UTC (permalink / raw)
To: linux-arm-kernel
From: Magnus Damm <damm+renesas@opensource.se>
Add a Kconfig entry for R-Car Generation 1 SoCs that
enables TMU timer and the INTC IRQPIN driver.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/Kconfig | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig
index 6de3058..258d730 100644
--- a/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@ -1,6 +1,11 @@
config ARCH_SHMOBILE
bool
+config ARCH_RCAR_GEN1
+ bool
+ select RENESAS_INTC_IRQPIN
+ select SYS_SUPPORTS_SH_TMU
+
config ARCH_RMOBILE
bool
select SYS_SUPPORTS_SH_CMT
@@ -33,8 +38,7 @@ config ARCH_R7S72100
config ARCH_R8A7779
bool "R-Car H1 (R8A77790)"
- select RENESAS_INTC_IRQPIN
- select SYS_SUPPORTS_SH_TMU
+ select ARCH_RCAR_GEN1
config ARCH_R8A7790
bool "R-Car H2 (R8A77900)"
@@ -114,21 +118,19 @@ config ARCH_R8A7740
config ARCH_R8A7778
bool "R-Car M1A (R8A77781)"
+ select ARCH_RCAR_GEN1
select ARCH_WANT_OPTIONAL_GPIOLIB
select CPU_V7
select SH_CLK_CPG
select ARM_GIC
- select SYS_SUPPORTS_SH_TMU
- select RENESAS_INTC_IRQPIN
config ARCH_R8A7779
bool "R-Car H1 (R8A77790)"
+ select ARCH_RCAR_GEN1
select ARCH_WANT_OPTIONAL_GPIOLIB
select ARM_GIC
select CPU_V7
select SH_CLK_CPG
- select RENESAS_INTC_IRQPIN
- select SYS_SUPPORTS_SH_TMU
config ARCH_R8A7790
bool "R-Car H2 (R8A77900)"
--
2.0.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 3/9] ARM: shmobile: Introduce a Kconfig entry for R-Car Gen2
2014-09-04 1:12 [GIT PULL] Renesas ARM Based SoC Kconfig Cleanups for v3.18 Simon Horman
2014-09-04 1:12 ` [PATCH 1/9] ARM: shmobile: Introduce a Kconfig entry for R-Mobile Simon Horman
2014-09-04 1:12 ` [PATCH 2/9] ARM: shmobile: Introduce a Kconfig entry for R-Car Gen1 Simon Horman
@ 2014-09-04 1:12 ` Simon Horman
2014-09-04 1:12 ` [PATCH 4/9] ARM: shmobile: Cleanup pm-rcar.o build using Kconfig Simon Horman
` (6 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Simon Horman @ 2014-09-04 1:12 UTC (permalink / raw)
To: linux-arm-kernel
From: Magnus Damm <damm+renesas@opensource.se>
Add a Kconfig entry for R-Car Generation 2 SoCs that
enables CMT timer and the IRQC interrupt driver.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/Kconfig | 17 +++++++++--------
arch/arm/mach-shmobile/Makefile | 12 ++++++------
2 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig
index 258d730..73d6d3d 100644
--- a/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@ -6,6 +6,11 @@ config ARCH_RCAR_GEN1
select RENESAS_INTC_IRQPIN
select SYS_SUPPORTS_SH_TMU
+config ARCH_RCAR_GEN2
+ bool
+ select RENESAS_IRQC
+ select SYS_SUPPORTS_SH_CMT
+
config ARCH_RMOBILE
bool
select SYS_SUPPORTS_SH_CMT
@@ -42,13 +47,11 @@ config ARCH_R8A7779
config ARCH_R8A7790
bool "R-Car H2 (R8A77900)"
- select RENESAS_IRQC
- select SYS_SUPPORTS_SH_CMT
+ select ARCH_RCAR_GEN2
config ARCH_R8A7791
bool "R-Car M2 (R8A77910)"
- select RENESAS_IRQC
- select SYS_SUPPORTS_SH_CMT
+ select ARCH_RCAR_GEN2
comment "Renesas ARM SoCs Board Type"
@@ -134,24 +137,22 @@ config ARCH_R8A7779
config ARCH_R8A7790
bool "R-Car H2 (R8A77900)"
+ select ARCH_RCAR_GEN2
select ARCH_WANT_OPTIONAL_GPIOLIB
select ARM_GIC
select CPU_V7
select MIGHT_HAVE_PCI
select SH_CLK_CPG
- select RENESAS_IRQC
- select SYS_SUPPORTS_SH_CMT
select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE
config ARCH_R8A7791
bool "R-Car M2 (R8A77910)"
+ select ARCH_RCAR_GEN2
select ARCH_WANT_OPTIONAL_GPIOLIB
select ARM_GIC
select CPU_V7
select MIGHT_HAVE_PCI
select SH_CLK_CPG
- select RENESAS_IRQC
- select SYS_SUPPORTS_SH_CMT
select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE
config ARCH_R7S72100
diff --git a/arch/arm/mach-shmobile/Makefile b/arch/arm/mach-shmobile/Makefile
index fe3878a..ddc91fd 100644
--- a/arch/arm/mach-shmobile/Makefile
+++ b/arch/arm/mach-shmobile/Makefile
@@ -15,8 +15,7 @@ obj-$(CONFIG_ARCH_R8A7740) += setup-r8a7740.o
obj-$(CONFIG_ARCH_R8A7778) += setup-r8a7778.o
obj-$(CONFIG_ARCH_R8A7779) += setup-r8a7779.o
obj-$(CONFIG_ARCH_R8A7790) += setup-r8a7790.o
-obj-$(CONFIG_ARCH_R8A7790) += setup-r8a7790.o setup-rcar-gen2.o
-obj-$(CONFIG_ARCH_R8A7791) += setup-r8a7791.o setup-rcar-gen2.o
+obj-$(CONFIG_ARCH_R8A7791) += setup-r8a7791.o
obj-$(CONFIG_ARCH_EMEV2) += setup-emev2.o
obj-$(CONFIG_ARCH_R7S72100) += setup-r7s72100.o
@@ -36,8 +35,9 @@ endif
# CPU reset vector handling objects
cpu-y := platsmp.o headsmp.o
-cpu-$(CONFIG_ARCH_R8A7790) += platsmp-apmu.o
-cpu-$(CONFIG_ARCH_R8A7791) += platsmp-apmu.o
+
+# Shared SoC family objects
+obj-$(CONFIG_ARCH_RCAR_GEN2) += setup-rcar-gen2.o platsmp-apmu.o $(cpu-y)
# SMP objects
smp-y := $(cpu-y)
@@ -55,8 +55,8 @@ obj-$(CONFIG_ARCH_SH7372) += pm-sh7372.o sleep-sh7372.o pm-rmobile.o
obj-$(CONFIG_ARCH_SH73A0) += pm-sh73a0.o
obj-$(CONFIG_ARCH_R8A7740) += pm-r8a7740.o pm-rmobile.o
obj-$(CONFIG_ARCH_R8A7779) += pm-r8a7779.o pm-rcar.o
-obj-$(CONFIG_ARCH_R8A7790) += pm-r8a7790.o pm-rcar.o $(cpu-y)
-obj-$(CONFIG_ARCH_R8A7791) += pm-r8a7791.o pm-rcar.o $(cpu-y)
+obj-$(CONFIG_ARCH_R8A7790) += pm-r8a7790.o pm-rcar.o
+obj-$(CONFIG_ARCH_R8A7791) += pm-r8a7791.o pm-rcar.o
# IRQ objects
obj-$(CONFIG_ARCH_SH7372) += entry-intc.o
--
2.0.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 4/9] ARM: shmobile: Cleanup pm-rcar.o build using Kconfig
2014-09-04 1:12 [GIT PULL] Renesas ARM Based SoC Kconfig Cleanups for v3.18 Simon Horman
` (2 preceding siblings ...)
2014-09-04 1:12 ` [PATCH 3/9] ARM: shmobile: Introduce a Kconfig entry for R-Car Gen2 Simon Horman
@ 2014-09-04 1:12 ` Simon Horman
2014-09-04 1:12 ` [PATCH 5/9] ARM: shmobile: Cleanup pm-rmobile.o " Simon Horman
` (5 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Simon Horman @ 2014-09-04 1:12 UTC (permalink / raw)
To: linux-arm-kernel
From: Magnus Damm <damm+renesas@opensource.se>
Add a CONFIG_PM_RCAR entry and enable it for R-Car
Generation 1 or 2 in case CONFIG_PM or CONFIG_SMP
is set. Consolidate power management objects and
get rid of #ifdefs in the C code.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/Kconfig | 5 +++++
arch/arm/mach-shmobile/Makefile | 10 ++++------
arch/arm/mach-shmobile/pm-rcar.c | 4 ----
3 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig
index 73d6d3d..cd13021 100644
--- a/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@ -1,13 +1,18 @@
config ARCH_SHMOBILE
bool
+config PM_RCAR
+ bool
+
config ARCH_RCAR_GEN1
bool
+ select PM_RCAR if PM || SMP
select RENESAS_INTC_IRQPIN
select SYS_SUPPORTS_SH_TMU
config ARCH_RCAR_GEN2
bool
+ select PM_RCAR if PM || SMP
select RENESAS_IRQC
select SYS_SUPPORTS_SH_CMT
diff --git a/arch/arm/mach-shmobile/Makefile b/arch/arm/mach-shmobile/Makefile
index ddc91fd..c9ad169 100644
--- a/arch/arm/mach-shmobile/Makefile
+++ b/arch/arm/mach-shmobile/Makefile
@@ -13,9 +13,9 @@ obj-$(CONFIG_ARCH_SH73A0) += setup-sh73a0.o intc-sh73a0.o
obj-$(CONFIG_ARCH_R8A73A4) += setup-r8a73a4.o
obj-$(CONFIG_ARCH_R8A7740) += setup-r8a7740.o
obj-$(CONFIG_ARCH_R8A7778) += setup-r8a7778.o
-obj-$(CONFIG_ARCH_R8A7779) += setup-r8a7779.o
-obj-$(CONFIG_ARCH_R8A7790) += setup-r8a7790.o
-obj-$(CONFIG_ARCH_R8A7791) += setup-r8a7791.o
+obj-$(CONFIG_ARCH_R8A7779) += setup-r8a7779.o pm-r8a7779.o
+obj-$(CONFIG_ARCH_R8A7790) += setup-r8a7790.o pm-r8a7790.o
+obj-$(CONFIG_ARCH_R8A7791) += setup-r8a7791.o pm-r8a7791.o
obj-$(CONFIG_ARCH_EMEV2) += setup-emev2.o
obj-$(CONFIG_ARCH_R7S72100) += setup-r7s72100.o
@@ -51,12 +51,10 @@ smp-$(CONFIG_ARCH_EMEV2) += smp-emev2.o headsmp-scu.o platsmp-scu.o
obj-$(CONFIG_SUSPEND) += suspend.o
obj-$(CONFIG_CPU_IDLE) += cpuidle.o
obj-$(CONFIG_CPU_FREQ) += cpufreq.o
+obj-$(CONFIG_PM_RCAR) += pm-rcar.o
obj-$(CONFIG_ARCH_SH7372) += pm-sh7372.o sleep-sh7372.o pm-rmobile.o
obj-$(CONFIG_ARCH_SH73A0) += pm-sh73a0.o
obj-$(CONFIG_ARCH_R8A7740) += pm-r8a7740.o pm-rmobile.o
-obj-$(CONFIG_ARCH_R8A7779) += pm-r8a7779.o pm-rcar.o
-obj-$(CONFIG_ARCH_R8A7790) += pm-r8a7790.o pm-rcar.o
-obj-$(CONFIG_ARCH_R8A7791) += pm-r8a7791.o pm-rcar.o
# IRQ objects
obj-$(CONFIG_ARCH_SH7372) += entry-intc.o
diff --git a/arch/arm/mach-shmobile/pm-rcar.c b/arch/arm/mach-shmobile/pm-rcar.c
index 34b8a56..00022ee 100644
--- a/arch/arm/mach-shmobile/pm-rcar.c
+++ b/arch/arm/mach-shmobile/pm-rcar.c
@@ -31,8 +31,6 @@
#define SYSCISR_RETRIES 1000
#define SYSCISR_DELAY_US 1
-#if defined(CONFIG_PM) || defined(CONFIG_SMP)
-
static void __iomem *rcar_sysc_base;
static DEFINE_SPINLOCK(rcar_sysc_lock); /* SMP CPUs + I/O devices */
@@ -137,5 +135,3 @@ void __iomem *rcar_sysc_init(phys_addr_t base)
return rcar_sysc_base;
}
-
-#endif /* CONFIG_PM || CONFIG_SMP */
--
2.0.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 5/9] ARM: shmobile: Cleanup pm-rmobile.o build using Kconfig
2014-09-04 1:12 [GIT PULL] Renesas ARM Based SoC Kconfig Cleanups for v3.18 Simon Horman
` (3 preceding siblings ...)
2014-09-04 1:12 ` [PATCH 4/9] ARM: shmobile: Cleanup pm-rcar.o build using Kconfig Simon Horman
@ 2014-09-04 1:12 ` Simon Horman
2014-09-04 1:12 ` [PATCH 6/9] ARM: shmobile: Only select PM_RMOBILE for legacy case Simon Horman
` (4 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Simon Horman @ 2014-09-04 1:12 UTC (permalink / raw)
To: linux-arm-kernel
From: Magnus Damm <damm+renesas@opensource.se>
Add a CONFIG_PM_RMOBILE entry and enable it for R-Mobile
SoCs in case CONFIG_PM is set. Consolidate Makefile power
management objects and get rid of #ifdefs in the C code.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/Kconfig | 4 ++++
arch/arm/mach-shmobile/Makefile | 14 ++++++--------
arch/arm/mach-shmobile/pm-rmobile.c | 2 --
arch/arm/mach-shmobile/pm-rmobile.h | 4 ++--
4 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig
index cd13021..9295776 100644
--- a/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@ -4,6 +4,9 @@ config ARCH_SHMOBILE
config PM_RCAR
bool
+config PM_RMOBILE
+ bool
+
config ARCH_RCAR_GEN1
bool
select PM_RCAR if PM || SMP
@@ -18,6 +21,7 @@ config ARCH_RCAR_GEN2
config ARCH_RMOBILE
bool
+ select PM_RMOBILE if PM
select SYS_SUPPORTS_SH_CMT
select SYS_SUPPORTS_SH_TMU
diff --git a/arch/arm/mach-shmobile/Makefile b/arch/arm/mach-shmobile/Makefile
index c9ad169..7b259ce 100644
--- a/arch/arm/mach-shmobile/Makefile
+++ b/arch/arm/mach-shmobile/Makefile
@@ -8,10 +8,10 @@ ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/arch/arm/mach-shmobile/incl
obj-y := timer.o console.o
# CPU objects
-obj-$(CONFIG_ARCH_SH7372) += setup-sh7372.o intc-sh7372.o
-obj-$(CONFIG_ARCH_SH73A0) += setup-sh73a0.o intc-sh73a0.o
+obj-$(CONFIG_ARCH_SH7372) += setup-sh7372.o intc-sh7372.o pm-sh7372.o
+obj-$(CONFIG_ARCH_SH73A0) += setup-sh73a0.o intc-sh73a0.o pm-sh73a0.o
obj-$(CONFIG_ARCH_R8A73A4) += setup-r8a73a4.o
-obj-$(CONFIG_ARCH_R8A7740) += setup-r8a7740.o
+obj-$(CONFIG_ARCH_R8A7740) += setup-r8a7740.o pm-r8a7740.o
obj-$(CONFIG_ARCH_R8A7778) += setup-r8a7778.o
obj-$(CONFIG_ARCH_R8A7779) += setup-r8a7779.o pm-r8a7779.o
obj-$(CONFIG_ARCH_R8A7790) += setup-r8a7790.o pm-r8a7790.o
@@ -52,12 +52,10 @@ obj-$(CONFIG_SUSPEND) += suspend.o
obj-$(CONFIG_CPU_IDLE) += cpuidle.o
obj-$(CONFIG_CPU_FREQ) += cpufreq.o
obj-$(CONFIG_PM_RCAR) += pm-rcar.o
-obj-$(CONFIG_ARCH_SH7372) += pm-sh7372.o sleep-sh7372.o pm-rmobile.o
-obj-$(CONFIG_ARCH_SH73A0) += pm-sh73a0.o
-obj-$(CONFIG_ARCH_R8A7740) += pm-r8a7740.o pm-rmobile.o
+obj-$(CONFIG_PM_RMOBILE) += pm-rmobile.o
-# IRQ objects
-obj-$(CONFIG_ARCH_SH7372) += entry-intc.o
+# special sh7372 handling for IRQ objects and low level sleep code
+obj-$(CONFIG_ARCH_SH7372) += entry-intc.o sleep-sh7372.o
# Board objects
ifdef CONFIG_ARCH_SHMOBILE_MULTI
diff --git a/arch/arm/mach-shmobile/pm-rmobile.c b/arch/arm/mach-shmobile/pm-rmobile.c
index ebdd16e..a88079a 100644
--- a/arch/arm/mach-shmobile/pm-rmobile.c
+++ b/arch/arm/mach-shmobile/pm-rmobile.c
@@ -27,7 +27,6 @@
#define PSTR_RETRIES 100
#define PSTR_DELAY_US 10
-#ifdef CONFIG_PM
static int rmobile_pd_power_down(struct generic_pm_domain *genpd)
{
struct rmobile_pm_domain *rmobile_pd = to_rmobile_pd(genpd);
@@ -151,4 +150,3 @@ void rmobile_add_devices_to_domains(struct pm_domain_device data[],
rmobile_add_device_to_domain_td(data[j].domain_name,
data[j].pdev, &latencies);
}
-#endif /* CONFIG_PM */
diff --git a/arch/arm/mach-shmobile/pm-rmobile.h b/arch/arm/mach-shmobile/pm-rmobile.h
index 690553a..8f66b34 100644
--- a/arch/arm/mach-shmobile/pm-rmobile.h
+++ b/arch/arm/mach-shmobile/pm-rmobile.h
@@ -36,7 +36,7 @@ struct pm_domain_device {
struct platform_device *pdev;
};
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_RMOBILE
extern void rmobile_init_domains(struct rmobile_pm_domain domains[], int num);
extern void rmobile_add_device_to_domain_td(const char *domain_name,
struct platform_device *pdev,
@@ -58,6 +58,6 @@ extern void rmobile_add_devices_to_domains(struct pm_domain_device data[],
static inline void rmobile_add_devices_to_domains(struct pm_domain_device d[],
int size) {}
-#endif /* CONFIG_PM */
+#endif /* CONFIG_PM_RMOBILE */
#endif /* PM_RMOBILE_H */
--
2.0.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 6/9] ARM: shmobile: Only select PM_RMOBILE for legacy case
2014-09-04 1:12 [GIT PULL] Renesas ARM Based SoC Kconfig Cleanups for v3.18 Simon Horman
` (4 preceding siblings ...)
2014-09-04 1:12 ` [PATCH 5/9] ARM: shmobile: Cleanup pm-rmobile.o " Simon Horman
@ 2014-09-04 1:12 ` Simon Horman
2014-09-04 1:12 ` [PATCH 7/9] ARM: shmobile: Consolidate Legacy CPU_V7 Kconfig Simon Horman
` (3 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Simon Horman @ 2014-09-04 1:12 UTC (permalink / raw)
To: linux-arm-kernel
From: Magnus Damm <damm+renesas@opensource.se>
Adjust the ARM mach-shmobile Kconfig bits to only
select PM_RMOBILE in case of legacy. This allows us
to enable partial multiplatform support for various
SoCs before Power Domains DT bindings are finalized.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig
index 9295776..42d9de0 100644
--- a/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@ -21,7 +21,7 @@ config ARCH_RCAR_GEN2
config ARCH_RMOBILE
bool
- select PM_RMOBILE if PM
+ select PM_RMOBILE if PM && !ARCH_SHMOBILE_MULTI
select SYS_SUPPORTS_SH_CMT
select SYS_SUPPORTS_SH_TMU
--
2.0.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [GIT PULL] Renesas ARM Based SoC Kconfig Cleanups for v3.18
@ 2014-09-04 1:12 Simon Horman
2014-09-04 1:12 ` [PATCH 1/9] ARM: shmobile: Introduce a Kconfig entry for R-Mobile Simon Horman
` (9 more replies)
0 siblings, 10 replies; 11+ messages in thread
From: Simon Horman @ 2014-09-04 1:12 UTC (permalink / raw)
To: linux-arm-kernel
Hi Olof, Hi Kevin, Hi Arnd,
Please consider these Renesas ARM based SoC kconfig cleanups for v3.18.
This pull request is based on v3.17-rc2.
This is to avoid a conflict between v3.17-rc2 and this series.
The following changes since commit 52addcf9d6669fa439387610bc65c92fa0980cef:
Linux 3.17-rc2 (2014-08-25 15:36:20 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-kconfig-cleanups-for-v3.18
for you to fetch changes up to 13298fbbdb3f6a0ef55419dc048e064c7a7b0ef8:
ARM: shmobile: r8a7791 is now called "R-Car M2-W" (2014-09-02 09:32:08 +0900)
----------------------------------------------------------------
Renesas ARM Based SoC Kconfig Cleanups for v3.18
* Update name of "R-Car M2-W" SoC (previously there was no "-W")
* Consolidate Legacy SH_CLK_CPG and CPU_V7 Kconfig
* Only select PM_RMOBILE for legacy case
* Cleanup pm-rcar.o and pm-rmobile.o build using Kconfig
----------------------------------------------------------------
Geert Uytterhoeven (1):
ARM: shmobile: r8a7791 is now called "R-Car M2-W"
Magnus Damm (8):
ARM: shmobile: Introduce a Kconfig entry for R-Mobile
ARM: shmobile: Introduce a Kconfig entry for R-Car Gen1
ARM: shmobile: Introduce a Kconfig entry for R-Car Gen2
ARM: shmobile: Cleanup pm-rcar.o build using Kconfig
ARM: shmobile: Cleanup pm-rmobile.o build using Kconfig
ARM: shmobile: Only select PM_RMOBILE for legacy case
ARM: shmobile: Consolidate Legacy CPU_V7 Kconfig
ARM: shmobile: Consolidate Legacy SH_CLK_CPG Kconfig
arch/arm/Kconfig | 2 +
arch/arm/mach-shmobile/Kconfig | 77 ++++++++++++++++++-------------------
arch/arm/mach-shmobile/Makefile | 30 +++++++--------
arch/arm/mach-shmobile/pm-rcar.c | 4 --
arch/arm/mach-shmobile/pm-rmobile.c | 2 -
arch/arm/mach-shmobile/pm-rmobile.h | 4 +-
6 files changed, 54 insertions(+), 65 deletions(-)
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 7/9] ARM: shmobile: Consolidate Legacy CPU_V7 Kconfig
2014-09-04 1:12 [GIT PULL] Renesas ARM Based SoC Kconfig Cleanups for v3.18 Simon Horman
` (5 preceding siblings ...)
2014-09-04 1:12 ` [PATCH 6/9] ARM: shmobile: Only select PM_RMOBILE for legacy case Simon Horman
@ 2014-09-04 1:12 ` Simon Horman
2014-09-04 1:12 ` [PATCH 8/9] ARM: shmobile: Consolidate Legacy SH_CLK_CPG Kconfig Simon Horman
` (2 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Simon Horman @ 2014-09-04 1:12 UTC (permalink / raw)
To: linux-arm-kernel
From: Magnus Damm <damm+renesas@opensource.se>
Consolidate CPU_V7 under ARCH_SHMOBILE_LEGACY so it can
be shared by the legacy ARM mach-shmobile support code.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/Kconfig | 1 +
arch/arm/mach-shmobile/Kconfig | 8 --------
2 files changed, 1 insertion(+), 8 deletions(-)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index c49a775..93efc9a 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -650,6 +650,7 @@ config ARCH_SHMOBILE_LEGACY
select ARCH_SHMOBILE
select ARM_PATCH_PHYS_VIRT if MMU
select CLKDEV_LOOKUP
+ select CPU_V7
select GENERIC_CLOCKEVENTS
select HAVE_ARM_SCU if SMP
select HAVE_ARM_TWD if SMP
diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig
index 42d9de0..d4cf8bf 100644
--- a/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@ -95,7 +95,6 @@ config ARCH_SH7372
select ARCH_RMOBILE
select ARCH_WANT_OPTIONAL_GPIOLIB
select ARM_CPU_SUSPEND if PM || CPU_IDLE
- select CPU_V7
select SH_CLK_CPG
select SH_INTC
@@ -104,7 +103,6 @@ config ARCH_SH73A0
select ARCH_RMOBILE
select ARCH_WANT_OPTIONAL_GPIOLIB
select ARM_GIC
- select CPU_V7
select I2C
select SH_CLK_CPG
select SH_INTC
@@ -115,7 +113,6 @@ config ARCH_R8A73A4
select ARCH_RMOBILE
select ARCH_WANT_OPTIONAL_GPIOLIB
select ARM_GIC
- select CPU_V7
select SH_CLK_CPG
select RENESAS_IRQC
@@ -124,7 +121,6 @@ config ARCH_R8A7740
select ARCH_RMOBILE
select ARCH_WANT_OPTIONAL_GPIOLIB
select ARM_GIC
- select CPU_V7
select SH_CLK_CPG
select RENESAS_INTC_IRQPIN
@@ -132,7 +128,6 @@ config ARCH_R8A7778
bool "R-Car M1A (R8A77781)"
select ARCH_RCAR_GEN1
select ARCH_WANT_OPTIONAL_GPIOLIB
- select CPU_V7
select SH_CLK_CPG
select ARM_GIC
@@ -141,7 +136,6 @@ config ARCH_R8A7779
select ARCH_RCAR_GEN1
select ARCH_WANT_OPTIONAL_GPIOLIB
select ARM_GIC
- select CPU_V7
select SH_CLK_CPG
config ARCH_R8A7790
@@ -149,7 +143,6 @@ config ARCH_R8A7790
select ARCH_RCAR_GEN2
select ARCH_WANT_OPTIONAL_GPIOLIB
select ARM_GIC
- select CPU_V7
select MIGHT_HAVE_PCI
select SH_CLK_CPG
select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE
@@ -159,7 +152,6 @@ config ARCH_R8A7791
select ARCH_RCAR_GEN2
select ARCH_WANT_OPTIONAL_GPIOLIB
select ARM_GIC
- select CPU_V7
select MIGHT_HAVE_PCI
select SH_CLK_CPG
select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE
--
2.0.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 8/9] ARM: shmobile: Consolidate Legacy SH_CLK_CPG Kconfig
2014-09-04 1:12 [GIT PULL] Renesas ARM Based SoC Kconfig Cleanups for v3.18 Simon Horman
` (6 preceding siblings ...)
2014-09-04 1:12 ` [PATCH 7/9] ARM: shmobile: Consolidate Legacy CPU_V7 Kconfig Simon Horman
@ 2014-09-04 1:12 ` Simon Horman
2014-09-04 1:12 ` [PATCH 9/9] ARM: shmobile: r8a7791 is now called "R-Car M2-W" Simon Horman
2014-09-05 16:15 ` [GIT PULL] Renesas ARM Based SoC Kconfig Cleanups for v3.18 Arnd Bergmann
9 siblings, 0 replies; 11+ messages in thread
From: Simon Horman @ 2014-09-04 1:12 UTC (permalink / raw)
To: linux-arm-kernel
From: Magnus Damm <damm+renesas@opensource.se>
Consolidate SH_CLK_CPG under ARCH_SHMOBILE_LEGACY so it can
be shared by the legacy ARM mach-shmobile support code.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/Kconfig | 1 +
arch/arm/mach-shmobile/Kconfig | 8 --------
2 files changed, 1 insertion(+), 8 deletions(-)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 93efc9a..bd8beae 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -661,6 +661,7 @@ config ARCH_SHMOBILE_LEGACY
select NO_IOPORT_MAP
select PINCTRL
select PM_GENERIC_DOMAINS if PM
+ select SH_CLK_CPG
select SPARSE_IRQ
help
Support for Renesas ARM SoC platforms using a non-multiplatform
diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig
index d4cf8bf..6283ff2 100644
--- a/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@ -95,7 +95,6 @@ config ARCH_SH7372
select ARCH_RMOBILE
select ARCH_WANT_OPTIONAL_GPIOLIB
select ARM_CPU_SUSPEND if PM || CPU_IDLE
- select SH_CLK_CPG
select SH_INTC
config ARCH_SH73A0
@@ -104,7 +103,6 @@ config ARCH_SH73A0
select ARCH_WANT_OPTIONAL_GPIOLIB
select ARM_GIC
select I2C
- select SH_CLK_CPG
select SH_INTC
select RENESAS_INTC_IRQPIN
@@ -113,7 +111,6 @@ config ARCH_R8A73A4
select ARCH_RMOBILE
select ARCH_WANT_OPTIONAL_GPIOLIB
select ARM_GIC
- select SH_CLK_CPG
select RENESAS_IRQC
config ARCH_R8A7740
@@ -121,14 +118,12 @@ config ARCH_R8A7740
select ARCH_RMOBILE
select ARCH_WANT_OPTIONAL_GPIOLIB
select ARM_GIC
- select SH_CLK_CPG
select RENESAS_INTC_IRQPIN
config ARCH_R8A7778
bool "R-Car M1A (R8A77781)"
select ARCH_RCAR_GEN1
select ARCH_WANT_OPTIONAL_GPIOLIB
- select SH_CLK_CPG
select ARM_GIC
config ARCH_R8A7779
@@ -136,7 +131,6 @@ config ARCH_R8A7779
select ARCH_RCAR_GEN1
select ARCH_WANT_OPTIONAL_GPIOLIB
select ARM_GIC
- select SH_CLK_CPG
config ARCH_R8A7790
bool "R-Car H2 (R8A77900)"
@@ -144,7 +138,6 @@ config ARCH_R8A7790
select ARCH_WANT_OPTIONAL_GPIOLIB
select ARM_GIC
select MIGHT_HAVE_PCI
- select SH_CLK_CPG
select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE
config ARCH_R8A7791
@@ -153,7 +146,6 @@ config ARCH_R8A7791
select ARCH_WANT_OPTIONAL_GPIOLIB
select ARM_GIC
select MIGHT_HAVE_PCI
- select SH_CLK_CPG
select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE
config ARCH_R7S72100
--
2.0.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 9/9] ARM: shmobile: r8a7791 is now called "R-Car M2-W"
2014-09-04 1:12 [GIT PULL] Renesas ARM Based SoC Kconfig Cleanups for v3.18 Simon Horman
` (7 preceding siblings ...)
2014-09-04 1:12 ` [PATCH 8/9] ARM: shmobile: Consolidate Legacy SH_CLK_CPG Kconfig Simon Horman
@ 2014-09-04 1:12 ` Simon Horman
2014-09-05 16:15 ` [GIT PULL] Renesas ARM Based SoC Kconfig Cleanups for v3.18 Arnd Bergmann
9 siblings, 0 replies; 11+ messages in thread
From: Simon Horman @ 2014-09-04 1:12 UTC (permalink / raw)
To: linux-arm-kernel
From: Geert Uytterhoeven <geert+renesas@glider.be>
As per recent revisions of the datasheet.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/Kconfig | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig
index 6283ff2..efc49da 100644
--- a/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@ -59,7 +59,7 @@ config ARCH_R8A7790
select ARCH_RCAR_GEN2
config ARCH_R8A7791
- bool "R-Car M2 (R8A77910)"
+ bool "R-Car M2-W (R8A77910)"
select ARCH_RCAR_GEN2
comment "Renesas ARM SoCs Board Type"
@@ -141,7 +141,7 @@ config ARCH_R8A7790
select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE
config ARCH_R8A7791
- bool "R-Car M2 (R8A77910)"
+ bool "R-Car M2-W (R8A77910)"
select ARCH_RCAR_GEN2
select ARCH_WANT_OPTIONAL_GPIOLIB
select ARM_GIC
--
2.0.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [GIT PULL] Renesas ARM Based SoC Kconfig Cleanups for v3.18
2014-09-04 1:12 [GIT PULL] Renesas ARM Based SoC Kconfig Cleanups for v3.18 Simon Horman
` (8 preceding siblings ...)
2014-09-04 1:12 ` [PATCH 9/9] ARM: shmobile: r8a7791 is now called "R-Car M2-W" Simon Horman
@ 2014-09-05 16:15 ` Arnd Bergmann
9 siblings, 0 replies; 11+ messages in thread
From: Arnd Bergmann @ 2014-09-05 16:15 UTC (permalink / raw)
To: linux-arm-kernel
On Thursday 04 September 2014, Simon Horman wrote:
> Renesas ARM Based SoC Kconfig Cleanups for v3.18
>
> * Update name of "R-Car M2-W" SoC (previously there was no "-W")
> * Consolidate Legacy SH_CLK_CPG and CPU_V7 Kconfig
> * Only select PM_RMOBILE for legacy case
> * Cleanup pm-rcar.o and pm-rmobile.o build using Kconfig
>
Merged into next/cleanup, thanks!
Arnd
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2014-09-05 16:15 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-09-04 1:12 [GIT PULL] Renesas ARM Based SoC Kconfig Cleanups for v3.18 Simon Horman
2014-09-04 1:12 ` [PATCH 1/9] ARM: shmobile: Introduce a Kconfig entry for R-Mobile Simon Horman
2014-09-04 1:12 ` [PATCH 2/9] ARM: shmobile: Introduce a Kconfig entry for R-Car Gen1 Simon Horman
2014-09-04 1:12 ` [PATCH 3/9] ARM: shmobile: Introduce a Kconfig entry for R-Car Gen2 Simon Horman
2014-09-04 1:12 ` [PATCH 4/9] ARM: shmobile: Cleanup pm-rcar.o build using Kconfig Simon Horman
2014-09-04 1:12 ` [PATCH 5/9] ARM: shmobile: Cleanup pm-rmobile.o " Simon Horman
2014-09-04 1:12 ` [PATCH 6/9] ARM: shmobile: Only select PM_RMOBILE for legacy case Simon Horman
2014-09-04 1:12 ` [PATCH 7/9] ARM: shmobile: Consolidate Legacy CPU_V7 Kconfig Simon Horman
2014-09-04 1:12 ` [PATCH 8/9] ARM: shmobile: Consolidate Legacy SH_CLK_CPG Kconfig Simon Horman
2014-09-04 1:12 ` [PATCH 9/9] ARM: shmobile: r8a7791 is now called "R-Car M2-W" Simon Horman
2014-09-05 16:15 ` [GIT PULL] Renesas ARM Based SoC Kconfig Cleanups for v3.18 Arnd Bergmann
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).