* [PATCH 1/4] ARM: shmobile: sh73a0 legacy/reference: Add missing INTCA0 clock for irqpin module
2014-12-29 1:47 [GIT PULL] Renesas ARM Based SoC Updates for v3.20 Simon Horman
@ 2014-12-29 1:47 ` Simon Horman
2014-12-29 1:47 ` [PATCH 2/4] ARM: shmobile: Fix is_e2 warning Simon Horman
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Simon Horman @ 2014-12-29 1:47 UTC (permalink / raw)
To: linux-arm-kernel
From: Geert Uytterhoeven <geert+renesas@glider.be>
This clock drives the irqpin controller modules.
Before, it was assumed enabled by the bootloader or reset state.
By making it available to the driver, we make sure it gets enabled when
needed, and allow it to be managed by system or runtime PM.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/clock-sh73a0.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/arch/arm/mach-shmobile/clock-sh73a0.c b/arch/arm/mach-shmobile/clock-sh73a0.c
index 6b4c1f3..3855fb0 100644
--- a/arch/arm/mach-shmobile/clock-sh73a0.c
+++ b/arch/arm/mach-shmobile/clock-sh73a0.c
@@ -553,6 +553,7 @@ enum { MSTP001,
MSTP314, MSTP313, MSTP312, MSTP311,
MSTP304, MSTP303, MSTP302, MSTP301, MSTP300,
MSTP411, MSTP410, MSTP403,
+ MSTP508,
MSTP_NR };
#define MSTP(_parent, _reg, _bit, _flags) \
@@ -597,6 +598,7 @@ static struct clk mstp_clks[MSTP_NR] = {
[MSTP411] = MSTP(&div4_clks[DIV4_HP], SMSTPCR4, 11, 0), /* IIC3 */
[MSTP410] = MSTP(&div4_clks[DIV4_HP], SMSTPCR4, 10, 0), /* IIC4 */
[MSTP403] = MSTP(&r_clk, SMSTPCR4, 3, 0), /* KEYSC */
+ [MSTP508] = MSTP(&div4_clks[DIV4_HP], SMSTPCR5, 8, 0), /* INTCA0 */
};
/* The lookups structure below includes duplicate entries for some clocks
@@ -677,6 +679,14 @@ static struct clk_lookup lookups[] = {
CLKDEV_DEV_ID("i2c-sh_mobile.4", &mstp_clks[MSTP410]), /* I2C4 */
CLKDEV_DEV_ID("e6828000.i2c", &mstp_clks[MSTP410]), /* I2C4 */
CLKDEV_DEV_ID("sh_keysc.0", &mstp_clks[MSTP403]), /* KEYSC */
+ CLKDEV_DEV_ID("renesas_intc_irqpin.0", &mstp_clks[MSTP508]), /* INTCA0 */
+ CLKDEV_DEV_ID("e6900000.irqpin", &mstp_clks[MSTP508]), /* INTCA0 */
+ CLKDEV_DEV_ID("renesas_intc_irqpin.1", &mstp_clks[MSTP508]), /* INTCA0 */
+ CLKDEV_DEV_ID("e6900004.irqpin", &mstp_clks[MSTP508]), /* INTCA0 */
+ CLKDEV_DEV_ID("renesas_intc_irqpin.2", &mstp_clks[MSTP508]), /* INTCA0 */
+ CLKDEV_DEV_ID("e6900008.irqpin", &mstp_clks[MSTP508]), /* INTCA0 */
+ CLKDEV_DEV_ID("renesas_intc_irqpin.3", &mstp_clks[MSTP508]), /* INTCA0 */
+ CLKDEV_DEV_ID("e690000c.irqpin", &mstp_clks[MSTP508]), /* INTCA0 */
/* ICK */
CLKDEV_ICK_ID("dsit_clk", "sh-mipi-dsi.0", &div6_clks[DIV6_DSIT]),
--
2.1.3
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/4] ARM: shmobile: Fix is_e2 warning
2014-12-29 1:47 [GIT PULL] Renesas ARM Based SoC Updates for v3.20 Simon Horman
2014-12-29 1:47 ` [PATCH 1/4] ARM: shmobile: sh73a0 legacy/reference: Add missing INTCA0 clock for irqpin module Simon Horman
@ 2014-12-29 1:47 ` Simon Horman
2014-12-29 1:47 ` [PATCH 3/4] ARM: shmobile: r8a7779: No TWD setup in C for Multiplatform Simon Horman
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Simon Horman @ 2014-12-29 1:47 UTC (permalink / raw)
To: linux-arm-kernel
From: Magnus Damm <damm+renesas@opensource.se>
Fix "is_e2" warning introduced by:
9ce3fa6 ARM: shmobile: rcar-gen2: Add CA7 arch_timer initialization for r8a7794
Only triggers on kernel configurations that have ARCH_ARM_TIMER=n.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/setup-rcar-gen2.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/arch/arm/mach-shmobile/setup-rcar-gen2.c b/arch/arm/mach-shmobile/setup-rcar-gen2.c
index 3dd6edd..c35b91d 100644
--- a/arch/arm/mach-shmobile/setup-rcar-gen2.c
+++ b/arch/arm/mach-shmobile/setup-rcar-gen2.c
@@ -52,15 +52,13 @@ void __init rcar_gen2_timer_init(void)
{
#if defined(CONFIG_ARM_ARCH_TIMER) || defined(CONFIG_COMMON_CLK)
u32 mode = rcar_gen2_read_mode_pins();
- bool is_e2 = (bool)of_find_compatible_node(NULL, NULL,
- "renesas,r8a7794");
#endif
#ifdef CONFIG_ARM_ARCH_TIMER
void __iomem *base;
int extal_mhz = 0;
u32 freq;
- if (is_e2) {
+ if (of_machine_is_compatible("renesas,r8a7794")) {
freq = 260000000 / 8; /* ZS / 8 */
/* CNTVOFF has to be initialized either from non-secure
* Hypervisor mode or secure Monitor mode with SCR.NS==1.
--
2.1.3
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [GIT PULL] Renesas ARM Based SoC Updates for v3.20
@ 2014-12-29 1:47 Simon Horman
2014-12-29 1:47 ` [PATCH 1/4] ARM: shmobile: sh73a0 legacy/reference: Add missing INTCA0 clock for irqpin module Simon Horman
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: Simon Horman @ 2014-12-29 1:47 UTC (permalink / raw)
To: linux-arm-kernel
Hi Olof, Hi Kevin, Hi Arnd,
Please consider these Renesas ARM based SoC updates for v3.20.
The following changes since commit 97bf6af1f928216fd6c5a66e8a57bfa95a659672:
Linux 3.19-rc1 (2014-12-20 17:08:50 -0800)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-soc-for-v3.20
for you to fetch changes up to 39695882d3d642a73bca551e682426e4e3bcd158:
ARM: shmobile: r8a73a4: Multiplatform support (2014-12-21 17:11:22 +0900)
----------------------------------------------------------------
Renesas ARM Based SoC Updates for v3.20
* Multiplatform support for r8a73a4
* No TWD setup in C for Multiplatform on r8a7779
* Fix is_e2 warning in generic R-Car Gen2 SoC setup code
* Add missing Add missing legacy INTCA0 clock for irqpin module on sh73a0
----------------------------------------------------------------
Geert Uytterhoeven (1):
ARM: shmobile: sh73a0 legacy/reference: Add missing INTCA0 clock for irqpin module
Magnus Damm (2):
ARM: shmobile: Fix is_e2 warning
ARM: shmobile: r8a7779: No TWD setup in C for Multiplatform
Ulrich Hecht (1):
ARM: shmobile: r8a73a4: Multiplatform support
arch/arm/mach-shmobile/Kconfig | 5 +++++
arch/arm/mach-shmobile/clock-sh73a0.c | 10 ++++++++++
arch/arm/mach-shmobile/setup-rcar-gen2.c | 4 +---
arch/arm/mach-shmobile/smp-r8a7779.c | 2 +-
4 files changed, 17 insertions(+), 4 deletions(-)
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 3/4] ARM: shmobile: r8a7779: No TWD setup in C for Multiplatform
2014-12-29 1:47 [GIT PULL] Renesas ARM Based SoC Updates for v3.20 Simon Horman
2014-12-29 1:47 ` [PATCH 1/4] ARM: shmobile: sh73a0 legacy/reference: Add missing INTCA0 clock for irqpin module Simon Horman
2014-12-29 1:47 ` [PATCH 2/4] ARM: shmobile: Fix is_e2 warning Simon Horman
@ 2014-12-29 1:47 ` Simon Horman
2014-12-29 1:47 ` [PATCH 4/4] ARM: shmobile: r8a73a4: Multiplatform support Simon Horman
2015-01-12 22:37 ` [GIT PULL] Renesas ARM Based SoC Updates for v3.20 Olof Johansson
4 siblings, 0 replies; 6+ messages in thread
From: Simon Horman @ 2014-12-29 1:47 UTC (permalink / raw)
To: linux-arm-kernel
From: Magnus Damm <damm+renesas@opensource.se>
Skip the TWD setup in C for r8a7779 Multiplatform.
We should use DTS for the TWD device anyway.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/smp-r8a7779.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/mach-shmobile/smp-r8a7779.c b/arch/arm/mach-shmobile/smp-r8a7779.c
index 3f761f8..9fc280e 100644
--- a/arch/arm/mach-shmobile/smp-r8a7779.c
+++ b/arch/arm/mach-shmobile/smp-r8a7779.c
@@ -56,7 +56,7 @@ static struct rcar_sysc_ch *r8a7779_ch_cpu[4] = {
[3] = &r8a7779_ch_cpu3,
};
-#ifdef CONFIG_HAVE_ARM_TWD
+#if defined(CONFIG_HAVE_ARM_TWD) && !defined(CONFIG_ARCH_MULTIPLATFORM)
static DEFINE_TWD_LOCAL_TIMER(twd_local_timer, R8A7779_SCU_BASE + 0x600, 29);
void __init r8a7779_register_twd(void)
{
--
2.1.3
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 4/4] ARM: shmobile: r8a73a4: Multiplatform support
2014-12-29 1:47 [GIT PULL] Renesas ARM Based SoC Updates for v3.20 Simon Horman
` (2 preceding siblings ...)
2014-12-29 1:47 ` [PATCH 3/4] ARM: shmobile: r8a7779: No TWD setup in C for Multiplatform Simon Horman
@ 2014-12-29 1:47 ` Simon Horman
2015-01-12 22:37 ` [GIT PULL] Renesas ARM Based SoC Updates for v3.20 Olof Johansson
4 siblings, 0 replies; 6+ messages in thread
From: Simon Horman @ 2014-12-29 1:47 UTC (permalink / raw)
To: linux-arm-kernel
From: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
Enable r8a73a4 Multiplatform support for the generic r8a73a4
machine vector.
Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
Acked-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 +++++
1 file changed, 5 insertions(+)
diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig
index 1b4fafe..d107b93 100644
--- a/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@ -51,6 +51,11 @@ config ARCH_R7S72100
bool "RZ/A1H (R7S72100)"
select SYS_SUPPORTS_SH_MTU2
+config ARCH_R8A73A4
+ bool "R-Mobile APE6 (R8A73A40)"
+ select ARCH_RMOBILE
+ select RENESAS_IRQC
+
config ARCH_R8A7740
bool "R-Mobile A1 (R8A77400)"
select ARCH_RMOBILE
--
2.1.3
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [GIT PULL] Renesas ARM Based SoC Updates for v3.20
2014-12-29 1:47 [GIT PULL] Renesas ARM Based SoC Updates for v3.20 Simon Horman
` (3 preceding siblings ...)
2014-12-29 1:47 ` [PATCH 4/4] ARM: shmobile: r8a73a4: Multiplatform support Simon Horman
@ 2015-01-12 22:37 ` Olof Johansson
4 siblings, 0 replies; 6+ messages in thread
From: Olof Johansson @ 2015-01-12 22:37 UTC (permalink / raw)
To: linux-arm-kernel
Hi Simon,
On Mon, Dec 29, 2014 at 10:47:06AM +0900, Simon Horman wrote:
> Hi Olof, Hi Kevin, Hi Arnd,
>
> Please consider these Renesas ARM based SoC updates for v3.20.
>
>
> The following changes since commit 97bf6af1f928216fd6c5a66e8a57bfa95a659672:
>
> Linux 3.19-rc1 (2014-12-20 17:08:50 -0800)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-soc-for-v3.20
>
> for you to fetch changes up to 39695882d3d642a73bca551e682426e4e3bcd158:
>
> ARM: shmobile: r8a73a4: Multiplatform support (2014-12-21 17:11:22 +0900)
>
> ----------------------------------------------------------------
> Renesas ARM Based SoC Updates for v3.20
>
> * Multiplatform support for r8a73a4
> * No TWD setup in C for Multiplatform on r8a7779
> * Fix is_e2 warning in generic R-Car Gen2 SoC setup code
> * Add missing Add missing legacy INTCA0 clock for irqpin module on sh73a0
>
> ----------------------------------------------------------------
> Geert Uytterhoeven (1):
> ARM: shmobile: sh73a0 legacy/reference: Add missing INTCA0 clock for irqpin module
>
> Magnus Damm (2):
> ARM: shmobile: Fix is_e2 warning
> ARM: shmobile: r8a7779: No TWD setup in C for Multiplatform
>
> Ulrich Hecht (1):
> ARM: shmobile: r8a73a4: Multiplatform support
This branch is a little odd. There are several fixes in here, but it's grouped
as an SoC branch. I can see the multiplatform patch belonging here, but it
seems that the three other patches could go in a fixes-non-critical branch.
Anyway, I've merged this into next/soc now, but please try to keep some of
these a little better sorted going forward.
Thanks,
-Olof
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2015-01-12 22:37 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-12-29 1:47 [GIT PULL] Renesas ARM Based SoC Updates for v3.20 Simon Horman
2014-12-29 1:47 ` [PATCH 1/4] ARM: shmobile: sh73a0 legacy/reference: Add missing INTCA0 clock for irqpin module Simon Horman
2014-12-29 1:47 ` [PATCH 2/4] ARM: shmobile: Fix is_e2 warning Simon Horman
2014-12-29 1:47 ` [PATCH 3/4] ARM: shmobile: r8a7779: No TWD setup in C for Multiplatform Simon Horman
2014-12-29 1:47 ` [PATCH 4/4] ARM: shmobile: r8a73a4: Multiplatform support Simon Horman
2015-01-12 22:37 ` [GIT PULL] Renesas ARM Based SoC Updates for v3.20 Olof Johansson
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).